From 849442e4f63a5fd7ae154ef6bc77c967a82f40b8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 26 六月 2025 08:46:01 +0800
Subject: [PATCH] 删除改S7通讯时注释的原opc代码
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageHollowTask.java | 90 +-------------------------------------------
1 files changed, 3 insertions(+), 87 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 3b93f35..a9713dd 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
@@ -112,43 +112,20 @@
@Resource
private RedisUtil redisUtil;
-// @Value("${mes.slotWidth}")
-// private Integer slotWidth;
-//
-// @Value("${mes.glassGap}")
-// private Integer glassGap;
-//
-// @Value("${mes.carWidth}")
-// private Integer carWidth;
-//
-// @Value("${mes.outCarMaxSize}")
-// private Integer outCarMaxSize;
-//
-// @Value("${mes.slotMaxHeight}")
-// private Integer slotMaxHeight;
-// @Value("${mes.slotMaxthickness}")
-// private Integer slotMaxthickness;
-
@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();
if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
-// ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP2A.DLP2A.RequestMes");
-// if (!"1".equals(requestEntity.getValue() + "")) {
String requestEntity = s7DataZKDLPOne.getRequestMes().toString();
if (!"1".equals(requestEntity)) {
log.info("褰撳墠鏈敹鍒拌繘鐗囪姹傦紝缁撴潫杩涚墖浠诲姟");
return;
}
-// ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP2A.DLP2A.MesReply");
-// if ("1".equals(mesReplyEntity.getValue() + "")) {
String mesReplyEntity = s7DataZKDLPOne.getMesReply().toString();
if ("1".equals(mesReplyEntity)) {
log.info("鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岀粨鏉熻繘鐗囦换鍔�");
@@ -156,23 +133,17 @@
}
List<BigStorageCageTask> inTaskList = new ArrayList();
-// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM1");
String fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
List<String> glassIdList = new ArrayList<>();
List<String> requestWords = s7DataZKDLPOne.getIds();
for (int i = 1; i <= 6; i++) {
-// ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
String requestWord = requestWords.get(i - 1);
-// if (null != requestWord.getValue()) {
if (null != requestWord && !requestWord.isEmpty()) {
BigStorageCageTask task = new BigStorageCageTask();
-// task.setGlassId(requestWord.getValue() + "");
- task.setGlassId(requestWord.toString());
-// task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+ task.setGlassId(requestWord);
task.setStartSlot(Integer.parseInt(fromOpcUa));
inTaskList.add(task);
-// glassIdList.add(requestWord.getValue() + "");
- glassIdList.add(requestWord.toString());
+ glassIdList.add(requestWord);
continue;
}
}
@@ -186,7 +157,6 @@
if (entry.getValue() > 1) {
log.info("杩涚墖鐜荤拑{}瀛樺湪鐩稿悓锛岀粨鏉熸湰娆′换鍔�", entry.getKey());
//鍚憄lc鍙戦�佹姤璀�:鍚屼竴杞﹁繘鐗囩幓鐠冨瓨鍦ㄧ浉鍚�
-// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 2));
s7DataZKDLPOne = new S7DataZKDLPOne();
s7DataZKDLPOne.setAlramSignal(2);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
@@ -198,7 +168,6 @@
if (CollectionUtil.isNotEmpty(detailsList)) {
log.info("鐞嗙墖绗煎瓨鍦ㄧ浉鍚岀殑杩涚墖鐜荤拑{}锛岀粨鏉熸湰娆′换鍔�", detailsList);
//鍚憄lc鍙戦�佹姤璀�:鐞嗙墖绗煎瓨鍦ㄧ浉鍚岀殑杩涚墖鐜荤拑
-// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 4));
s7DataZKDLPOne = new S7DataZKDLPOne();
s7DataZKDLPOne.setAlramSignal(4);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
@@ -209,7 +178,6 @@
if (glassInfoList.size() != inTaskList.size()) {
log.info("杩涚墖浠诲姟鏁伴噺{}涓庣幓鐠冩暟閲弡}涓嶅尮閰嶏紝缁撴潫鏈杩涚墖", inTaskList.size(), glassInfoList.size());
//鍚憄lc鍙戦�佹姤璀�:杩涚墖浠诲姟鏁伴噺涓庣郴缁熸煡璇㈠埌鐨勭幓鐠冩暟閲忎笉鍖归厤
-// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 8));
s7DataZKDLPOne = new S7DataZKDLPOne();
s7DataZKDLPOne.setAlramSignal(8);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
@@ -227,7 +195,6 @@
if (count < entry.getValue()) {
log.info("绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻锛岀粨鏉熸湰娆¤繘鐗�");
//鍚憄lc鍙戦�佹姤璀�:绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻
-// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 16));
s7DataZKDLPOne = new S7DataZKDLPOne();
s7DataZKDLPOne.setAlramSignal(16);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
@@ -244,7 +211,6 @@
if (count > 0) {
log.info("鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝缁撴潫鏈杩涚墖");
//鍚憄lc鍙戦�佹姤璀�:鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝鏃犳硶缁х画鐩撮��
-// miloService.writeToOpcWord(generateReadWriteEntity("DLP2A.DLP2A.alarmSignal", 64));
s7DataZKDLPOne = new S7DataZKDLPOne();
s7DataZKDLPOne.setAlramSignal(64);
s7SerializerZKDLPOne.write(s7DataZKDLPOne);
@@ -268,6 +234,7 @@
Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
try {
+ log.info("寮�濮嬭绠楃洰鏍囨牸瀛�,鐜荤拑id鏈夛細{}", inTaskList);
if (slotMaxHeight > Math.min(glassInfoList.get(0).getWidth(), glassInfoList.get(0).getHeight()) && glassInfoList.get(0).getThickness() < slotMaxthickness) {
for (BigStorageCageTask task : inTaskList) {
GlassInfo info = glassListMap.get(task.getGlassId()).get(0);
@@ -279,7 +246,6 @@
.eq(HollowBigStorageCage::getSlot, bigStorageDTO.getSlot()));
task.setTargetSlot(bigStorageDTO.getSlot());
task.setGlassId(info.getGlassId());
-// bigStorageCageTaskService.updateTaskMessage(BIG_STORAGE_CAGE_IN_TWO_TASK, task);
//瀛樻斁鍘嗗彶浠诲姟
HollowBigStorageCageHistoryTask historyTask = new HollowBigStorageCageHistoryTask();
BeanUtils.copyProperties(task, historyTask);
@@ -312,7 +278,6 @@
} else {
BigStorageCageTask task = inTaskList.get(0);
task.setTargetSlot(THROUGH_SLOT);
-// bigStorageCageTaskService.updateTaskMessage("big_storage_cage_in_two_task", task);
//瀛樻斁鍘嗗彶浠诲姟
HollowBigStorageCageHistoryTask historyTask = new HollowBigStorageCageHistoryTask();
BeanUtils.copyProperties(task, historyTask);
@@ -347,12 +312,6 @@
//鍘嗗彶鏁版嵁鍏ュ簱
hollowBigStorageCageHistoryTaskService.saveBatch(historyTasks);
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
-// List<ReadWriteEntity> list = new ArrayList<>();
-// for (int i = 1; i <= inTaskList.size(); i++) {
-// list.add(generateReadWriteEntity("DLP2A.DLP2A.TO" + i, inTaskList.get(i - 1).getTargetSlot()));
-// }
-// list.add(generateReadWriteEntity("DLP2A.DLP2A.MesReply", 1));
-// miloService.writeToOpcWord(list);
s7DataZKDLPOne = new S7DataZKDLPOne();
for (int i = 0; i < inTaskList.size() && i < 6; i++) {
Integer value = inTaskList.get(i).getTargetSlot();
@@ -388,23 +347,17 @@
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();
if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
-// ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP2B.DLP2B.RequestMes");
-// if (!"1".equals(requestEntity.getValue() + "")) {
String requestEntity = s7DataZKDLPTwo.getRequestMes().toString();
if (!"1".equals(requestEntity)) {
log.info("褰撳墠鏈敹鍒板嚭鐗囪姹傦紝缁撴潫鍑虹墖浠诲姟");
return;
}
//鑾峰彇鍑虹墖浠诲姟琛�
-// List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
-
List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataZKDLPTwo);
if (CollectionUtil.isNotEmpty(outTaskList)) {
@@ -441,7 +394,6 @@
if (null == hollowGlassOutRelationInfo) {
Boolean entity = map.get(i);
cell = i;
-// if (null != entity.getValue() && ("1".equals(entity.getValue() + "") || Boolean.parseBoolean(entity.getValue() + ""))) {
if (null != entity && entity) {
hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService
.getOne(new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
@@ -490,7 +442,6 @@
.set(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_SUCCESS));
}
}
-// redisUtil.setCacheObject("dispatchHollowSwitch",true);
//鏄惁瀛樺湪闇�瑕佸唴閮ㄨ皟搴︾殑鏍煎瓙:鎵ц鍐呴儴璋冨害浠诲姟
if (redisUtil.getCacheObject("dispatchHollowSwitch")) {
//todo:鑾峰彇绗煎唴鍗曟牸宸茬粡鍒伴綈鐨勭幓鐠冩牸瀛愪俊鎭�
@@ -533,8 +484,6 @@
@Scheduled(fixedDelay = 1000)
public void finishInBigStorageTask() throws Exception {
S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
-// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2A.DLP2A.mesControl");
-// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫瀹屾垚杩涚墖浠诲姟");
@@ -543,18 +492,12 @@
//鑾峰彇杩涚墖浠诲姟琛�
List<BigStorageCageTask> inTaskList = new ArrayList();
List<String> glassIdList = new ArrayList<>();
-// ReadWriteEntity toWord = miloService.readFromOpcUa("DLP2A.DLP2A.TO1");
-// if ("0".equals(toWord.getValue() + "")) {
String toWord = s7DataZKDLPOne.getTo1().toString();
if ("0".equals(toWord)) {
log.info("瀹屾垚浠诲姟宸叉墽琛岋紝缁撴潫鏈瀹屾垚杩涚墖浠诲姟");
return;
}
for (int i = 1; i <= 6; i++) {
-// ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP2A.DLP2A.DI" + i);
-// ReadWriteEntity statetWord = miloService.readFromOpcUa("DLP2A.DLP2A.STATE" + i);
-// ReadWriteEntity toOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.TO" + i);
-// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP2A.DLP2A.FROM" + i);
String requestWord = "";
String statetWord = "";
String toOpcUa = "";
@@ -601,16 +544,11 @@
// if (null != requestWord.getValue()) {
if (null != requestWord && !requestWord.isEmpty()) {
BigStorageCageTask task = new BigStorageCageTask();
-// task.setGlassId(requestWord.getValue() + "");
-// task.setTargetSlot(Integer.parseInt(toOpcUa.getValue() + ""));
-// task.setTaskState(Integer.parseInt(statetWord.getValue() + ""));
-// task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
task.setGlassId(requestWord);
task.setTargetSlot(Integer.parseInt(toOpcUa));
task.setTaskState(Integer.parseInt(statetWord));
task.setStartSlot(Integer.parseInt(fromOpcUa));
inTaskList.add(task);
-// glassIdList.add(requestWord.getValue() + "");
glassIdList.add(requestWord);
continue;
}
@@ -687,13 +625,6 @@
}
//娓呯┖鍚姩鐘舵��
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
- //鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
-// List<ReadWriteEntity> list = new ArrayList<>();
-// for (int i = 1; i <= 6; i++) {
-// list.add(generateReadWriteEntity("DLP2A.DLP2A.TO" + i, 0));
-// }
-// list.add(generateReadWriteEntity("DLP2A.DLP2A.MesReply", 0));
-// miloService.writeToOpcWord(list);
s7DataZKDLPOne = new S7DataZKDLPOne();
s7DataZKDLPOne.setTo1(0);
s7DataZKDLPOne.setTo2(0);
@@ -710,15 +641,12 @@
@Scheduled(fixedDelay = 1000)
public void finishOutBigStorageTask() throws Exception {
S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
-// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP2B.DLP2B.mesControl");
-// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
Boolean inkageEntity = s7DataZKDLPTwo.getMesControl();
if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫瀹屾垚鍑虹墖浠诲姟");
return;
}
//鑾峰彇鍑虹墖浠诲姟琛�
-// List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataZKDLPTwo);
if (CollectionUtil.isEmpty(outTaskList)) {
log.info("褰撳墠澶ц溅鏃犲嚭鐗囩幓鐠冿紝缁撴潫瀹屾垚鍑虹墖浠诲姟");
@@ -837,11 +765,9 @@
}
// 閲嶇疆浠诲姟琛ㄦ暟鎹�
-// bigStorageCageTaskService.updateOutTaskMessage(BIG_STORAGE_CAGE_OUT_TWO_TASK);
resetOutTask();
//娓呯┖鍚姩鐘舵��
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
-// miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 0));
s7DataZKDLPTwo = new S7DataZKDLPTwo();
s7DataZKDLPTwo.setMesReply(0);
s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
@@ -1060,13 +986,8 @@
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));
-// }
//娓呯┖浠诲姟琛ㄦ暟鎹�
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++) {
@@ -1128,8 +1049,6 @@
.ne(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_OUT)
.in(HollowBigStorageCageDetails::getGlassId, glassIds));
try {
-
-// miloService.writeToOpcWord(generateReadWriteEntity("DLP2B.DLP2B.MesReply", 1));
s7DataZKDLPTwo = new S7DataZKDLPTwo();
s7DataZKDLPTwo.setMesReply(1);
s7SerializerZKDLPTwo.write(s7DataZKDLPTwo);
@@ -1149,9 +1068,6 @@
Integer slotWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_SLOT_WIDTH);
if (CollectionUtils.isNotEmpty(inSlotGlassList)) {
//瀛樺湪 灏嗘牸瀛愬唴鐨勭幓鐠冨垎鍒繘琛屾洿鏂�
-// List<HollowBigStorageCage> hollowBigStorageCageList = hollowBigStorageCageService.list(new LambdaQueryWrapper<HollowBigStorageCage>()
-// .lt(HollowBigStorageCage::getRemainWidth, 0).in(HollowBigStorageCage::getSlot, slotList));
-// List<Integer> resultSlotList = hollowBigStorageCageList.stream().map(HollowBigStorageCage::getSlot).collect(Collectors.toList());
slotRemainMap = inSlotGlassList.stream()
.collect(Collectors.groupingBy(HollowBigStorageCageDetails::getSlot, Collectors.summingDouble(item -> Math.max(item.getWidth(), item.getHeight()) + glassGap)));
slotRemainMap.forEach((e, v) -> {
--
Gitblit v1.8.0