From af7f09e7965887b034c9add213bf68c816f22338 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 19 九月 2025 18:02:36 +0800
Subject: [PATCH] 中空理片笼缺片详情改造，中空一线二线三线页面改造
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java | 107 +++++++++++++----------------------------------------
1 files changed, 26 insertions(+), 81 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 0b82e3f..ec636fd 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
@@ -3,13 +3,11 @@
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;
import com.mes.bigstorage.entity.dto.BigStorageSummaryDTO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
-import com.mes.bigstoragecagetask.entity.BigStorageCageHistoryTask;
import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
import com.mes.bigstoragecagetask.entity.BigStorageTaskVO;
import com.mes.bigstoragecagetask.service.BigStorageCageHistoryTaskService;
@@ -22,9 +20,10 @@
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.tools.WebSocketUtils;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.scheduling.annotation.Scheduled;
@@ -70,6 +69,9 @@
@Qualifier("s7SerializerDLPTwo")
private S7Serializer s7SerializerDLPTwo;
+ @Resource
+ private WebSocketUtils webSocketUtils;
+
private JSONObject jsonObject = new JSONObject();
public void queryDataSource1() throws Exception {
@@ -85,22 +87,16 @@
try {
//杩涚墖浠诲姟鏁版嵁
List<BigStorageTaskVO> inTaskList = new ArrayList();
-// 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);
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) {
+ if (StringUtils.isNotEmpty(requestWord)) {
BigStorageTaskVO task = new BigStorageTaskVO();
-// 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));
@@ -109,9 +105,6 @@
} 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));
task.setTargetSlot(Integer.parseInt(targetSlotWord));
task.setTaskState(Integer.parseInt(stateWord));
@@ -125,34 +118,23 @@
}
try {
//杩涚墖鑱旀満
-// 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());
String requestEntity = s7DataDLPOne.getRequestMes().toString();
jsonObject.append("requestEntity", requestEntity);
//鍚姩鍛戒护
-// 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());
Boolean outInkageEntity = s7DataWLTwo.getMesControl();
jsonObject.append("outInkageEntity", outInkageEntity);
//鍑虹墖璇锋眰
-// 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 = new ArrayList<>();
for (int i = 0; i < 6; i++) {
@@ -200,11 +182,13 @@
taskState = s7DataWLTwo.getState6();
break;
}
- bigStorageCageTask.setGlassId(glassId);
- bigStorageCageTask.setStartSlot(startSlot);
- bigStorageCageTask.setTargetSlot(targetSlot);
- bigStorageCageTask.setTaskState(taskState);
- outTaskList.add(bigStorageCageTask);
+ if (StringUtils.isNotEmpty(glassId)) {
+ bigStorageCageTask.setGlassId(glassId);
+ bigStorageCageTask.setStartSlot(startSlot);
+ bigStorageCageTask.setTargetSlot(targetSlot);
+ bigStorageCageTask.setTaskState(taskState);
+ outTaskList.add(bigStorageCageTask);
+ }
}
jsonObject.append("bigStorageCageDetailsOutTask", outTaskList);
} catch (Exception e) {
@@ -247,13 +231,7 @@
jsonObject.append("autoPrint", autoPrint);
//褰撳墠鎸囧畾宸ョ▼
- String temperingengineerId = "";
- if (redisUtil.getCacheObject("temperingengineerId") == null) {
- redisUtil.setCacheObject("temperingengineerId", temperingengineerId);
- } else {
- temperingengineerId = redisUtil.getCacheObject("temperingengineerId");
- }
- jsonObject.append("temperingengineerId", temperingengineerId);
+ jsonObject.append("temperingEngineerId", redisUtil.getCacheObject("temperingEngineerId"));
}
@@ -273,58 +251,25 @@
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
@Scheduled(fixedDelay = 3000)
- public void plcStorageCageTask() throws InterruptedException {
+ public void plcStorageCageTask() throws Exception {
jsonObject = new JSONObject();
- try {
- //鏌ヨ浣跨敤鏁版嵁婧�1鏌ヨ鏁版嵁
- queryDataSource1();
- //鏌ヨ浣跨敤鏁版嵁婧�2鏌ヨ鏁版嵁
+ //鏌ヨ浣跨敤鏁版嵁婧�1鏌ヨ鏁版嵁
+ queryDataSource1();
+ //鏌ヨ浣跨敤鏁版嵁婧�2鏌ヨ鏁版嵁
// queryDataSource2();
-
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("slicecage");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- List<String> messages = webserver.getMessages();
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
- }
- } else {
- log.info("Home is closed");
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
+ webSocketUtils.sendToWeb("slicecage", jsonObject);
}
@Scheduled(fixedDelay = 1000)
public void largenScreen() {
JSONObject jsonObject = new JSONObject();
//鐞嗙墖绗间娇鐢ㄦ儏鍐�
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
- if (sendwServer != null) {
- List<Map<String, Object>> bigStorageCageUsage = bigStorageCageService.selectBigStorageCageUsage();
- jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
- List<PieChartVO> pieChartVOS = bigStorageCageService.queryPieChart();
- jsonObject.append("pieChartVOS", pieChartVOS);
- List<RunTime> tempRunTimes = bigStorageCageHistoryTaskService.queryRunTimes(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
- jsonObject.append("tempRunTimes", tempRunTimes);
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
- List<String> messages = webserver.getMessages();
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
- }
- } else {
- log.info("largenScreen is closed");
- }
- }
- }
+ List<Map<String, Object>> bigStorageCageUsage = bigStorageCageService.selectBigStorageCageUsage();
+ jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
+ List<PieChartVO> pieChartVOS = bigStorageCageService.queryPieChart();
+ jsonObject.append("pieChartVOS", pieChartVOS);
+ List<RunTime> tempRunTimes = bigStorageCageHistoryTaskService.queryRunTimes(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ jsonObject.append("tempRunTimes", tempRunTimes);
+ webSocketUtils.sendToWeb("largenScreen", jsonObject);
}
}
\ No newline at end of file
--
Gitblit v1.8.0