yandaniu 1 month ago
parent
commit
ab2a402ace
24 changed files with 3 additions and 1 deletions
  1. 1 1
      .env
  2. BIN
      .vs/ProjectEvaluation/ropin.inspection.api.metadata.v6.1
  3. BIN
      .vs/ProjectEvaluation/ropin.inspection.api.projects.v6.1
  4. BIN
      .vs/Ropin.Inspection.Api/DesignTimeBuild/.dtbcache.v2
  5. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/2c3708d9-84c8-41c7-982b-8d4fff3f2f1b.vsidx
  6. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/2ca5332d-8b18-41c1-8456-287318937e2d.vsidx
  7. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/3d9cd55f-c39f-418b-af0d-3bb9fb9a0eb8.vsidx
  8. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/67d8f1e4-38e9-4848-a82c-3ab22c7ce789.vsidx
  9. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/73bd97a8-38de-4310-ab87-597ed387bf4b.vsidx
  10. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/73dd0c29-d304-4ca6-a0ea-47b4642d6191.vsidx
  11. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/7d866426-858b-41e0-a4cb-530cdebd2300.vsidx
  12. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/93a0e32e-cde7-4b8b-b9fc-ee1ae84fcd8d.vsidx
  13. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/dd7c5fc3-9ce7-40ed-b0e6-f760b6bec0cc.vsidx
  14. BIN
      .vs/Ropin.Inspection.Api/FileContentIndex/fdd6a538-902c-4b7e-b35f-bfbb79b6b107.vsidx
  15. BIN
      .vs/Ropin.Inspection.Api/v17/.futdcache.v2
  16. BIN
      .vs/Ropin.Inspection.Api/v17/.suo
  17. BIN
      Ropin.Environmentally.AlarmService/obj/Debug/net5.0/Ropin.Environmentally.AlarmService.csproj.AssemblyReference.cache
  18. BIN
      Ropin.Environmentally.DcsService/obj/Debug/net5.0/Ropin.Environmentally.DcsService.csproj.AssemblyReference.cache
  19. BIN
      Ropin.Environmentally.LedgeService1/obj/Debug/net5.0/Ropin.Environmentally.LedgeService1.csproj.AssemblyReference.cache
  20. BIN
      Ropin.Environmentally.VideoService/obj/Debug/net5.0/Ropin.Environmentally.VideoService.csproj.AssemblyReference.cache
  21. BIN
      Ropin.Environmentally.WebScada/obj/Debug/net5.0/Ropin.Environmentally.WebScada.csproj.AssemblyReference.cache
  22. BIN
      Ropin.IOT.MqttService/obj/Debug/net5.0/Ropin.IOT.MqttService.csproj.AssemblyReference.cache
  23. BIN
      Ropin.IOT.MsgService/obj/Debug/net5.0/Ropin.IOT.MsgService.csproj.AssemblyReference.cache
  24. 2 0
      Ropin.Inspection.Api/Controllers/Base/AIController.cs

+ 1 - 1
.env

@@ -2,4 +2,4 @@
 #Development
 #Staging
 DEV_ENVIRONMENT=Development 
-version=1.3.12
+version=1.3.14

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/fbc7f609-5490-4061-b1dc-8d639bb76634.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/2c3708d9-84c8-41c7-982b-8d4fff3f2f1b.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/aaf909ca-180a-4dfd-8b22-a733080d22fc.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/2ca5332d-8b18-41c1-8456-287318937e2d.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/5e5e0b12-d367-4f78-aab4-7a2fda7fc44b.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/3d9cd55f-c39f-418b-af0d-3bb9fb9a0eb8.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/de0fe434-cf11-49b7-be16-3690659f3df0.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/67d8f1e4-38e9-4848-a82c-3ab22c7ce789.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/bf8f1773-ae1b-4ff5-bef2-40958c636137.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/73bd97a8-38de-4310-ab87-597ed387bf4b.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/02a3b676-27e4-42a3-b7e4-8147ecc33c40.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/73dd0c29-d304-4ca6-a0ea-47b4642d6191.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/bf161e1d-8797-4050-a6ae-d1f962729c1a.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/7d866426-858b-41e0-a4cb-530cdebd2300.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/9e871312-c94e-421b-bfc0-5f31bbc922a0.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/93a0e32e-cde7-4b8b-b9fc-ee1ae84fcd8d.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/ff0ada04-c3e1-4c8b-a607-923d14368629.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/dd7c5fc3-9ce7-40ed-b0e6-f760b6bec0cc.vsidx


BIN
.vs/Ropin.Inspection.Api/FileContentIndex/fe157948-f3a0-40c3-81d8-6dba070e43e5.vsidx → .vs/Ropin.Inspection.Api/FileContentIndex/fdd6a538-902c-4b7e-b35f-bfbb79b6b107.vsidx


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


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


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


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


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


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


+ 2 - 0
Ropin.Inspection.Api/Controllers/Base/AIController.cs

@@ -160,6 +160,8 @@ namespace Ropin.Inspection.Api.Controllers.Base
         [Route("/device/business/generalApp/pushData/alarmData/{deviceNo}")]
         public async Task<ApiResultModel<object>> AlarmData([FromRoute] string deviceNo, [FromBody] AlarmDataModel alarmDataModel)
         {
+            Console.WriteLine("/device/business/generalApp/pushData/alarmData");
+            Console.WriteLine("deviceNo" + deviceNo);
             //var devIds = await _vmcCameraService.GetCameraByTDH(alarmDataModel.deviceNo);
             //int row = 0;
             //foreach (var x in devIds)