yandaniu hace 3 semanas
padre
commit
36e646c12b
Se han modificado 100 ficheros con 174 adiciones y 23 borrados
  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/10efde8c-1c53-4ecd-aae0-d44ee9e506ab.vsidx
  5. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/14970307-586d-4742-b153-26cc6d209d68.vsidx
  6. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/14fdb36b-7a41-40b6-b1c1-47c498508c9c.vsidx
  7. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/17c25694-2a7f-4075-aeb4-518c03475b50.vsidx
  8. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/4644d9a8-cf09-4bfc-bf73-44063223eb6b.vsidx
  9. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/7e9f5c4a-b79d-44bb-8708-a3f9179fae18.vsidx
  10. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/7f02d622-7ee6-4c49-9019-84ec6e560b51.vsidx
  11. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/8746401a-d6c0-4645-b14e-5f76724f0e5e.vsidx
  12. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/9eaf3ec7-a104-4f9e-bc1e-3ed7760dc957.vsidx
  13. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/a68678a8-2980-42ab-aa28-4e73cca27cc0.vsidx
  14. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/b0f78664-24c8-4c1c-8884-ca344e3de716.vsidx
  15. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/b4af4d7d-66e4-4f09-a94b-f78e218a9bc3.vsidx
  16. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/bd7015a5-9762-4f6e-8105-68dd54ae8250.vsidx
  17. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/d7cd8e4e-3981-4ac6-8744-e4495581aaa2.vsidx
  18. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/d8ed3796-4c0e-41d7-b003-564e98519822.vsidx
  19. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/edef2cfa-f291-4a31-b02f-e1816d2a5c78.vsidx
  20. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/f1fd42e7-cc67-47bd-a9c1-181f88b509bf.vsidx
  21. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/f2978117-5ba5-49ee-b207-a58f9dfbb157.vsidx
  22. BIN
      .vs/Ropin.Inspection.Api/v17/.futdcache.v2
  23. BIN
      .vs/Ropin.Inspection.Api/v17/.suo
  24. BIN
      .vs/Ropin.Inspection.Api/v17/fileList.bin
  25. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Core.Extensions.dll
  26. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Core.Extensions.pdb
  27. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Common.dll
  28. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Common.pdb
  29. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Model.dll
  30. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Model.pdb
  31. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Repository.dll
  32. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb
  33. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Service.dll
  34. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Service.pdb
  35. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Tasks.dll
  36. BIN
      Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Tasks.pdb
  37. BIN
      Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.csproj.AssemblyReference.cache
  38. BIN
      Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.dll
  39. BIN
      Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.pdb
  40. BIN
      Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.csproj.AssemblyReference.cache
  41. BIN
      Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.csproj.AssemblyReference.cache
  42. BIN
      Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.csproj.AssemblyReference.cache
  43. BIN
      Ropin.Environmentally.VideoService/obj/Debug/net5.0/Ropin.Environmentally.VideoService.csproj.AssemblyReference.cache
  44. 1 1
      Ropin.Environmentally.WebScada/Properties/launchSettings.json
  45. 7 0
      Ropin.Environmentally.WebScada/Work/HostedService.cs
  46. 10 0
      Ropin.Environmentally.WebScada/appsettings.Production.json
  47. 10 0
      Ropin.Environmentally.WebScada/appsettings.Staging.json
  48. 5 5
      Ropin.Environmentally.WebScada/appsettings.json
  49. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Core.Extensions.dll
  50. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Core.Extensions.pdb
  51. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Environmentally.WebScada.Views.dll
  52. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Environmentally.WebScada.Views.pdb
  53. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Environmentally.WebScada.dll
  54. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Environmentally.WebScada.pdb
  55. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Common.dll
  56. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Common.pdb
  57. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Model.dll
  58. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Model.pdb
  59. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Repository.dll
  60. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Repository.pdb
  61. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Service.dll
  62. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Service.pdb
  63. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Tasks.dll
  64. BIN
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Tasks.pdb
  65. 10 0
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/appsettings.Production.json
  66. 10 0
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/appsettings.Staging.json
  67. 11 8
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/appsettings.json
  68. 9 0
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/logs/2025/202503/20250325.txt
  69. 0 0
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/logs/2025/202503/20250325_error.txt
  70. 3 0
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/logs/2025/202503/20250326.txt
  71. 0 0
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/logs/2025/202503/20250326_error.txt
  72. BIN
      Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.Views.dll
  73. BIN
      Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.Views.pdb
  74. BIN
      Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.csproj.AssemblyReference.cache
  75. 2 0
      Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.csproj.FileListAbsolute.txt
  76. BIN
      Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.dll
  77. BIN
      Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.pdb
  78. BIN
      Ropin.IOT.MqttService/obj/Debug/net5.0/Ropin.IOT.MqttService.csproj.AssemblyReference.cache
  79. 15 6
      Ropin.Inspection.Api/Controllers/Base/AIController.cs
  80. 22 0
      Ropin.Inspection.Api/Controllers/MTN/TmtnAlarmOrderController.cs
  81. 2 2
      Ropin.Inspection.Api/TmtnDevOpsRecordController.cs
  82. 2 1
      Ropin.Inspection.Api/appsettings.Development.json
  83. 1 0
      Ropin.Inspection.Api/appsettings.Production.json
  84. 1 0
      Ropin.Inspection.Api/appsettings.Staging.json
  85. 48 0
      Ropin.Inspection.Api/appsettings.json
  86. BIN
      Ropin.Inspection.Api/obj/Debug/net5.0/Ropin.Inspection.Api.csproj.AssemblyReference.cache
  87. BIN
      Ropin.Inspection.Common/bin/Debug/net5.0/Ropin.Inspection.Common.dll
  88. BIN
      Ropin.Inspection.Common/bin/Debug/net5.0/Ropin.Inspection.Common.pdb
  89. BIN
      Ropin.Inspection.Common/obj/Debug/net5.0/Ropin.Inspection.Common.dll
  90. BIN
      Ropin.Inspection.Common/obj/Debug/net5.0/Ropin.Inspection.Common.pdb
  91. BIN
      Ropin.Inspection.Common/obj/Debug/net5.0/ref/Ropin.Inspection.Common.dll
  92. BIN
      Ropin.Inspection.Common/obj/Debug/net5.0/refint/Ropin.Inspection.Common.dll
  93. BIN
      Ropin.Inspection.Model/bin/Debug/net5.0/Ropin.Inspection.Common.dll
  94. BIN
      Ropin.Inspection.Model/bin/Debug/net5.0/Ropin.Inspection.Common.pdb
  95. BIN
      Ropin.Inspection.Model/bin/Debug/net5.0/Ropin.Inspection.Model.dll
  96. BIN
      Ropin.Inspection.Model/bin/Debug/net5.0/Ropin.Inspection.Model.pdb
  97. BIN
      Ropin.Inspection.Model/obj/Debug/net5.0/Ropin.Inspection.Model.csproj.AssemblyReference.cache
  98. BIN
      Ropin.Inspection.Model/obj/Debug/net5.0/Ropin.Inspection.Model.dll
  99. BIN
      Ropin.Inspection.Model/obj/Debug/net5.0/Ropin.Inspection.Model.pdb
  100. 5 0
      Ropin.Inspection.Repository/MTN/TmtnAlarmOrderRepository.cs

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/10efde8c-1c53-4ecd-aae0-d44ee9e506ab.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/14970307-586d-4742-b153-26cc6d209d68.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/14fdb36b-7a41-40b6-b1c1-47c498508c9c.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/17c25694-2a7f-4075-aeb4-518c03475b50.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/4644d9a8-cf09-4bfc-bf73-44063223eb6b.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/7e9f5c4a-b79d-44bb-8708-a3f9179fae18.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/7f02d622-7ee6-4c49-9019-84ec6e560b51.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/8746401a-d6c0-4645-b14e-5f76724f0e5e.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/9eaf3ec7-a104-4f9e-bc1e-3ed7760dc957.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/a68678a8-2980-42ab-aa28-4e73cca27cc0.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/b0f78664-24c8-4c1c-8884-ca344e3de716.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/b4af4d7d-66e4-4f09-a94b-f78e218a9bc3.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/bd7015a5-9762-4f6e-8105-68dd54ae8250.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/d7cd8e4e-3981-4ac6-8744-e4495581aaa2.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/d8ed3796-4c0e-41d7-b003-564e98519822.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/edef2cfa-f291-4a31-b02f-e1816d2a5c78.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/f1fd42e7-cc67-47bd-a9c1-181f88b509bf.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/f2978117-5ba5-49ee-b207-a58f9dfbb157.vsidx


BIN
.vs/Ropin.Inspection.Api/v17/.futdcache.v2


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


BIN
.vs/Ropin.Inspection.Api/v17/fileList.bin


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Core.Extensions.dll


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Core.Extensions.pdb


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Common.dll


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Common.pdb


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Model.dll


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Model.pdb


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


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


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Service.dll


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Service.pdb


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Tasks.dll


BIN
Ropin.Core.Extensions/bin/Debug/net5.0/Ropin.Inspection.Tasks.pdb


BIN
Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.csproj.AssemblyReference.cache


BIN
Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.dll


BIN
Ropin.Core.Extensions/obj/Debug/net5.0/Ropin.Core.Extensions.pdb


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


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


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


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


+ 1 - 1
Ropin.Environmentally.WebScada/Properties/launchSettings.json

@@ -11,7 +11,7 @@
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development" //Production
       },
       "dotnetRunMessages": "true",
       "applicationUrl": "http://localhost:5000"

+ 7 - 0
Ropin.Environmentally.WebScada/Work/HostedService.cs

@@ -38,6 +38,7 @@ using Microsoft.AspNetCore.SignalR;
 using Ropin.Environmentally.WebScada.Hubs;
 using Autofac.Core;
 using Google.Protobuf.WellKnownTypes;
+using System.Text.RegularExpressions;
 
 namespace Ropin.Environmentally.WebScada.Work
 {
@@ -1725,8 +1726,14 @@ namespace Ropin.Environmentally.WebScada.Work
 
                 try
                 {
+                    
                     if (string.IsNullOrEmpty((string)dev["id"]) || string.IsNullOrEmpty((string)dev["value"]) || (string)dev["value"] == "null")
                         continue;
+                    bool isDecimal = Regex.IsMatch((string)dev["value"], @"^\d+(\.\d+)?$");//true是非负数的整数和小数
+                    if ((string)dev["value"] == "NaN" || !isDecimal)
+                    {
+                        continue;
+                    }
                     string strId = (string)dev["id"];
                     string strDevSpotCode = (string)dev["devSpotCode"];
                     float dValue = Convert.ToSingle((string)dev["value"]);

+ 10 - 0
Ropin.Environmentally.WebScada/appsettings.Production.json

@@ -0,0 +1,10 @@
+{
+  "DetailedErrors": true,
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}

+ 10 - 0
Ropin.Environmentally.WebScada/appsettings.Staging.json

@@ -0,0 +1,10 @@
+{
+  "DetailedErrors": true,
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}

+ 5 - 5
Ropin.Environmentally.WebScada/appsettings.json

@@ -14,8 +14,8 @@
     //"MySqlConnection": "server=60.204.212.71;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250224;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"
+    "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"
 
   },
   "WX": {
@@ -42,15 +42,15 @@
     }
   },
   "APIUrl": {
-    "PublicPushMessageAPI": "http://124.71.132.255:93/api/Account/PublicPushMessage"
+    "PublicPushMessageAPI": "http://60.204.212.71:93/api/Account/PublicPushMessage"
   },
   "IniInflux": {
-    "infuxUrl": "http://124.71.132.255:8085/",
+    "infuxUrl": "http://60.204.212.71:8085/",
     "infuxUser": "admin",
     "infuxPwd": "123456"
   },
   "RabbitMQ": {
-    "HostName": "124.71.132.255", //IP地址
+    "HostName": "60.204.212.71", //IP地址
     "Port": 5673, //端口号
     "UserName": "admin", //用户账号
     "VirtualHost": "/",

BIN
Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Core.Extensions.dll


BIN
Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Core.Extensions.pdb


BIN
Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Environmentally.WebScada.Views.dll


BIN
Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Environmentally.WebScada.Views.pdb


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


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


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


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


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


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


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


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


BIN
Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Service.dll


BIN
Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Service.pdb


BIN
Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Tasks.dll


BIN
Ropin.Environmentally.WebScada/bin/Debug/net5.0/Ropin.Inspection.Tasks.pdb


+ 10 - 0
Ropin.Environmentally.WebScada/bin/Debug/net5.0/appsettings.Production.json

@@ -0,0 +1,10 @@
+{
+  "DetailedErrors": true,
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}

+ 10 - 0
Ropin.Environmentally.WebScada/bin/Debug/net5.0/appsettings.Staging.json

@@ -0,0 +1,10 @@
+{
+  "DetailedErrors": true,
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}

+ 11 - 8
Ropin.Environmentally.WebScada/bin/Debug/net5.0/appsettings.json

@@ -11,8 +11,11 @@
     //"MySqlConnection": "server=120.26.5.167;user id=root;password=Ropin1234%$#@;port=8605;persistsecurityinfo=True;database=SH_HB_Test;sslMode=None",
     //"RedisConnection": "60.204.212.71:6380,defaultDatabase=2,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_CustomerTest;sslMode=None",
-    "RedisConnection": "124.71.132.255:6379,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_20250224;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"
 
   },
   "WX": {
@@ -39,18 +42,18 @@
     }
   },
   "APIUrl": {
-    "PublicPushMessageAPI": "http://124.71.132.255:93/api/Account/PublicPushMessage"
+    "PublicPushMessageAPI": "http://60.204.212.71:93/api/Account/PublicPushMessage"
   },
   "IniInflux": {
-    "infuxUrl": "http://124.71.132.255:8085/",
+    "infuxUrl": "http://60.204.212.71:8085/",
     "infuxUser": "admin",
     "infuxPwd": "123456"
   },
   "RabbitMQ": {
-    "HostName": "124.71.132.255", //IP地址
-    "Port": 5672, //端口号
-    "UserName": "guest", //用户账号
+    "HostName": "60.204.212.71", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
     "VirtualHost": "/",
-    "Password": "guest" //用户密码
+    "Password": "ropin@epe" //用户密码
   }
 }

+ 9 - 0
Ropin.Environmentally.WebScada/bin/Debug/net5.0/logs/2025/202503/20250325.txt

@@ -0,0 +1,9 @@
+2025-03-25 14:15:18,707  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [0] - MESSAGE: Task2-异常:Timeout performing GET fanyibox_devspot_06eef952-6e1e-4079-a958-33fe5caaeb65, inst: 1, queue: 26, qu: 0, qs: 2, qc: 24, wr: 0, wq: 0, in: 0, ar: 0, clientName: DESKTOP-6J9CVS9, serverEndpoint: 60.204.212.71:6379, keyHashSlot: 4739 (Please take a look at this article for some common client-side issues that can cause timeouts: http://stackexchange.github.io/StackExchange.Redis/Timeouts)
+ 2025-03-25 14:34:22,241  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [0] - MESSAGE: Task2-异常:Timeout performing GET fanyibox_devspotColour_6f6a6978-1360-40fd-8395-da298121b6a5, inst: 1, queue: 36, qu: 0, qs: 7, qc: 29, wr: 0, wq: 0, in: 0, ar: 0, clientName: DESKTOP-6J9CVS9, serverEndpoint: 60.204.212.71:6379, keyHashSlot: 12691 (Please take a look at this article for some common client-side issues that can cause timeouts: http://stackexchange.github.io/StackExchange.Redis/Timeouts)
+ 2025-03-25 14:39:55,878  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [0] - MESSAGE: Task2-异常:Timeout performing GET fanyibox_devStore_019fbdae-a462-4b46-bbb7-caaf01e00022, inst: 1, queue: 44, qu: 0, qs: 44, qc: 0, wr: 0, wq: 0, in: 0, ar: 0, clientName: DESKTOP-6J9CVS9, serverEndpoint: 60.204.212.71:6379, keyHashSlot: 12234 (Please take a look at this article for some common client-side issues that can cause timeouts: http://stackexchange.github.io/StackExchange.Redis/Timeouts)
+ 2025-03-25 15:08:37,857  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [0] - MESSAGE: Task2-异常:Timeout performing GET fanyibox_devspot_9fc955da-16bb-4541-b704-5f62e9408d46, inst: 1, queue: 42, qu: 0, qs: 35, qc: 7, wr: 0, wq: 0, in: 0, ar: 0, clientName: DESKTOP-6J9CVS9, serverEndpoint: 60.204.212.71:6379, keyHashSlot: 13040 (Please take a look at this article for some common client-side issues that can cause timeouts: http://stackexchange.github.io/StackExchange.Redis/Timeouts)
+ 2025-03-25 15:38:12,388  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [933] - MESSAGE: -设备点开关机开始-进入状态不相等【设备ID=34c5b133-b7ce-4e92-bb00-c2d37dd29d79,ala[value]=0】
+ 2025-03-25 15:38:12,623  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [946] - MESSAGE: {"devStoreCode":"34c5b133-b7ce-4e92-bb00-c2d37dd29d79","devRunSpot":"10a95596-1dce-4e96-83df-d7b2515210d1","time":"2025-03-25T15:38:12.6204997+08:00"};发送RabbitMQ消息
+ 2025-03-25 15:38:53,318  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [933] - MESSAGE: -设备点开关机开始-进入状态不相等【设备ID=6114f202-eb8b-4e0c-af44-e16f1a032c45,ala[value]=0】
+ 2025-03-25 15:38:53,385  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [946] - MESSAGE: {"devStoreCode":"6114f202-eb8b-4e0c-af44-e16f1a032c45","devRunSpot":"08d9ce00-8c61-4abb-8a8b-26e2fbf62105","time":"2025-03-25T15:38:53.3850436+08:00"};发送RabbitMQ消息
+ 

+ 0 - 0
Ropin.Environmentally.WebScada/bin/Debug/net5.0/logs/2025/202503/20250325_error.txt


+ 3 - 0
Ropin.Environmentally.WebScada/bin/Debug/net5.0/logs/2025/202503/20250326.txt

@@ -0,0 +1,3 @@
+2025-03-26 14:48:36,232  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-26 14:48:54,119  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.
+ 

+ 0 - 0
Ropin.Environmentally.WebScada/bin/Debug/net5.0/logs/2025/202503/20250326_error.txt


BIN
Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.Views.dll


BIN
Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.Views.pdb


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


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

@@ -602,3 +602,5 @@ E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.WebScada
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.WebScada\bin\Debug\net5.0\System.Threading.Channels.dll
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.WebScada\bin\Debug\net5.0\log4net.config
 E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.WebScada\bin\Debug\net5.0\nlog.config
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.WebScada\bin\Debug\net5.0\appsettings.Production.json
+E:\Ropin\svn\SH_HB\Source_SQ\Ropin.Inspection.Api\Ropin.Environmentally.WebScada\bin\Debug\net5.0\appsettings.Staging.json

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


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


BIN
Ropin.IOT.MqttService/obj/Debug/net5.0/Ropin.IOT.MqttService.csproj.AssemblyReference.cache


+ 15 - 6
Ropin.Inspection.Api/Controllers/Base/AIController.cs

@@ -18,6 +18,7 @@ using System.Collections.Generic;
 using System;
 using Newtonsoft.Json;
 using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Configuration;
 
 namespace Ropin.Inspection.Api.Controllers.Base
 {
@@ -27,11 +28,14 @@ namespace Ropin.Inspection.Api.Controllers.Base
         private readonly AIProjectHelper aIHelper;
         private readonly ITsysMessageService _TsysMessageService;
         private readonly IPushMsgService _pushMsgService;
-        public AIController(IHttpClientFactory httpClientFactory, ITsysMessageService tsysMessageService, IPushMsgService pushMsgService)
+        private string IsUpdateAI = "false";
+        public AIController(IHttpClientFactory httpClientFactory, ITsysMessageService tsysMessageService, IPushMsgService pushMsgService, IConfiguration configuration)
         {
             aIHelper = new AIProjectHelper(httpClientFactory);
             _TsysMessageService = tsysMessageService;
             _pushMsgService = pushMsgService;
+            string IsUpdate = configuration.GetSection("AIIsUpdate")?.Value;
+            IsUpdateAI = !string.IsNullOrEmpty(IsUpdate) ? IsUpdate : "false";
         }
         /// <summary>
         /// AI登录
@@ -76,8 +80,8 @@ namespace Ropin.Inspection.Api.Controllers.Base
         public async Task<ApiResult> AiAlmSaveMessage()
         {
             //40124884581189;33379713109829
-            var data = await aIHelper.GetAlmDispose("", 1, 100, 40124884581189);        
-            //var data = await aIHelper.GetHistoricAlmrecord("", 7, 10, 33379713109829);
+            var data = await aIHelper.GetAlmDispose("", 1, 100, 40124884581189);
+            //var data = await aIHelper.GetHistoricAlmrecord("", 1, 10, 40124884581189);
             if (data!=null)
             {
                 foreach (var item in data.Items)
@@ -96,13 +100,18 @@ namespace Ropin.Inspection.Api.Controllers.Base
                         MessageFile messageFile = new MessageFile();
                         messageFile.Text = datas;
                         messageFile.Type = "FILE_TYP_006";
+                        string msg = item.Event_Name;
+                        if (string.IsNullOrEmpty(msg))
+                        {
+                            msg = item.Event_Code;
+                        }
                         TpushMsgModel model = new TpushMsgModel
                         {
                             C_DevStoreCode = "d705ceb5-7473-4b19-91dd-d3eff223f05b",
                             C_MsgTypeCode = "MSG_TYPE_024",
                             Subject = item.Device_TypeName + "报警",
-                            Msg = item.Event_Name??item.Event_Code,
-                            UserName = "AI",
+                            Msg = msg,
+                            UserName = "AI盒子",
                             UserMobile = "",
                             CreateOn = item.StartTime?.ToString("yyyy-MM-dd HH:mm:ss"),
                             GenerationType = 1,
@@ -110,7 +119,7 @@ namespace Ropin.Inspection.Api.Controllers.Base
                             FileList=new List<MessageFile> { messageFile }
                         };
                         bool bol = await _pushMsgService.PushAlarmMsgAsync(model, model.Subject);
-                        if (bol)
+                        if (bol&& IsUpdateAI=="true")
                         {
                             DateTime updTime = DateTime.Now;
                             var updData = new

+ 22 - 0
Ropin.Inspection.Api/Controllers/MTN/TmtnAlarmOrderController.cs

@@ -257,6 +257,28 @@ namespace Ropin.Inspection.Api.Controllers.MTN
             }
         }
         /// <summary>
+        /// 通过消息编号获取报警工单信息
+        /// </summary>
+        /// <param name="messageCode"></param>
+        /// <returns></returns>
+        [HttpGet("GetAlarmOrderByMessageCodeAsync/{messageCode}")]
+        public async Task<ApiResult> GetAlarmOrderByMessageCodeAsync(string messageCode)
+        {
+            if (string.IsNullOrEmpty(messageCode))
+            {
+                return new ApiResult(ReturnCode.GeneralError);
+            }
+            try
+            {
+                var content = await _repository.GetByMessageCodeAsync(messageCode);
+                return new ApiResult<AlarmOrderViewModel>(content);
+            }
+            catch (Exception ex)
+            {
+                return new ApiResult(ReturnCode.GeneralError, ex.Message);
+            }
+        }
+        /// <summary>
         /// 报警工单列表
         /// </summary>
         /// <param name="searchModel"></param>

+ 2 - 2
Ropin.Inspection.Api/TmtnDevOpsRecordController.cs

@@ -576,7 +576,7 @@ namespace Ropin.Inspection.Api
                                         run.AppendText("    现场拍照:");
                                         foreach (var path in item.RecordImageList)
                                         {
-                                            string pathFile = path.ToString();
+                                            string pathFile = path.C_ImageURL;
                                             if (pathFile[0].ToString() == @"/")
                                             {
                                                 pathFile = pathFile.Substring(1);
@@ -1035,7 +1035,7 @@ namespace Ropin.Inspection.Api
                                 run.AppendText("    现场拍照:");
                                 foreach (var path in item.RecordImageList)
                                 {
-                                    string pathFile = path.ToString();
+                                    string pathFile = path.C_ImageURL;
                                     if (pathFile[0].ToString() == @"/")
                                     {
                                         pathFile = pathFile.Substring(1);

+ 2 - 1
Ropin.Inspection.Api/appsettings.Development.json

@@ -14,7 +14,7 @@
   "ConnectionSetting": {
     //"MySqlConnection": "server=120.26.5.167;user id=root;password=Ropin1234%$#@;port=8605;persistsecurityinfo=True;database=SH_HB_Owner;sslMode=None",
     //"MySqlConnection": "server=60.204.212.71;user id=root;password=Ropin1234;port=8065;persistsecurityinfo=True;database=sh_hb_yantest;sslMode=None"
-    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250319;sslMode=None"  //SH_HB_CustomerTest
+    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250319;sslMode=None" //SH_HB_CustomerTest
     //"MySqlConnection": "server=124.71.132.255;user id=root;password=tony;port=3306;persistsecurityinfo=True;database=SH_HB_CustomerTest;sslMode=None"
     //"MySqlConnection": "server=60.204.212.71;user id=root;password=Ropin1234;port=8065;persistsecurityinfo=True;database=SH_HB;sslMode=None"
     //"MySqlConnection": "server=120.26.5.167;user id=root;password=Ropin1234%$#@;port=8605;persistsecurityinfo=True;database=SH_HB_Owner;sslMode=None"
@@ -49,6 +49,7 @@
     "infuxPwd": "123456"
   },
   "IsSendEmail": "true", //是否发送邮件;false:不发送;true:发送
+  "AIIsUpdate": "true", //同步AI报警数据后,是否修改报警数据;false:不修改;true:修改
   "RabbitMQ": {
     "IsOfficial": "true", //是否是正式系统;true:是;false:不是
     "QueueName": "rab.cmd.down.device.mqtt", //消息队列名称-命令

+ 1 - 0
Ropin.Inspection.Api/appsettings.Production.json

@@ -49,6 +49,7 @@
     "infuxPwd": "123456"
   },
   "IsSendEmail": "true", //是否发送邮件;false:不发送;true:发送
+  "AIIsUpdate": "true", //同步AI报警数据后,是否修改报警数据;false:不修改;true:修改
   "RabbitMQ": {
     "IsOfficial": "true", //是否是正式系统;true:是;false:不是
     "QueueName": "rab.cmd.down.device.mqtt", //消息队列名称-命令

+ 1 - 0
Ropin.Inspection.Api/appsettings.Staging.json

@@ -49,6 +49,7 @@
     "infuxPwd": "123456"
   },
   "IsSendEmail": "true", //是否发送邮件;false:不发送;true:发送
+  "AIIsUpdate": "true", //同步AI报警数据后,是否修改报警数据;false:不修改;true:修改
   "RabbitMQ": {
     "IsOfficial": "true", //是否是正式系统;true:是;false:不是
     "QueueName": "rab.cmd.down.device.mqtt", //消息队列名称-命令

+ 48 - 0
Ropin.Inspection.Api/appsettings.json

@@ -5,5 +5,53 @@
       "Microsoft": "Warning",
       "Microsoft.Hosting.Lifetime": "Information"
     }
+  },
+  "AllowedHosts": "*",
+  "Redis": {
+    //"ConnectionString": "60.204.212.71,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000,abortConnect=false"
+    "ConnectionString": "124.71.132.255:6379,defaultDatabase=1,password=1234566,connectTimeout=15000,syncTimeout=5000"
+  },
+  "ConnectionSetting": {
+    "MySqlConnection": "server=124.71.132.255;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Test;sslMode=None"
+    //"MySqlConnection": "server=60.204.212.71;user id=root;password=Ropin@EPE5744;port=5744;persistsecurityinfo=True;database=SH_HB_Owner_20250321;sslMode=None"    
+  },
+  "WX": {
+    "Token": "qwertyuiop",
+    "AppId": "wx40250567e9c14ae6",
+    "Secret": "8c1117595f359f4ebc60650ed27e835a",
+    "Code2Session": "https://api.weixin.qq.com/sns/jscode2session?appid={0}&secret={1}&js_code={2}&grant_type=authorization_code"
+  },
+  "JWT": {
+    "Issuer": "yandaniu",
+    "Audience": "TestAudience",
+    "IssuerSigningKey": "yandaniu1234567890",
+    "AccessTokenExpiresMinutes": "60",
+    "ValidAudience": "yandaniu",
+    "RefreshTokenAudience": "RefreshTokenAudience",
+    "RefreshTokenExpiresMinutes": "10080" //60*24*7
+  },
+  "Middleware": {
+    "QuartzNetJob": {
+      "Enabled": true
+    },
+    "Consul": {
+      "Enabled": false
+    }
+  },
+  "IniInflux": {
+    "infuxUrl": "http://60.204.212.71:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "IsSendEmail": "true", //是否发送邮件;false:不发送;true:发送
+  "AIIsUpdate": "true", //同步AI报警数据后,是否修改报警数据;false:不修改;true:修改
+  "RabbitMQ": {
+    "IsOfficial": "true", //是否是正式系统;true:是;false:不是
+    "QueueName": "rab.cmd.down.device.mqtt", //消息队列名称-命令
+    "HostName": "60.204.212.71", //IP地址
+    "Port": 5672, //端口号
+    "UserName": "guest", //用户账号
+    "VirtualHost": "/",
+    "Password": "guest" //用户密码
   }
 }

BIN
Ropin.Inspection.Api/obj/Debug/net5.0/Ropin.Inspection.Api.csproj.AssemblyReference.cache


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


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


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


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


BIN
Ropin.Inspection.Common/obj/Debug/net5.0/ref/Ropin.Inspection.Common.dll


BIN
Ropin.Inspection.Common/obj/Debug/net5.0/refint/Ropin.Inspection.Common.dll


BIN
Ropin.Inspection.Model/bin/Debug/net5.0/Ropin.Inspection.Common.dll


BIN
Ropin.Inspection.Model/bin/Debug/net5.0/Ropin.Inspection.Common.pdb


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


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


BIN
Ropin.Inspection.Model/obj/Debug/net5.0/Ropin.Inspection.Model.csproj.AssemblyReference.cache


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


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


+ 5 - 0
Ropin.Inspection.Repository/MTN/TmtnAlarmOrderRepository.cs

@@ -26,6 +26,7 @@ namespace Ropin.Inspection.Repository.MTN
             MySqlConnector.MySqlParameter[] parameters = new[] {
                 new MySqlConnector.MySqlParameter("Status", searchModel.C_Status),
                 new MySqlConnector.MySqlParameter("id", searchModel.C_ID),
+                new MySqlConnector.MySqlParameter("messageCode", searchModel.C_MessageCode),
                 new MySqlConnector.MySqlParameter("storeCode", searchModel.C_StoreCode),
                 new MySqlConnector.MySqlParameter("devCode", searchModel.C_DevCode),
                 new MySqlConnector.MySqlParameter("name",  "%"+searchModel.C_Name+"%"),
@@ -70,6 +71,10 @@ LEFT JOIN TSYS_User c on (a.C_CreateBy=c.C_UserID)
             {
                 sql.Append(" and C_ID=@id ");
             }
+            if (!string.IsNullOrEmpty(searchModel.C_MessageCode))
+            {
+                sql.Append(" and C_MessageCode=@messageCode ");
+            }
             if (!string.IsNullOrEmpty(searchModel.C_Name))
             {
                 sql.Append(" and C_Name like @name ");

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio