From 91c0155937f3177c41cfd91636d5094454fff855 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 12 三月 2025 17:19:14 +0800
Subject: [PATCH] 添加上片历史任务接口
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 181 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 137 insertions(+), 44 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 06ffda6..8190839 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,14 +1,24 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
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;
+import com.mes.opctask.entity.LoadGlassDeviceTask;
+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.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;
+import com.mes.utils.RedisUtil;
import com.mes.workstation.entity.UpWorkstation;
import com.mes.workstation.service.UpWorkstationService;
import lombok.extern.slf4j.Slf4j;
@@ -16,8 +26,11 @@
import org.springframework.scheduling.annotation.Scheduled;
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;
/**
* @author SNG-010
@@ -34,25 +47,34 @@
private UpPattenUsageService upPattenUsageService;
@Autowired
private OptimizeProjectService optimizeProjectService;
-
+ @Autowired
+ RedisUtil redisUtil;
+ @Resource
+ private LoadGlassDeviceTaskService loadGlassDeviceTaskService;
+ @Resource
+ 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";
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 3000000)
+// @Scheduled(fixedDelay = 300)
public void plcLoadGlassTask() throws InterruptedException {
try {
//鑾峰彇鑱旀満鐘舵��
- String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue();
+ String inkageStatus = plcParameterObject.getPlcParameter("InkageStatus").getValue();
//鑾峰彇鏄惁鏈変笂鐗囪姹�
String loadRequest = plcParameterObject.getPlcParameter("loadRequest").getValue();
//mes鐘舵��
String mesToPlc = plcParameterObject.getPlcParameter("MesToPlc").getValue();
- if("1".equals(inkageStatus)&&"1".equals(loadRequest)) {
+ if ("1".equals(inkageStatus) && "1".equals(loadRequest)) {
//鍒ゆ柇寮�濮嬩笂鐗囩殑宸ョ▼鍙�
Engineering engineering = engineeringService.selectInitiate(1);
if (engineering != null) {
@@ -65,10 +87,10 @@
int workId = upwork.getWorkstationId();//宸ヤ綅id
double width = upwork.getPatternWidth();//瀹藉害
double height = upwork.getPatternHeight();//楂樺害
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("WorkId").getAddress(), workId);
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassWidth").getAddress(), (long) width);
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassHeight").getAddress(), (long) height);
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 1);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("WorkId").getAddress(), workId);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("GlassWidth").getAddress(), (int) width);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("GlassHeight").getAddress(), (int) height);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 1);
//鏇存敼涓婄墖琛ㄧ姸鎬�
upPattenUsageService.updateUpPattenUsageState(upPattenUsage, workId);
@@ -78,7 +100,7 @@
}
if ("1".equals(mesToPlc) && "0".equals(loadRequest)) {
//璇锋眰瀛椾负闆舵椂锛屼换鍔″瓧娓呴浂
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 0);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 0);
}
//鎵ц鍚庝紤鐪�300姣
//Thread.sleep(300);
@@ -87,8 +109,8 @@
}
}
- @Scheduled(fixedDelay = 3000000)
- public void plcLoadGlassReport(){
+ // @Scheduled(fixedDelay = 300)
+ public void plcLoadGlassReport() {
//鑾峰彇鏄惁鏈夋眹鎶�
String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
if (loadStatus != null) {
@@ -109,57 +131,128 @@
overTask(loadStatus, 0);
break;
case "0":
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 0);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 0);
break;
}
}
}
@Scheduled(fixedDelay = 1000)
- public void loadGlassHome(){
- JSONObject jsonObject = new JSONObject();
- //姝ｅ湪杩涜鐨勪换鍔�
- List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
- jsonObject.append("prioritylist", upPattenUsages);
- //宸ヤ綅淇℃伅
- List<UpWorkstation> upWorkstations = upWorkstationService.list();
- jsonObject.append("list", upWorkstations);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
-// List<String> messages = webserver.getMessages();
-// if (!messages.isEmpty()) {
-// // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
-// webserver.clearMessages();
+ public void loadGlassHome() {
+ try {
+ JSONObject jsonObject = new JSONObject();
+ //姝ｅ湪杩涜鐨勪换鍔�
+ List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
+ if (upPattenUsages != null) {
+ jsonObject.append("prioritylist", upPattenUsages);
+ }
+ //鏌ヨ1鍙风嚎鐨勪换鍔�
+ Engineering request = redisUtil.getCacheObject("loadGlassRequest");
+ if (request == null) {
+ request = new Engineering();
+ request.setStationCell(5);
+ }
+ 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);
+// 鏌ヨ宸ヤ綅浠诲姟
+ //鑱旀満鐘舵��
+ 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());
+
+ //宸ヤ綅淇℃伅
+ List<RawGlassStorageDetails> rawGlassStorageDetailList = rawGlassStorageStationService.listRawGlassDetails();
+ 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);
+ //鏄惁寮�濮嬪伐绋�
+ Engineering engineering = engineeringService.selectInitiate(1);
+ jsonObject.append("engineering", engineering);
+ //宸ヤ綅淇℃伅
+ List<UpWorkstation> upWorkstations = upWorkstationService.list();
+ jsonObject.append("list", upWorkstations);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
// }
- } else {
- log.info("Home is closed");
+ } else {
+ log.info("loadGlass is closed");
+ }
}
}
+ } catch (Exception e) {
+ e.printStackTrace();
}
+
}
- @Scheduled(fixedDelay = 5000)
- public void loadGlassStatus(){
- JSONObject jsonObject = new JSONObject();
- //姝ｅ湪杩涜鐨勪换鍔�
- //String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue();
- String inkageStatus ="1";
- jsonObject.append("InkageStatus", inkageStatus);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
+
+ @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("Home is closed");
+ log.info("mainMes is closed");
}
}
}
}
- public void overTask(String loadStatus, int state) {
+ // @Scheduled(fixedDelay = 5000)
+ public void loadGlassStatus() {
+ JSONObject jsonObject = new JSONObject();
+ //姝ｅ湪杩涜鐨勪换鍔�
+ 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");
+ }
+ }
+ }
+ }
+
+// @Scheduled(fixedDelay = 1000)
+// public void loadGlassIsRun() {
+// JSONObject jsonObject = new JSONObject();
+//
+// 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) {
UpPattenUsage upPattenUsage = upPattenUsageService.selectOverTask();
if (upPattenUsage != null) {
@@ -169,11 +262,11 @@
//瀹屾垚涓婄墖琛ㄧ姸鎬�
upPattenUsageService.updateUpPattenUsageState(upPattenUsage, state);
//鍒ゆ柇鏄惁鏄渶鍚庝竴鍧楃幓鐠�
- UpPattenUsage sequence=upPattenUsageService.selectSequence(upPattenUsage);
+ UpPattenUsage sequence = upPattenUsageService.selectSequence(upPattenUsage);
//濡傛灉鏄渶鍚庝竴鍧楁椂瀹屾垚宸ョ▼浠诲姟
- optimizeProjectService.overTask(sequence,300);
+ optimizeProjectService.overTask(sequence, 300);
}
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 1);
+ S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("MesToPlcStatus").getAddress(), 1);
}
}
\ No newline at end of file
--
Gitblit v1.8.0