Преглед изворни кода

webscada判断设备离线

yandaniu пре 3 недеља
родитељ
комит
c06d968590
17 измењених фајлова са 206 додато и 6 уклоњено
  1. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/458014c7-75e7-40e0-ad00-781e3f19e1a1.vsidx
  2. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/4cb41892-c523-463a-9a5b-64b43bd09745.vsidx
  3. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/5f3ad1c8-2f82-44d4-8200-6a36546d55bb.vsidx
  4. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/68ce4ced-7596-4715-b32c-e610321e1f42.vsidx
  5. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/82991774-76f2-4d86-96a8-f3401e8b6834.vsidx
  6. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/ab27d06d-b18a-4b7d-83ce-a9de8610e92b.vsidx
  7. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/b466c7f6-bc86-417a-b03c-9fedb2c1a81c.vsidx
  8. BIN
      .vs/Ropin.Inspection.Api/v17/.suo
  9. 1 1
      Ropin.Environmentally.WebScada/Properties/launchSettings.json
  10. 51 2
      Ropin.Environmentally.WebScada/appsettings.json
  11. 50 1
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/appsettings.Development.json
  12. 50 1
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/appsettings.Production.json
  13. 50 1
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/appsettings.Staging.json
  14. 4 0
      Ropin.Environmentally.WebScada/bin/Debug/net5.0/logs/2025/202503/20250326.txt
  15. BIN
      Ropin.Inspection.Model/bin/Debug/net5.0/Ropin.Inspection.Common.dll
  16. BIN
      Ropin.Inspection.Model/bin/Debug/net5.0/Ropin.Inspection.Common.pdb
  17. BIN
      Ropin.Inspection.Model/obj/Debug/net5.0/Ropin.Inspection.Model.csproj.AssemblyReference.cache

BIN
.vs/Ropin.Inspection.Api/FileContentIndex/066c0612-abb7-4f83-8667-58bf8390bdb2.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/458014c7-75e7-40e0-ad00-781e3f19e1a1.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/3e54bd04-a148-48c0-a789-9030b6c34934.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/4cb41892-c523-463a-9a5b-64b43bd09745.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/af7b00a5-999e-40d4-b276-762d2766305c.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/5f3ad1c8-2f82-44d4-8200-6a36546d55bb.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/f8eb3d48-4569-44de-9d56-9e89e694efa8.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/68ce4ced-7596-4715-b32c-e610321e1f42.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/51bcea3e-5ee1-4522-a8e7-3e70c3b2967a.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/82991774-76f2-4d86-96a8-f3401e8b6834.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/4c72ab78-1fc5-408a-8cf9-7931c5c24bdc.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/ab27d06d-b18a-4b7d-83ce-a9de8610e92b.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/0a067682-074f-4aa1-ad5e-abf10d3bc0a5.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/b466c7f6-bc86-417a-b03c-9fedb2c1a81c.vsidx


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


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

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

+ 51 - 2
Ropin.Environmentally.WebScada/appsettings.json

@@ -1,10 +1,59 @@
 {
-  "DetailedErrors": true,
   "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",
+    //"RedisConnection": "60.204.212.71:6380,defaultDatabase=2,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": {
+    "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
+    }
+  },
+  "APIUrl": {
+    "PublicPushMessageAPI": "http://60.204.212.71:93/api/Account/PublicPushMessage"
+  },
+  "IniInflux": {
+    "infuxUrl": "http://60.204.212.71:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "RabbitMQ": {
+    "HostName": "60.204.212.71", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
+    "VirtualHost": "/",
+    "Password": "ropin@epe" //用户密码
   }
-}
+}

+ 50 - 1
Ropin.Environmentally.WebScada/bin/Debug/net5.0/appsettings.Development.json

@@ -1,10 +1,59 @@
 {
-  "DetailedErrors": true,
   "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",
+    //"RedisConnection": "60.204.212.71:6380,defaultDatabase=2,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": {
+    "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
+    }
+  },
+  "APIUrl": {
+    "PublicPushMessageAPI": "http://60.204.212.71:93/api/Account/PublicPushMessage"
+  },
+  "IniInflux": {
+    "infuxUrl": "http://60.204.212.71:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "RabbitMQ": {
+    "HostName": "60.204.212.71", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
+    "VirtualHost": "/",
+    "Password": "ropin@epe" //用户密码
   }
 }

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

@@ -1,10 +1,59 @@
 {
-  "DetailedErrors": true,
   "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",
+    //"RedisConnection": "60.204.212.71:6380,defaultDatabase=2,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": {
+    "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
+    }
+  },
+  "APIUrl": {
+    "PublicPushMessageAPI": "http://60.204.212.71:93/api/Account/PublicPushMessage"
+  },
+  "IniInflux": {
+    "infuxUrl": "http://60.204.212.71:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "RabbitMQ": {
+    "HostName": "60.204.212.71", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
+    "VirtualHost": "/",
+    "Password": "ropin@epe" //用户密码
   }
 }

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

@@ -1,10 +1,59 @@
 {
-  "DetailedErrors": true,
   "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",
+    //"RedisConnection": "60.204.212.71:6380,defaultDatabase=2,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": {
+    "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
+    }
+  },
+  "APIUrl": {
+    "PublicPushMessageAPI": "http://60.204.212.71:93/api/Account/PublicPushMessage"
+  },
+  "IniInflux": {
+    "infuxUrl": "http://60.204.212.71:8085/",
+    "infuxUser": "admin",
+    "infuxPwd": "123456"
+  },
+  "RabbitMQ": {
+    "HostName": "60.204.212.71", //IP地址
+    "Port": 5673, //端口号
+    "UserName": "admin", //用户账号
+    "VirtualHost": "/",
+    "Password": "ropin@epe" //用户密码
   }
 }

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

@@ -29,4 +29,8 @@
  2025-03-26 18:05:10,290  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [271] - MESSAGE: Task2-异常:Timeout performing EXISTS webSocket_devStore_186a5ab2-4cea-4d3b-a2ac-b582bef6961a, inst: 1, queue: 58, qu: 0, qs: 34, qc: 24, wr: 0, wq: 0, in: 0, ar: 0, clientName: DESKTOP-6J9CVS9, serverEndpoint: 60.204.212.71:6379, keyHashSlot: 2534 (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-26 18:07:08,199  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [271] - MESSAGE: Task2-异常:Timeout performing GET fanyibox_devspot_cede49bd-4a5d-4d4e-80e8-0e74d4c98c10, inst: 2, queue: 59, qu: 0, qs: 10, qc: 49, wr: 0, wq: 0, in: 0, ar: 0, clientName: DESKTOP-6J9CVS9, serverEndpoint: 60.204.212.71:6379, keyHashSlot: 4673 (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-26 18:09:39,424  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [271] - MESSAGE: Task2-异常:Timeout performing GET fanyibox_devStore_006653c7-13df-4344-909e-a5efaca20f60, inst: 1, queue: 58, qu: 0, qs: 58, qc: 0, wr: 0, wq: 0, in: 0, ar: 0, clientName: DESKTOP-6J9CVS9, serverEndpoint: 60.204.212.71:6379, keyHashSlot: 12721 (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-26 18:16:35,763  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [969] - MESSAGE: 1log-设备点预警报警-进入报警-Begin【设备ID=aa4ae3b2-d7cd-47f3-b134-598e99208ac8;ala[id]=338301733128115320;strAlaColour=red;sendmsg=true;devspotColour=yellow】---
+ 2025-03-26 18:16:35,860  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [1021] - MESSAGE: 1log-设备点预警报警-发送RabbitMQ消息-设备报警【设备ID=aa4ae3b2-d7cd-47f3-b134-598e99208ac8;ala[id]=338301733128115320;strAlaColour=red;sendmsg=true;devspotColour=yellow;msgData={"C_DevStoreCode":"aa4ae3b2-d7cd-47f3-b134-598e99208ac8","C_MsgTypeCode":"MSG_TYPE_012","Subject":"设备点报警","Msg":"南大喷漆房2VOCs的主机2初中段压差D2设备点报警  设备点值:1005.498","DevNumber":"2021083006","DevName":"南大喷漆房2VOCs","UserName":"设备","UserMobile":null,"DevAddress":null,"DevOpsName":null,"CreateOn":"2025/3/26 18:16:35","GenerationType":1,"msgStatus":1,"FileList":null}】---
+ 2025-03-26 18:21:01,599  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [969] - MESSAGE: 1log-设备点预警报警-进入报警-Begin【设备ID=aa4ae3b2-d7cd-47f3-b134-598e99208ac8;ala[id]=338301733128115320;strAlaColour=yellow;sendmsg=true;devspotColour=red】---
+ 2025-03-26 18:21:01,697  INFO Ropin.Environmentally.WebScada.Work.HostedService.MoveNext [1021] - MESSAGE: 1log-设备点预警报警-发送RabbitMQ消息-设备报警【设备ID=aa4ae3b2-d7cd-47f3-b134-598e99208ac8;ala[id]=338301733128115320;strAlaColour=yellow;sendmsg=true;devspotColour=red;msgData={"C_DevStoreCode":"aa4ae3b2-d7cd-47f3-b134-598e99208ac8","C_MsgTypeCode":"MSG_TYPE_017","Subject":"设备点预警","Msg":"南大喷漆房2VOCs的主机2初中段压差D2设备点预警  设备点值:983.435","DevNumber":"2021083006","DevName":"南大喷漆房2VOCs","UserName":"设备","UserMobile":null,"DevAddress":null,"DevOpsName":null,"CreateOn":"2025/3/26 18:21:01","GenerationType":1,"msgStatus":1,"FileList":null}】---
  

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/obj/Debug/net5.0/Ropin.Inspection.Model.csproj.AssemblyReference.cache