From b4ff04d7dd22f0e48bf386cd422e885aef08fed7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 22 五月 2025 15:03:10 +0800
Subject: [PATCH] OPC通讯修改为S7通讯
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 72 +++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 29 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index ca32684..334cfba 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -11,6 +11,9 @@
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.DateRequest;
+import com.mes.largenscreen.entity.PieChartVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.largenscreen.service.LargenScreenService;
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
@@ -21,7 +24,10 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -146,14 +152,13 @@
}
}
- @Scheduled(fixedDelay = 30000)
+ @Scheduled(fixedDelay = 1000)
public void querySameDayProductionTask() {
JSONObject jsonObject = new JSONObject();
- DailyProductionVO productionVO = largenScreenService.querySameDayProduction(null);
- jsonObject.append("productionVO", productionVO);
-
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreenProduction");
if (sendwServer != null) {
+ List<DailyProductionVO> productionVO = largenScreenService.querySameDayProduction(new DateRequest());
+ jsonObject.append("productionVO", productionVO);
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
webserver.sendMessage(jsonObject.toString());
@@ -169,36 +174,45 @@
}
}
- @Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 500)
public void largenScreen() {
JSONObject jsonObject = new JSONObject();
//纾ㄨ竟淇℃伅
- List<EdgStorageDeviceTaskHistory> edgOneTasks = edgStorageDeviceTaskHistoryService.list(
- new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
- .eq(EdgStorageDeviceTaskHistory::getDeviceId, 1)
- .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE)
- );
- List<EdgStorageDeviceTaskHistory> edgTwoTasks = edgStorageDeviceTaskHistoryService.list(
- new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
- .eq(EdgStorageDeviceTaskHistory::getDeviceId, 2)
- .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.EDG_GLASS_BEFORE)
- );
- jsonObject.append("edgOneTasks", edgOneTasks);
- jsonObject.append("edgTwoTasks", edgTwoTasks);
- List<Engineering> engineeringOne = engineeringService.list(
- new LambdaQueryWrapper<Engineering>()
- .eq(Engineering::getStationCell, 5)
- .eq(Engineering::getState, 0)
- );
- List<Engineering> engineeringTow = engineeringService.list(
- new LambdaQueryWrapper<Engineering>()
- .eq(Engineering::getStationCell, 6)
- .eq(Engineering::getState, 0)
- );
- jsonObject.append("engineeringOne", engineeringOne);
- jsonObject.append("engineeringTwo", engineeringTow);
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (sendwServer != null) {
+ Date startOfToday = new Date(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli());
+
+ List<EdgGlassTaskInfo> edgOneTasks = edgGlassTaskInfoService.list(
+ new LambdaQueryWrapper<EdgGlassTaskInfo>()
+ .lt(EdgGlassTaskInfo::getState, 2)
+ .eq(EdgGlassTaskInfo::getLine, 1)
+ .ge(EdgGlassTaskInfo::getCreateTime, startOfToday)
+ );
+ List<EdgGlassTaskInfo> edgTwoTasks = edgGlassTaskInfoService.list(
+ new LambdaQueryWrapper<EdgGlassTaskInfo>()
+ .lt(EdgGlassTaskInfo::getState, 2)
+ .eq(EdgGlassTaskInfo::getLine, 2)
+ .ge(EdgGlassTaskInfo::getCreateTime, startOfToday)
+ );
+ jsonObject.append("edgOneTasks", edgOneTasks);
+ jsonObject.append("edgTwoTasks", edgTwoTasks);
+ List<Engineering> engineeringOne = engineeringService.list(
+ new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getStationCell, 5)
+ .eq(Engineering::getState, 0)
+ );
+ List<Engineering> engineeringTow = engineeringService.list(
+ new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getStationCell, 6)
+ .eq(Engineering::getState, 0)
+ );
+ jsonObject.append("engineeringOne", engineeringOne);
+ jsonObject.append("engineeringTwo", engineeringTow);
+ List<PieChartVO> pieChartVOS = edgStorageCageDetailsService.queryPieChart();
+ jsonObject.append("pieChartVOS", pieChartVOS);
+ List<RunTime> loadRunTimes = edgStorageDeviceTaskHistoryService.queryRunTimes();
+ jsonObject.append("loadRunTimes", loadRunTimes);
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
webserver.sendMessage(jsonObject.toString());
--
Gitblit v1.8.0