From 842807bcfff77c7275984077245d277b48a85b27 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 05 七月 2024 14:33:04 +0800
Subject: [PATCH] 拉取最新代码
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 58 ++++------------------------------------------------------
1 files changed, 4 insertions(+), 54 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index a63c890..e04f87a 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -72,7 +72,7 @@
@Value("${mes.secondLength}")
private String secondLength;
- @Scheduled(fixedDelay = 1000)
+// @Scheduled(fixedDelay = 5000000)
public void plcHomeEdgTask() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
String taskRequestTypeValue = plcParameterObject.getPlcParameter("A06_request_word").getValue();
@@ -632,7 +632,7 @@
}
/**
- * 褰撳墠鍒囧壊鐗堝浘淇℃伅
+ * 褰撳墠鍒囧壊鐗堝浘淇℃伅 +纾ㄨ竟浠诲姟+纾ㄨ竟鍓� 缂撳瓨鍐呬俊鎭�
*
* @param
* @return
@@ -642,62 +642,10 @@
JSONObject jsonObject = new JSONObject();
List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
jsonObject.append("currentCutTerritory", currentCutTerritorys);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- List<String> messages = webserver.getMessages();
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
- }
- } else {
- log.info("Home is closed");
- }
- }
- }
- }
-
- /**
- * 纾ㄨ竟浠诲姟
- *
- * @param
- * @return
- */
- @Scheduled(fixedDelay = 1000)
- public void selectEdgTask(){
- JSONObject jsonObject = new JSONObject();
List<Map<String,Object>> EdgTasks1 = taskCacheService.selectEdgInfo("2001");
List<Map<String,Object>> EdgTasks2 = taskCacheService.selectEdgInfo("2002");
jsonObject.append("EdgTasks1", EdgTasks1);
jsonObject.append("EdgTasks2", EdgTasks2);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- List<String> messages = webserver.getMessages();
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
- }
- } else {
- log.info("Home is closed");
- }
- }
- }
- }
-
- /**
- * 纾ㄨ竟鍓� 缂撳瓨鍐呬俊鎭�
- *
- * @param
- * @return
- */
- @Scheduled(fixedDelay = 1000)
- public void selectEdgStorageCage(){
- JSONObject jsonObject = new JSONObject();
List<Map<String, Object>> EdgStorageCageinfos=edgStorageCageService.selectEdgStorageCages();
jsonObject.append("EdgStorageCageinfos", EdgStorageCageinfos);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass");
@@ -718,4 +666,6 @@
}
+
+
}
--
Gitblit v1.8.0