From eae026a90011e77c1a3947021c87a2eea786d1b1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 十月 2025 13:57:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 143 ++++++++++++-----------------------------------
1 files changed, 38 insertions(+), 105 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 2cf6ed0..0518590 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
@@ -1,9 +1,8 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.mes.common.S7object;
-import com.mes.common.config.Const;
import com.mes.device.PlcParameterObject;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
@@ -11,10 +10,8 @@
import com.mes.opctask.service.LoadGlassDeviceTaskService;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
-import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
-import com.mes.rawglassstation.entity.RawGlassStorageStation;
-import com.mes.tools.DateUtil;
-import com.mes.tools.WebSocketServer;
+import com.mes.rawglassstation.service.RawGlassStorageStationService;
+import com.mes.tools.WebSocketUtils;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.utils.RedisUtil;
@@ -26,8 +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;
@@ -51,13 +46,16 @@
@Resource
private LoadGlassDeviceTaskService loadGlassDeviceTaskService;
@Resource
- private RawGlassStorageDetailsService rawGlassStorageDetailsService;
+ private RawGlassStorageStationService rawGlassStorageStationService;
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
private static final String LOAD_GLASS_DEVICE_ONE_TASK = "load_glass_device_one_task";
private static final String LOAD_GLASS_DEVICE_TWO_TASK = "load_glass_device_two_task";
+
+ @Resource
+ private WebSocketUtils webSocketUtils;
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
@@ -136,86 +134,50 @@
}
}
- @Scheduled(fixedDelay = 1000)
- public void loadGlassHome() {
+ @Scheduled(fixedDelay = 10000)
+ public void loadOneGlass() {
+ loadGlassChild("loadGlassRequestOne", 5, LOAD_GLASS_DEVICE_ONE_TASK, "loadGlassOne");
+ }
+
+ @Scheduled(fixedDelay = 10000)
+ public void loadTwoGlass() {
+ loadGlassChild("loadGlassRequestTwo", 6, LOAD_GLASS_DEVICE_TWO_TASK, "loadGlassTwo");
+ }
+
+
+ public String loadGlassChild(String redisRequest, int stationCell, String tableName, String webSocketName) {
try {
JSONObject jsonObject = new JSONObject();
- //姝ｅ湪杩涜鐨勪换鍔�
- List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
- if (upPattenUsages != null) {
- jsonObject.append("prioritylist", upPattenUsages);
+ //褰撳墠绾胯矾姝ｅ湪鎵ц鐨勫伐绋�
+ Engineering engineering = engineeringService.getOne(new LambdaQueryWrapper<Engineering>().eq(Engineering::getStationCell, stationCell)
+ .eq(Engineering::getState, 1).last("limit 1"));
+ if (null != engineering) {
+ jsonObject.append("engineering", engineering);
}
- //鏌ヨ1鍙风嚎鐨勪换鍔�
- Engineering request = redisUtil.getCacheObject("loadGlassRequest");
+ //鑾峰彇褰撳墠绾胯矾姝ｅ湪鎵ц鐨勫伐绋嬪師鐗囦俊鎭�
+ Engineering request = redisUtil.getCacheObject(redisRequest);
if (request == null) {
request = new Engineering();
- request.setStationCell(5);
+ request.setStationCell(stationCell);
}
- List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(request);
- jsonObject.append("loadTask1", upPattenUsages1);
- //鏌ヨ2鍙风嚎鐨勪换鍔�
- Engineering request2 = redisUtil.getCacheObject("loadGlassRequest2");
- if (request2 == null) {
- request2 = new Engineering();
- request2.setStationCell(6);
- }
- List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(request2);
- jsonObject.append("loadTask2", upPattenUsages2);
-// 鏌ヨ宸ヤ綅浠诲姟
+ List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectLoadTask(request);
+ jsonObject.append("upPattenUsages", upPattenUsages);
+
//鑱旀満鐘舵��
- LoadGlassDeviceTask LoadOneState = loadGlassDeviceTaskService.queryTaskMessage(LOAD_GLASS_DEVICE_ONE_TASK);
- LoadGlassDeviceTask LoadTwoState = loadGlassDeviceTaskService.queryTaskMessage(LOAD_GLASS_DEVICE_TWO_TASK);
- jsonObject.append("LoadOneState", LoadOneState.getInkageState());
- jsonObject.append("LoadTwoervice", LoadTwoState.getInkageState());
-
+ LoadGlassDeviceTask LoadTask = loadGlassDeviceTaskService.queryTaskMessage(tableName);
+ jsonObject.append("inkageState", LoadTask.getInkageState());
//宸ヤ綅淇℃伅
- MPJLambdaWrapper<RawGlassStorageDetails> wrapper = new MPJLambdaWrapper<>();
- wrapper.select(RawGlassStorageStation::getSlot)
- .select("ifnull(remain_quantity, 0) as remain_quantity")
- .rightJoin(RawGlassStorageStation.class, on -> on.eq(RawGlassStorageStation::getSlot, RawGlassStorageDetails::getSlot)
- .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_IN))
- .in(RawGlassStorageStation::getDeviceId, 5, 6)
- .orderByAsc(RawGlassStorageStation::getSlot);
- List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageDetailsService.list(wrapper);
- List<RawGlassStorageDetails> stationOneList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == 5).collect(Collectors.toList());
- List<RawGlassStorageDetails> stationTwoList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == 6).collect(Collectors.toList());
- jsonObject.append("stationOne", stationOneList);
- jsonObject.append("stationTwo", stationTwoList);
+ List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageStationService.listRawGlassDetails();
+ List<RawGlassStorageDetails> stationList = rawGlassStorageDetailList.stream().filter(item -> item.getDeviceId() == stationCell).collect(Collectors.toList());
+ jsonObject.append("stationList", stationList);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
-// }
- } else {
- log.info("loadGlass is closed");
- }
- }
- }
+ webSocketUtils.sendToWeb(webSocketName, jsonObject);
} catch (Exception e) {
e.printStackTrace();
}
-
+ return "success";
}
- @Scheduled(fixedDelay = 1000)
- 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() {
@@ -224,38 +186,9 @@
String inkageStatus = plcParameterObject.getPlcParameter("InkageStatus").getValue();
// String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("loadGlass is closed");
- }
- }
- }
+ webSocketUtils.sendToWeb("loadGlass", jsonObject);
}
- @Scheduled(fixedDelay = 1000)
- public void loadGlassIsRun() {
- JSONObject jsonObject = new JSONObject();
- //鏄惁寮�濮嬪伐绋�
- Engineering engineering = engineeringService.selectInitiate(1);
- jsonObject.append("engineering", engineering);
- //宸ヤ綅淇℃伅
- List<UpWorkstation> upWorkstations = upWorkstationService.list();
- jsonObject.append("list", upWorkstations);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlassIsRun");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- } else {
- log.info("loadGlassIsRun is closed");
- }
- }
- }
- }
public void overTask(String loadStatus, int state) {
--
Gitblit v1.8.0