XKH
/
LonglslandExhibitionCenter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: XKH:a8d2a3cabbf824aad6c209cdd4d2f8f0e1fbd2f8
Branches Tags
XKH:master
..
compare: XKH:50c80f96e5a117871a703922947927f0c2984aba
Branches Tags
XKH:master

No commits in common. "a8d2a3cabbf824aad6c209cdd4d2f8f0e1fbd2f8" and "50c80f96e5a117871a703922947927f0c2984aba" have entirely different histories.
a8d2a3cabb ... 50c80f96e5

25 changed files with 10 additions and 29 deletions
Show Stats Expand all files Collapse all files

BIN
.vs/LonglslandExhibitionCenterAPI/FileContentIndex/e07a7c5d-ddc0-49c0-8521-5f28b3154d4a.vsidx → .vs/LonglslandExhibitionCenterAPI/FileContentIndex/32af3570-eb77-4f9e-9edb-c15295bc64db.vsidx
View File

Binary file not shown.

BIN
.vs/LonglslandExhibitionCenterAPI/FileContentIndex/ea21d3bf-2261-4fbe-95f5-cdc01c007451.vsidx → .vs/LonglslandExhibitionCenterAPI/FileContentIndex/81e97ba9-2dd1-44c3-a00d-5243973ee289.vsidx
View File

Binary file not shown.

BIN
.vs/LonglslandExhibitionCenterAPI/v17/.suo
View File

Binary file not shown.

2
LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>

BIN
LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll
View File

Binary file not shown.

BIN
LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb
View File

Binary file not shown.

BIN
LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll
View File

Binary file not shown.

BIN
LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb
View File

Binary file not shown.

9
Security/ServiceSecurity.cs
View File

@ -399,8 +399,6 @@ namespace Security
model.Reserve1 = "配电室低压";
model.Reserve2 = GetDeviceName4(Convert.ToInt32(name));
if (model.EH != null && model.Ua != null && model.Ub != null && model.Uc != null && model.Ia != null && model.Ib != null && model.Ic != null && model.P != null && model.Kvar != null)
{
if (model.EH > 0 || model.Ua > 0 || model.Ub > 0 || model.Uc > 0 || model.Ia > 0 || model.Ib > 0 || model.Ic > 0 || model.P > 0 || model.Kvar > 0)
{
bll.AddDate(model, date);
}
@ -409,7 +407,6 @@ namespace Security
}
}
}
}
//配电室高压
if (topic.Contains("/9b841d78-68ca-45e5-ba5a-35dc43560c39"))
{
@ -524,8 +521,6 @@ namespace Security
model.Reserve1 = "配电室高压";
//model.Reserve2 = GetDeviceName4(Convert.ToInt32(name));
if (model.EH != null && model.Ua != null && model.Ub != null && model.Uc != null && model.Ia != null && model.Ib != null && model.Ic != null && model.P != null && model.Kvar != null)
{
if (model.EH > 0 || model.Ua > 0 || model.Ub > 0 || model.Uc > 0 || model.Ia > 0 || model.Ib > 0 || model.Ic > 0 || model.P > 0 || model.Kvar > 0)
{
bll.AddDate(model, date);
}
@ -534,7 +529,6 @@ namespace Security
}
}
}
}
//电能-室外箱变
if (topic.Contains("/bbb05637-34f2-4c1d-864e-6bbfca39d38b"))
{
@ -647,12 +641,9 @@ namespace Security
model.Reserve1 = "电能-室外箱变";
//model.Reserve2 = GetDeviceName4(Convert.ToInt32(name));
if (model.EH != null && model.Ua != null && model.Ub != null && model.Uc != null && model.Ia != null && model.Ib != null && model.Ic != null && model.P != null && model.Kvar != null)
{
if (model.EH > 0 || model.Ua > 0 || model.Ub > 0 || model.Uc > 0 || model.Ia > 0 || model.Ib > 0 || model.Ic > 0 || model.P > 0 || model.Kvar > 0)
{
bll.AddDate(model, date);
}
}
//else
//{
// log.Info("电能-室外箱变msg" + msg);

2
Security/bin/Debug/ServiceSecurity.application
View File

@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>5YN1lTA96iVN+gVTv+oSqwWoS4QX/DppZpvXONMDZaQ=</dsig:DigestValue>
<dsig:DigestValue>iv32QMruZnKNEzz+kjmmksq99mmjWfL88nEu1GZD+2g=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

BIN
Security/bin/Debug/ServiceSecurity.exe
View File

Binary file not shown.

4
Security/bin/Debug/ServiceSecurity.exe.manifest
View File

@ -138,14 +138,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="61920">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="60384">
<assemblyIdentity name="ServiceSecurity" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>Rgjm8G8WNGqXhelbzkcNskUVdQjHnXLQeEXzossMCiw=</dsig:DigestValue>
<dsig:DigestValue>uU7KmmhQEnNwdQxHU5xLv6w0ryLzshDrQvsWtpaW6Rc=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

BIN
Security/bin/Debug/ServiceSecurity.pdb
View File

Binary file not shown.

BIN
Security/bin/Debug/app.publish/ServiceSecurity.exe
View File

Binary file not shown.

BIN
Security/obj/Debug/Security.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Security/obj/Debug/ServiceSecurity.application
View File

@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>5YN1lTA96iVN+gVTv+oSqwWoS4QX/DppZpvXONMDZaQ=</dsig:DigestValue>
<dsig:DigestValue>iv32QMruZnKNEzz+kjmmksq99mmjWfL88nEu1GZD+2g=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

BIN
Security/obj/Debug/ServiceSecurity.exe
View File

Binary file not shown.

4
Security/obj/Debug/ServiceSecurity.exe.manifest
View File

@ -138,14 +138,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="61920">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="60384">
<assemblyIdentity name="ServiceSecurity" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>Rgjm8G8WNGqXhelbzkcNskUVdQjHnXLQeEXzossMCiw=</dsig:DigestValue>
<dsig:DigestValue>uU7KmmhQEnNwdQxHU5xLv6w0ryLzshDrQvsWtpaW6Rc=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

BIN
Security/obj/Debug/ServiceSecurity.pdb
View File

Binary file not shown.

10
Supplement/bin/Debug/App_Data/Logs_20240919.txt
View File

@ -1,10 +0,0 @@
------------------------------------------------
------------------------------------------------
------------------------------------------------
2024-09-19 10:22:58,745 [3] INFO loginfo - 启动服务
2024-09-19 10:23:03,580 [5] INFO loginfo - 开始补录
------------------------------------------------
------------------------------------------------
------------------------------------------------
2024-09-19 10:24:18,476 [3] INFO loginfo - 启动服务
2024-09-19 10:25:03,406 [5] INFO loginfo - 开始补录

BIN
Supplement/bin/Debug/ServiceSupplement.exe
View File

Binary file not shown.

BIN
Supplement/bin/Debug/ServiceSupplement.pdb
View File

Binary file not shown.

BIN
Supplement/obj/Debug/ServiceSupplement.exe
View File

Binary file not shown.

BIN
Supplement/obj/Debug/ServiceSupplement.pdb
View File

Binary file not shown.

0
Supplement/obj/Debug/build.force Normal file
View File