From 1ca3da2cdeee4597a7782fd0d7f5386108b9eb11 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 18 六月 2025 14:02:37 +0800
Subject: [PATCH] 中空模块配置多线程
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
index 2eb6d01..3b93f35 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java
@@ -387,7 +387,7 @@
public void outBigStorageTask() throws Exception {
Date startDate = new Date();
S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
- log.info("杩涚墖浠诲姟璇诲彇s7DataZKDLPTwo:{}", s7DataZKDLPTwo);
+ log.info("鍑虹墖浠诲姟璇诲彇s7DataZKDLPTwo:{}", s7DataZKDLPTwo);
// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2B.DLP2B.mesControl");
// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
Boolean inkageEntity = s7DataZKDLPTwo.getMesControl();
@@ -415,14 +415,20 @@
//鑾峰彇绌洪棽涓旈鍙栦换鍔＄殑鏁版嵁淇℃伅锛屾病鏈変换鍔＄洿鎺ヨ蛋鐜荤拑璋冨害
HashMap<Integer, Boolean> map = new HashMap<>();
try {
- Boolean oneEntity = CMJ1ModbusTcp.readUInt16(42027 - 40001) != 0;
- map.put(930, oneEntity);
+ if (CMJ1ModbusTcp.checkConnected()) {
+ Boolean oneEntity = CMJ1ModbusTcp.readUInt16(42027 - 40001) != 0;
+ map.put(930, oneEntity);
+ } else {
+ map.put(930, Boolean.FALSE);
+ }
+
} catch (Exception e) {
//nothing
log.info("涓�绾跨┖闂茬姸鎬佽幏鍙栧紓甯�");
}
try {
S7DataZKExtra s7DataZKExtra = s7SerializerZKQ2.read(S7DataZKExtra.class);
+ log.info("涓┖棰濆璇诲彇{}", s7DataZKExtra);
map.put(931, s7DataZKExtra.getIsFree());
map.put(932, s7DataZKExtra.getIsFree03());
} catch (Exception e) {
@@ -1051,9 +1057,9 @@
int glassCount = baseInfoList.size();
List<BigStorageCageTask> bigStorageCageTaskList = new ArrayList<>();
//鐢熸垚鍑虹墖浠诲姟鏉℃暟涓嶈冻6琛ュ叏
-// for (T t : baseInfoList) {
-// bigStorageCageTaskList.add(new BigStorageCageTask(t.getGlassId(), t.getSlot(), targetSlot, 0));
-// }
+ for (T t : baseInfoList) {
+ bigStorageCageTaskList.add(new BigStorageCageTask(t.getGlassId(), t.getSlot(), targetSlot, 0));
+ }
// while (bigStorageCageTaskList.size() < 6) {
// bigStorageCageTaskList.add(new BigStorageCageTask("", 0, 0, 0));
// }
@@ -1061,6 +1067,7 @@
resetOutTask();
// bigStorageCageTaskService.removeAll(tableName);
// bigStorageCageTaskService.saveTaskMessage(tableName, bigStorageCageTaskList);
+ log.info("鐢熸垚鍑虹墖浠诲姟鏁版嵁{}", bigStorageCageTaskList);
S7DataZKDLPTwo s7DataZKDLPTwo = new S7DataZKDLPTwo();
for (int i = 0; i < bigStorageCageTaskList.size() && i < 6; i++) {
String glassId = bigStorageCageTaskList.get(i).getGlassId();
@@ -1102,6 +1109,9 @@
}
}
s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
+ log.info("鍑虹墖浠诲姟鍐欏叆鏁版嵁{}", s7DataZKDLPTwo);
+ S7DataZKDLPTwo s7DataZKDLPTwo1 = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
+ log.info("鍐欏叆鍑虹墖浠诲姟鍚庤鍙栨暟鎹畕}", s7DataZKDLPTwo1);
List<HollowBigStorageCageHistoryTask> historyList = bigStorageCageTaskList.stream().filter(e -> StringUtils.isNotBlank(e.getGlassId())).map(e -> {
HollowBigStorageCageHistoryTask history = new HollowBigStorageCageHistoryTask();
BeanUtils.copyProperties(e, history);
@@ -1109,6 +1119,7 @@
history.setTaskType(taskType);
return history;
}).collect(Collectors.toList());
+ log.info("鍘嗗彶浠诲姟淇濆瓨{}", historyList);
hollowBigStorageCageHistoryTaskService.saveBatch(historyList);
log.info("灏嗗嚭鐗囩幓鐠儃}鐜荤拑鐘舵�佹敼涓哄嚭鐗囦腑", glassIds);
hollowBigStorageCageDetailsService.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>()
--
Gitblit v1.8.0