Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

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

@@ -60,8 +60,8 @@ public class FireDeviceController extends BaseController {
     /***
      * 固定30s
      */
-    @Value("${time.direTime}")
-    private Long direTime;
+    @Value("${time.fireTime}")
+    private Long fireTime;
 
     @Autowired
     private MqttSend mqttSend;
@@ -286,7 +286,7 @@ public class FireDeviceController extends BaseController {
         //int waitTime = 5;//倒计时等待时间（秒）
         map.put("online", online);
         map.put("waitTime", countDown);
-        map.put("direTime", direTime);
+        map.put("direTime", fireTime);
         new Thread(()->startTT(subjectId,deviceCode,countDown)).start();
         return ResultData.success(map);
     }
@@ -336,7 +336,7 @@ public class FireDeviceController extends BaseController {
         //int waitTime = 5;//倒计时等待时间（秒）
         map.put("online", online);
         map.put("waitTime", countDown);
-        map.put("direTime", direTime);
+        map.put("direTime", fireTime);
         new Thread(()->startTT(subjectId,deviceCode,countDown)).start();
         return ResultData.success(map);
     }
@@ -413,7 +413,7 @@ public class FireDeviceController extends BaseController {
         logger.info("灭火设备状态：" + object);
 
         //手动灭火时间
-        redisService.setCacheObject(ARTIFICIAL_OUT_FILE+list.get(0).getDeviceCode(),System.currentTimeMillis(),Long.valueOf(list.get(0).getDeviceCountDown()+direTime),TimeUnit.SECONDS);
+        redisService.setCacheObject(ARTIFICIAL_OUT_FILE+list.get(0).getDeviceCode(),System.currentTimeMillis(),Long.valueOf(list.get(0).getDeviceCountDown()+fireTime),TimeUnit.SECONDS);
 
         if (StringUtils.isNotNull(object)) {
             //异常传感器数量
@@ -477,7 +477,7 @@ public class FireDeviceController extends BaseController {
         //通知前端一键灭火正在执行
         Map<String,Object> mapstatus = new HashMap<>();
         mapstatus.put("fireStatus",1);
-        mapstatus.put("direTime",direTime);
+        mapstatus.put("direTime",fireTime);
         mqttSend.send(MqttConstants.TOPIC_FIRE_DEVICE_EXECUTING+deviceCode,JSON.toJSONString(mapstatus));
 
         //关闭继电器
@@ -581,6 +581,24 @@ public class FireDeviceController extends BaseController {
         return ResultData.success(fireDeviceLogService.insertFireAutomatic(code));
     }
 
+    /***
+     * 根据采集器编号查询
+     * @param deviceCode
+     * @return
+     */
+    @GetMapping(value = "/getDeviceByCode")
+    public ResultData getDeviceByCode(String deviceCode) {
+        // fireDeviceService.selectHardwareFireDeviceList();
+        HardwareFireDeviceVO vo = new HardwareFireDeviceVO();
+        vo.setDeviceCode(deviceCode);
+        List<HardwareFireDeviceVO> list = fireDeviceService.selectHardwareFireDeviceList(vo);
+        if(list.size()>0){
+            return ResultData.success(list.get(0));
+        }else{
+            return ResultData.success(null);
+        }
+    }
+
     public static void main(String[] args) {
         Map<String,Object> map = new HashMap<>();
         map.put("fireStatus",1);