From e50d8c30b43dd30daa77da27101ce21d8ef2fcef Mon Sep 17 00:00:00 2001 From: whycxzp <glperry@163.com> Date: 星期一, 17 三月 2025 17:20:10 +0800 Subject: [PATCH] 锂电设备相关代码更新 --- src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/whyc/webSocket/DevRtStateSocket.java b/src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java similarity index 72% rename from src/main/java/com/whyc/webSocket/DevRtStateSocket.java rename to src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java index 4af1304..1a73f11 100644 --- a/src/main/java/com/whyc/webSocket/DevRtStateSocket.java +++ b/src/main/java/com/whyc/webSocket/DevLithiumRtStateSocket.java @@ -18,20 +18,20 @@ /** - * 璁惧瀹炴椂杩炴帴淇℃伅 + * 閿傜數璁惧瀹炴椂杩炴帴淇℃伅 */ @Component -@ServerEndpoint(value = "/rtstateSocket",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class) -public class DevRtStateSocket { +@ServerEndpoint(value = "/DevLithiumRtState",encoders = WebSocketEncoder.class,configurator = WebSocketConfig.class) +public class DevLithiumRtStateSocket { private Session session; private Thread thread; - private static BattRtDataService rtdataService; + private static BattRtDataService battRtDataService; - private static A200RealStateService a200Service; + private static A200RealStateService a200RtStateService; - private static ActmRealStateService actmService; + private static ActmRealStateService actmRtStateService; private static WorkStateChangeEventService eventService; @@ -43,23 +43,23 @@ private volatile Map<Long,Boolean> threadFlagMap = new HashMap<>(); @Autowired - public void setBattRtdataService(BattRtDataService rtdataService) { - DevRtStateSocket.rtdataService = rtdataService; + public void setBattRtDataService(BattRtDataService battRtDataService) { + DevLithiumRtStateSocket.battRtDataService = battRtDataService; } @Autowired - public void setA200RealstateService(A200RealStateService a200Service) { - DevRtStateSocket.a200Service = a200Service; + public void setA200RealStateService(A200RealStateService a200RtStateService) { + DevLithiumRtStateSocket.a200RtStateService = a200RtStateService; } @Autowired - public void setActmRealstateService(ActmRealStateService actmService) { - DevRtStateSocket.actmService = actmService; + public void setActmRealStateService(ActmRealStateService actmRtStateService) { + DevLithiumRtStateSocket.actmRtStateService = actmRtStateService; } @Autowired - public void setWorkstateChangeeventService(WorkStateChangeEventService eventService) { - DevRtStateSocket.eventService = eventService; + public void setWorkStateChangeEventService(WorkStateChangeEventService eventService) { + DevLithiumRtStateSocket.eventService = eventService; } @OnOpen @@ -69,7 +69,7 @@ @OnMessage public void onMessage(Session session, String message) { RtStateDto dto= ActionUtil.getGson().fromJson(message, RtStateDto.class); - thread = new Thread("Thread_RtstateSocket") { + thread = new Thread("DevLithiumRtStateSocket") { @Override public void run() { while (runFlag && !isInterrupted()) { @@ -110,13 +110,13 @@ //鍧囪 浠狝ctm瀹炴椂鏁版嵁 private Response getActmState(int devId) { Map<String, Response> map = new HashMap<>(); - Response resActmState=actmService.getActmState(devId); - Response rtdataState0=rtdataService.getActmRtdataState(devId,0); - Response rtdataState1=rtdataService.getActmRtdataState(devId,1); + Response resActmState=actmRtStateService.getActmState(devId); + Response rtDataState0=battRtDataService.getActmRtdataState(devId,0); + Response rtDataState1=battRtDataService.getActmRtdataState(devId,1); Response event=eventService.getWorkEvent(devId); map.put("resActmState",resActmState); - map.put("rtdataState0",rtdataState0); - map.put("rtdataState1",rtdataState1); + map.put("rtDataState0",rtDataState0); + map.put("rtDataState1",rtDataState1); map.put("event",event); return new Response().setII(1,true,map,"鍧囪 浠狝ctm瀹炴椂鏁版嵁"); } @@ -124,11 +124,11 @@ //涓�浣撴満A200瀹炴椂鏁版嵁 private Response getA200State(int devId) { Map<String, Response> map = new HashMap<>(); - Response resA200State=a200Service.getA200State(devId); - Response rtdataState=rtdataService.getA200RtdataState(devId); + Response resA200State=a200RtStateService.getA200State(devId); + Response rtDataState=battRtDataService.getA200RtdataState(devId); Response event=eventService.getWorkEvent(devId); map.put("resA200State",resA200State); - map.put("rtdataState",rtdataState); + map.put("rtDataState",rtDataState); map.put("event",event); return new Response().setII(1,true,map,"涓�浣撴満A200瀹炴椂鏁版嵁"); } -- Gitblit v1.9.1