From 50ae51c95b795d509cc877b1df97762255498523 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 29 五月 2024 13:50:18 +0800
Subject: [PATCH] 更改判断逻辑，减少对数据库的查询量
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 d0d6e14..edb9b39 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
@@ -49,14 +49,14 @@
try {
//鑾峰彇鑱旀満鐘舵��
String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue();
- if("1".equals(inkageStatus)) {
-
- //鑾峰彇鏄惁鏈変笂鐗囪姹�
- String loadRequest = plcParameterObject.getPlcParameter("loadRequest").getValue();
- String mesToPlc = plcParameterObject.getPlcParameter("MesToPlc").getValue();
+ //鑾峰彇鏄惁鏈変笂鐗囪姹�
+ String loadRequest = plcParameterObject.getPlcParameter("loadRequest").getValue();
+ //mes鐘舵��
+ String mesToPlc = plcParameterObject.getPlcParameter("MesToPlc").getValue();
+ if("1".equals(inkageStatus)&&"1".equals(loadRequest)) {
//鍒ゆ柇寮�濮嬩笂鐗囩殑宸ョ▼鍙�
Engineering engineering = engineeringService.selectInitiate(1);
- if ("1".equals(loadRequest) && engineering != null) {
+ if (engineering != null) {
log.info("寮�濮嬩笂鐗囦换鍔�");
UpPattenUsage upPattenUsage = upWorkstationService.selectPriority(engineering);
log.info("褰撴湁璇锋眰鏃舵煡璇㈠綋鍓嶄笂鐗囬『搴忕殑鐜荤拑淇℃伅{}", upPattenUsage);
@@ -75,10 +75,11 @@
}
}
- if ("1".equals(mesToPlc) && "0".equals(loadRequest)) {
- //璇锋眰瀛椾负闆舵椂锛屼换鍔″瓧娓呴浂
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 0);
- }
+
+ }
+ if ("1".equals(mesToPlc) && "0".equals(loadRequest)) {
+ //璇锋眰瀛椾负闆舵椂锛屼换鍔″瓧娓呴浂
+ S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 0);
}
//鎵ц鍚庝紤鐪�300姣
//Thread.sleep(300);
@@ -115,7 +116,7 @@
}
}
- @Scheduled(fixedDelay = 300)
+ @Scheduled(fixedDelay = 1000)
public void loadGlassHome(){
JSONObject jsonObject = new JSONObject();
//姝ｅ湪杩涜鐨勪换鍔�
--
Gitblit v1.8.0