From 50363ebc3219e7be3515acb716a96e5003e11ae2 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 16 六月 2025 09:03:01 +0800
Subject: [PATCH] 大理片测试地址修改
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java | 129 ++++++++++++++++++++++++++++++++++++------
1 files changed, 109 insertions(+), 20 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
index 54bf769..46df258 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
@@ -2,6 +2,7 @@
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.bigstorage.entity.BigStorageCageDetails;
@@ -17,12 +18,15 @@
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.largenscreen.entity.PieChartVO;
import com.mes.largenscreen.entity.RunTime;
+import com.mes.s7.entity.S7DataDLPOne;
+import com.mes.s7.entity.S7DataDLPTwo;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.tools.WebSocketServer;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
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;
@@ -56,9 +60,19 @@
@Autowired(required = false)
MiloService miloService;
+ @Autowired
+ @Qualifier("s7SerializerDLPOne")
+ private S7Serializer s7SerializerDLPOne;
+
+ @Autowired
+ @Qualifier("s7SerializerDLPTwo")
+ private S7Serializer s7SerializerDLPTwo;
+
private JSONObject jsonObject = new JSONObject();
public void queryDataSource1() throws Exception {
+ S7DataDLPOne s7DataDLPOne = s7SerializerDLPOne.read(S7DataDLPOne.class);
+ S7DataDLPTwo s7DataWLTwo = s7SerializerDLPTwo.read(S7DataDLPTwo.class);
List<Double> carPostion = new ArrayList<>();
carPostion.add(0.25);
carPostion.add(0.5);
@@ -69,14 +83,23 @@
try {
//杩涚墖浠诲姟鏁版嵁
List<BigStorageTaskVO> inTaskList = new ArrayList();
- ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM1");
+// ReadWriteEntity fromOpcUa = miloService.readFromOpcUa("DLP1A.DLP1A.FROM1");
+ String fromOpcUa = s7DataDLPOne.getFrom1().toString();
+ List<Integer> states = s7DataDLPOne.getStates();
+ List<Integer> tos = s7DataDLPOne.getTos();
+ List<String> ids = s7DataDLPOne.getIds();
for (int i = 1; i <= 6; i++) {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
- ReadWriteEntity targetSlotWord = miloService.readFromOpcUa("DLP1A.DLP1A.TO" + i);
- ReadWriteEntity stateWord = miloService.readFromOpcUa("DLP1A.DLP1A.STATE" + i);
- if (null != requestWord.getValue()) {
+// ReadWriteEntity requestWord = miloService.readFromOpcUa("DLP1A.DLP1A.DI" + i);
+// ReadWriteEntity targetSlotWord = miloService.readFromOpcUa("DLP1A.DLP1A.TO" + i);
+// ReadWriteEntity stateWord = miloService.readFromOpcUa("DLP1A.DLP1A.STATE" + i);
+ String requestWord = ids.get(i - 1);
+ String targetSlotWord = tos.get(i - 1).toString();
+ String stateWord = states.get(i - 1).toString();
+// if (null != requestWord.getValue()) {
+ if (null != requestWord) {
BigStorageTaskVO task = new BigStorageTaskVO();
- task.setGlassId(requestWord.getValue() + "");
+// task.setGlassId(requestWord.getValue() + "");
+ task.setGlassId(requestWord);
int isExistCount = bigStorageCageDetailsService.count(new LambdaQueryWrapper<BigStorageCageDetails>().in(BigStorageCageDetails::getGlassId, task.getGlassId())
.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
if (isExistCount > 0) {
@@ -84,9 +107,12 @@
} else {
task.setIsSame(0);
}
- task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
- task.setTargetSlot(Integer.parseInt(targetSlotWord.getValue() + ""));
- task.setTaskState(Integer.parseInt(stateWord.getValue() + ""));
+// task.setStartSlot(Integer.parseInt(fromOpcUa.getValue() + ""));
+// task.setTargetSlot(Integer.parseInt(targetSlotWord.getValue() + ""));
+// task.setTaskState(Integer.parseInt(stateWord.getValue() + ""));
+ task.setStartSlot(Integer.parseInt(fromOpcUa));
+ task.setTargetSlot(Integer.parseInt(targetSlotWord));
+ task.setTaskState(Integer.parseInt(stateWord));
inTaskList.add(task);
continue;
}
@@ -97,24 +123,87 @@
}
try {
//杩涚墖鑱旀満
- ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
- jsonObject.append("inkageEntity", inkageEntity.getValue());
+// ReadWriteEntity inkageEntity = miloService.readFromOpcUa("DLP1A.DLP1A.mesControl");
+// jsonObject.append("inkageEntity", inkageEntity.getValue());
+ Boolean inkageEntity = s7DataDLPOne.getMesControl();
+ jsonObject.append("inkageEntity", inkageEntity);
//杩涚墖璇锋眰
- ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1A.DLP1A.RequestMes");
- jsonObject.append("requestEntity", requestEntity.getValue());
+// ReadWriteEntity requestEntity = miloService.readFromOpcUa("DLP1A.DLP1A.RequestMes");
+// jsonObject.append("requestEntity", requestEntity.getValue());
+ String requestEntity = s7DataDLPOne.getRequestMes().toString();
+ jsonObject.append("requestEntity", requestEntity);
//鍚姩鍛戒护
- ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP1A.DLP1A.MesReply");
- jsonObject.append("mesReplyEntity", mesReplyEntity.getValue());
+// ReadWriteEntity mesReplyEntity = miloService.readFromOpcUa("DLP1A.DLP1A.MesReply");
+// jsonObject.append("mesReplyEntity", mesReplyEntity.getValue());
+ String mesReplyEntity = s7DataDLPOne.getMesReply().toString();
+ jsonObject.append("mesReplyEntity", mesReplyEntity);
//鍑虹墖鑱旀満
- ReadWriteEntity outInkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
- jsonObject.append("outInkageEntity", outInkageEntity.getValue());
+// ReadWriteEntity outInkageEntity = miloService.readFromOpcUa("DLP1B.DLP1B.mesControl");
+// jsonObject.append("outInkageEntity", outInkageEntity.getValue());
+ Boolean outInkageEntity = s7DataWLTwo.getMesControl();
+ jsonObject.append("outInkageEntity", outInkageEntity);
//鍑虹墖璇锋眰
- ReadWriteEntity outRequestEntity = miloService.readFromOpcUa("DLP1B.DLP1B.RequestMes");
- jsonObject.append("outRequestEntity", outRequestEntity.getValue());
+// ReadWriteEntity outRequestEntity = miloService.readFromOpcUa("DLP1B.DLP1B.RequestMes");
+// jsonObject.append("outRequestEntity", outRequestEntity.getValue());
+ String outRequestEntity = s7DataWLTwo.getRequestMes().toString();
+ jsonObject.append("outRequestEntity", outRequestEntity);
//鍑虹墖浠诲姟鏁版嵁
- List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
+// List<BigStorageCageTask> outTaskList = bigStorageCageTaskService.queryTaskMessage("big_storage_cage_out_one_task");
+ List<BigStorageCageTask> outTaskList = new ArrayList<>();
+ for (int i = 0; i < 6; i++) {
+
+ BigStorageCageTask bigStorageCageTask = new BigStorageCageTask();
+ String glassId = "";
+ Integer startSlot = 0;
+ Integer targetSlot = 0;
+ Integer taskState = 0;
+ switch (i) {
+ case 0:
+ glassId = s7DataWLTwo.getId1();
+ startSlot = s7DataWLTwo.getFrom1();
+ targetSlot = s7DataWLTwo.getTo1();
+ taskState = s7DataWLTwo.getState1();
+ ;
+ break;
+ case 1:
+ glassId = s7DataWLTwo.getId2();
+ startSlot = s7DataWLTwo.getFrom2();
+ targetSlot = s7DataWLTwo.getTo2();
+ taskState = s7DataWLTwo.getState2();
+ break;
+ case 2:
+ glassId = s7DataWLTwo.getId3();
+ startSlot = s7DataWLTwo.getFrom3();
+ targetSlot = s7DataWLTwo.getTo3();
+ taskState = s7DataWLTwo.getState3();
+ break;
+ case 3:
+ glassId = s7DataWLTwo.getId4();
+ startSlot = s7DataWLTwo.getFrom4();
+ targetSlot = s7DataWLTwo.getTo4();
+ taskState = s7DataWLTwo.getState4();
+ break;
+ case 4:
+ glassId = s7DataWLTwo.getId5();
+ startSlot = s7DataWLTwo.getFrom5();
+ targetSlot = s7DataWLTwo.getTo5();
+ taskState = s7DataWLTwo.getState5();
+ break;
+ case 5:
+ glassId = s7DataWLTwo.getId6();
+ startSlot = s7DataWLTwo.getFrom6();
+ targetSlot = s7DataWLTwo.getTo6();
+ taskState = s7DataWLTwo.getState6();
+ break;
+ }
+ bigStorageCageTask.setGlassId(glassId);
+ bigStorageCageTask.setStartSlot(startSlot);
+ bigStorageCageTask.setTargetSlot(targetSlot);
+ bigStorageCageTask.setTaskState(taskState);
+ outTaskList.add(bigStorageCageTask);
+ }
jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
} catch (Exception e) {
//todo:涓嶅仛浠诲姟澶勭悊
--
Gitblit v1.8.0