From 9ac149efc825b9237d5e483d63dd15604f0bc30b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 01 四月 2025 17:01:32 +0800
Subject: [PATCH] 1、切割识别界面提供原片尺寸。 2、fixbug：当工程下的版图切割完毕后，界面显示工程号+最大版序+1bug 3、系统参数配置：新增系统参数配置，存入redis，方便后续各个模块调用。后续工作：将各个模块的配置参数由配置文件调整为数据库记录。
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 23 ++---------------------
1 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index dbf0966..588bda2 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -11,7 +11,6 @@
import com.mes.pp.service.OptimizeProjectService;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassstation.service.RawGlassStorageStationService;
-import com.mes.tools.DateUtil;
import com.mes.tools.WebSocketServer;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
@@ -24,7 +23,6 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -139,7 +137,7 @@
loadGlassChild("loadGlassRequestOne", 5, LOAD_GLASS_DEVICE_ONE_TASK, "loadGlassOne");
}
- @Scheduled(fixedDelay = 10)
+ @Scheduled(fixedDelay = 10000)
public void loadTwoGlass() {
loadGlassChild("loadGlassRequestTwo", 6, LOAD_GLASS_DEVICE_TWO_TASK, "loadGlassTwo");
}
@@ -186,24 +184,7 @@
}
}
- @Scheduled(fixedDelay = 216000000)
- public void send() {
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("mainMes");
- if (sendwServer != null) {
- //鎺ㄩ�佹湇鍔″櫒褰撳墠鏃堕棿
- JSONObject jsonObject = new JSONObject();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- jsonObject.append("globalDate", sdf.format(DateUtil.getEndDate()));
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("mainMes is closed");
- }
- }
- }
- }
-
+
// @Scheduled(fixedDelay = 5000)
public void loadGlassStatus() {
JSONObject jsonObject = new JSONObject();
--
Gitblit v1.8.0