diff --git a/.vs/IOT.Show/v16/.suo b/.vs/IOT.Show/v16/.suo new file mode 100644 index 0000000..624fad2 Binary files /dev/null and b/.vs/IOT.Show/v16/.suo differ diff --git a/IOT.Show.Common/bin/Debug/IOT.Show.Common.dll b/IOT.Show.Common/bin/Debug/IOT.Show.Common.dll index 4b2e641..2cf2833 100644 Binary files a/IOT.Show.Common/bin/Debug/IOT.Show.Common.dll and b/IOT.Show.Common/bin/Debug/IOT.Show.Common.dll differ diff --git a/IOT.Show.Common/bin/Debug/IOT.Show.Common.pdb b/IOT.Show.Common/bin/Debug/IOT.Show.Common.pdb index f7601e1..89c7f5c 100644 Binary files a/IOT.Show.Common/bin/Debug/IOT.Show.Common.pdb and b/IOT.Show.Common/bin/Debug/IOT.Show.Common.pdb differ diff --git a/IOT.Show.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IOT.Show.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8ffce13..3369dcd 100644 Binary files a/IOT.Show.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/IOT.Show.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/IOT.Show.Common/obj/Debug/IOT.Show.Common.csproj.AssemblyReference.cache b/IOT.Show.Common/obj/Debug/IOT.Show.Common.csproj.AssemblyReference.cache index 0443ce3..ffb9e06 100644 Binary files a/IOT.Show.Common/obj/Debug/IOT.Show.Common.csproj.AssemblyReference.cache and b/IOT.Show.Common/obj/Debug/IOT.Show.Common.csproj.AssemblyReference.cache differ diff --git a/IOT.Show.Common/obj/Debug/IOT.Show.Common.csproj.CoreCompileInputs.cache b/IOT.Show.Common/obj/Debug/IOT.Show.Common.csproj.CoreCompileInputs.cache index fe74508..085dd7d 100644 --- a/IOT.Show.Common/obj/Debug/IOT.Show.Common.csproj.CoreCompileInputs.cache +++ b/IOT.Show.Common/obj/Debug/IOT.Show.Common.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -433b0b20593db62031988848a0a633d4b110739e +d44c44b8bde6a79f6a585e665c1751be7ed8068a diff --git a/IOT.Show.Common/obj/Debug/IOT.Show.Common.csproj.FileListAbsolute.txt b/IOT.Show.Common/obj/Debug/IOT.Show.Common.csproj.FileListAbsolute.txt index 2212292..82c8538 100644 --- a/IOT.Show.Common/obj/Debug/IOT.Show.Common.csproj.FileListAbsolute.txt +++ b/IOT.Show.Common/obj/Debug/IOT.Show.Common.csproj.FileListAbsolute.txt @@ -47,3 +47,13 @@ E:\项目源码\新昆能源管理项目\MES数据抽取服务\LED物联网展 \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show.Common\obj\Debug\IOT.Show.Common.csproj.CopyComplete \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show.Common\obj\Debug\IOT.Show.Common.dll \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show.Common\obj\Debug\IOT.Show.Common.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Common\bin\Debug\log4net.config +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Common\bin\Debug\IOT.Show.Common.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Common\bin\Debug\IOT.Show.Common.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Common\bin\Debug\log4net.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Common\bin\Debug\log4net.xml +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Common\obj\Debug\IOT.Show.Common.csproj.CoreCompileInputs.cache +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Common\obj\Debug\IOT.Show.Common.csproj.CopyComplete +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Common\obj\Debug\IOT.Show.Common.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Common\obj\Debug\IOT.Show.Common.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Common\obj\Debug\IOT.Show.Common.csproj.AssemblyReference.cache diff --git a/IOT.Show.Common/obj/Debug/IOT.Show.Common.dll b/IOT.Show.Common/obj/Debug/IOT.Show.Common.dll index 4b2e641..2cf2833 100644 Binary files a/IOT.Show.Common/obj/Debug/IOT.Show.Common.dll and b/IOT.Show.Common/obj/Debug/IOT.Show.Common.dll differ diff --git a/IOT.Show.Common/obj/Debug/IOT.Show.Common.pdb b/IOT.Show.Common/obj/Debug/IOT.Show.Common.pdb index f7601e1..89c7f5c 100644 Binary files a/IOT.Show.Common/obj/Debug/IOT.Show.Common.pdb and b/IOT.Show.Common/obj/Debug/IOT.Show.Common.pdb differ diff --git a/IOT.Show.Model/bin/Debug/IOT.Show.Model.dll b/IOT.Show.Model/bin/Debug/IOT.Show.Model.dll index de37662..5364b6d 100644 Binary files a/IOT.Show.Model/bin/Debug/IOT.Show.Model.dll and b/IOT.Show.Model/bin/Debug/IOT.Show.Model.dll differ diff --git a/IOT.Show.Model/bin/Debug/IOT.Show.Model.pdb b/IOT.Show.Model/bin/Debug/IOT.Show.Model.pdb index 0f4dd9a..3aeea51 100644 Binary files a/IOT.Show.Model/bin/Debug/IOT.Show.Model.pdb and b/IOT.Show.Model/bin/Debug/IOT.Show.Model.pdb differ diff --git a/IOT.Show.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IOT.Show.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index b030aa0..c81867a 100644 Binary files a/IOT.Show.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/IOT.Show.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/IOT.Show.Model/obj/Debug/IOT.Show.Model.csproj.AssemblyReference.cache b/IOT.Show.Model/obj/Debug/IOT.Show.Model.csproj.AssemblyReference.cache deleted file mode 100644 index ad79f31..0000000 Binary files a/IOT.Show.Model/obj/Debug/IOT.Show.Model.csproj.AssemblyReference.cache and /dev/null differ diff --git a/IOT.Show.Model/obj/Debug/IOT.Show.Model.csproj.FileListAbsolute.txt b/IOT.Show.Model/obj/Debug/IOT.Show.Model.csproj.FileListAbsolute.txt index d5bd2b3..caa5b42 100644 --- a/IOT.Show.Model/obj/Debug/IOT.Show.Model.csproj.FileListAbsolute.txt +++ b/IOT.Show.Model/obj/Debug/IOT.Show.Model.csproj.FileListAbsolute.txt @@ -27,3 +27,8 @@ E:\项目源码\新昆能源管理项目\MES数据抽取服务\LED物联网展 \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show.Model\obj\Debug\IOT.Show.Model.csproj.CoreCompileInputs.cache \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show.Model\obj\Debug\IOT.Show.Model.dll \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show.Model\obj\Debug\IOT.Show.Model.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Model\bin\Debug\IOT.Show.Model.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Model\bin\Debug\IOT.Show.Model.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Model\obj\Debug\IOT.Show.Model.csproj.CoreCompileInputs.cache +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Model\obj\Debug\IOT.Show.Model.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Model\obj\Debug\IOT.Show.Model.pdb diff --git a/IOT.Show.Model/obj/Debug/IOT.Show.Model.dll b/IOT.Show.Model/obj/Debug/IOT.Show.Model.dll index de37662..5364b6d 100644 Binary files a/IOT.Show.Model/obj/Debug/IOT.Show.Model.dll and b/IOT.Show.Model/obj/Debug/IOT.Show.Model.dll differ diff --git a/IOT.Show.Model/obj/Debug/IOT.Show.Model.pdb b/IOT.Show.Model/obj/Debug/IOT.Show.Model.pdb index 0f4dd9a..3aeea51 100644 Binary files a/IOT.Show.Model/obj/Debug/IOT.Show.Model.pdb and b/IOT.Show.Model/obj/Debug/IOT.Show.Model.pdb differ diff --git a/IOT.Show.Service/bin/Debug/IOT.Show.Service.dll b/IOT.Show.Service/bin/Debug/IOT.Show.Service.dll index a24f8ec..ae8b545 100644 Binary files a/IOT.Show.Service/bin/Debug/IOT.Show.Service.dll and b/IOT.Show.Service/bin/Debug/IOT.Show.Service.dll differ diff --git a/IOT.Show.Service/bin/Debug/IOT.Show.Service.pdb b/IOT.Show.Service/bin/Debug/IOT.Show.Service.pdb index e27c634..9f7c49b 100644 Binary files a/IOT.Show.Service/bin/Debug/IOT.Show.Service.pdb and b/IOT.Show.Service/bin/Debug/IOT.Show.Service.pdb differ diff --git a/IOT.Show.Service/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IOT.Show.Service/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index d8a2260..252892d 100644 Binary files a/IOT.Show.Service/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/IOT.Show.Service/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/IOT.Show.Service/obj/Debug/IOT.Show.Service.csproj.AssemblyReference.cache b/IOT.Show.Service/obj/Debug/IOT.Show.Service.csproj.AssemblyReference.cache deleted file mode 100644 index ad79f31..0000000 Binary files a/IOT.Show.Service/obj/Debug/IOT.Show.Service.csproj.AssemblyReference.cache and /dev/null differ diff --git a/IOT.Show.Service/obj/Debug/IOT.Show.Service.csproj.FileListAbsolute.txt b/IOT.Show.Service/obj/Debug/IOT.Show.Service.csproj.FileListAbsolute.txt index f73b9b9..db65866 100644 --- a/IOT.Show.Service/obj/Debug/IOT.Show.Service.csproj.FileListAbsolute.txt +++ b/IOT.Show.Service/obj/Debug/IOT.Show.Service.csproj.FileListAbsolute.txt @@ -27,3 +27,8 @@ E:\项目源码\新昆能源管理项目\MES数据抽取服务\LED物联网展 \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show.Service\obj\Debug\IOT.Show.Service.csproj.CoreCompileInputs.cache \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show.Service\obj\Debug\IOT.Show.Service.dll \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show.Service\obj\Debug\IOT.Show.Service.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Service\bin\Debug\IOT.Show.Service.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Service\bin\Debug\IOT.Show.Service.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Service\obj\Debug\IOT.Show.Service.csproj.CoreCompileInputs.cache +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Service\obj\Debug\IOT.Show.Service.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.Service\obj\Debug\IOT.Show.Service.pdb diff --git a/IOT.Show.Service/obj/Debug/IOT.Show.Service.dll b/IOT.Show.Service/obj/Debug/IOT.Show.Service.dll index a24f8ec..ae8b545 100644 Binary files a/IOT.Show.Service/obj/Debug/IOT.Show.Service.dll and b/IOT.Show.Service/obj/Debug/IOT.Show.Service.dll differ diff --git a/IOT.Show.Service/obj/Debug/IOT.Show.Service.pdb b/IOT.Show.Service/obj/Debug/IOT.Show.Service.pdb index e27c634..9f7c49b 100644 Binary files a/IOT.Show.Service/obj/Debug/IOT.Show.Service.pdb and b/IOT.Show.Service/obj/Debug/IOT.Show.Service.pdb differ diff --git a/IOT.Show.SqlBase/SqlSugarBase.cs b/IOT.Show.SqlBase/SqlSugarBase.cs index 10e42f5..cfecbec 100644 --- a/IOT.Show.SqlBase/SqlSugarBase.cs +++ b/IOT.Show.SqlBase/SqlSugarBase.cs @@ -17,7 +17,7 @@ namespace IOT.Show.SqlBase { SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { - ConnectionString = "server=10.113.254.16;uid=sa;pwd=klltdb@3391123;database=XJEMSRefactor", + ConnectionString = "server=10.113.254.18;uid=sa;pwd=klltdb@3391123;database=XJIoTEMSRefactor", DbType = SqlSugar.DbType.SqlServer, IsAutoCloseConnection = true, InitKeyType = InitKeyType.Attribute @@ -46,7 +46,8 @@ namespace IOT.Show.SqlBase { try { - var sqlStr = "select monitorName,\r\n ip,\r\n title,\r\n max(t.进水温度) as tempreture,\r\n MAX(t.出水温度) as humidity,\r\n (MAX(t.出水温度) - MAX(t.进水温度)) illuminance\r\nfrom (select Left(a.monitorName, len(a.monitorName) - 4) as monitorName,\r\n Right(a.monitorName, 4) as monitorType,\r\n a.ip,\r\n a.title,\r\n b.tempreture,\r\n a.monitorOrder\r\n from (\r\n select t1.title,\r\n t2.ledId,\r\n t1.ip,\r\n t2.monitorId,\r\n t2.monitorOrder,\r\n t3.monitorName,\r\n MAX(t4.collectTime) as collectTime\r\n from T_Led_Info t1\r\n left join T_Led_MonitorUnit t2 on t1.ledId = t2.ledId\r\n left join T_Monitor t3 on t2.monitorId = t3.monitorId\r\n left join T_W_TempertureData t4 on t4.monitorId = t3.monitorId\r\n where t1.title = @titleName \r\n group by t1.title, t2.ledId, t1.ip, t2.monitorId, t3.monitorName, t2.monitorOrder\r\n ) as a\r\n left join T_W_TempertureData b on b.collectTime = a.collectTime and a.monitorId = b.monitorId) as s1\r\n pivot (max(tempreture) for monitorType in (进水温度,出水温度)) t\r\ngroup by monitorName, ip, title, monitorOrder\r\norder by monitorOrder"; + var sqlStr = "select monitorName,\r\n ip,\r\n title,\r\n CONVERT(varchar,max(t.进水温度)) as tempreture,\r\n CONVERT(varchar,MAX(t.出水温度)) as humidity,\r\n CONVERT(varchar,ROUND((MAX(t.出水温度) - MAX(t.进水温度)), 2)) as illuminance\r\nfrom (select Left(a.monitorName, len(a.monitorName) - 4) as monitorName,\r\n Right(a.monitorName, 4) as monitorType,\r\n a.ip,\r\n a.title,\r\n ROUND(b.tempreture+a.repair_value,2) as tempreture,\r\n a.monitorOrder\r\n from (\r\n select t1.title,\r\n t2.ledId,\r\n t1.ip,\r\n t2.monitorId,\r\n t2.monitorOrder,\r\n t3.monitorName,t2.repair_value,\r\n MAX(t4.collectTime) as collectTime\r\n from T_Led_Info t1\r\n left join T_Led_MonitorUnit t2 on t1.ledId = t2.ledId\r\n left join T_Monitor t3 on t2.monitorId = t3.monitorId\r\n left join T_W_TempertureData t4 on t4.monitorId = t3.monitorId\r\n where t1.title = @titleName \r\n group by t1.title, t2.ledId, t1.ip, t2.monitorId, t3.monitorName, t2.repair_value,t2.monitorOrder\r\n ) as a\r\n left join T_W_TempertureData b on b.collectTime = a.collectTime and a.monitorId = b.monitorId) as s1\r\n pivot (max(tempreture) for monitorType in (进水温度,出水温度)) t\r\ngroup by monitorName, ip, title, monitorOrder\r\norder by monitorOrder"; + //LogHelper.Info("语句:"+sqlStr); var info = db.Ado.SqlQuery(sqlStr, new List(){ diff --git a/IOT.Show.SqlBase/bin/Debug/IOT.Show.Common.dll b/IOT.Show.SqlBase/bin/Debug/IOT.Show.Common.dll index 4b2e641..2cf2833 100644 Binary files a/IOT.Show.SqlBase/bin/Debug/IOT.Show.Common.dll and b/IOT.Show.SqlBase/bin/Debug/IOT.Show.Common.dll differ diff --git a/IOT.Show.SqlBase/bin/Debug/IOT.Show.Common.pdb b/IOT.Show.SqlBase/bin/Debug/IOT.Show.Common.pdb index f7601e1..89c7f5c 100644 Binary files a/IOT.Show.SqlBase/bin/Debug/IOT.Show.Common.pdb and b/IOT.Show.SqlBase/bin/Debug/IOT.Show.Common.pdb differ diff --git a/IOT.Show.SqlBase/bin/Debug/IOT.Show.Model.dll b/IOT.Show.SqlBase/bin/Debug/IOT.Show.Model.dll index de37662..5364b6d 100644 Binary files a/IOT.Show.SqlBase/bin/Debug/IOT.Show.Model.dll and b/IOT.Show.SqlBase/bin/Debug/IOT.Show.Model.dll differ diff --git a/IOT.Show.SqlBase/bin/Debug/IOT.Show.Model.pdb b/IOT.Show.SqlBase/bin/Debug/IOT.Show.Model.pdb index 0f4dd9a..3aeea51 100644 Binary files a/IOT.Show.SqlBase/bin/Debug/IOT.Show.Model.pdb and b/IOT.Show.SqlBase/bin/Debug/IOT.Show.Model.pdb differ diff --git a/IOT.Show.SqlBase/bin/Debug/IOT.Show.SqlBase.dll b/IOT.Show.SqlBase/bin/Debug/IOT.Show.SqlBase.dll index 3ba6b78..04bc503 100644 Binary files a/IOT.Show.SqlBase/bin/Debug/IOT.Show.SqlBase.dll and b/IOT.Show.SqlBase/bin/Debug/IOT.Show.SqlBase.dll differ diff --git a/IOT.Show.SqlBase/bin/Debug/IOT.Show.SqlBase.pdb b/IOT.Show.SqlBase/bin/Debug/IOT.Show.SqlBase.pdb index 94408ca..37eb643 100644 Binary files a/IOT.Show.SqlBase/bin/Debug/IOT.Show.SqlBase.pdb and b/IOT.Show.SqlBase/bin/Debug/IOT.Show.SqlBase.pdb differ diff --git a/IOT.Show.SqlBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IOT.Show.SqlBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index c000b46..ef9a972 100644 Binary files a/IOT.Show.SqlBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/IOT.Show.SqlBase/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.csproj.AssemblyReference.cache b/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.csproj.AssemblyReference.cache index 6982604..e3e3d9f 100644 Binary files a/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.csproj.AssemblyReference.cache and b/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.csproj.AssemblyReference.cache differ diff --git a/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.csproj.CoreCompileInputs.cache b/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.csproj.CoreCompileInputs.cache index 9cd5e8b..b8579f8 100644 --- a/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.csproj.CoreCompileInputs.cache +++ b/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -b27d1b1b98e2613cc3c7cc77534e1dd83c599c26 +d581e2829ea53b112c54710617f7a928e0b6a2a6 diff --git a/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.csproj.FileListAbsolute.txt b/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.csproj.FileListAbsolute.txt index 7ba2b27..28ee0cb 100644 --- a/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.csproj.FileListAbsolute.txt +++ b/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.csproj.FileListAbsolute.txt @@ -75,3 +75,18 @@ E:\项目源码\新昆能源管理项目\MES数据抽取服务\LED物联网展 \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show.SqlBase\obj\Debug\IOT.Show.SqlBase.csproj.CopyComplete \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show.SqlBase\obj\Debug\IOT.Show.SqlBase.dll \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show.SqlBase\obj\Debug\IOT.Show.SqlBase.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\bin\Debug\log4net.config +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\bin\Debug\IOT.Show.SqlBase.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\bin\Debug\IOT.Show.SqlBase.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\bin\Debug\IOT.Show.Common.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\bin\Debug\IOT.Show.Model.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\bin\Debug\SqlSugar.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\bin\Debug\log4net.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\bin\Debug\IOT.Show.Common.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\bin\Debug\IOT.Show.Model.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\bin\Debug\log4net.xml +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\obj\Debug\IOT.Show.SqlBase.csproj.AssemblyReference.cache +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\obj\Debug\IOT.Show.SqlBase.csproj.CoreCompileInputs.cache +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\obj\Debug\IOT.Show.SqlBase.csproj.CopyComplete +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\obj\Debug\IOT.Show.SqlBase.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show.SqlBase\obj\Debug\IOT.Show.SqlBase.pdb diff --git a/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.dll b/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.dll index 3ba6b78..04bc503 100644 Binary files a/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.dll and b/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.dll differ diff --git a/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.pdb b/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.pdb index 94408ca..37eb643 100644 Binary files a/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.pdb and b/IOT.Show.SqlBase/obj/Debug/IOT.Show.SqlBase.pdb differ diff --git a/IOT.Show/bin/密炼5-8.zip b/IOT.Show/bin/Debug.zip similarity index 98% rename from IOT.Show/bin/密炼5-8.zip rename to IOT.Show/bin/Debug.zip index d10f6e8..e2106bd 100644 Binary files a/IOT.Show/bin/密炼5-8.zip and b/IOT.Show/bin/Debug.zip differ diff --git a/IOT.Show/bin/Debug/IOT.Show.Common.dll b/IOT.Show/bin/Debug/IOT.Show.Common.dll index 4b2e641..2cf2833 100644 Binary files a/IOT.Show/bin/Debug/IOT.Show.Common.dll and b/IOT.Show/bin/Debug/IOT.Show.Common.dll differ diff --git a/IOT.Show/bin/Debug/IOT.Show.Common.pdb b/IOT.Show/bin/Debug/IOT.Show.Common.pdb index f7601e1..89c7f5c 100644 Binary files a/IOT.Show/bin/Debug/IOT.Show.Common.pdb and b/IOT.Show/bin/Debug/IOT.Show.Common.pdb differ diff --git a/IOT.Show/bin/Debug/IOT.Show.Model.dll b/IOT.Show/bin/Debug/IOT.Show.Model.dll index de37662..5364b6d 100644 Binary files a/IOT.Show/bin/Debug/IOT.Show.Model.dll and b/IOT.Show/bin/Debug/IOT.Show.Model.dll differ diff --git a/IOT.Show/bin/Debug/IOT.Show.Model.pdb b/IOT.Show/bin/Debug/IOT.Show.Model.pdb index 0f4dd9a..3aeea51 100644 Binary files a/IOT.Show/bin/Debug/IOT.Show.Model.pdb and b/IOT.Show/bin/Debug/IOT.Show.Model.pdb differ diff --git a/IOT.Show/bin/Debug/IOT.Show.SqlBase.dll b/IOT.Show/bin/Debug/IOT.Show.SqlBase.dll index 3ba6b78..04bc503 100644 Binary files a/IOT.Show/bin/Debug/IOT.Show.SqlBase.dll and b/IOT.Show/bin/Debug/IOT.Show.SqlBase.dll differ diff --git a/IOT.Show/bin/Debug/IOT.Show.SqlBase.pdb b/IOT.Show/bin/Debug/IOT.Show.SqlBase.pdb index 94408ca..37eb643 100644 Binary files a/IOT.Show/bin/Debug/IOT.Show.SqlBase.pdb and b/IOT.Show/bin/Debug/IOT.Show.SqlBase.pdb differ diff --git a/IOT.Show/bin/Debug/IOT.Show.exe b/IOT.Show/bin/Debug/IOT.Show.exe index 40ec0b5..196485f 100644 Binary files a/IOT.Show/bin/Debug/IOT.Show.exe and b/IOT.Show/bin/Debug/IOT.Show.exe differ diff --git a/IOT.Show/bin/Debug/IOT.Show.pdb b/IOT.Show/bin/Debug/IOT.Show.pdb index 0e6d1aa..bc0492e 100644 Binary files a/IOT.Show/bin/Debug/IOT.Show.pdb and b/IOT.Show/bin/Debug/IOT.Show.pdb differ diff --git a/IOT.Show/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/IOT.Show/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index ba5fdac..a3f5c87 100644 Binary files a/IOT.Show/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/IOT.Show/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/IOT.Show/obj/Debug/IOT.Show.csproj.AssemblyReference.cache b/IOT.Show/obj/Debug/IOT.Show.csproj.AssemblyReference.cache index ed01831..174484f 100644 Binary files a/IOT.Show/obj/Debug/IOT.Show.csproj.AssemblyReference.cache and b/IOT.Show/obj/Debug/IOT.Show.csproj.AssemblyReference.cache differ diff --git a/IOT.Show/obj/Debug/IOT.Show.csproj.CoreCompileInputs.cache b/IOT.Show/obj/Debug/IOT.Show.csproj.CoreCompileInputs.cache index 0f8eab5..a75a37d 100644 --- a/IOT.Show/obj/Debug/IOT.Show.csproj.CoreCompileInputs.cache +++ b/IOT.Show/obj/Debug/IOT.Show.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -ad0577d240358618386bceb894b8aef7065946e2 +939d603d10e0cfdf3f02d65a0ea2937552bb5abc diff --git a/IOT.Show/obj/Debug/IOT.Show.csproj.FileListAbsolute.txt b/IOT.Show/obj/Debug/IOT.Show.csproj.FileListAbsolute.txt index 5919440..8bc2e1c 100644 --- a/IOT.Show/obj/Debug/IOT.Show.csproj.FileListAbsolute.txt +++ b/IOT.Show/obj/Debug/IOT.Show.csproj.FileListAbsolute.txt @@ -104,3 +104,23 @@ E:\项目源码\新昆能源管理项目\MES数据抽取服务\LED物联网展 \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show\obj\Debug\IOT.Show.csproj.CopyComplete \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show\obj\Debug\IOT.Show.exe \\Mac\iCloud\项目资料\LED物联网展示平台\密炼LED\IOT.Show\obj\Debug\IOT.Show.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\bin\Debug\log4net.config +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\bin\Debug\IOT.Show.exe.config +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\bin\Debug\IOT.Show.exe +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\bin\Debug\IOT.Show.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\bin\Debug\IOT.Show.Common.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\bin\Debug\IOT.Show.Model.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\bin\Debug\IOT.Show.SqlBase.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\bin\Debug\log4net.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\bin\Debug\SqlSugar.dll +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\bin\Debug\IOT.Show.Common.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\bin\Debug\IOT.Show.Model.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\bin\Debug\IOT.Show.SqlBase.pdb +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\bin\Debug\log4net.xml +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\obj\Debug\IOT.Show.csproj.AssemblyReference.cache +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\obj\Debug\IOT.Show.ProjectInstaller.resources +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\obj\Debug\IOT.Show.csproj.GenerateResource.cache +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\obj\Debug\IOT.Show.csproj.CoreCompileInputs.cache +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\obj\Debug\IOT.Show.csproj.CopyComplete +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\obj\Debug\IOT.Show.exe +C:\项目代码\新昆LED\XK.IOT.Show.ML\IOT.Show\obj\Debug\IOT.Show.pdb diff --git a/IOT.Show/obj/Debug/IOT.Show.csproj.GenerateResource.cache b/IOT.Show/obj/Debug/IOT.Show.csproj.GenerateResource.cache index 4c6fca4..826b52a 100644 Binary files a/IOT.Show/obj/Debug/IOT.Show.csproj.GenerateResource.cache and b/IOT.Show/obj/Debug/IOT.Show.csproj.GenerateResource.cache differ diff --git a/IOT.Show/obj/Debug/IOT.Show.exe b/IOT.Show/obj/Debug/IOT.Show.exe index 40ec0b5..196485f 100644 Binary files a/IOT.Show/obj/Debug/IOT.Show.exe and b/IOT.Show/obj/Debug/IOT.Show.exe differ diff --git a/IOT.Show/obj/Debug/IOT.Show.pdb b/IOT.Show/obj/Debug/IOT.Show.pdb index 0e6d1aa..bc0492e 100644 Binary files a/IOT.Show/obj/Debug/IOT.Show.pdb and b/IOT.Show/obj/Debug/IOT.Show.pdb differ