设备模块黑蚊香车间生产监控看板内容修改

op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java

@@ -1,6 +1,8 @@
 package com.op.device.controller;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.op.device.domain.EquEquipment;
@@ -48,6 +50,8 @@ public class EquRepairOrderController extends BaseController {
         return getDataTable(list);
     }
 
+
+
     /**
      * 导出故障报修列表
      */
@@ -152,4 +156,20 @@ public class EquRepairOrderController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 黑蚊香车间生产监控看板设备故障信息
+     */
+
+
+    @GetMapping("/getCsRepairlist")
+    public List<EquRepairOrder> getCsRepairlist(EquRepairOrder equRepairOrder) {
+        equRepairOrder.setOrderStatus("2");
+        List<EquRepairOrder> equRepairOrderList=equRepairOrderService.selectEquRepairOrderList(equRepairOrder);
+        for (int i = 0; i < equRepairOrderList.size(); i++) {
+            Map map=new HashMap();
+            map=equRepairOrderService.selectEquInfoByequCode(equRepairOrderList.get(i).getEquipmentCode());
+            equRepairOrderList.get(i).setParams(map);
+        }
+        return equRepairOrderList;
+    }
 }

op-modules/op-device/src/main/java/com/op/device/schedul/MyWebSocketHandler.java

@@ -27,19 +27,5 @@ public class MyWebSocketHandler extends TextWebSocketHandler {
     private EquRepairOrderMapper equRepairOrderMapper;
 
 
-    @Scheduled(fixedRate = 5000) // 每60秒执行一次
-    @DS("ds_1000")
-    public void sendPeriodicMessages() {
-        EquRepairOrder equRepairOrder=new EquRepairOrder();
-        equRepairOrder.setOrderStatus("2");
-        List<EquRepairOrder> equRepairOrderList=equRepairOrderMapper.selectEquRepairOrderList(equRepairOrder);
-        for (int i = 0; i < equRepairOrderList.size(); i++) {
-            Map map=new HashMap();
-            map=equRepairOrderMapper.selectEquInfoByequCode(equRepairOrderList.get(i).getEquipmentCode());
-            equRepairOrderList.get(i).setParams(map);
-        }
-        String jsonResult = JSON.toJSONString(equRepairOrderList);
-        WebSocketUsers.sendMessageToUsersByText(jsonResult);
 
 }
-}

op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java

@@ -1,6 +1,7 @@
 package com.op.device.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.op.common.core.web.domain.AjaxResult;
 import com.op.device.domain.*;
@@ -80,4 +81,5 @@ public interface IEquRepairOrderService {
 
     //查询组线
     public List<EquEquipment> selectGroupLineList();
+    Map selectEquInfoByequCode(String equipmentCode);
 }

op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java

@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -604,4 +605,10 @@ public class EquRepairOrderServiceImpl implements IEquRepairOrderService {
         return equEquipmentMapper.selectEquipmentGroupLine();
     }
 
+    @Override
+    @DS("#header.poolName")
+    public Map selectEquInfoByequCode(String equipmentCode) {
+        return equRepairOrderMapper.selectEquInfoByequCode(equipmentCode);
+    }
+
 }

op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml

@@ -15,8 +15,9 @@
         from equ_repair_work_order wo
         left join base_equipment be on wo.equipment_code = be.equipment_code
         left join equ_team et on wo.work_team = et.team_code
-        where wo.work_status = '0'
+        where
-		and wo.del_flag = '0'
+        wo.work_status = '0'
+		wo.del_flag = '0'
     </select>
 
     <select id="selectEquipmentList" parameterType="EquOperation" resultType="com.op.device.domain.vo.IEquipmentVO">