From f9ac6553e1e96f07b58ea4e0b51f6af9875219ea Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 28 二月 2025 10:32:42 +0800
Subject: [PATCH] 1、中空创建任务界面新增厚度查询，按流程卡升序排序
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 99 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 91 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
index 3b05bc6..f5661a3 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -1,8 +1,14 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.mes.common.config.Const;
+import com.mes.damage.entity.Damage;
+import com.mes.damage.service.DamageService;
+import com.mes.engineering.entity.Engineering;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
-import com.mes.temperingglass.service.TemperingAgoService;
import com.mes.tools.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +17,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author SNG-010
@@ -20,27 +27,48 @@
public class PlcTemperingGlassTask {
@Autowired
- private TemperingAgoService temperingAgoService;
+ private TemperingGlassInfoService temperingAgoService;
+ @Autowired
+ private DamageService damageService;
+
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
@Scheduled(fixedDelay = 1000)
- public void loadGlassHome(){
+ public void temperingGlassHome() {
JSONObject jsonObject = new JSONObject();
//姝ｅ湪绛夊緟杩涚墖鐨勭幓鐠�
List<TemperingGlassInfo> waitingGlass = temperingAgoService.selectWaitingGlass();
- jsonObject.append("waitingGlass", waitingGlass);
+ if (waitingGlass != null) {
+ jsonObject.append("waitingGlass", waitingGlass);
+ }
+
+ //鑾峰彇鏁村湪鐐変腑鐨勪袱涓増鍥緄d
+ List<TemperingGlassInfo> layoutId = temperingAgoService.selectLayoutId();
//杩涚倝涓殑鐜荤拑
- List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass();
- jsonObject.append("intoGlass", intoGlass);
+ if (!layoutId.isEmpty()) {
+ List<TemperingGlassInfo> intoGlass = temperingAgoService.selectIntoGlass(layoutId.get(0));
+ jsonObject.append("intoGlass", intoGlass);
+ //杩涚倝涓殑绗簩涓増鍥�
+ if (layoutId.size() > 1) {
+ List<TemperingGlassInfo> intoGlass2 = temperingAgoService.selectIntoGlass(layoutId.get(1));
+ jsonObject.append("intoGlass2", intoGlass2);
+ }
+ }
//鍑虹倝鍚庣殑鐜荤拑
List<TemperingGlassInfo> outGlass = temperingAgoService.selectOutGlass();
- jsonObject.append("outGlass", outGlass);
+ if (outGlass != null) {
+ jsonObject.append("outGlass", outGlass);
+ }
+
//杩囨棆杞彴閽㈠寲鍚庣殑鐜荤拑
List<TemperingGlassInfo> overGlass = temperingAgoService.selectOverGlass();
- jsonObject.append("overGlass", overGlass);
+ if (outGlass != null) {
+ jsonObject.append("overGlass", overGlass);
+ }
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingGlass");
if (sendwServer != null) {
@@ -54,4 +82,59 @@
}
}
+ @Scheduled(fixedDelay = 1000)
+ public void temperingIsRun() {
+ JSONObject jsonObject = new JSONObject();
+ //姝ｅ湪杩涜鐨勪换鍔�
+ List<TemperingGlassInfo> temperingTaskType = temperingAgoService.selectTaskType();
+ jsonObject.append("temperingTaskType", temperingTaskType);
+
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("temperingIsRun");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ } else {
+ log.info("Home is closed");
+ }
+ }
+ }
+
+ }
+
+ @Scheduled(fixedDelay = 1000)
+ public void largenScreen() {
+ JSONObject jsonObject = new JSONObject();
+ //澶у睆閽㈠寲淇℃伅
+ Integer putGlass = temperingAgoService.count(
+ new LambdaUpdateWrapper<TemperingGlassInfo>()
+ .eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW)
+ );
+ jsonObject.append("temperingTaskType", putGlass);
+ //澶у睆閽㈠寲淇℃伅
+ List<TemperingGlassInfo> temperingGlassInfoList = temperingAgoService.list(
+ new LambdaQueryWrapper<TemperingGlassInfo>()
+ .select(TemperingGlassInfo::getEngineerId, TemperingGlassInfo::getTemperingLayoutId) // 閫夋嫨瑕佸幓閲嶇殑瀛楁
+ .eq(TemperingGlassInfo::getState, Const.TEMPERING_START)
+ .groupBy(TemperingGlassInfo::getEngineerId, TemperingGlassInfo::getTemperingLayoutId) // 鎸� engineerId 鍜� temperingLayoutId 鍒嗙粍
+ );
+ jsonObject.append("temperingGlassInfoList", temperingGlassInfoList.size());
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
+ 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("largenScreen is closed");
+ }
+ }
+ }
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0