一键灭火修改

zd-modules/zd-algorithm/src/main/java/com/zd/alg/fire/controller/FireDeviceController.java

@@ -370,7 +370,7 @@ public class FireDeviceController extends BaseController {
             }
             map.put("online", online);
 
-            logger.info("=========PC端开始一键灭火=======");
+            logger.info("=========开始一键灭火=======");
             //执行灭火指令
             try {
                 map = outFireCom(subjectId,map);
@@ -385,8 +385,6 @@ public class FireDeviceController extends BaseController {
      * @return
      */
     public Map<String,Object> outFireCom(Long subjectId,Map<String, Object> map) throws InterruptedException {
-        //Map<String, Object> map = new HashMap<>();
-        map.put("check","");
         //查询实验室下的硬件
         RemoteLabHardware hd = new RemoteLabHardware();
         //实验室id
@@ -395,12 +393,12 @@ public class FireDeviceController extends BaseController {
         hd.setIsPcfire(1);
         List<RemoteLabHardware> hdlist = remoteLaboratoryService.remoteList(hd).getData();
         if (hdlist.size() == 0) {
-            //return ResultData.fail("该实验室尚未配置关联硬件！");
-            map.put("check","该实验室尚未配置关联硬件！");
+            logger.info("该实验室尚未配置关联硬件！");
+            //map.put("check","该实验室尚未配置关联硬件！");
             return  map;
         } else if (hdlist.size() != 2) {
-            //return ResultData.fail("该实验室尚未配置2路控制器！");
-            map.put("check","该实验室尚未配置2路控制器！");
+            logger.info("该实验室尚未配置2路控制器！");
+            //map.put("check","该实验室尚未配置2路控制器！");
             return map;
         }
 
@@ -588,7 +586,6 @@ public class FireDeviceController extends BaseController {
      */
     @GetMapping(value = "/getDeviceByCode")
     public ResultData getDeviceByCode(String deviceCode) {
-        // fireDeviceService.selectHardwareFireDeviceList();
         HardwareFireDeviceVO vo = new HardwareFireDeviceVO();
         vo.setDeviceCode(deviceCode);
         List<HardwareFireDeviceVO> list = fireDeviceService.selectHardwareFireDeviceList(vo);

zd-modules/zd-algorithm/src/main/java/com/zd/alg/fire/utils/FireDeviceStatusTask.java

@@ -74,6 +74,7 @@ public class FireDeviceStatusTask {
                 //获取灭火主机最后一次响应时间,判断响应是否超时
                 Long timeJson = redisService.getCacheObject(CacheConstants.FIRE_DEVICE_RESPOND_TIME+list.get(0).getDeviceCode());
                 if (StringUtils.isNull(timeJson)) {
+                    logger.info("设备掉线");
                     //离线
                     mqttSend.send(MqttConstants.TOPIC_FIRE_DEVICE_ONLINE+list.get(0).getDeviceCode(), "0");
                 }else{

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mqtt/config/MqttConfig.java

@@ -282,7 +282,7 @@ public class MqttConfig {
                     //redis存值 采集器编号：主机状态json
                     redisService.setCacheObject(receivedTopic, jsonObject, 1L, TimeUnit.MINUTES);
                     //redis存值 灭火主机响应时间
-                    redisService.setCacheObject(CacheConstants.FIRE_DEVICE_RESPOND_TIME, System.currentTimeMillis(), 1L, TimeUnit.MINUTES);
+                    redisService.setCacheObject(CacheConstants.FIRE_DEVICE_RESPOND_TIME+receivedTopic, System.currentTimeMillis(), 1L, TimeUnit.MINUTES);
 
                     Integer fireNumber = Integer.valueOf(jsonObject.get("fireNumber").toString());
                     //灭火主机发生预警