From 9a04a35fd540aaf419361e2f8d89e28aed5d768f Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Mon, 31 Mar 2025 11:13:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9D=97=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0websocket=E9=80=9A=E8=AE=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/mapper/EquRepairOrderMapper.java | 3 ++- .../op/device/schedul/MyWebSocketHandler.java | 15 +++++-------- .../op/device/websocket/WebSocketServer.java | 2 +- .../mapper/device/EquRepairOrderMapper.xml | 22 +++++++++++-------- .../mapper/mes/MesAttendanceRecordsMapper.xml | 4 +++- 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java index 55ca833a4..65b4a288e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairOrderMapper.java @@ -1,6 +1,7 @@ package com.op.device.mapper; import java.util.List; +import java.util.Map; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.domain.BaseFileData; @@ -111,5 +112,5 @@ public interface EquRepairOrderMapper { //查询公告绑定的班组 List getNoticesGroup(SysNoticeGroup noticeQo); - Equipment selectEquInfoByequCode(Equipment equipment); + Map selectEquInfoByequCode(String equipmentCode); } 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 5dfb0e926..371df11aa 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,21 +27,18 @@ public class MyWebSocketHandler extends TextWebSocketHandler { private EquRepairOrderMapper equRepairOrderMapper; - @Scheduled(fixedRate = 10000) // 每60秒执行一次 + @Scheduled(fixedRate = 5000) // 每60秒执行一次 @DS("ds_1000") public void sendPeriodicMessages() { EquRepairOrder equRepairOrder=new EquRepairOrder(); equRepairOrder.setOrderStatus("2"); List equRepairOrderList=equRepairOrderMapper.selectEquRepairOrderList(equRepairOrder); - Equipment equipment=new Equipment(); - List equRepairOrders=new ArrayList<>(); - for (EquRepairOrder repairOrder : equRepairOrderList) { - equipment.setEquipmentCode(repairOrder.getEquipmentCode()); - equipment=equRepairOrderMapper.selectEquInfoByequCode(equipment); - repairOrder.setEquipment(equipment); - equRepairOrders.add(repairOrder); + 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(equRepairOrders); + String jsonResult = JSON.toJSONString(equRepairOrderList); WebSocketUsers.sendMessageToUsersByText(jsonResult); } diff --git a/op-modules/op-device/src/main/java/com/op/device/websocket/WebSocketServer.java b/op-modules/op-device/src/main/java/com/op/device/websocket/WebSocketServer.java index 1063d89d5..70887df54 100644 --- a/op-modules/op-device/src/main/java/com/op/device/websocket/WebSocketServer.java +++ b/op-modules/op-device/src/main/java/com/op/device/websocket/WebSocketServer.java @@ -54,7 +54,7 @@ public class WebSocketServer WebSocketUsers.put(session.getId(), session); LOGGER.info("\n 建立连接 - {}", session); LOGGER.info("\n 当前人数 - {}", WebSocketUsers.getUsers().size()); - WebSocketUsers.sendMessageToUserByText(session, "连接成功"); + // WebSocketUsers.sendMessageToUserByText(session, "连接成功"); } } diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml index 0d958237c..252688ea2 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairOrderMapper.xml @@ -345,15 +345,19 @@ left join base_team_user btu on sng.group_code = btu.team_code where sng.notice_id = #{noticeId} and sng.del_flag = '0' - + + SELECT + A.auxiliary_equipment_code as auxiliaryequipmentCode, + A.auxiliary_equipment_name as auxiliaryequipmentName, + A.equipment_code as equipmentCode, + A.equipment_name as equipmentName + FROM + equ_bind_auxiliary_equipment A + WHERE + A.auxiliary_equipment_code = #{equipmentCode} + + diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesAttendanceRecordsMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesAttendanceRecordsMapper.xml index 0dbd9798b..9b7b885b1 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesAttendanceRecordsMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesAttendanceRecordsMapper.xml @@ -24,7 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, user_id, user_name, attendance_status, sex, age, id_number, start_time, start_addr, end_time, end_addr, attendance_time, attendance_date, work_hours, create_time, post from mes_attendance_records + select id, user_id, user_name, attendance_status, sex, age, id_number, start_time, start_addr, end_time, end_addr, attendance_time, attendance_date, work_hours, create_time, post + from mes_attendance_records +