From 14f9b0e0a5277997d9fd13c684687c692a57bbfc Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Wed, 21 May 2025 18:12:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9D=97=E9=BB=91?= =?UTF-8?q?=E8=9A=8A=E9=A6=99=E8=BD=A6=E9=97=B4=E7=94=9F=E4=BA=A7=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E7=9C=8B=E6=9D=BF=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EquRepairOrderController.java | 20 +++++++++++++++++++ .../op/device/schedul/MyWebSocketHandler.java | 14 ------------- .../service/IEquRepairOrderService.java | 2 ++ .../impl/EquRepairOrderServiceImpl.java | 7 +++++++ .../mapper/device/DeviceInterfaceMapper.xml | 5 +++-- 5 files changed, 32 insertions(+), 16 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java index 082f86cc1..e5a1ddf09 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairOrderController.java +++ b/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 getCsRepairlist(EquRepairOrder equRepairOrder) { + equRepairOrder.setOrderStatus("2"); + List 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; + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/schedul/MyWebSocketHandler.java b/op-modules/op-device/src/main/java/com/op/device/schedul/MyWebSocketHandler.java index 371df11aa..9f8f922ec 100644 --- a/op-modules/op-device/src/main/java/com/op/device/schedul/MyWebSocketHandler.java +++ b/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 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); - } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java index 7723522fc..ef6a91292 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairOrderService.java +++ b/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 selectGroupLineList(); + Map selectEquInfoByequCode(String equipmentCode); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java index 50b64e9fc..a1f1e28d6 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairOrderServiceImpl.java +++ b/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); + } + } diff --git a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml index 1f1b294ee..c7c811d07 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/DeviceInterfaceMapper.xml +++ b/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' - and wo.del_flag = '0' + where + wo.work_status = '0' + wo.del_flag = '0'