From 7b89e2cf25b6d5a43ecc86bb64a6a245ae862c6e Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 17 五月 2024 11:12:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 76 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index ab589a7..1e9a559 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -5,8 +5,12 @@
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
+import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
+import com.mes.common.S7object;
+import com.mes.common.WebSocketServer;
+import com.mes.device.PlcParameterObject;
import com.mes.edgstoragetask.service.TaskCacheService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
@@ -16,28 +20,31 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
@Component
@Slf4j
public class PlcStorageCageTask {
- @Autowired
+ @Resource
private BigStorageCageService bigStorageCageService;
- @Autowired
+ @Resource
private BigStorageCageDetailsService bigStorageCageDetailsService;
- @Autowired
+ @Resource
private GlassInfoService glassInfoService;
- @Autowired
+ @Resource
private BigStorageCageFeedTaskService bigStorageCageFeedTaskService;
- @Autowired
+ @Resource
private BigStorageCageOutTaskService bigStorageCageOutTaskService;
- @Autowired
+ @Resource
private TaskCacheService taskCacheService;
- @Autowired
+ @Resource
private SysMenuService sysMenuService;
+ PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
@@ -46,22 +53,18 @@
public void plcStorageCageTask() throws InterruptedException {
JSONObject jsonObject = new JSONObject();
try {
- Thread.sleep(300);
+ // 鐖嗙鎶ヨ
boolean bigStorageCageFullAlarm = false;
- String plcD01FeedReq = "0";
- String plcD04FeedReq = "0";
- String plcFeedGlassid = "111";
+ String plcFeedGlassid = "";
String plcFeedReqLine = "0";
- if ("1".equals(plcD01FeedReq)) {
+ if ("1".equals(plcParameterObject.getPlcParameter("D01Request").getValue())) {
plcFeedReqLine = "1";
- } else {
- //plc浠诲姟鍙戦�佸瓧0
+ plcFeedGlassid=plcParameterObject.getPlcParameter("D01ID1").getValue();
}
- if ("1".equals(plcD04FeedReq)) {
+ if ("1".equals(plcParameterObject.getPlcParameter("D04Request").getValue())) {
plcFeedReqLine = "2";
- } else {
- //plc浠诲姟鍙戦�佸瓧0
+ plcFeedGlassid=plcParameterObject.getPlcParameter("D04ID1").getValue();
}
if (!("0".equals(plcFeedReqLine))) {
@@ -75,10 +78,8 @@
log.info("3銆佹煡璇换鍔¤〃鍒ゆ柇褰撳墠浠诲姟绫诲瀷涓轰笂杞︾瓑鍒拌繕鏄笂杞﹀惎鍔�" + taskType);
bigStorageCageFeedTaskService.addFeedTask(slotInfo, Integer.parseInt(plcFeedReqLine), taskType);
log.info("4銆佹坊鍔犱换鍔″埌浠诲姟琛�");
- //plc浠诲姟鍙戦�佸瓧1
bigStorageCageFullAlarm = false;
} else {
- //鐞嗙墖绗肩垎绗兼姤璀�
bigStorageCageFullAlarm = true;
}
} else {
@@ -96,24 +97,33 @@
}
}
- //鍑虹墖璇锋眰
- String plcOutReq = "0";
- boolean result = false;
- if ("1".equals(plcOutReq)) {
- result = bigStorageCageService.outGlass();
- log.info("8銆佸嚭鐗囪姹傛椂璋冪敤鍑虹墖鎺ュ彛" + result);
- if (result) {
- //plc浠诲姟鍙戦�佸瓧1
- }
- } else {
- bigStorageCageOutTaskService.updateOutTask();
- //plc浠诲姟鍙戦�佸瓧0
+ //鏌ヨ鍑虹墖琛ㄦ槸鍚︽湁浠诲姟鏈畬鎴愮殑浠诲姟
+ List<BigStorageCageOutTask> bigStorageCageOutTask=bigStorageCageOutTaskService.querybigStorageCageOutTask(0);
+ if(bigStorageCageOutTask.size()==0){
+ bigStorageCageService.outGlass();
+ log.info("8銆佹病鏈夋湭瀹屾垚浠诲姟鏃惰皟鐢ㄥ嚭鐗囨帴鍙�");
}
-
- //鏄剧ず鍓╀綑绌烘牸瀛�
+ bigStorageCageOutTaskService.updateOutTask();
+ log.info("9銆佹牴鎹换鍔¤〃鐘舵�佷慨鏀归挗鍖栧皬鐗囪〃浠诲姟鐘舵��");
//鎶ヨ淇℃伅
jsonObject.append("bigStorageCageFullAlarm", bigStorageCageFullAlarm);
+
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
+ 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("Home is closed");
+ }
+ }
+ }
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0