mq测试

business-service/src/main/java/com/ozs/service/service/impl/BaseCameraVersionServiceImpl.java

@@ -176,7 +176,7 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
             }
         }
         PublishClient.updateDeviceSn(baseCameraVersionVo);
-        new SubscribeClient("update", "update").start();
+        new SubscribeClient("update_34020000001320000188", "update_34020000001320000188").start();
         return AjaxResult.success("已经为您提交升级申请，请您到“日志管理>相机升级日志”页面查看升级结果。");
     }
 }

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -884,7 +884,7 @@ public class BaseCameraManagementController extends BaseController {
             if (!ObjectUtils.isEmpty(baseCameraManagement.getEndMile())&&!ObjectUtils.isEmpty(baseCameraManagement.getBeginMile())) {
                 String begin = AppendUtils.stringAppend(baseCameraManagement.getBeginMile());
                 String end = AppendUtils.stringAppend(baseCameraManagement.getEndMile());
-                String endMile = "[" + begin + "]-[" + end + "]";
+                String endMile =   begin + "~" + end ;
                 msgAlarmResp.setBeginMile(endMile);
             }
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -509,18 +509,13 @@ public class MsgAlarmController extends BaseController {
         wrapper.eq("camera_code", cameraCode);
         wrapper.orderByDesc("alarm_time");
         List<MsgAlarm> list = msgAlarmService.list(wrapper);
-        if (list.size() > 0) {
-            for (MsgAlarm msgAlarm : list) {
-                msgAlarm.setFailureToAlarm(1);
-            }
-            return AjaxResult.success(list);
-        } else {
-            List<MsgAlarm> msgAlarmList = new ArrayList<>();
-            MsgAlarm msgAlarm = new MsgAlarm();
-            msgAlarm.setFailureToAlarm(2);
-            msgAlarmList.add(msgAlarm);
-            return AjaxResult.success(msgAlarmList);
-        }
+//        if (list.size() > 0) {
+//            for (MsgAlarm msgAlarm : list) {
+//                msgAlarm.setFailureToAlarm(1);
+//            }
+//            return AjaxResult.success(list);
+//        } 
+        return AjaxResult.success(list);
     }
 
     /**