yandaniu пре 3 недеља
родитељ
комит
16d401ce7a
47 измењених фајлова са 215 додато и 45 уклоњено
  1. BIN
      .vs/ProjectEvaluation/ropin.inspection.api.metadata.v6.1
  2. BIN
      .vs/ProjectEvaluation/ropin.inspection.api.projects.v6.1
  3. BIN
      .vs/Ropin.Inspection.Api/DesignTimeBuild/.dtbcache.v2
  4. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/0ff55d43-d444-49db-815f-17553b304276.vsidx
  5. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/47bf5ebf-4dc5-4168-bd56-1940f79964b9.vsidx
  6. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/4d87412f-a836-49f3-a037-93d856a38693.vsidx
  7. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/6aa2dd80-1862-46d0-a1d1-eb214384bba7.vsidx
  8. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/9cd2171e-fd96-403b-b2b4-ef1f13e3feae.vsidx
  9. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/c5930883-b235-48a2-a7bf-d4329d07f9ee.vsidx
  10. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/c6ff5421-d9f3-4079-8bc9-0bac6ad061ed.vsidx
  11. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/e363df6c-b870-4663-a420-128baa06a060.vsidx
  12. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/e74b9749-83d3-4fb0-8e04-fec190ac66ac.vsidx
  13. BIN
      .vs/Ropin.Inspection.Api/v17/.suo
  14. 24 0
      Ropin.Environmentally.LedgeService1/appsettings.Development.json
  15. 34 0
      Ropin.Environmentally.LedgeService1/appsettings.Production.json
  16. 33 0
      Ropin.Environmentally.LedgeService1/appsettings.Staging.json
  17. 1 25
      Ropin.Environmentally.LedgeService1/appsettings.json
  18. BIN
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Core.Common.dll
  19. BIN
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Core.Common.pdb
  20. BIN
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Environmentally.LedgeService1.dll
  21. BIN
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Environmentally.LedgeService1.pdb
  22. BIN
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Inspection.Common.dll
  23. BIN
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Inspection.Common.pdb
  24. BIN
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Inspection.Model.dll
  25. BIN
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Inspection.Model.pdb
  26. BIN
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Inspection.Repository.dll
  27. BIN
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb
  28. 24 0
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/appsettings.Development.json
  29. 34 0
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/appsettings.Production.json
  30. 33 0
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/appsettings.Staging.json
  31. 1 18
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/appsettings.json
  32. 1 1
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/log4net.config
  33. 0 0
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/logs/2025/202503/20250327.txt
  34. 0 0
      Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/logs/2025/202503/20250327_error.txt
  35. BIN
      Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.csproj.AssemblyReference.cache
  36. 2 0
      Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.csproj.FileListAbsolute.txt
  37. BIN
      Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.dll
  38. BIN
      Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.pdb
  39. BIN
      Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/ref/Ropin.Environmentally.LedgeService1.dll
  40. BIN
      Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/refint/Ropin.Environmentally.LedgeService1.dll
  41. 25 0
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/logs/2025/202503/20250327.txt
  42. 2 0
      Ropin.Inspection.Repository/TmtnPushMsgResultRepository.cs
  43. BIN
      Ropin.Inspection.Repository/bin/Debug/net5.0/Ropin.Inspection.Repository.dll
  44. BIN
      Ropin.Inspection.Repository/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb
  45. BIN
      Ropin.Inspection.Repository/obj/Debug/net5.0/Ropin.Inspection.Repository.dll
  46. BIN
      Ropin.Inspection.Repository/obj/Debug/net5.0/Ropin.Inspection.Repository.pdb
  47. 1 1
      docker-compose-horbar.override.yml

BIN
.vs/ProjectEvaluation/ropin.inspection.api.metadata.v6.1


BIN
.vs/ProjectEvaluation/ropin.inspection.api.projects.v6.1


BIN
.vs/Ropin.Inspection.Api/DesignTimeBuild/.dtbcache.v2


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/8661e957-db76-44ef-8776-729405238cea.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/0ff55d43-d444-49db-815f-17553b304276.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/fbf62f49-f1ee-48cd-af4f-678d078e3aa2.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/47bf5ebf-4dc5-4168-bd56-1940f79964b9.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/4d87412f-a836-49f3-a037-93d856a38693.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/6aa2dd80-1862-46d0-a1d1-eb214384bba7.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/093724cf-09bb-47f2-bde9-f16da2523092.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/9cd2171e-fd96-403b-b2b4-ef1f13e3feae.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/c5930883-b235-48a2-a7bf-d4329d07f9ee.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/1e065a50-35aa-4618-a673-666588331095.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/c6ff5421-d9f3-4079-8bc9-0bac6ad061ed.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/a0ed3f05-f4e7-4a1a-99c4-9005c465aa61.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/e363df6c-b870-4663-a420-128baa06a060.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/e74b9749-83d3-4fb0-8e04-fec190ac66ac.vsidx


BIN
.vs/Ropin.Inspection.Api/v17/.suo


+ 24 - 0
Ropin.Environmentally.LedgeService1/appsettings.Development.json

@@ -5,5 +5,29 @@
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "AllowedHosts": "*",
+  "ConnectionSetting": {
+    //"MySqlConnection": "server=120.26.5.167;user id=root;password=Ropin1234%$#@;port=8605;persistsecurityinfo=True;database=SH_HB_Test;sslMode=None",
+    //"MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_CustomerTest;sslMode=None",
+    //"RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
+    
+    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250319;sslMode=None",
+    "RedisConnection": "124.71.132.255:6379,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
+  },
+  "IniInflux": {
+    "infuxUrl": "http://124.71.132.255:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "RabbitMQ": {
+    "QueueName": "rabbit@rabbitmq01", //消息队列名称[]
+    "HostName": "124.71.132.255", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
+    "VirtualHost": "/",
+    "Password": "ropin@epe", //用户密码
+    "ExchangeName": "rabbit@rabbitmq01.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
+    "RoutingKey": "rabbit@rabbitmq01.key" //路由键【消息队列名称+.key】
   }
 }

+ 34 - 0
Ropin.Environmentally.LedgeService1/appsettings.Production.json

@@ -0,0 +1,34 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "ConnectionSetting": {
+    //"MySqlConnection": "server=120.26.5.167;user id=root;password=Ropin1234%$#@;port=8605;persistsecurityinfo=True;database=SH_HB_Test;sslMode=None",
+    //"MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_CustomerTest;sslMode=None",
+    //"RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
+    
+    "MySqlConnection": "server=60.204.212.71;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250321;sslMode=None",
+    "RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000,abortConnect=false"
+  },
+  "IniInflux": {
+    "infuxUrl": "http://124.71.132.255:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "RabbitMQ": {
+    "QueueName": "rabbit@rabbitmq01", //消息队列名称[]
+    "HostName": "60.204.212.71", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
+    "VirtualHost": "/",
+    "Password": "ropin@epe", //用户密码
+    "ExchangeName": "rabbit@rabbitmq01.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
+    "RoutingKey": "rabbit@rabbitmq01.key" //路由键【消息队列名称+.key】
+  }
+}
+

+ 33 - 0
Ropin.Environmentally.LedgeService1/appsettings.Staging.json

@@ -0,0 +1,33 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "ConnectionSetting": {
+    //"MySqlConnection": "server=120.26.5.167;user id=root;password=Ropin1234%$#@;port=8605;persistsecurityinfo=True;database=SH_HB_Test;sslMode=None",
+    //"MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_CustomerTest;sslMode=None",
+    //"RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
+    
+    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250319;sslMode=None",
+    "RedisConnection": "124.71.132.255:6379,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
+  },
+  "IniInflux": {
+    "infuxUrl": "http://124.71.132.255:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "RabbitMQ": {
+    "QueueName": "rabbit@rabbitmq01", //消息队列名称[]
+    "HostName": "124.71.132.255", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
+    "VirtualHost": "/",
+    "Password": "ropin@epe", //用户密码
+    "ExchangeName": "rabbit@rabbitmq01.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
+    "RoutingKey": "rabbit@rabbitmq01.key" //路由键【消息队列名称+.key】
+  }
+}

+ 1 - 25
Ropin.Environmentally.LedgeService1/appsettings.json

@@ -5,29 +5,5 @@
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
-  },
-  "AllowedHosts": "*",
-  "ConnectionSetting": {
-    //"MySqlConnection": "server=120.26.5.167;user id=root;password=Ropin1234%$#@;port=8605;persistsecurityinfo=True;database=SH_HB_Test;sslMode=None",
-    //"MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_CustomerTest;sslMode=None",
-    //"RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
-    
-    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250319;sslMode=None",
-    "RedisConnection": "124.71.132.255:6379,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
-  },
-  "IniInflux": {
-    "infuxUrl": "http://124.71.132.255:8085/",
-    "infuxUser": "admin",
-    "infuxPwd": "123456"
-  },
-  "RabbitMQ": {
-    "QueueName": "rabbit@rabbitmq01", //消息队列名称[]
-    "HostName": "124.71.132.255", //IP地址
-    "Port": 5673, //端口号
-    "UserName": "admin", //用户账号
-    "VirtualHost": "/",
-    "Password": "ropin@epe", //用户密码
-    "ExchangeName": "rabbit@rabbitmq01.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
-    "RoutingKey": "rabbit@rabbitmq01.key" //路由键【消息队列名称+.key】
   }
-}
+}

BIN
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Core.Common.dll


BIN
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Core.Common.pdb


BIN
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Environmentally.LedgeService1.dll


BIN
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Environmentally.LedgeService1.pdb


BIN
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Inspection.Common.dll


BIN
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Inspection.Common.pdb


BIN
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Inspection.Model.dll


BIN
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Inspection.Model.pdb


BIN
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Inspection.Repository.dll


BIN
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb


+ 24 - 0
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/appsettings.Development.json

@@ -5,5 +5,29 @@
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "AllowedHosts": "*",
+  "ConnectionSetting": {
+    //"MySqlConnection": "server=120.26.5.167;user id=root;password=Ropin1234%$#@;port=8605;persistsecurityinfo=True;database=SH_HB_Test;sslMode=None",
+    //"MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_CustomerTest;sslMode=None",
+    //"RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
+    
+    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250319;sslMode=None",
+    "RedisConnection": "124.71.132.255:6379,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
+  },
+  "IniInflux": {
+    "infuxUrl": "http://124.71.132.255:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "RabbitMQ": {
+    "QueueName": "rabbit@rabbitmq01", //消息队列名称[]
+    "HostName": "124.71.132.255", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
+    "VirtualHost": "/",
+    "Password": "ropin@epe", //用户密码
+    "ExchangeName": "rabbit@rabbitmq01.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
+    "RoutingKey": "rabbit@rabbitmq01.key" //路由键【消息队列名称+.key】
   }
 }

+ 34 - 0
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/appsettings.Production.json

@@ -0,0 +1,34 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "ConnectionSetting": {
+    //"MySqlConnection": "server=120.26.5.167;user id=root;password=Ropin1234%$#@;port=8605;persistsecurityinfo=True;database=SH_HB_Test;sslMode=None",
+    //"MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_CustomerTest;sslMode=None",
+    //"RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
+    
+    "MySqlConnection": "server=60.204.212.71;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250321;sslMode=None",
+    "RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000,abortConnect=false"
+  },
+  "IniInflux": {
+    "infuxUrl": "http://124.71.132.255:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "RabbitMQ": {
+    "QueueName": "rabbit@rabbitmq01", //消息队列名称[]
+    "HostName": "60.204.212.71", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
+    "VirtualHost": "/",
+    "Password": "ropin@epe", //用户密码
+    "ExchangeName": "rabbit@rabbitmq01.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
+    "RoutingKey": "rabbit@rabbitmq01.key" //路由键【消息队列名称+.key】
+  }
+}
+

+ 33 - 0
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/appsettings.Staging.json

@@ -0,0 +1,33 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*",
+  "ConnectionSetting": {
+    //"MySqlConnection": "server=120.26.5.167;user id=root;password=Ropin1234%$#@;port=8605;persistsecurityinfo=True;database=SH_HB_Test;sslMode=None",
+    //"MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_CustomerTest;sslMode=None",
+    //"RedisConnection": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
+    
+    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250319;sslMode=None",
+    "RedisConnection": "124.71.132.255:6379,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
+  },
+  "IniInflux": {
+    "infuxUrl": "http://124.71.132.255:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "RabbitMQ": {
+    "QueueName": "rabbit@rabbitmq01", //消息队列名称[]
+    "HostName": "124.71.132.255", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
+    "VirtualHost": "/",
+    "Password": "ropin@epe", //用户密码
+    "ExchangeName": "rabbit@rabbitmq01.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
+    "RoutingKey": "rabbit@rabbitmq01.key" //路由键【消息队列名称+.key】
+  }
+}

+ 1 - 18
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/appsettings.json

@@ -5,22 +5,5 @@
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
-  },
-  "AllowedHosts": "*",
-  "ConnectionSetting": {
-    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_CustomerTest;sslMode=None",
-    "RedisConnection": "124.71.132.255,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
-  },
-  "IniInflux": {
-    "infuxUrl": "http://124.71.132.255:8085/",
-    "infuxUser": "admin",
-    "infuxPwd": "123456"
-  },
-  "RabbitMQ": {
-    "HostName": "124.71.132.255", //IP地址
-    "Port": 5672, //端口号
-    "UserName": "guest", //用户账号
-    "VirtualHost": "/",
-    "Password": "guest" //用户密码
   }
-}
+}

+ 1 - 1
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/log4net.config

@@ -64,7 +64,7 @@
 		</layout>
 	</appender>
 	<root>
-		<level value="TRACE" />
+		<level value="OFF" />
 		<appender-ref ref="RollingFileError" />
 		<appender-ref ref="RollingFileAll" />
 		<appender-ref ref="TraceAppender" />

+ 0 - 0
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/logs/2025/202503/20250327.txt


+ 0 - 0
Ropin.Environmentally.LedgeService1/bin/Debug/net5.0/logs/2025/202503/20250327_error.txt


BIN
Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.csproj.AssemblyReference.cache


+ 2 - 0
Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.csproj.FileListAbsolute.txt

@@ -101,3 +101,5 @@ E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.LedgeSer
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.LedgeService1\obj\Debug\net5.0\Ropin.Environmentally.LedgeService1.pdb
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.LedgeService1\obj\Debug\net5.0\Ropin.Environmentally.LedgeService1.genruntimeconfig.cache
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.LedgeService1\obj\Debug\net5.0\ref\Ropin.Environmentally.LedgeService1.dll
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.LedgeService1\bin\Debug\net5.0\appsettings.Production.json
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.LedgeService1\bin\Debug\net5.0\appsettings.Staging.json

BIN
Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.dll


BIN
Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.pdb


BIN
Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/ref/Ropin.Environmentally.LedgeService1.dll


BIN
Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/refint/Ropin.Environmentally.LedgeService1.dll


+ 25 - 0
Ropin.Environmentally.WebScada/bin/Debug/net5.0/logs/2025/202503/20250327.txt

@@ -27,4 +27,29 @@
  2025-03-27 15:48:12,674  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
  2025-03-27 15:49:12,789  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
  2025-03-27 15:50:12,915  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 15:51:13,018  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 15:52:05,525  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [271] - MESSAGE: Task2-异常:An exception has been raised that is likely due to a transient failure. Consider enabling transient error resiliency by adding 'EnableRetryOnFailure()' to the 'UseMySql' call.
+ 2025-03-27 15:52:08,644  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [997] - MESSAGE: 1log-设备点预警报警-进入报警-Begin【设备ID=8793c6c8-d855-421e-9fa1-d25f914bb730;ala[id]=338301733131261139;strAlaColour=yellow;sendmsg=false;devspotColour=green】---
+ 2025-03-27 15:52:08,748  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [1049] - MESSAGE: 1log-设备点预警报警-发送RabbitMQ消息-设备报警【设备ID=8793c6c8-d855-421e-9fa1-d25f914bb730;ala[id]=338301733131261139;strAlaColour=yellow;sendmsg=false;devspotColour=green;msgData={"C_DevStoreCode":"8793c6c8-d855-421e-9fa1-d25f914bb730","C_MsgTypeCode":"MSG_TYPE_017","Subject":"设备点预警","Msg":"北大喷漆房3VOCs的催化床进口温度 T1实际值设备点预警  设备点值:258","DevNumber":"2021083004","DevName":"北大喷漆房3VOCs","UserName":"设备","UserMobile":null,"DevAddress":null,"DevOpsName":null,"CreateOn":"2025/3/27 15:52:08","GenerationType":1,"msgStatus":1,"FileList":null}】---
+ 2025-03-27 15:52:13,100  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 15:53:13,247  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 15:54:13,357  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 15:55:00,093  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [997] - MESSAGE: 1log-设备点预警报警-进入报警-Begin【设备ID=f451172e-ee94-44dd-931a-9eff5cf477e6;ala[id]=338301733124969517;strAlaColour=red;sendmsg=true;devspotColour=yellow】---
+ 2025-03-27 15:55:00,238  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [1049] - MESSAGE: 1log-设备点预警报警-发送RabbitMQ消息-设备报警【设备ID=f451172e-ee94-44dd-931a-9eff5cf477e6;ala[id]=338301733124969517;strAlaColour=red;sendmsg=true;devspotColour=yellow;msgData={"C_DevStoreCode":"f451172e-ee94-44dd-931a-9eff5cf477e6","C_MsgTypeCode":"MSG_TYPE_012","Subject":"设备点报警","Msg":"南小喷漆房1VOCs设备的主机1初中段压差D2设备点报警  设备点值:1003.689","DevNumber":"20240122","DevName":"南小喷漆房1VOCs设备","UserName":"设备","UserMobile":null,"DevAddress":null,"DevOpsName":null,"CreateOn":"2025/3/27 15:55:00","GenerationType":1,"msgStatus":1,"FileList":null}】---
+ 2025-03-27 15:55:15,075  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 15:55:48,958  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [961] - MESSAGE: -设备点开关机开始-进入状态不相等【设备ID=59e98720-f26a-4322-9dad-c92bb5d7ae8b,ala[value]=0】
+ 2025-03-27 15:55:49,016  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [974] - MESSAGE: {"devStoreCode":"59e98720-f26a-4322-9dad-c92bb5d7ae8b","devRunSpot":"338301733134406924","time":"2025-03-27T15:55:49.0169219+08:00"};发送RabbitMQ消息
+ 2025-03-27 15:56:15,265  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 15:57:15,412  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 15:58:15,502  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 15:59:17,648  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 16:00:17,782  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 16:01:17,875  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 16:02:17,990  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 16:03:18,078  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 16:04:19,054  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 16:05:19,234  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 16:07:13,297  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 16:08:13,486  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
+ 2025-03-27 16:09:13,580  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [389] - MESSAGE: AI报警数据同步接口返回【】
  

+ 2 - 0
Ropin.Inspection.Repository/TmtnPushMsgResultRepository.cs

@@ -149,6 +149,8 @@ namespace Ropin.Inspection.Repository
             string FistTime=null,LastTime=null;
             foreach (var item in recordItemlist)
             {
+                if (item == null)
+                    continue;
                var msgMode= JsonConvert.DeserializeObject<TpushMsgModel>(item.C_Content);
                 if (msgMode.Msg== "开启")
                 {

BIN
Ropin.Inspection.Repository/bin/Debug/net5.0/Ropin.Inspection.Repository.dll


BIN
Ropin.Inspection.Repository/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb


BIN
Ropin.Inspection.Repository/obj/Debug/net5.0/Ropin.Inspection.Repository.dll


BIN
Ropin.Inspection.Repository/obj/Debug/net5.0/Ropin.Inspection.Repository.pdb


+ 1 - 1
docker-compose-horbar.override.yml

@@ -13,7 +13,7 @@ services:
       ASPNETCORE_ENVIRONMENT: ${DEV_ENVIRONMENT}
       #- mongo
   qlhuanbaoledgesvc99:
-    image: www.dgt.net.cn:5443/huanbao/qlhuanbaoledgesvcimage99:1.3
+    image: www.dgt.net.cn:5443/huanbao/qlhuanbaoledgesvcimage99:1.3.5
     environment:
       TZ: "Asia/Shanghai"
       ASPNETCORE_ENVIRONMENT: ${DEV_ENVIRONMENT}