大屏设备启动报警由只报一次警改为需手动删除

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/largeScreen/component/WebSocketServer3.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.largeScreen.component;
 
 import org.jeecg.modules.itdmOpenDaping.entity.ItdmDaping;
 import org.jeecg.modules.largeScreen.config.CronTaskRegistrar;
+import org.jeecg.modules.largeScreen.task.DemoTask3;
 import org.jeecg.modules.largeScreen.task.SchedulingRunnable;
 import org.jeecg.modules.largeScreen.util.EncoderClassListVo;
 import org.jeecg.modules.largeScreen.util.SpringUtils;
@@ -36,9 +37,9 @@ public class WebSocketServer3 {
     private Session session;
 
     //改的地方
-//    public DemoTask3 getDemoTask3() {
-//        return SpringUtils.getBean(DemoTask3.class);
-//    }
+    public DemoTask3 getDemoTask3() {
+        return SpringUtils.getBean(DemoTask3.class);
+    }
 
     public CronTaskRegistrar getCronTaskRegistrar() {
         return SpringUtils.getBean(CronTaskRegistrar.class);
@@ -53,13 +54,13 @@ public class WebSocketServer3 {
     public void onOpen(Session session) {
         this.session = session;
         webSocketSet.add(this);
-//
-//        sendUser(this.getDemoTask3().dakaiwangye(), session);
-//        SchedulingRunnable task = new SchedulingRunnable("demoTask3", "dakaidaping", session);
-//
+
+        sendUser(this.getDemoTask3().chushihua(), session);
+        SchedulingRunnable task = new SchedulingRunnable("demoTask3", "taskWithParamsList", session);
+
         addOnlineCount();//在线数加1
-//        this.getCronTaskRegistrar().addCronTask(task, "0/100 * * * * ?");//30秒传一次数据
-//        webSocketSet1.put(session.getId(), task);
+        this.getCronTaskRegistrar().addCronTask(task, "0/30 * * * * ?");//30秒传一次数据
+        webSocketSet1.put(session.getId(), task);
     }
 
     /**
@@ -69,7 +70,7 @@ public class WebSocketServer3 {
     public void onClose(Session session) {
         webSocketSet.remove(this);
         subOnlineCount();
-//        this.getCronTaskRegistrar().removeCronTask(webSocketSet1.get(session.getId()));
+        this.getCronTaskRegistrar().removeCronTask(webSocketSet1.get(session.getId()));
     }
 
     /**

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/largeScreen/controller/ItdmVoiceController.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.itdmDataNow.entity.ItdmAlarmNow;
 import org.jeecg.modules.itdmDataNow.service.IItdmAlarmNowService;
+import org.jeecg.modules.itdmDeviceStart.entity.ItdmDeviceStart;
+import org.jeecg.modules.itdmDeviceStart.service.IItdmDeviceStartService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -17,6 +19,9 @@ public class ItdmVoiceController {
     @Autowired
     @SuppressWarnings("all")
     private IItdmAlarmNowService alarmNowService;
+    @Autowired
+    @SuppressWarnings("all")
+    private IItdmDeviceStartService deviceStartService;
 
     @DeleteMapping("/delete")//"/delete/{deleteId}"
     @ApiOperation("单个关闭语音报警）")//@PathVariable("deleteId")
@@ -26,6 +31,11 @@ public class ItdmVoiceController {
             itdmAlarmNow.setId(deleteId);
             itdmAlarmNow.setVoiceStatus(0);
             alarmNowService.updateById(itdmAlarmNow);
+        }else if(alarmType==3){
+            ItdmDeviceStart start = new ItdmDeviceStart();
+            start.setId(deleteId);
+            start.setDataStatus(1);
+            deviceStartService.updateById(start);
         }
     }
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/largeScreen/task/DemoTask2.java

@@ -135,11 +135,11 @@ public class DemoTask2 {
         map.put("name","报警列表");
         list.add(map);
 
-        /**已展示的数据状态更新*/
-        for (ItdmDeviceStart start : deviceStartList){
-            start.setDataStatus(1);
-            deviceStartService.updateById(start);
-        }
+//        /**已展示的数据状态更新*/
+//        for (ItdmDeviceStart start : deviceStartList){
+//            start.setDataStatus(1);
+//            deviceStartService.updateById(start);
+//        }
 
         /**语音列表*/
         List<ItdmVoiceWSVO> voiceWSVOList = alarmNowWSVOList.stream().map(i->{