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/CacheVerticalGlassModule/src/main/java/com/mes/job/OpcPlcStorageCageNewTask.java | 65 +-------------------------------
1 files changed, 2 insertions(+), 63 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 5689af6..f8f60df 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
@@ -102,23 +102,17 @@
@Scheduled(fixedDelay = 1000)
public void inBigStorageTask() throws Exception {
S7DataDLPOne s7DataDLPOne = s7SerializerDLPOne.read(S7DataDLPOne.class);
- log.info("杩涚墖浠诲姟寮�濮媨}",s7DataDLPOne);
-// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
-// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ log.info("杩涚墖浠诲姟寮�濮媨}", s7DataDLPOne);
Boolean inkageEntity = s7DataDLPOne.getMesControl();
if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
-// 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() + "")) {
String mesReplyEntity = s7DataDLPOne.getMesReply().toString();
if ("1".equals(mesReplyEntity)) {
log.info("鏈夋鍦ㄦ墽琛岀殑浠诲姟锛岀粨鏉熻繘鐗囦换鍔�");
@@ -126,23 +120,17 @@
}
//鑾峰彇杩涚墖浠诲姟淇℃伅
List<BigStorageCageTask> inTaskList = new ArrayList();
-// 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 = 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.setGlassId(requestWord);
-// task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
task.setStartSlot(Integer.parseInt(fromOpcUa));
inTaskList.add(task);
-// glassIdList.add(requestWord.getValue() + "");
glassIdList.add(requestWord);
continue;
}
@@ -152,13 +140,10 @@
return;
}
log.info("鑾峰彇浠诲姟鐨勭幓鐠僫d锛歿}", glassIdList);
-// 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));
s7DataDLPOne = new S7DataDLPOne();
s7DataDLPOne.setAlarmSignal(1);
s7SerializerDLPOne.write(s7DataDLPOne);
@@ -169,7 +154,6 @@
if (entry.getValue() > 1) {
log.info("杩涚墖鐜荤拑{}瀛樺湪鐩稿悓锛岀粨鏉熸湰娆′换鍔�", entry.getKey());
//鍚憄lc鍙戦�佹姤璀�:鍚屼竴杞﹁繘鐗囩幓鐠冨瓨鍦ㄧ浉鍚�
-// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 2));
s7DataDLPOne = new S7DataDLPOne();
s7DataDLPOne.setAlarmSignal(2);
s7SerializerDLPOne.write(s7DataDLPOne);
@@ -181,7 +165,6 @@
if (CollectionUtil.isNotEmpty(detailsList)) {
log.info("鐞嗙墖绗煎瓨鍦ㄧ浉鍚岀殑杩涚墖鐜荤拑{}锛岀粨鏉熸湰娆′换鍔�", detailsList);
//鍚憄lc鍙戦�佹姤璀�:鐞嗙墖绗煎瓨鍦ㄧ浉鍚岀殑杩涚墖鐜荤拑
-// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 4));
s7DataDLPOne = new S7DataDLPOne();
s7DataDLPOne.setAlarmSignal(4);
s7SerializerDLPOne.write(s7DataDLPOne);
@@ -192,7 +175,6 @@
if (glassInfoList.size() != inTaskList.size()) {
log.info("杩涚墖浠诲姟鏁伴噺{}涓庣幓鐠冩暟閲弡}涓嶅尮閰嶏紝缁撴潫鏈杩涚墖", inTaskList.size(), glassInfoList.size());
//鍚憄lc鍙戦�佹姤璀�:杩涚墖浠诲姟鏁伴噺涓庣郴缁熸煡璇㈠埌鐨勭幓鐠冩暟閲忎笉鍖归厤
-// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 8));
s7DataDLPOne = new S7DataDLPOne();
s7DataDLPOne.setAlarmSignal(8);
s7SerializerDLPOne.write(s7DataDLPOne);
@@ -254,7 +236,6 @@
GlassInfo info = glassListMap.get(task.getGlassId()).get(0);
BigStorageDTO bigStorageDTO = bigStorageGlassInfoService.queryBigStorageTargetSlot(info.getEngineerId(), info.getTemperingLayoutId(), info.getTemperingFeedSequence());
//鑾峰彇鐩爣鏍煎瓙淇℃伅
-// BigStorageDTO bigStorageDTO = bigStorageCageDetailsService.queryTargetSlotByTempering(info);
// 涓存椂鏇存柊鏍煎瓙鐨勫墿浣欏昂瀵革細闃叉鐩搁偦鐜荤拑杩涘悓涓�鏍煎瓙閫犳垚鍓╀綑灏哄涓嶈冻锛岀幓鐠冭秺鐣岀殑鎯呭喌锛屼换鍔″畬鎴愬悗鍐嶆鏇存柊澶х悊鐗囩琛ㄥ墿浣欏搴︼紙鎸夌収绗煎唴鐜荤拑鏁伴噺鏇存柊澶х悊鐗囩鍓╀綑灏哄锛�
bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>()
.set(BigStorageCage::getRemainWidth, bigStorageDTO.getWidth() - Math.max(info.getWidth(), info.getHeight()) - glassGap)
@@ -284,7 +265,6 @@
} else {
BigStorageCageTask task = inTaskList.get(0);
task.setTargetSlot(THROUGH_SLOT);
-// bigStorageCageTaskService.updateTaskMessage("big_storage_cage_in_one_task", task);
//瀛樻斁鍘嗗彶浠诲姟
BigStorageCageHistoryTask historyTask = new BigStorageCageHistoryTask();
BeanUtils.copyProperties(task, historyTask);
@@ -308,12 +288,6 @@
//鍘嗗彶鏁版嵁鍏ュ簱
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.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());
@@ -348,16 +322,12 @@
public void outBigStorageTask() throws Exception {
Date startDate = new Date();
S7DataDLPTwo s7DataWLTwo = s7SerializerDLPTwo.read(S7DataDLPTwo.class);
- log.info("鍑虹墖浠诲姟寮�濮媨}",s7DataWLTwo);
-// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
-// if (true != Boolean.parseBoolean(inkageEntity.getValue() + "")) {
+ log.info("鍑虹墖浠诲姟寮�濮媨}", s7DataWLTwo);
Boolean inkageEntity = s7DataWLTwo.getMesControl();
if (true != inkageEntity) {
log.info("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫杩涚墖浠诲姟");
return;
}
-// ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1B.DLP1B.RequestMes");
-// if (!"1".equals(requestEntity.getValue() + "")) {
String requestEntity = s7DataWLTwo.getRequestMes().toString();
if (!"1".equals(requestEntity)) {
log.info("褰撳墠鏈敹鍒板嚭鐗囪姹傦紝缁撴潫鍑虹墖浠诲姟");
@@ -365,7 +335,6 @@
}
//鑾峰彇鍑虹墖浠诲姟琛�
List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataWLTwo);
-// List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
if (CollectionUtil.isNotEmpty(outTaskList)) {
log.info("鏈夋鍦ㄦ墽琛岀殑鍑虹墖浠诲姟锛岀粨鏉熸湰娆″嚭鐗囦换鍔�");
return;
@@ -481,30 +450,21 @@
@Scheduled(fixedDelay = 1000)
public void finishInBigStorageTask() throws Exception {
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;
}
//鑾峰彇杩涚墖浠诲姟琛�
-// List<BigStorageCageTask> inTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_in_one_task");
List<BigStorageCageTask> inTaskList = new ArrayList();
List<String> glassIdList = new ArrayList<>();
-// 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 = 0; 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);
String requestWord = "";
String statetWord = "";
String toOpcUa = "";
@@ -548,19 +508,13 @@
break;
}
-// 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);
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;
}
@@ -607,17 +561,9 @@
.eq(BigStorageCageHistoryTask::getGlassId, item.getGlassId()));
item.setTargetSlot(0);
//娓呯┖浠诲姟琛ㄦ暟鎹�
-// 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);
s7DataDLPOne = new S7DataDLPOne();
s7DataDLPOne.setTo1(0);
s7DataDLPOne.setTo2(0);
@@ -632,8 +578,6 @@
@Scheduled(fixedDelay = 1000)
public void finishOutBigStorageTask() throws Exception {
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("褰撳墠涓洪潪鑱旀満鐘舵�侊紝缁撴潫瀹屾垚鍑虹墖浠诲姟");
@@ -641,7 +585,6 @@
}
//鑾峰彇鍑虹墖浠诲姟琛�
List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataWLTwo);
-// List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
if (CollectionUtil.isEmpty(outTaskList)) {
log.info("褰撳墠澶ц溅鏃犲嚭鐗囩幓鐠冿紝缁撴潫瀹屾垚鍑虹墖浠诲姟");
return;
@@ -725,11 +668,9 @@
}
}
// 閲嶇疆浠诲姟琛ㄦ暟鎹�
-// bigStorageCageTaskService.updateOutTaskMessage("big_storage_cage_out_one_task");
resetOutTask();
//娓呯┖鍚姩鐘舵��
//鍚憃pc鍙戦�佸惎鍔ㄤ俊鍙�
-// miloService.writeToOpcWord(generateReadWriteEntity("DLP1B.DLP1B.MesReply", 0));
S7DataDLPTwo s7DataDLPTwo = new S7DataDLPTwo();
s7DataDLPTwo.setMesReply(0);
s7SerializerDLPTwo.write(s7DataDLPTwo);
@@ -911,8 +852,6 @@
}
}
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);
--
Gitblit v1.8.0