From a6720987358933753d9b90acda9103003cfb37ee Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 13 六月 2025 17:09:57 +0800
Subject: [PATCH] 更新通讯依赖版本为1.5.4，中空大理片，钢化大理片S7，modbus测试完成代码提交
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 194 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 158 insertions(+), 36 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 5cfe3f2..5641094 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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.github.xingshuangs.iot.protocol.modbus.service.ModbusTcp;
import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
@@ -36,6 +37,7 @@
import com.mes.hollowtask.service.HollowBigStorageCageHistoryTaskService;
import com.mes.s7.entity.S7DataZKDLPOne;
import com.mes.s7.entity.S7DataZKDLPTwo;
+import com.mes.s7.entity.S7DataZKExtra;
import com.mes.sysconfig.service.SysConfigService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
@@ -91,6 +93,14 @@
@Qualifier("s7SerializerZKDLPTwo")
private S7Serializer s7SerializerZKDLPTwo;
+ @Autowired
+ @Qualifier("s7SerializerZKQ2")
+ private S7Serializer s7SerializerZKQ2;
+
+ @Autowired
+ @Qualifier("CMJ1ModbusTcp")
+ ModbusTcp CMJ1ModbusTcp;
+
private static final String BIG_STORAGE_CAGE_IN_TWO_TASK = "big_storage_cage_in_two_task";
private static final String BIG_STORAGE_CAGE_OUT_TWO_TASK = "big_storage_cage_out_two_task";
/**
@@ -122,6 +132,7 @@
@Scheduled(fixedDelay = 1000)
public void inBigStorageTask() throws Exception {
S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
+ log.info("杩涚墖浠诲姟璇诲彇s7DataZKDLPOne:{}", s7DataZKDLPOne);
// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2A.DLP2A.mesControl");
// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
@@ -148,12 +159,12 @@
// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM1");
String fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
List<String> glassIdList = new ArrayList<>();
- List<Integer> requestWords = s7DataZKDLPOne.getStates();
+ List<String> requestWords = s7DataZKDLPOne.getIds();
for (int i = 1; i <= 6; i++) {
// ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
- Integer requestWord = requestWords.get(i - 1);
+ String requestWord = requestWords.get(i - 1);
// if (null != requestWord.getValue()) {
- if (null != requestWord) {
+ if (null != requestWord && !requestWord.isEmpty()) {
BigStorageCageTask task = new BigStorageCageTask();
// task.setGlassId(requestWord.getValue() + "");
task.setGlassId(requestWord.toString());
@@ -268,7 +279,7 @@
.eq(HollowBigStorageCage::getSlot, bigStorageDTO.getSlot()));
task.setTargetSlot(bigStorageDTO.getSlot());
task.setGlassId(info.getGlassId());
- bigStorageCageTaskService.updateTaskMessage(BIG_STORAGE_CAGE_IN_TWO_TASK, task);
+// bigStorageCageTaskService.updateTaskMessage(BIG_STORAGE_CAGE_IN_TWO_TASK, task);
//瀛樻斁鍘嗗彶浠诲姟
HollowBigStorageCageHistoryTask historyTask = new HollowBigStorageCageHistoryTask();
BeanUtils.copyProperties(task, historyTask);
@@ -301,7 +312,7 @@
} else {
BigStorageCageTask task = inTaskList.get(0);
task.setTargetSlot(THROUGH_SLOT);
- bigStorageCageTaskService.updateTaskMessage("big_storage_cage_in_two_task", task);
+// bigStorageCageTaskService.updateTaskMessage("big_storage_cage_in_two_task", task);
//瀛樻斁鍘嗗彶浠诲姟
HollowBigStorageCageHistoryTask historyTask = new HollowBigStorageCageHistoryTask();
BeanUtils.copyProperties(task, historyTask);
@@ -367,12 +378,16 @@
}
}
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
+ s7DataZKDLPOne = new S7DataZKDLPOne();
+ s7DataZKDLPOne.setMesReply(1);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
}
@Scheduled(fixedDelay = 1000)
public void outBigStorageTask() throws Exception {
Date startDate = new Date();
S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
+ log.info("杩涚墖浠诲姟璇诲彇s7DataZKDLPTwo:{}", s7DataZKDLPTwo);
// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2B.DLP2B.mesControl");
// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
Boolean inkageEntity = s7DataZKDLPTwo.getMesControl();
@@ -388,17 +403,27 @@
return;
}
//鑾峰彇鍑虹墖浠诲姟琛�
- List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
+// List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
+
+ List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataZKDLPTwo);
+
if (CollectionUtil.isNotEmpty(outTaskList)) {
log.info("鏈夋鍦ㄦ墽琛岀殑鍑虹墖浠诲姟锛岀粨鏉熸湰娆″嚭鐗囦换鍔�");
return;
}
//鑾峰彇绌洪棽涓旈鍙栦换鍔＄殑鏁版嵁淇℃伅锛屾病鏈変换鍔＄洿鎺ヨ蛋鐜荤拑璋冨害
- HashMap<Integer, ReadWriteEntity> map = new HashMap<>();
- ReadWriteEntity oneEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
- ReadWriteEntity twoEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
- ReadWriteEntity threeEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree03");
+
+ HashMap<Integer, Boolean> map = new HashMap<>();
+ S7DataZKExtra s7DataZKExtra = s7SerializerZKQ2.read(S7DataZKExtra.class);
+ Boolean oneEntity = CMJ1ModbusTcp.readUInt16(42027 - 40001) != 0;
+ log.info("璇诲彇浠诲姟{}", CMJ1ModbusTcp.readUInt16(42027 - 40001));
+ Boolean twoEntity = s7DataZKExtra.getIsFree();
+ Boolean threeEntity = s7DataZKExtra.getIsFree03();
+// HashMap<Integer, ReadWriteEntity> map = new HashMap<>();
+// ReadWriteEntity oneEntity = miloService.readFromOpcUa("CMJ1.CMJ1.isFree");
+// ReadWriteEntity twoEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree");
+// ReadWriteEntity threeEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isFree03");
map.put(930, oneEntity);
map.put(931, twoEntity);
map.put(932, threeEntity);
@@ -406,9 +431,10 @@
int cell = -1;
for (int i = 930; i <= 932; i++) {
if (null == hollowGlassOutRelationInfo) {
- ReadWriteEntity entity = map.get(i);
+ Boolean entity = map.get(i);
cell = i;
- if (null != entity.getValue() && ("1".equals(entity.getValue() + "") || Boolean.parseBoolean(entity.getValue() + ""))) {
+// if (null != entity.getValue() && ("1".equals(entity.getValue() + "") || Boolean.parseBoolean(entity.getValue() + ""))) {
+ if (null != entity && entity) {
hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
.getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
.eq(HollowGlassOutRelationInfo::getCell, cell)
@@ -526,37 +552,37 @@
String toOpcUa = "";
String fromOpcUa = "";
switch (i) {
- case 0:
+ case 1:
requestWord = s7DataZKDLPOne.getId1().toString();
statetWord = s7DataZKDLPOne.getState1().toString();
toOpcUa = s7DataZKDLPOne.getTo1().toString();
fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
break;
- case 1:
+ case 2:
requestWord = s7DataZKDLPOne.getId2().toString();
statetWord = s7DataZKDLPOne.getState2().toString();
toOpcUa = s7DataZKDLPOne.getTo2().toString();
fromOpcUa = s7DataZKDLPOne.getFrom2().toString();
break;
- case 2:
+ case 3:
requestWord = s7DataZKDLPOne.getId3().toString();
statetWord = s7DataZKDLPOne.getState3().toString();
toOpcUa = s7DataZKDLPOne.getTo3().toString();
fromOpcUa = s7DataZKDLPOne.getFrom3().toString();
break;
- case 3:
+ case 4:
requestWord = s7DataZKDLPOne.getId4().toString();
statetWord = s7DataZKDLPOne.getState4().toString();
toOpcUa = s7DataZKDLPOne.getTo4().toString();
fromOpcUa = s7DataZKDLPOne.getFrom4().toString();
break;
- case 4:
+ case 5:
requestWord = s7DataZKDLPOne.getId5().toString();
statetWord = s7DataZKDLPOne.getState5().toString();
toOpcUa = s7DataZKDLPOne.getTo5().toString();
fromOpcUa = s7DataZKDLPOne.getFrom5().toString();
break;
- case 5:
+ case 6:
requestWord = s7DataZKDLPOne.getId6().toString();
statetWord = s7DataZKDLPOne.getState6().toString();
toOpcUa = s7DataZKDLPOne.getTo6().toString();
@@ -565,7 +591,7 @@
}
// if (null != requestWord.getValue()) {
- if (null != requestWord) {
+ if (null != requestWord && !requestWord.isEmpty()) {
BigStorageCageTask task = new BigStorageCageTask();
// task.setGlassId(requestWord.getValue() + "");
// task.setTargetSlot(Integer.parseInt(toOpcUa.getValue() + ""));
@@ -649,7 +675,7 @@
.eq(HollowBigStorageCageHistoryTask::getGlassId, item.getGlassId()));
item.setTargetSlot(0);
//娓呯┖浠诲姟琛ㄦ暟鎹�
- bigStorageCageTaskService.updateTaskMessage("big_storage_cage_in_one_task", item);
+// bigStorageCageTaskService.updateTaskMessage("big_storage_cage_in_one_task", item);
}
//娓呯┖鍚姩鐘舵��
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
@@ -667,6 +693,8 @@
s7DataZKDLPOne.setTo4(0);
s7DataZKDLPOne.setTo5(0);
s7DataZKDLPOne.setTo6(0);
+ s7SerializerZKDLPOne.write(s7DataZKDLPOne);
+ s7DataZKDLPOne = new S7DataZKDLPOne();
s7DataZKDLPOne.setMesReply(0);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
}
@@ -681,10 +709,11 @@
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫瀹屾垚鍑虹墖浠诲姟");
return;
}
- //鑾峰彇杩涚墖浠诲姟琛�
- List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
+ //鑾峰彇鍑虹墖浠诲姟琛�
+// List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
+ List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataZKDLPTwo);
if (CollectionUtil.isEmpty(outTaskList)) {
- log.info("褰撳墠澶ц溅鏃犺繘鐗囩幓鐠冿紝缁撴潫瀹屾垚杩涚墖浠诲姟");
+ log.info("褰撳墠澶ц溅鏃犲嚭鐗囩幓鐠冿紝缁撴潫瀹屾垚鍑虹墖浠诲姟");
return;
}
List<BigStorageCageTask> unFinishTaskList = outTaskList.stream().filter(e -> e.getTaskState() <= 1 || e.getStartSlot() == 0).collect(Collectors.toList());
@@ -705,7 +734,7 @@
taskMap.forEach((e1, v) -> {
if (e1 == 2) {
//杩涚墖瀹屾垚
- log.info("3銆佽幏鍙栬繘鐗囧凡瀹屾垚鐨勭幓鐠冧俊鎭痠d:{}", v);
+ log.info("3銆佽幏鍙栧嚭鐗囧凡瀹屾垚鐨勭幓鐠冧俊鎭痠d:{}", v);
List<Integer> outSuccessGlassSlot = new ArrayList<>();
if (finalTaskType.equals(Const.BIG_STORAGE_AFTER_OUT)) {
outSuccessGlassSlot = v.stream().map(BigStorageCageTask::getStartSlot).collect(Collectors.toList());
@@ -733,7 +762,7 @@
List<Integer> slotList = storageCageDTOList.stream().map(UpdateHollowBigStorageCageDTO::getTargetSlot).distinct().collect(Collectors.toList());
hollowBigStorageCageDetailsService.updateDeviceIdBySlot(slotList);
}
- log.info("4銆佸ぇ鐞嗙墖绗艰繘鐗囩姸鎬佸凡瀹屾垚宸插畬鎴愮殑鐜荤拑淇℃伅id:{}", v);
+ log.info("4銆佸ぇ鐞嗙墖绗煎嚭鐗囩姸鎬佸凡瀹屾垚宸插畬鎴愮殑鐜荤拑淇℃伅id:{}", v);
updateSlotRemainBySlots(outSuccessGlassSlot);
} else if (e1 == 3) {
//鐮存崯澶勭悊
@@ -800,8 +829,8 @@
}
// 閲嶇疆浠诲姟琛ㄦ暟鎹�
- bigStorageCageTaskService.updateOutTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
-
+// bigStorageCageTaskService.updateOutTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
+ resetOutTask();
//娓呯┖鍚姩鐘舵��
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
// miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 0));
@@ -1019,15 +1048,57 @@
int glassCount = baseInfoList.size();
List<BigStorageCageTask> bigStorageCageTaskList = new ArrayList<>();
//鐢熸垚鍑虹墖浠诲姟鏉℃暟涓嶈冻6琛ュ叏
- 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));
- }
+// 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));
+// }
//娓呯┖浠诲姟琛ㄦ暟鎹�
- bigStorageCageTaskService.removeAll(tableName);
- bigStorageCageTaskService.saveTaskMessage(tableName, bigStorageCageTaskList);
+ resetOutTask();
+// bigStorageCageTaskService.removeAll(tableName);
+// bigStorageCageTaskService.saveTaskMessage(tableName, bigStorageCageTaskList);
+ S7DataZKDLPTwo s7DataZKDLPTwo = new S7DataZKDLPTwo();
+ for (int i = 0; i < bigStorageCageTaskList.size() && i < 6; i++) {
+ String glassId = bigStorageCageTaskList.get(i).getGlassId();
+ Integer startSlot = bigStorageCageTaskList.get(i).getStartSlot();
+ Integer target = bigStorageCageTaskList.get(i).getTargetSlot();
+ if (startSlot > 0) {
+ switch (i) {
+ case 0:
+ s7DataZKDLPTwo.setId1(glassId);
+ s7DataZKDLPTwo.setFrom1(startSlot);
+ s7DataZKDLPTwo.setTo1(target);
+ break;
+ case 1:
+ s7DataZKDLPTwo.setId2(glassId);
+ s7DataZKDLPTwo.setFrom2(startSlot);
+ s7DataZKDLPTwo.setTo2(target);
+ break;
+ case 2:
+ s7DataZKDLPTwo.setId3(glassId);
+ s7DataZKDLPTwo.setFrom3(startSlot);
+ s7DataZKDLPTwo.setTo3(target);
+ break;
+ case 3:
+ s7DataZKDLPTwo.setId4(glassId);
+ s7DataZKDLPTwo.setFrom4(startSlot);
+ s7DataZKDLPTwo.setTo4(target);
+ break;
+ case 4:
+ s7DataZKDLPTwo.setId5(glassId);
+ s7DataZKDLPTwo.setFrom5(startSlot);
+ s7DataZKDLPTwo.setTo5(target);
+ break;
+ case 5:
+ s7DataZKDLPTwo.setId6(glassId);
+ s7DataZKDLPTwo.setFrom6(startSlot);
+ s7DataZKDLPTwo.setTo6(target);
+ break;
+ }
+ }
+ }
+ s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
List<HollowBigStorageCageHistoryTask> historyList = bigStorageCageTaskList.stream().filter(e -> StringUtils.isNotBlank(e.getGlassId())).map(e -> {
HollowBigStorageCageHistoryTask history = new HollowBigStorageCageHistoryTask();
BeanUtils.copyProperties(e, history);
@@ -1043,8 +1114,9 @@
.ne(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_OUT)
.in(HollowBigStorageCageDetails::getGlassId, glassIds));
try {
+
// miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 1));
- S7DataZKDLPTwo s7DataZKDLPTwo = new S7DataZKDLPTwo();
+ s7DataZKDLPTwo = new S7DataZKDLPTwo();
s7DataZKDLPTwo.setMesReply(1);
s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
} catch (Exception e) {
@@ -1090,4 +1162,54 @@
.value(value)
.build();
}
+
+ //璇诲彇鍑虹墖鍦板潃
+ private List<BigStorageCageTask> getOutTaskList(S7DataZKDLPTwo s7DataZKDLPTwo) {
+ List<BigStorageCageTask> outTaskList = new ArrayList<>();
+ List<String> glassIds = s7DataZKDLPTwo.getIds();
+ List<Integer> startSlots = s7DataZKDLPTwo.getFroms();
+ List<Integer> endSlots = s7DataZKDLPTwo.getTos();
+ List<Integer> states = s7DataZKDLPTwo.getStates();
+ for (int i = 0; i < 6; i++) {
+ if (glassIds.get(i) != null && !glassIds.get(i).isEmpty()) {
+ BigStorageCageTask bigStorageCageTask = new BigStorageCageTask();
+ bigStorageCageTask.setGlassId(glassIds.get(i));
+ bigStorageCageTask.setStartSlot(startSlots.get(i));
+ bigStorageCageTask.setTargetSlot(endSlots.get(i));
+ bigStorageCageTask.setTaskState(states.get(i));
+ outTaskList.add(bigStorageCageTask);
+ }
+ }
+ return outTaskList;
+ }
+
+ //閲嶇疆浠诲姟琛�
+ private void resetOutTask() {
+ S7DataZKDLPTwo s7DataZKDLPTwo = new S7DataZKDLPTwo();
+ s7DataZKDLPTwo.setId1("");
+ s7DataZKDLPTwo.setId2("");
+ s7DataZKDLPTwo.setId3("");
+ s7DataZKDLPTwo.setId4("");
+ s7DataZKDLPTwo.setId5("");
+ s7DataZKDLPTwo.setId6("");
+ s7DataZKDLPTwo.setFrom1(0);
+ s7DataZKDLPTwo.setFrom2(0);
+ s7DataZKDLPTwo.setFrom3(0);
+ s7DataZKDLPTwo.setFrom4(0);
+ s7DataZKDLPTwo.setFrom5(0);
+ s7DataZKDLPTwo.setFrom6(0);
+ s7DataZKDLPTwo.setTo1(0);
+ s7DataZKDLPTwo.setTo2(0);
+ s7DataZKDLPTwo.setTo3(0);
+ s7DataZKDLPTwo.setTo4(0);
+ s7DataZKDLPTwo.setTo5(0);
+ s7DataZKDLPTwo.setTo6(0);
+ s7DataZKDLPTwo.setState1(0);
+ s7DataZKDLPTwo.setState2(0);
+ s7DataZKDLPTwo.setState3(0);
+ s7DataZKDLPTwo.setState4(0);
+ s7DataZKDLPTwo.setState5(0);
+ s7DataZKDLPTwo.setState6(0);
+ s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0