From 373528b4322c6158d04d38f4e9902359e19ff14b Mon Sep 17 00:00:00 2001 From: dfdg <2710245601@qq.com> Date: Mon, 3 Nov 2025 11:45:08 +0800 Subject: [PATCH] =?UTF-8?q?websocket=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/bigscreen/config/RedisConfig.java | 3 --- .../bigscreen/listener/RedisMessageListener.java | 1 - .../bigscreen/manager/RedisSubscribeManager.java | 7 ++++--- .../impl/AsyncMessageHandlerServiceImpl.java | 1 + .../gps/service/impl/GpsEquipmentServiceImpl.java | 2 +- .../DeviceMessageSender.java | 1 + .../mobileAttendanceMachine/WebSocketConfig.java | 15 --------------- .../websocket}/config/WebSocketConfig.java | 2 +- .../websocket/service}/DeviceWebSocketServer.java | 3 ++- .../service}/InitOnStartWebSocketServer.java | 14 +------------- .../domain/bo/XzdCsContractChangeBo.java | 2 +- .../domain/bo/XzdCsContractSuspendBo.java | 2 +- .../domain/vo/XzdCsContractChangeVo.java | 2 +- .../impl/XzdCsContractChangeServiceImpl.java | 3 +++ .../impl/XzdCsContractSuspendServiceImpl.java | 3 +++ 15 files changed, 20 insertions(+), 41 deletions(-) delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mobileAttendanceMachine/WebSocketConfig.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{bigscreen => websocket/websocket}/config/WebSocketConfig.java (85%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{mobileAttendanceMachine => websocket/websocket/service}/DeviceWebSocketServer.java (99%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/{bigscreen/service/impl => websocket/websocket/service}/InitOnStartWebSocketServer.java (85%) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/config/RedisConfig.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/config/RedisConfig.java index 28274800..f4db93da 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/config/RedisConfig.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/config/RedisConfig.java @@ -8,12 +8,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.data.redis.listener.PatternTopic; import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.data.redis.listener.adapter.MessageListenerAdapter; -import java.util.List; - @Configuration public class RedisConfig { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/listener/RedisMessageListener.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/listener/RedisMessageListener.java index c2b37f9d..add56506 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/listener/RedisMessageListener.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/listener/RedisMessageListener.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.dromara.bigscreen.service.IAsyncMessageHandlerService; -import org.dromara.bigscreen.service.impl.InitOnStartWebSocketServer; import org.dromara.common.websocket.dto.WebSocketMessageDto; import org.dromara.common.websocket.holder.WebSocketSessionHolder; import org.dromara.common.websocket.utils.WebSocketUtils; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/manager/RedisSubscribeManager.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/manager/RedisSubscribeManager.java index 9ebf6d6b..35e71ebe 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/manager/RedisSubscribeManager.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/manager/RedisSubscribeManager.java @@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.dromara.bigscreen.service.impl.InitOnStartWebSocketServer; + import org.dromara.common.redis.utils.RedisUtils; import org.dromara.drone.domain.DroProjectDrone; import org.dromara.drone.service.IDroProjectDroneService; +import org.dromara.websocket.websocket.service.InitOnStartWebSocketServer; import org.springframework.context.annotation.Lazy; import org.springframework.data.redis.listener.PatternTopic; import org.springframework.data.redis.listener.RedisMessageListenerContainer; @@ -132,8 +133,8 @@ public class RedisSubscribeManager { } -// @Scheduled(cron = "0/10 * * * * ?") - @JobExecutor(name = "ueWsConnect") + @Scheduled(cron = "0/10 * * * * ?") +// @JobExecutor(name = "ueWsConnect") public void ueWsConnect() { try { int onlineCount = InitOnStartWebSocketServer.getOnlineCount(); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/AsyncMessageHandlerServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/AsyncMessageHandlerServiceImpl.java index 2a2971d2..026108cb 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/AsyncMessageHandlerServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/AsyncMessageHandlerServiceImpl.java @@ -11,6 +11,7 @@ import org.dromara.common.websocket.holder.WebSocketSessionHolder; import org.dromara.common.websocket.utils.WebSocketUtils; import org.dromara.drone.domain.DroProjectDrone; import org.dromara.drone.mapper.DroProjectDroneMapper; +import org.dromara.websocket.websocket.service.InitOnStartWebSocketServer; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.scheduling.annotation.Async; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java index 5ffc9937..7e7546ec 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/service/impl/GpsEquipmentServiceImpl.java @@ -6,7 +6,7 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; -import org.dromara.bigscreen.service.impl.InitOnStartWebSocketServer; +import org.dromara.websocket.websocket.service.InitOnStartWebSocketServer; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mobileAttendanceMachine/DeviceMessageSender.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mobileAttendanceMachine/DeviceMessageSender.java index c489c3a6..513231a4 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mobileAttendanceMachine/DeviceMessageSender.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mobileAttendanceMachine/DeviceMessageSender.java @@ -1,6 +1,7 @@ package org.dromara.mobileAttendanceMachine; import lombok.extern.log4j.Log4j2; +import org.dromara.websocket.websocket.service.DeviceWebSocketServer; import org.springframework.stereotype.Service; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mobileAttendanceMachine/WebSocketConfig.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mobileAttendanceMachine/WebSocketConfig.java deleted file mode 100644 index 87926826..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mobileAttendanceMachine/WebSocketConfig.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.mobileAttendanceMachine; - - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.socket.server.standard.ServerEndpointExporter; - - -//@Configuration -public class WebSocketConfig { - @Bean - public ServerEndpointExporter serverEndpointExporter() { - return new ServerEndpointExporter(); - } -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/config/WebSocketConfig.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/config/WebSocketConfig.java similarity index 85% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/config/WebSocketConfig.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/config/WebSocketConfig.java index 03787b59..f91161a5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/config/WebSocketConfig.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/config/WebSocketConfig.java @@ -1,4 +1,4 @@ -package org.dromara.bigscreen.config;// 路径：com.ruoyi.framework.config.WebSocketConfig +package org.dromara.websocket.websocket.config;// 路径：com.ruoyi.framework.config.WebSocketConfig import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.socket.server.standard.ServerEndpointExporter; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mobileAttendanceMachine/DeviceWebSocketServer.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/DeviceWebSocketServer.java similarity index 99% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mobileAttendanceMachine/DeviceWebSocketServer.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/DeviceWebSocketServer.java index fc345d92..2845b421 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mobileAttendanceMachine/DeviceWebSocketServer.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/DeviceWebSocketServer.java @@ -1,4 +1,4 @@ -package org.dromara.mobileAttendanceMachine; +package org.dromara.websocket.websocket.service; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -7,6 +7,7 @@ import jakarta.websocket.server.ServerEndpoint; import lombok.extern.log4j.Log4j2; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.SpringUtils; +import org.dromara.mobileAttendanceMachine.KqjEntity; import org.dromara.project.service.IBusAttendanceMachineService; import org.springframework.stereotype.Component; diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/InitOnStartWebSocketServer.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/InitOnStartWebSocketServer.java similarity index 85% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/InitOnStartWebSocketServer.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/InitOnStartWebSocketServer.java index c4148da7..c11f2e85 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/InitOnStartWebSocketServer.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/websocket/service/InitOnStartWebSocketServer.java @@ -1,23 +1,11 @@ -package org.dromara.bigscreen.service.impl;// 路径：com.ruoyi.web.websocket.InitOnStartWebSocketServer -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import jakarta.annotation.Resource; +package org.dromara.websocket.websocket.service;// 路径：com.ruoyi.web.websocket.InitOnStartWebSocketServer import jakarta.websocket.*; import jakarta.websocket.server.ServerEndpoint; import lombok.extern.slf4j.Slf4j; -import org.dromara.bigscreen.manager.RedisSubscribeManager; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.drone.domain.DroProjectDrone; -import org.dromara.drone.service.IDroProjectDroneService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import java.io.IOException; -import java.util.HashSet; -import java.util.List; import java.util.Map; -import java.util.Set; import java.util.concurrent.ConcurrentHashMap; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractChangeBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractChangeBo.java index c94ed233..90642369 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractChangeBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractChangeBo.java @@ -41,7 +41,7 @@ public class XzdCsContractChangeBo extends BaseEntity { /** * 单据编码 */ - @NotBlank(message = "单据编码不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "单据编码不能为空", groups = { EditGroup.class }) private String docCode; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractSuspendBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractSuspendBo.java index e3e66393..38063af3 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractSuspendBo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/bo/XzdCsContractSuspendBo.java @@ -40,7 +40,7 @@ public class XzdCsContractSuspendBo extends BaseEntity { /** * 单据编码 */ - @NotBlank(message = "单据编码不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotBlank(message = "单据编码不能为空", groups = { EditGroup.class }) private String receiptsCode; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java index f70787cf..13a0724b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/domain/vo/XzdCsContractChangeVo.java @@ -107,7 +107,7 @@ public class XzdCsContractChangeVo implements Serializable { */ @ExcelProperty(value = "组织") private Long organization; - @Translation(type = TransConstant.XZD_KHXX_ID_TO_NAME, mapper = "organization") + @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "organization") private String organizationName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java index 1672a81c..b7f83075 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractChangeServiceImpl.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.domain.vo.SysDeptVo; import org.dromara.system.service.ISysDeptService; import org.dromara.system.service.ISysUserService; @@ -167,6 +168,8 @@ public class XzdCsContractChangeServiceImpl extends ServiceImpl 0; if (flag) { diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractSuspendServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractSuspendServiceImpl.java index 2ec4c9dc..c671de7b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractSuspendServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/comprehensive/service/impl/XzdCsContractSuspendServiceImpl.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.utils.BatchNumberGenerator; import org.dromara.system.domain.vo.SysDeptVo; import org.dromara.system.service.impl.SysDeptServiceImpl; import org.dromara.system.service.impl.SysOssServiceImpl; @@ -122,6 +123,8 @@ public class XzdCsContractSuspendServiceImpl extends ServiceImpl 0; if (flag) {