gao.qiang 1 년 전
부모
커밋
1cd215b0ff

+ 1 - 1
business-service/src/main/java/com/ozs/service/utils/PublishCallback.java

@@ -27,7 +27,7 @@ public class PublishCallback implements MqttCallback {
     @Override
     public void connectionLost(Throwable cause) {
         // 连接丢失后,一般在这里面进行重连
-//        System.out.println("连接断开,可以做重连");
+        System.out.println("连接断开,可以做重连"+cause);
     }
 
     //接收到已经发布的 QoS 1 或 QoS 2 消息的传递令牌时调用

+ 1 - 0
business-service/src/main/java/com/ozs/service/utils/PublishClient.java

@@ -167,6 +167,7 @@ public class PublishClient {
         for (String code : baseCameraVersionVo.getCameraCodeList()) {
             try {
                 PublishClient server = new PublishClient("update_" + code, "update_" + code);
+                log.info("update_" + code);
                 UpdateDeviceSn updateDeviceSn = new UpdateDeviceSn();
                 updateDeviceSn.setName("UpdateRequest");
                 updateDeviceSn.setType(Integer.valueOf(baseCameraVersionVo.getUpgradeType()));

+ 1 - 1
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());

+ 7 - 12
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);
     }
 
     /**