From 5d69a09b49458784d62197482f39a94b1aa1064d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 23 九月 2024 11:17:57 +0800
Subject: [PATCH] 原片仓储代码功能编写:漏提

---
 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java |   53 ++++++++++++++++++++++++++
 /dev/null                                                                                             |   56 ----------------------------
 2 files changed, 53 insertions(+), 56 deletions(-)

diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
new file mode 100644
index 0000000..bf5b012
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java
@@ -0,0 +1,53 @@
+package com.mes.job;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONObject;
+import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
+import com.mes.rawglassstation.service.RawGlassStorageStationService;
+import com.mes.rawglasstask.entity.RawGlassStorageTask;
+import com.mes.rawglasstask.service.RawGlassStorageTaskService;
+import com.mes.tools.WebSocketServer;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author wangfei
+ */
+@Slf4j
+@Component
+public class RawGlassPushMessage {
+
+  @Resource private RawGlassStorageStationService rawGlassStorageStationService;
+
+  @Resource private RawGlassStorageTaskService rawGlassStorageTaskService;
+
+  @Scheduled(fixedDelay = 2000)
+  public void sendRawGlassMessage() {
+    log.info("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
+    JSONObject jsonObject = new JSONObject();
+    List<RawGlassStorageDetails> rawStationDetailsList =
+        rawGlassStorageStationService.listRawGlassDetails();
+    List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.listRawGlassTask();
+    jsonObject.append("rawStationDetailsList", rawStationDetailsList);
+    jsonObject.append("tasks", tasks);
+    log.info("鑾峰彇鍒扮殑宸ヤ綅璇︽儏鍙婁换鍔′俊鎭负锛歿}", jsonObject);
+
+    List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("rawGlass");
+    if (CollectionUtil.isNotEmpty(sendwServer)) {
+      if (sendwServer.get(0).session.isOpen()) {
+        log.info("宸插彂閫�");
+        sendwServer.get(0).sendMessage(String.valueOf(jsonObject));
+      }
+    }
+  }
+
+  /** todo:鍏ュ簱浠诲姟锛氬悐瑁呬綅鏈夌幓鐠冿紝鍏堝幓宸ヤ綅琛ㄦ煡璇㈢┖鏍煎瓙锛岀敓鎴愬叆搴撲换鍔′粠鍚婅浣嶅埌鐩爣鏍煎瓙 */
+
+  /** todo:鍑哄簱浠诲姟锛�1銆佺偣鍑哄簱锛岀珛椹敓鎴愬嚭鐗囦换鍔� 2銆佺偣鍑哄簱淇敼宸ヤ綅璇︽儏鍐呯殑鐘舵�佷负寰呭嚭搴擄紝瀹氭椂浠诲姟鎵弿鐢熸垚鍑哄簱浠诲姟 */
+
+  /** todo:鍘熺墖璋冨害锛�1銆佹煡璇㈠伐绋嬪師鐗囪〃锛屾寜鐓ч『搴忓皢鍘熺墖鏀惧叆涓婄墖1鍙蜂綅锛屽悗缁師鐗囨斁涓婄墖2鍙蜂綅锛屽嚭鐜板昂瀵告浛鎹紝鍒ゆ柇鍘熶笂鐗囦綅鏄惁鏈夌幓鐠冿紝鏈� 鍏堝嚭鍚庤繘锛屾棤 鐩存帴杩涚墖 */
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
deleted file mode 100644
index d3970d5..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.mes.job;
-
-import cn.hutool.json.JSONObject;
-import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
-import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
-import com.mes.rawglassstation.entity.RawGlassStorageStation;
-import com.mes.rawglassstation.service.RawGlassStorageStationService;
-import com.mes.rawglasstask.entity.RawGlassStorageTask;
-import com.mes.rawglasstask.service.RawGlassStorageTaskService;
-import com.mes.tools.WebSocketServer;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Slf4j
-@Component
-public class push {
-
-    @Autowired
-    private RawGlassStorageDetailsService rawGlassStorageDetailsService;
-    @Autowired
-    private RawGlassStorageStationService rawGlassStorageStationService;
-
-    @Autowired
-    private RawGlassStorageTaskService rawGlassStorageTaskService;
-
-
-    @Scheduled(fixedDelay = 2000)
-    public void sendDownWorkstations() {
-        log.info("鍙戦�佷换鍔′俊鎭拰鏋跺瓙淇℃伅");
-        JSONObject jsonObject = new JSONObject();
-        List<RawGlassStorageDetails> rack =  rawGlassStorageDetailsService.list();
-        List<RawGlassStorageStation> state =  rawGlassStorageStationService.list();
-        //List<RawGlassStorageTask> tasks =  rawGlassStorageTaskService.list();
-        List<RawGlassStorageTask> tasks =  rawGlassStorageTaskService.findAll();
-        jsonObject.append("rack",rack);
-        jsonObject.append("state",state);
-        jsonObject.append("tasks",tasks);
-        log.info(jsonObject.toString());
-        ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("rawGlass");
-        if (sendwServer != null) {
-            for (WebSocketServer webserver : sendwServer) {
-                if (webserver != null&&webserver.session.isOpen()) {
-                    log.info("宸插彂閫�");
-                    webserver.sendMessage(String.valueOf(jsonObject));
-                }
-            }
-        }
-    }
-
-
-}

--
Gitblit v1.8.0