第二版,后台bug

src/main/java/com/care/bigscreen/controller/CommonController.java

@@ -48,10 +48,10 @@ public class CommonController {
     @GetMapping("/pushEvent")
     public Result<Object> pushEvent(@RequestParam("stationId") Long stationId,@RequestParam(value = "orderId") Long orderId) {
         try {
-            bigScreenService.pushRtEventFlag(String.valueOf(stationId),orderId.toString(),"orderStatusUpdate");
+            bigScreenService.pushRtEventFlag(String.valueOf(stationId),orderId.toString(),"bigscreenRefresh");
             bigScreenService.pushRtEventFlag(String.valueOf(stationId),orderId.toString(),"orderAdd");
             bigScreenService.pushRtEventFlag(String.valueOf(stationId),orderId.toString(),"orderUpdate");
-
+            bigScreenService.pushRtEventFlag(String.valueOf(stationId),orderId.toString(),"orderHandle");
             return Result.success("成功");
         } catch (Exception e) {
             log.error("convertedCodeName: ",e);

src/main/java/com/care/bigscreen/service/impl/BigScreenServiceImpl.java

@@ -217,12 +217,14 @@ public class BigScreenServiceImpl implements BigScreenService {
         try {
             //触发统计
             exeStatistics();
-            if("orderStatusUpdate".equals(flag)) {
+            if("bigscreenRefresh".equals(flag)) {
                 StationWebSocketEndpoint.sendMessage(stationId, "rt_event_happen");
             } else if("orderAdd".equals(flag)) {
                 WebSocketEndpoint.sendMessage("rt_event_add_happen@" + orderId);
             } else if("orderUpdate".equals(flag)){
                 WebSocketEndpoint.sendMessage("rt_event_update_happen@" + orderId);
+            } else if("orderHandle".equals(flag)){
+                WebSocketEndpoint.sendMessage("rt_event_handle_happen@" + orderId);
             }
 
         } catch (Exception e){

src/main/java/com/care/bms/controller/EventHandleController.java

@@ -3,6 +3,7 @@ package com.care.bms.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.care.bigscreen.service.BigScreenService;
 import com.care.bms.service.BmsEventOrderService;
 import com.care.common.entity.CareEventOrderChamb;
 import com.care.common.enums.CallResultEnum;
@@ -25,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
@@ -44,7 +46,8 @@ public class EventHandleController {
 
     @Autowired
     private BmsEventOrderService bmsEventOrderService;
-
+    @Resource
+    private BigScreenService bigScreenService;
 
     /**
      *未处理事件查询
@@ -178,6 +181,7 @@ public class EventHandleController {
     public Result<Object> receiveOrder(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("orderId") Long orderId){
         UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
         this.bmsEventOrderService.receiveOrder(orderId,loginUser);
+        bigScreenService.pushRtEventFlag(null,String.valueOf(orderId),"orderHandle");
         return  Result.success("领取工单成功！");
     }
     @GetMapping("/getEventInfo/{orderId}")

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -476,7 +476,7 @@ public class BmsEventOrderService {
                 .set(CareEventOrder::getStatus,orderStatusEnum.getValue())
                 .set(CareEventOrder::getModifyTime,DateUtil.date());
         this.careEventOrderService.update(updateWrapper);
-        this.bigScreenService.pushRtEventFlag(order.getStationId().toString(),orderId.toString(),"orderStatusUpdate");
+        this.bigScreenService.pushRtEventFlag(order.getStationId().toString(),orderId.toString(),"bigscreenRefresh");
     }
 
     /**

src/main/java/com/care/bms/service/MqttMsgService.java

@@ -157,7 +157,7 @@ public class MqttMsgService {
             this.bigScreenService.pushRtEventFlag(order.getStationId().toString(),order.getId().toString(),"orderAdd");
         }
 
-        this.bigScreenService.pushRtEventFlag(order.getStationId().toString(),order.getId().toString(),"orderStatusUpdate");
+        this.bigScreenService.pushRtEventFlag(order.getStationId().toString(),order.getId().toString(),"bigscreenRefresh");
     }
 
     class MyThread extends Thread {