设备模块增加websocket通讯

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<SysNoticeGroup> getNoticesGroup(SysNoticeGroup noticeQo);
 
-    Equipment selectEquInfoByequCode(Equipment equipment);
+    Map selectEquInfoByequCode(String equipmentCode);
 }

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<EquRepairOrder> equRepairOrderList=equRepairOrderMapper.selectEquRepairOrderList(equRepairOrder);
-        Equipment equipment=new Equipment();
-        List<EquRepairOrder> 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);
 
     }

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, "连接成功");
         }
     }
 

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>
-    <select id="selectEquInfoByequCode" resultType="com.op.device.domain.Equipment" >
-        SELECT
-            equipment_code,
-            equipment_name,
-            sap_code
-        FROM
-            [dbo].[base_equipment]
-        WHERE
-            equipment_code = #{equipmentCode}
+    <select id="selectEquInfoByequCode" resultType="java.util.Map">
+
+            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}
+
     </select>
 
+
 </mapper>

op-modules/op-mes/src/main/resources/mapper/mes/MesAttendanceRecordsMapper.xml

@@ -24,7 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMesAttendanceRecordsVo">
-        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
+
     </sql>
 
     <select id="selectMesAttendanceRecordsList" parameterType="MesAttendanceRecords" resultMap="MesAttendanceRecordsResult">