From 818cb2051ffaf794f7e2ea12827b6aa30256fd84 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 12 七月 2024 13:46:47 +0800
Subject: [PATCH] 磨边页面参数修改

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java |   83 ++++++++---------------------------------
 1 files changed, 17 insertions(+), 66 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 62186a5..4791b00 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)
+
     public void plcHomeEdgTask() {
         PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
         String taskRequestTypeValue = plcParameterObject.getPlcParameter("A06_request_word").getValue();
@@ -93,7 +93,7 @@
                 return;
             }
             log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓�0锛屽皢纭瀛楁敼涓�0");
-            S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 0);
+            S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, 0);
             return;
         }
         if (!"0".equals(confirmationWrodValue)) {
@@ -169,7 +169,7 @@
         boolean taskCache = saveTaskCache(details.getGlassId(), 0, nearestEmpty.getSlot(), Const.GLASS_CACHE_TYPE_IN);
         log.info("5銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃鏄惁瀹屾垚锛歿}", taskCache);
 
-        S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 1);
+        S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, 1);
         log.info("6銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
 
 
@@ -589,7 +589,7 @@
             }
             boolean glassSizeStatus = saveGlassSize(glassInfo);
             log.info("7銆佹坊鍔犲嚭鐗囩幓鐠冨昂瀵镐俊鎭埌纾ㄨ竟鍓嶇幓鐠冭〃鏄惁瀹屾垚锛歿}", glassSizeStatus);
-            S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 1);
+            S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, 1);
             log.info("8銆佸彂閫佺‘璁ゅ瓧宸插畬鎴�");
             return Boolean.TRUE;
         }
@@ -632,47 +632,25 @@
         return edgGlassTaskInfoService.save(edgGlassTaskInfo);
     }
 
-    /**
-     * 褰撳墠鍒囧壊鐗堝浘淇℃伅
-     *
-     * @param
-     * @return
-     */
+
+
     @Scheduled(fixedDelay = 1000)
-    public void currentCutTerritory() {
+    public void CacheGlassTasks() {
         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");
+        //纾ㄨ竟淇℃伅
+        List<Map<String, Object>> EdgTasks1 = taskCacheService.selectEdgInfo(Const.A09_OUT_TARGET_POSITION.toString());
+        List<Map<String, Object>> EdgTasks2 = taskCacheService.selectEdgInfo(Const.A10_OUT_TARGET_POSITION.toString());
         jsonObject.append("EdgTasks1", EdgTasks1);
         jsonObject.append("EdgTasks2", EdgTasks2);
+
+        //鍗у缂撳瓨绗煎唴淇℃伅
+        List<Map<String, Object>> EdgStorageCageinfos = edgStorageCageService.selectEdgStorageCages();
+        jsonObject.append("EdgStorageCageinfos", EdgStorageCageinfos);
+
+        log.info("鎺ㄩ�佹暟鎹細{}",jsonObject);
         ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass");
         if (sendwServer != null) {
             for (WebSocketServer webserver : sendwServer) {
@@ -690,33 +668,6 @@
         }
     }
 
-    /**
-     * 纾ㄨ竟鍓� 缂撳瓨鍐呬俊鎭�
-     *
-     * @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");
-        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");
-                }
-            }
-        }
-    }
 
 
 }

--
Gitblit v1.8.0