aibox

.env

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

Ropin.Environmentally.AlarmService/Properties/launchSettings.json

@@ -13,7 +13,7 @@
       "launchBrowser": true,
       "launchUrl": "swagger",
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Production" //Development
       },
       "dotnetRunMessages": "true",
       "applicationUrl": "https://localhost:5002;http://localhost:5003"

Ropin.Environmentally.AlarmService/appsettings.Development.json

@@ -13,14 +13,14 @@
   },
   "CofingSet": {
     "RabbitMQ": {
-      "QueueName": "test_queue", //消息队列名称rabbit.alarmDevice
+      "QueueName": "rabbit.alarmDevice", //消息队列名称
       "HostName": "124.71.132.255", //IP地址
       "Port": 5673, //端口号
       "UserName": "admin", //用户账号
       "VirtualHost": "/",
       "Password": "ropin@epe", //用户密码
-      "ExchangeName": "test_exchange", //交换机名称【消息队列名称+.DirectExchange】
-      "RoutingKey": "test_queue" //路由键【消息队列名称+.key】
+      "ExchangeName": "rabbit.alarmDevice.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
+      "RoutingKey": "rabbit.alarmDevice.key" //路由键【消息队列名称+.key】
     },
     "PublicPushMessageAPI": "http://124.71.132.255:93/api/Account/PublicPushMessage"
     //"PublicPushMessageAPI": "https://www.dgt.net.cn:4443/api/Account/PublicPushMessage",

Ropin.Environmentally.AlarmService/bin/Debug/net5.0/appsettings.Development.json

@@ -13,14 +13,14 @@
   },
   "CofingSet": {
     "RabbitMQ": {
-      "QueueName": "test_queue", //消息队列名称rabbit.alarmDevice
+      "QueueName": "rabbit.alarmDevice", //消息队列名称
       "HostName": "124.71.132.255", //IP地址
       "Port": 5673, //端口号
       "UserName": "admin", //用户账号
       "VirtualHost": "/",
       "Password": "ropin@epe", //用户密码
-      "ExchangeName": "test_exchange", //交换机名称【消息队列名称+.DirectExchange】
-      "RoutingKey": "test_queue" //路由键【消息队列名称+.key】
+      "ExchangeName": "rabbit.alarmDevice.DirectExchange", //交换机名称【消息队列名称+.DirectExchange】
+      "RoutingKey": "rabbit.alarmDevice.key" //路由键【消息队列名称+.key】
     },
     "PublicPushMessageAPI": "http://124.71.132.255:93/api/Account/PublicPushMessage"
     //"PublicPushMessageAPI": "https://www.dgt.net.cn:4443/api/Account/PublicPushMessage",

Ropin.Inspection.Api/Controllers/Base/AIController.cs

@@ -86,7 +86,7 @@ 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.GetAlmDispose("", 1, 10, 40124884581189);
             //var data = await aIHelper.GetHistoricAlmrecord("", 1, 10, 40124884581189);
             if (data != null)
             {
@@ -160,45 +160,43 @@ 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)
-            //{
-            //    List<MessageFile> messageFiles = new List<MessageFile>();
-            //    var textJson = new
-            //    {
-            //        PanoramaId = alarmDataModel.panoramaId,
-            //        PanoramaUrl = alarmDataModel.panoramaUrl,
-            //        RoiJson = alarmDataModel.roiJson,
-            //        NonRoiJson = alarmDataModel.nonRoiJson,
-            //        DetectionFrameJson = alarmDataModel.detectionFrameJson
-            //    };
-            //    var datas = JsonConvert.SerializeObject(textJson);
-            //    MessageFile messageFile = new MessageFile();
-            //    messageFile.Text = datas;
-            //    messageFile.Type = "FILE_TYP_006";
-            //    messageFiles.Add(messageFile);
-            //    TpushMsgModel model = new TpushMsgModel
-            //    {
-            //        C_DevStoreCode = x,
-            //        C_MsgTypeCode = "MSG_TYPE_024",
-            //        Subject = "AI盒子报警",
-            //        Msg = alarmDataModel.alarmType,
-            //        UserName = "AI盒子",
-            //        UserMobile = "",
-            //        CreateOn = alarmDataModel.captureTime,
-            //        GenerationType = 1,
-            //        msgStatus = 1,
-            //        FileList = messageFiles
-            //    };
-            //    bool bol = await _pushMsgService.PushAlarmMsgAsync(model, model.Subject);
-            //    log.Info($"执行发送结果=[{bol}]");
-            //    if (bol) { row++; }
-            //}
-            //return ApiResultModel<object>.GetSuccess(row);
-            return await Task.FromResult(ApiResultModel<object>.GetSuccess(new object { }));
+            var devIds = await _vmcCameraService.GetCameraByTDH(alarmDataModel.deviceNo);
+            int row = 0;
+            foreach (var x in devIds)
+            {
+                List<MessageFile> messageFiles = new List<MessageFile>();
+                var textJson = new
+                {
+                    PanoramaId = alarmDataModel.panoramaId,
+                    PanoramaUrl = alarmDataModel.panoramaUrl,
+                    RoiJson = alarmDataModel.roiJson,
+                    NonRoiJson = alarmDataModel.nonRoiJson,
+                    DetectionFrameJson = alarmDataModel.detectionFrameJson
+                };
+                var datas = JsonConvert.SerializeObject(textJson);
+                MessageFile messageFile = new MessageFile();
+                messageFile.Text = datas;
+                messageFile.Type = "FILE_TYP_006";
+                messageFiles.Add(messageFile);
+                TpushMsgModel model = new TpushMsgModel
+                {
+                    C_DevStoreCode = x,
+                    C_MsgTypeCode = "MSG_TYPE_024",
+                    Subject = "AI盒子报警",
+                    Msg = alarmDataModel.alarmType,
+                    UserName = "AI盒子",
+                    UserMobile = "",
+                    CreateOn = alarmDataModel.captureTime,
+                    GenerationType = 1,
+                    msgStatus = 1,
+                    FileList = messageFiles
+                };
+                bool bol = await _pushMsgService.PushAlarmMsgAsync(model, model.Subject);
+                log.Info($"执行发送结果=[{bol}]");
+                if (bol) { row++; }
+            }
+            return ApiResultModel<object>.GetSuccess(row);
+            //return await Task.FromResult(ApiResultModel<object>.GetSuccess(new object { }));
         }
 
         /// <summary>