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/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java | 385 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 317 insertions(+), 68 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
index c1653c5..12c9e54 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java
@@ -4,6 +4,7 @@
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
import com.github.yulichang.toolkit.JoinWrappers;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
@@ -31,6 +32,8 @@
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.s7.entity.S7DataDLPOne;
+import com.mes.s7.entity.S7DataDLPTwo;
import com.mes.sysconfig.service.SysConfigService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
@@ -39,6 +42,7 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -76,6 +80,14 @@
@Autowired(required = false)
MiloService miloService;
+ @Autowired
+ @Qualifier("s7SerializerDLPOne")
+ private S7Serializer s7SerializerDLPOne;
+
+ @Autowired
+ @Qualifier("s7SerializerDLPTwo")
+ private S7Serializer s7SerializerDLPTwo;
+
@Resource
SysConfigService sysConfigService;
@@ -89,33 +101,48 @@
@Scheduled(fixedDelay = 1000)
public void inBigStorageTask() throws Exception {
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataDLPOne s7DataDLPOne = s7SerializerDLPOne.read(S7DataDLPOne.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataDLPOne.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
- ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1A.DLP1A.RequestMes");
- if (!"1".equals(requestEntity.getValue() + "")) {
+// ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1A.DLP1A.RequestMes");
+// if (!"1".equals(requestEntity.getValue() + "")) {
+ String requestEntity = s7DataDLPOne.getRequestMes().toString();
+ if (!"1".equals(requestEntity)) {
log.info("褰撳墠鏈敹鍒拌繘鐗囪姹傦紝缁撴潫杩涚墖浠诲姟");
return;
}
- ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP1A.DLP1A.MesReply");
- if ("1".equals(mesReplyEntity.getValue() + "")) {
+// ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP1A.DLP1A.MesReply");
+// if ("1".equals(mesReplyEntity.getValue() + "")) {
+ String mesReplyEntity = s7DataDLPOne.getMesReply().toString();
+ if ("1".equals(mesReplyEntity)) {
log.info("鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岀粨鏉熻繘鐗囦换鍔�");
return;
}
//鑾峰彇杩涚墖浠诲姟淇℃伅
List<BigStorageCageTask> inTaskList = new ArrayList();
- ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM1");
+// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM1");
+ String fromOpcUa = s7DataDLPOne.getFrom1().toString();
+
+ List<String> ids = s7DataDLPOne.getIds();
List<String> glassIdList = new ArrayList<>();
- for (int i = 1; i <= 6; i++) {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
- if (null != requestWord.getValue()) {
+ for (int i = 0; i < 6; i++) {
+// ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
+ String requestWord = ids.get(i);
+// if (null != requestWord.getValue()) {
+ if (null != requestWord && !requestWord.isEmpty()) {
BigStorageCageTask task = new BigStorageCageTask();
- task.setGlassId(requestWord.getValue() + "");
- task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+// task.setGlassId(requestWord.getValue() + "");
+ task.setGlassId(requestWord);
+// task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+ task.setStartSlot(Integer.parseInt(fromOpcUa));
inTaskList.add(task);
- glassIdList.add(requestWord.getValue() + "");
+// glassIdList.add(requestWord.getValue() + "");
+ glassIdList.add(requestWord);
continue;
}
}
@@ -124,11 +151,16 @@
return;
}
log.info("鑾峰彇浠诲姟鐨勭幓鐠僫d锛歿}", glassIdList);
- ReadWriteEntity countEntity = miloService.readFromOpcUa("DLP1A.DLP1A.glassCount");
- if (null == countEntity.getValue() || Integer.parseInt(countEntity.getValue() + "") != glassIdList.size()) {
- log.info("褰撳墠澶ц溅杩涚墖鐜荤拑鏁伴噺{}涓巑es璇诲彇鍒扮殑鏁伴噺{}涓嶅尮閰嶏紝缁撴潫杩涚墖浠诲姟", countEntity.getValue(), glassIdList.size());
+// ReadWriteEntity countEntity = miloService.readFromOpcUa("DLP1A.DLP1A.glassCount");
+ String countEntity = s7DataDLPOne.getGlassCount().toString();
+// if (null == countEntity.getValue() || Integer.parseInt(countEntity.getValue() + "") != glassIdList.size()) {
+ if (null == countEntity || Integer.parseInt(countEntity) != glassIdList.size()) {
+ log.info("褰撳墠澶ц溅杩涚墖鐜荤拑鏁伴噺{}涓巑es璇诲彇鍒扮殑鏁伴噺{}涓嶅尮閰嶏紝缁撴潫杩涚墖浠诲姟", countEntity, glassIdList.size());
//鍚憄lc鍙戦�佹姤璀�:褰撳墠澶ц溅杩涚墖鐜荤拑鏁伴噺涓巑es璇诲彇鍒扮殑鏁伴噺涓嶅尮閰�
- miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 1));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 1));
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setAlarmSignal(1);
+ s7SerializerDLPOne.write(s7DataDLPOne);
return;
}
Map<String, Long> glassCountMap = glassIdList.stream().collect(Collectors.groupingBy(e -> e, Collectors.counting()));
@@ -136,7 +168,10 @@
if (entry.getValue() > 1) {
log.info("杩涚墖鐜荤拑{}瀛樺湪鐩稿悓锛岀粨鏉熸湰娆′换鍔�", entry.getKey());
//鍚憄lc鍙戦�佹姤璀�:鍚屼竴杞﹁繘鐗囩幓鐠冨瓨鍦ㄧ浉鍚�
- miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 2));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 2));
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setAlarmSignal(2);
+ s7SerializerDLPOne.write(s7DataDLPOne);
return;
}
}
@@ -145,7 +180,10 @@
if (CollectionUtil.isNotEmpty(detailsList)) {
log.info("鐞嗙墖绗煎瓨鍦ㄧ浉鍚岀殑杩涚墖鐜荤拑{}锛岀粨鏉熸湰娆′换鍔�", detailsList);
//鍚憄lc鍙戦�佹姤璀�:鐞嗙墖绗煎瓨鍦ㄧ浉鍚岀殑杩涚墖鐜荤拑
- miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 4));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 4));
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setAlarmSignal(4);
+ s7SerializerDLPOne.write(s7DataDLPOne);
return;
}
List<GlassInfo> glassInfoList = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassIdList));
@@ -153,7 +191,10 @@
if (glassInfoList.size() != inTaskList.size()) {
log.info("杩涚墖浠诲姟鏁伴噺{}涓庣幓鐠冩暟閲弡}涓嶅尮閰嶏紝缁撴潫鏈杩涚墖", inTaskList.size(), glassInfoList.size());
//鍚憄lc鍙戦�佹姤璀�:杩涚墖浠诲姟鏁伴噺涓庣郴缁熸煡璇㈠埌鐨勭幓鐠冩暟閲忎笉鍖归厤
- miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 8));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 8));
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setAlarmSignal(8);
+ s7SerializerDLPOne.write(s7DataDLPOne);
return;
}
Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.VERTICAL_GLASS_GAP);
@@ -171,7 +212,10 @@
if (count < entry.getValue()) {
log.info("绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻锛岀粨鏉熸湰娆¤繘鐗�");
//鍚憄lc鍙戦�佹姤璀�:绗煎唴鏍煎瓙鍓╀綑鏁伴噺涓嶈冻
- miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 16));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 16));
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setAlarmSignal(16);
+ s7SerializerDLPOne.write(s7DataDLPOne);
return;
}
}
@@ -184,7 +228,10 @@
if (count > 0) {
log.info("鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝缁撴潫鏈杩涚墖");
//鍚憄lc鍙戦�佹姤璀�:鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝鏃犳硶缁х画鐩撮��
- miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 64));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 64));
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setAlarmSignal(64);
+ s7SerializerDLPOne.write(s7DataDLPOne);
return;
}
}
@@ -213,7 +260,7 @@
.eq(BigStorageCage::getSlot, bigStorageDTO.getSlot()));
task.setTargetSlot(bigStorageDTO.getSlot());
task.setGlassId(info.getGlassId());
- bigStorageCageTaskService.updateTaskMessage("big_storage_cage_in_one_task", task);
+// bigStorageCageTaskService.updateTaskMessage("big_storage_cage_in_one_task", task);
//瀛樻斁鍘嗗彶浠诲姟
BigStorageCageHistoryTask historyTask = new BigStorageCageHistoryTask();
BeanUtils.copyProperties(task, historyTask);
@@ -236,7 +283,7 @@
} else {
BigStorageCageTask task = inTaskList.get(0);
task.setTargetSlot(THROUGH_SLOT);
- bigStorageCageTaskService.updateTaskMessage("big_storage_cage_in_one_task", task);
+// bigStorageCageTaskService.updateTaskMessage("big_storage_cage_in_one_task", task);
//瀛樻斁鍘嗗彶浠诲姟
BigStorageCageHistoryTask historyTask = new BigStorageCageHistoryTask();
BeanUtils.copyProperties(task, historyTask);
@@ -260,29 +307,63 @@
//鍘嗗彶鏁版嵁鍏ュ簱
bigStorageCageHistoryTaskService.saveBatch(historyTasks);
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
- List<ReadWriteEntity> list = new ArrayList<>();
- for (int i = 1; i <= inTaskList.size(); i++) {
- list.add(generateReadWriteEntity("DLP1A.DLP1A.TO" + i, inTaskList.get(i - 1).getTargetSlot()));
+// List<ReadWriteEntity> list = new ArrayList<>();
+// for (int i = 1; i <= inTaskList.size(); i++) {
+// list.add(generateReadWriteEntity("DLP1A.DLP1A.TO" + i, inTaskList.get(i - 1).getTargetSlot()));
+// }
+// list.add(generateReadWriteEntity("DLP1A.DLP1A.MesReply", 1));
+// miloService.writeToOpcWord(list);
+ s7DataDLPOne = new S7DataDLPOne();
+ for (int i = 0; i < inTaskList.size(); i++) {
+ Integer value = Integer.parseInt(inTaskList.get(i).getTargetSlot().toString());
+ switch (i) {
+ case 0:
+ s7DataDLPOne.setTo1(value);
+ break;
+ case 1:
+ s7DataDLPOne.setTo2(value);
+ break;
+ case 2:
+ s7DataDLPOne.setTo3(value);
+ break;
+ case 3:
+ s7DataDLPOne.setTo4(value);
+ break;
+ case 4:
+ s7DataDLPOne.setTo5(value);
+ break;
+ case 5:
+ s7DataDLPOne.setTo6(value);
+ break;
+ }
}
- list.add(generateReadWriteEntity("DLP1A.DLP1A.MesReply", 1));
- miloService.writeToOpcWord(list);
+ s7SerializerDLPOne.write(s7DataDLPOne);
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setMesReply(1);
+ s7SerializerDLPOne.write(s7DataDLPOne);
}
@Scheduled(fixedDelay = 1000)
public void outBigStorageTask() throws Exception {
Date startDate = new Date();
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataDLPTwo s7DataWLTwo = s7SerializerDLPTwo.read(S7DataDLPTwo.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataWLTwo.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
- ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1B.DLP1B.RequestMes");
- if (!"1".equals(requestEntity.getValue() + "")) {
+// ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1B.DLP1B.RequestMes");
+// if (!"1".equals(requestEntity.getValue() + "")) {
+ String requestEntity = s7DataWLTwo.getRequestMes().toString();
+ if (!"1".equals(requestEntity)) {
log.info("褰撳墠鏈敹鍒板嚭鐗囪姹傦紝缁撴潫鍑虹墖浠诲姟");
return;
}
//鑾峰彇鍑虹墖浠诲姟琛�
- List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
+ List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataWLTwo);
+// List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
if (CollectionUtil.isNotEmpty(outTaskList)) {
log.info("鏈夋鍦ㄦ墽琛岀殑鍑虹墖浠诲姟锛岀粨鏉熸湰娆″嚭鐗囦换鍔�");
return;
@@ -397,8 +478,11 @@
@Scheduled(fixedDelay = 1000)
public void finishInBigStorageTask() throws Exception {
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataDLPOne s7DataDLPOne = s7SerializerDLPOne.read(S7DataDLPOne.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataDLPOne.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫瀹屾垚杩涚墖浠诲姟");
return;
}
@@ -407,25 +491,75 @@
List<BigStorageCageTask> inTaskList = new ArrayList();
List<String> glassIdList = new ArrayList<>();
- ReadWriteEntity toWord = miloService.readFromOpcUa("DLP1A.DLP1A.TO1");
- if ("0".equals(toWord.getValue() + "")) {
+// ReadWriteEntity toWord = miloService.readFromOpcUa("DLP1A.DLP1A.TO1");
+// if ("0".equals(toWord.getValue() + "")) {
+ String toWord = s7DataDLPOne.getTo1().toString();
+ if ("0".equals(toWord)) {
log.info("瀹屾垚浠诲姟宸叉墽琛岋紝缁撴潫鏈瀹屾垚杩涚墖浠诲姟");
return;
}
for (int i = 1; i <= 6; i++) {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
- ReadWriteEntity statetWord = miloService.readFromOpcUa("DLP1A.DLP1A.STATE" + i);
- ReadWriteEntity toOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.TO" + i);
- ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM" + i);
+// ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
+// ReadWriteEntity statetWord = miloService.readFromOpcUa("DLP1A.DLP1A.STATE" + i);
+// ReadWriteEntity toOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.TO" + i);
+// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM" + i);
+ String requestWord = "";
+ String statetWord = "";
+ String toOpcUa = "";
+ String fromOpcUa = "";
+ switch (i) {
+ case 0:
+ requestWord = s7DataDLPOne.getId1().toString();
+ statetWord = s7DataDLPOne.getState1().toString();
+ toOpcUa = s7DataDLPOne.getTo1().toString();
+ fromOpcUa = s7DataDLPOne.getFrom1().toString();
+ break;
+ case 1:
+ requestWord = s7DataDLPOne.getId2().toString();
+ statetWord = s7DataDLPOne.getState2().toString();
+ toOpcUa = s7DataDLPOne.getTo2().toString();
+ fromOpcUa = s7DataDLPOne.getFrom2().toString();
+ break;
+ case 2:
+ requestWord = s7DataDLPOne.getId3().toString();
+ statetWord = s7DataDLPOne.getState3().toString();
+ toOpcUa = s7DataDLPOne.getTo3().toString();
+ fromOpcUa = s7DataDLPOne.getFrom3().toString();
+ break;
+ case 3:
+ requestWord = s7DataDLPOne.getId4().toString();
+ statetWord = s7DataDLPOne.getState4().toString();
+ toOpcUa = s7DataDLPOne.getTo4().toString();
+ fromOpcUa = s7DataDLPOne.getFrom4().toString();
+ break;
+ case 4:
+ requestWord = s7DataDLPOne.getId5().toString();
+ statetWord = s7DataDLPOne.getState5().toString();
+ toOpcUa = s7DataDLPOne.getTo5().toString();
+ fromOpcUa = s7DataDLPOne.getFrom5().toString();
+ break;
+ case 5:
+ requestWord = s7DataDLPOne.getId6().toString();
+ statetWord = s7DataDLPOne.getState6().toString();
+ toOpcUa = s7DataDLPOne.getTo6().toString();
+ fromOpcUa = s7DataDLPOne.getFrom6().toString();
+ break;
+ }
- if (null != requestWord.getValue()) {
+// if (null != requestWord.getValue()) {
+ if (!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.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.getValue() + "");
+ glassIdList.add(requestWord);
continue;
}
}
@@ -471,28 +605,41 @@
.eq(BigStorageCageHistoryTask::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鍙戦�佸惎鍔ㄤ俊鍙�
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
- List<ReadWriteEntity> list = new ArrayList<>();
- for (int i = 1; i <= 6; i++) {
- list.add(generateReadWriteEntity("DLP1A.DLP1A.TO" + i, 0));
- }
- list.add(generateReadWriteEntity("DLP1A.DLP1A.MesReply", 0));
- miloService.writeToOpcWord(list);
+// List<ReadWriteEntity> list = new ArrayList<>();
+// for (int i = 1; i <= 6; i++) {
+// list.add(generateReadWriteEntity("DLP1A.DLP1A.TO" + i, 0));
+// }
+// list.add(generateReadWriteEntity("DLP1A.DLP1A.MesReply", 0));
+// miloService.writeToOpcWord(list);
+ s7DataDLPOne = new S7DataDLPOne();
+ s7DataDLPOne.setTo1(0);
+ s7DataDLPOne.setTo2(0);
+ s7DataDLPOne.setTo3(0);
+ s7DataDLPOne.setTo4(0);
+ s7DataDLPOne.setTo5(0);
+ s7DataDLPOne.setTo6(0);
+ s7DataDLPOne.setMesReply(0);
+ s7SerializerDLPOne.write(s7DataDLPOne);
}
@Scheduled(fixedDelay = 1000)
public void finishOutBigStorageTask() throws Exception {
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
- if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ S7DataDLPTwo s7DataWLTwo = s7SerializerDLPTwo.read(S7DataDLPTwo.class);
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
+// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ Boolean inkageEntity = s7DataWLTwo.getMesControl();
+ if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫瀹屾垚鍑虹墖浠诲姟");
return;
}
- //鑾峰彇杩涚墖浠诲姟琛�
- List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
+ //鑾峰彇鍑虹墖浠诲姟琛�
+ List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataWLTwo);
+// List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
if (CollectionUtil.isEmpty(outTaskList)) {
log.info("褰撳墠澶ц溅鏃犺繘鐗囩幓鐠冿紝缁撴潫瀹屾垚杩涚墖浠诲姟");
return;
@@ -576,10 +723,14 @@
}
}
// 閲嶇疆浠诲姟琛ㄦ暟鎹�
- bigStorageCageTaskService.updateOutTaskMessage("big_storage_cage_out_one_task");
+// bigStorageCageTaskService.updateOutTaskMessage("big_storage_cage_out_one_task");
+ resetOutTask();
//娓呯┖鍚姩鐘舵��
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
- miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 0));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 0));
+ S7DataDLPTwo s7DataDLPTwo = new S7DataDLPTwo();
+ s7DataDLPTwo.setMesReply(0);
+ s7SerializerDLPTwo.write(s7DataDLPTwo);
}
private void dealDamageInTask(List<BigStorageCageTask> damageTaskList) {
@@ -712,12 +863,54 @@
List<String> glassIds = bigStorageCageTaskList.stream().map(BigStorageCageTask::getGlassId).collect(Collectors.toList());
int glassCount = bigStorageCageTaskList.size();
//鐢熸垚鍑虹墖浠诲姟鏉℃暟涓嶈冻6琛ュ叏
- while (bigStorageCageTaskList.size() < 6) {
- bigStorageCageTaskList.add(new BigStorageCageTask("", 0, 0, 0));
- }
+// while (bigStorageCageTaskList.size() < 6) {
+// bigStorageCageTaskList.add(new BigStorageCageTask("", 0, 0, 0));
+// }
//娓呯┖浠诲姟琛ㄦ暟鎹�
- bigStorageCageTaskService.removeAll("big_storage_cage_out_one_task");
- bigStorageCageTaskService.saveTaskMessage(tableName, bigStorageCageTaskList);
+ resetOutTask();
+ S7DataDLPTwo s7DataDLPTwo = new S7DataDLPTwo();
+ 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:
+ s7DataDLPTwo.setId1(glassId);
+ s7DataDLPTwo.setFrom1(startSlot);
+ s7DataDLPTwo.setTo1(target);
+ break;
+ case 1:
+ s7DataDLPTwo.setId2(glassId);
+ s7DataDLPTwo.setFrom2(startSlot);
+ s7DataDLPTwo.setTo2(target);
+ break;
+ case 2:
+ s7DataDLPTwo.setId3(glassId);
+ s7DataDLPTwo.setFrom3(startSlot);
+ s7DataDLPTwo.setTo3(target);
+ break;
+ case 3:
+ s7DataDLPTwo.setId4(glassId);
+ s7DataDLPTwo.setFrom4(startSlot);
+ s7DataDLPTwo.setTo4(target);
+ break;
+ case 4:
+ s7DataDLPTwo.setId5(glassId);
+ s7DataDLPTwo.setFrom5(startSlot);
+ s7DataDLPTwo.setTo5(target);
+ break;
+ case 5:
+ s7DataDLPTwo.setId6(glassId);
+ s7DataDLPTwo.setFrom6(startSlot);
+ s7DataDLPTwo.setTo6(target);
+ break;
+ }
+ }
+ }
+ s7SerializerDLPTwo.write(s7DataDLPTwo);
+// bigStorageCageTaskService.removeAll("big_storage_cage_out_one_task");
+// bigStorageCageTaskService.saveTaskMessage(tableName, bigStorageCageTaskList);
List<BigStorageCageHistoryTask> historyList = bigStorageCageTaskList.stream().filter(e -> StringUtils.isNotBlank(e.getGlassId())).map(e -> {
BigStorageCageHistoryTask history = new BigStorageCageHistoryTask();
BeanUtils.copyProperties(e, history);
@@ -734,7 +927,10 @@
.ne(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT)
.in(BigStorageCageDetails::getGlassId, glassIds));
try {
- miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 1));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 1));
+ s7DataDLPTwo = new S7DataDLPTwo();
+ s7DataDLPTwo.setMesReply(1);
+ s7SerializerDLPTwo.write(s7DataDLPTwo);
} catch (Exception e) {
e.printStackTrace();
}
@@ -791,7 +987,10 @@
.set(Const.GLASS_STATE_SCHEDULE_ING.equals(state), BigStorageCageBaseInfo::getSlot, targetSlot)
.in(BigStorageCageDetails::getGlassId, glassIds));
try {
- miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 1));
+// miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 1));
+ S7DataDLPTwo s7DataDLPTwo = new S7DataDLPTwo();
+ s7DataDLPTwo.setMesReply(1);
+ s7SerializerDLPTwo.write(s7DataDLPTwo);
} catch (Exception e) {
e.printStackTrace();
}
@@ -833,4 +1032,54 @@
.value(value)
.build();
}
+
+ //閲嶇疆浠诲姟琛�
+ private void resetOutTask() {
+ S7DataDLPTwo s7DataDLPTwo = new S7DataDLPTwo();
+ s7DataDLPTwo.setId1("");
+ s7DataDLPTwo.setId2("");
+ s7DataDLPTwo.setId3("");
+ s7DataDLPTwo.setId4("");
+ s7DataDLPTwo.setId5("");
+ s7DataDLPTwo.setId6("");
+ s7DataDLPTwo.setFrom1(0);
+ s7DataDLPTwo.setFrom2(0);
+ s7DataDLPTwo.setFrom3(0);
+ s7DataDLPTwo.setFrom4(0);
+ s7DataDLPTwo.setFrom5(0);
+ s7DataDLPTwo.setFrom6(0);
+ s7DataDLPTwo.setTo1(0);
+ s7DataDLPTwo.setTo2(0);
+ s7DataDLPTwo.setTo3(0);
+ s7DataDLPTwo.setTo4(0);
+ s7DataDLPTwo.setTo5(0);
+ s7DataDLPTwo.setTo6(0);
+ s7DataDLPTwo.setState1(0);
+ s7DataDLPTwo.setState2(0);
+ s7DataDLPTwo.setState3(0);
+ s7DataDLPTwo.setState4(0);
+ s7DataDLPTwo.setState5(0);
+ s7DataDLPTwo.setState6(0);
+ s7SerializerDLPTwo.write(s7DataDLPTwo);
+ }
+
+ //璇诲彇鍑虹墖鍦板潃
+ private List<BigStorageCageTask> getOutTaskList(S7DataDLPTwo s7DataDLPTwo) {
+ List<BigStorageCageTask> outTaskList = new ArrayList<>();
+ List<String> glassIds = s7DataDLPTwo.getIds();
+ List<Integer> startSlots = s7DataDLPTwo.getFroms();
+ List<Integer> endSlots = s7DataDLPTwo.getTos();
+ List<Integer> states = s7DataDLPTwo.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;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0