一键灭火修改

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

@@ -291,11 +291,14 @@ public class FireDeviceController extends BaseController {
         HardwareFireDeviceVO vo = new HardwareFireDeviceVO();
         vo.setSubjectId(subjectId);
         List<HardwareFireDeviceVO> list = fireDeviceService.selectHardwareFireDeviceList(vo);
+        if(list.get(0).getDeviceCountDown()!=null){
+            fireTime= fireTime+list.get(0).getDeviceCountDown();
+        }
 
         //int waitTime = 5;//倒计时等待时间（秒）
         map.put("online", online);
         map.put("waitTime", countDown);
-        map.put("direTime", fireTime+list.get(0).getDeviceCountDown());
+        map.put("direTime", fireTime);
         new Thread(()->startTT(subjectId,deviceCode,countDown)).start();
         return ResultData.success(map);
     }
@@ -348,11 +351,14 @@ public class FireDeviceController extends BaseController {
         HardwareFireDeviceVO vo = new HardwareFireDeviceVO();
         vo.setSubjectId(subjectId);
         List<HardwareFireDeviceVO> list = fireDeviceService.selectHardwareFireDeviceList(vo);
+        if(list.get(0).getDeviceCountDown()!=null){
+            fireTime= fireTime+list.get(0).getDeviceCountDown();
+        }
 
         //int waitTime = 5;//倒计时等待时间（秒）
         map.put("online", online);
         map.put("waitTime", countDown);
-        map.put("direTime", fireTime+list.get(0).getDeviceCountDown());
+        map.put("direTime", fireTime);
         new Thread(()->startTT(subjectId,deviceCode,countDown)).start();
         return ResultData.success(map);
     }