From 8a9b0adc7fe0f72c4de8c8e5d14e282f5913d63d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 十二月 2024 14:48:36 +0800
Subject: [PATCH] 1、fixbug:笼内玻璃错乱问题解决 2、中空问题修复：避免多个线程拿到的空格相同 3、swagger名称显示
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 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 71351af..0118321 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
@@ -43,16 +43,16 @@
* 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 +65,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 +78,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 +87,8 @@
}
}
- @Scheduled(fixedDelay = 30000000)
- public void plcLoadGlassReport(){
+ @Scheduled(fixedDelay = 300)
+ public void plcLoadGlassReport() {
//鑾峰彇鏄惁鏈夋眹鎶�
String loadStatus = plcParameterObject.getPlcParameter("PlcStatus").getValue();
if (loadStatus != null) {
@@ -109,21 +109,28 @@
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(){
+ public void loadGlassHome() {
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
List<UpPattenUsage> upPattenUsages = upPattenUsageService.prioritylist();
- jsonObject.append("prioritylist", upPattenUsages);
+ if(upPattenUsages!=null){
+ jsonObject.append("prioritylist", upPattenUsages);
+ }
+
//宸ヤ綅淇℃伅
List<UpWorkstation> upWorkstations = upWorkstationService.list();
jsonObject.append("list", upWorkstations);
+ //鏄惁寮�濮嬪伐绋�
+ Engineering engineering = engineeringService.selectInitiate(1);
+ jsonObject.append("engineering", engineering);
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
@@ -140,12 +147,13 @@
}
}
}
+
@Scheduled(fixedDelay = 5000)
- public void loadGlassStatus(){
+ public void loadGlassStatus() {
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
- String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue();
- //String inkageStatus ="1";
+ String inkageStatus =plcParameterObject.getPlcParameter("InkageStatus").getValue();
+// String inkageStatus ="1";
jsonObject.append("InkageStatus", inkageStatus);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
@@ -158,8 +166,28 @@
}
}
}
+ @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("Home is closed");
+ }
+ }
+ }
+ }
- public void overTask(String loadStatus, int state) {
+ public void overTask(String loadStatus, int state) {
UpPattenUsage upPattenUsage = upPattenUsageService.selectOverTask();
if (upPattenUsage != null) {
@@ -169,11 +197,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