From 30317b7c1d87231f09f77d39b3d7ab54c26844ed Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 04 九月 2025 15:45:09 +0800
Subject: [PATCH] 1、各模块大屏运行情况查询修改
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 294 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 147 insertions(+), 147 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index a6c8bbf..ae03e7a 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -148,9 +148,9 @@
public void queryDataSource1(JSONObject jsonObject) throws Exception {
- S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
- S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
- S7DataZKExtra s7DataZKExtra = s7SerializerZKQ2.read(S7DataZKExtra.class);
+// S7DataZKDLPOne s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
+// S7DataZKDLPTwo s7DataZKDLPTwo = s7SerializerZKDLPTwo.read(S7DataZKDLPTwo.class);
+// S7DataZKExtra s7DataZKExtra = s7SerializerZKQ2.read(S7DataZKExtra.class);
List<Double> carPostion = new ArrayList<>();
carPostion.add(0.25);
carPostion.add(0.5);
@@ -158,150 +158,150 @@
//鐣岄潰灞曠ず绗煎瓙淇℃伅
jsonObject.append("bigStorageCageInfos", hollowBigStorageCageDetailsService.queryHollowbigStorageCageDetail());
- try {
- //杩涚墖浠诲姟鏁版嵁
- List<BigStorageTaskVO> inTaskList = new ArrayList();
- String fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
- for (int i = 0; i < 6; i++) {
- String requestWord = "";
- String stateWord = "";
- String targetSlotWord = "";
- switch (i) {
- case 0:
- requestWord = s7DataZKDLPOne.getId1();
- stateWord = s7DataZKDLPOne.getState1().toString();
- targetSlotWord = s7DataZKDLPOne.getTo1().toString();
- break;
- case 1:
- requestWord = s7DataZKDLPOne.getId2();
- stateWord = s7DataZKDLPOne.getState2().toString();
- targetSlotWord = s7DataZKDLPOne.getTo2().toString();
- break;
- case 2:
- requestWord = s7DataZKDLPOne.getId3();
- stateWord = s7DataZKDLPOne.getState3().toString();
- targetSlotWord = s7DataZKDLPOne.getTo3().toString();
- break;
- case 3:
- requestWord = s7DataZKDLPOne.getId4();
- stateWord = s7DataZKDLPOne.getState4().toString();
- targetSlotWord = s7DataZKDLPOne.getTo4().toString();
- break;
- case 4:
- requestWord = s7DataZKDLPOne.getId5();
- stateWord = s7DataZKDLPOne.getState5().toString();
- targetSlotWord = s7DataZKDLPOne.getTo5().toString();
- break;
- case 5:
- requestWord = s7DataZKDLPOne.getId6();
- stateWord = s7DataZKDLPOne.getState6().toString();
- targetSlotWord = s7DataZKDLPOne.getTo6().toString();
- break;
- }
- if (StringUtils.isNotEmpty(requestWord)) {
- BigStorageTaskVO task = new BigStorageTaskVO();
- task.setGlassId(requestWord);
- int isExistCount = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>().in(HollowBigStorageCageDetails::getGlassId, task.getGlassId())
- .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
- if (isExistCount > 0) {
- task.setIsSame(1);
- } else {
- task.setIsSame(0);
- }
- task.setStartSlot(Integer.parseInt(fromOpcUa));
- task.setTargetSlot(Integer.parseInt(targetSlotWord));
- task.setTaskState(Integer.parseInt(stateWord));
- inTaskList.add(task);
- continue;
- }
- }
- jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
- } catch (Exception e) {
- //todo:涓嶅仛浠诲姟澶勭悊
- }
- try {
- //杩涚墖鑱旀満
- Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
- jsonObject.append("inkageEntity", inkageEntity);
- //杩涚墖璇锋眰
- String requestEntity = s7DataZKDLPOne.getRequestMes().toString();
- jsonObject.append("requestEntity", requestEntity);
- //鍚姩鍛戒护
- String mesReplyEntity = s7DataZKDLPOne.getMesReply().toString();
- jsonObject.append("mesReplyEntity", mesReplyEntity);
- //鍑虹墖鑱旀満
- String outInkageEntity = s7DataZKDLPTwo.getMesControl().toString();
- jsonObject.append("outInkageEntity", outInkageEntity);
- //鍑虹墖璇锋眰
- String outRequestEntity = s7DataZKDLPTwo.getRequestMes().toString();
- jsonObject.append("outInkageEntity", outInkageEntity);
- //930绌洪棽淇″彿
- jsonObject.append("freeOneRequestEntity", CMJ1ModbusTcp.readUInt16(42027 - offset));
- //931绌洪棽淇″彿
- jsonObject.append("freeTwoRequestEntity", s7DataZKExtra.getIsFree());
- //932绌洪棽淇″彿
- jsonObject.append("freeThreeRequestEntity", s7DataZKExtra.getIsFree());
- } catch (Exception e) {
- //todo:涓嶅仛浠诲姟澶勭悊
- }
-
- //鍑虹墖浠诲姟鏁版嵁
- 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 = s7DataZKDLPTwo.getId1();
- startSlot = s7DataZKDLPTwo.getFrom1();
- targetSlot = s7DataZKDLPTwo.getTo1();
- taskState = s7DataZKDLPTwo.getState1();
- ;
- break;
- case 1:
- glassId = s7DataZKDLPTwo.getId2();
- startSlot = s7DataZKDLPTwo.getFrom2();
- targetSlot = s7DataZKDLPTwo.getTo2();
- taskState = s7DataZKDLPTwo.getState2();
- break;
- case 2:
- glassId = s7DataZKDLPTwo.getId3();
- startSlot = s7DataZKDLPTwo.getFrom3();
- targetSlot = s7DataZKDLPTwo.getTo3();
- taskState = s7DataZKDLPTwo.getState3();
- break;
- case 3:
- glassId = s7DataZKDLPTwo.getId4();
- startSlot = s7DataZKDLPTwo.getFrom4();
- targetSlot = s7DataZKDLPTwo.getTo4();
- taskState = s7DataZKDLPTwo.getState4();
- break;
- case 4:
- glassId = s7DataZKDLPTwo.getId5();
- startSlot = s7DataZKDLPTwo.getFrom5();
- targetSlot = s7DataZKDLPTwo.getTo5();
- taskState = s7DataZKDLPTwo.getState5();
- break;
- case 5:
- glassId = s7DataZKDLPTwo.getId6();
- startSlot = s7DataZKDLPTwo.getFrom6();
- targetSlot = s7DataZKDLPTwo.getTo6();
- taskState = s7DataZKDLPTwo.getState6();
- break;
- }
- if (StringUtils.isNotEmpty(glassId)) {
- bigStorageCageTask.setGlassId(glassId);
- bigStorageCageTask.setStartSlot(startSlot);
- bigStorageCageTask.setTargetSlot(targetSlot);
- bigStorageCageTask.setTaskState(taskState);
- outTaskList.add(bigStorageCageTask);
- }
- }
- jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
+// try {
+// //杩涚墖浠诲姟鏁版嵁
+// List<BigStorageTaskVO> inTaskList = new ArrayList();
+// String fromOpcUa = s7DataZKDLPOne.getFrom1().toString();
+// for (int i = 0; i < 6; i++) {
+// String requestWord = "";
+// String stateWord = "";
+// String targetSlotWord = "";
+// switch (i) {
+// case 0:
+// requestWord = s7DataZKDLPOne.getId1();
+// stateWord = s7DataZKDLPOne.getState1().toString();
+// targetSlotWord = s7DataZKDLPOne.getTo1().toString();
+// break;
+// case 1:
+// requestWord = s7DataZKDLPOne.getId2();
+// stateWord = s7DataZKDLPOne.getState2().toString();
+// targetSlotWord = s7DataZKDLPOne.getTo2().toString();
+// break;
+// case 2:
+// requestWord = s7DataZKDLPOne.getId3();
+// stateWord = s7DataZKDLPOne.getState3().toString();
+// targetSlotWord = s7DataZKDLPOne.getTo3().toString();
+// break;
+// case 3:
+// requestWord = s7DataZKDLPOne.getId4();
+// stateWord = s7DataZKDLPOne.getState4().toString();
+// targetSlotWord = s7DataZKDLPOne.getTo4().toString();
+// break;
+// case 4:
+// requestWord = s7DataZKDLPOne.getId5();
+// stateWord = s7DataZKDLPOne.getState5().toString();
+// targetSlotWord = s7DataZKDLPOne.getTo5().toString();
+// break;
+// case 5:
+// requestWord = s7DataZKDLPOne.getId6();
+// stateWord = s7DataZKDLPOne.getState6().toString();
+// targetSlotWord = s7DataZKDLPOne.getTo6().toString();
+// break;
+// }
+// if (StringUtils.isNotEmpty(requestWord)) {
+// BigStorageTaskVO task = new BigStorageTaskVO();
+// task.setGlassId(requestWord);
+// int isExistCount = hollowBigStorageCageDetailsService.count(new LambdaQueryWrapper<HollowBigStorageCageDetails>().in(HollowBigStorageCageDetails::getGlassId, task.getGlassId())
+// .in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
+// if (isExistCount > 0) {
+// task.setIsSame(1);
+// } else {
+// task.setIsSame(0);
+// }
+// task.setStartSlot(Integer.parseInt(fromOpcUa));
+// task.setTargetSlot(Integer.parseInt(targetSlotWord));
+// task.setTaskState(Integer.parseInt(stateWord));
+// inTaskList.add(task);
+// continue;
+// }
+// }
+// jsonObject.append("bigStorageCageDetailsFeedTask", inTaskList);
+// } catch (Exception e) {
+// //todo:涓嶅仛浠诲姟澶勭悊
+// }
+// try {
+// //杩涚墖鑱旀満
+// Boolean inkageEntity = s7DataZKDLPOne.getMesControl();
+// jsonObject.append("inkageEntity", inkageEntity);
+// //杩涚墖璇锋眰
+// String requestEntity = s7DataZKDLPOne.getRequestMes().toString();
+// jsonObject.append("requestEntity", requestEntity);
+// //鍚姩鍛戒护
+// String mesReplyEntity = s7DataZKDLPOne.getMesReply().toString();
+// jsonObject.append("mesReplyEntity", mesReplyEntity);
+// //鍑虹墖鑱旀満
+// String outInkageEntity = s7DataZKDLPTwo.getMesControl().toString();
+// jsonObject.append("outInkageEntity", outInkageEntity);
+// //鍑虹墖璇锋眰
+// String outRequestEntity = s7DataZKDLPTwo.getRequestMes().toString();
+// jsonObject.append("outInkageEntity", outInkageEntity);
+// //930绌洪棽淇″彿
+// jsonObject.append("freeOneRequestEntity", CMJ1ModbusTcp.readUInt16(42027 - offset));
+// //931绌洪棽淇″彿
+// jsonObject.append("freeTwoRequestEntity", s7DataZKExtra.getIsFree());
+// //932绌洪棽淇″彿
+// jsonObject.append("freeThreeRequestEntity", s7DataZKExtra.getIsFree());
+// } catch (Exception e) {
+// //todo:涓嶅仛浠诲姟澶勭悊
+// }
+//
+// //鍑虹墖浠诲姟鏁版嵁
+// 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 = s7DataZKDLPTwo.getId1();
+// startSlot = s7DataZKDLPTwo.getFrom1();
+// targetSlot = s7DataZKDLPTwo.getTo1();
+// taskState = s7DataZKDLPTwo.getState1();
+// ;
+// break;
+// case 1:
+// glassId = s7DataZKDLPTwo.getId2();
+// startSlot = s7DataZKDLPTwo.getFrom2();
+// targetSlot = s7DataZKDLPTwo.getTo2();
+// taskState = s7DataZKDLPTwo.getState2();
+// break;
+// case 2:
+// glassId = s7DataZKDLPTwo.getId3();
+// startSlot = s7DataZKDLPTwo.getFrom3();
+// targetSlot = s7DataZKDLPTwo.getTo3();
+// taskState = s7DataZKDLPTwo.getState3();
+// break;
+// case 3:
+// glassId = s7DataZKDLPTwo.getId4();
+// startSlot = s7DataZKDLPTwo.getFrom4();
+// targetSlot = s7DataZKDLPTwo.getTo4();
+// taskState = s7DataZKDLPTwo.getState4();
+// break;
+// case 4:
+// glassId = s7DataZKDLPTwo.getId5();
+// startSlot = s7DataZKDLPTwo.getFrom5();
+// targetSlot = s7DataZKDLPTwo.getTo5();
+// taskState = s7DataZKDLPTwo.getState5();
+// break;
+// case 5:
+// glassId = s7DataZKDLPTwo.getId6();
+// startSlot = s7DataZKDLPTwo.getFrom6();
+// targetSlot = s7DataZKDLPTwo.getTo6();
+// taskState = s7DataZKDLPTwo.getState6();
+// break;
+// }
+// if (StringUtils.isNotEmpty(glassId)) {
+// bigStorageCageTask.setGlassId(glassId);
+// bigStorageCageTask.setStartSlot(startSlot);
+// bigStorageCageTask.setTargetSlot(targetSlot);
+// bigStorageCageTask.setTaskState(taskState);
+// outTaskList.add(bigStorageCageTask);
+// }
+// }
+// jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
//璋冨害寮�鍏�
boolean dispatchHollowSwitch = false;
--
Gitblit v1.8.0