From 2022682967ad0b0d1cd6e2e86f8fb628478d4e9c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 11 十月 2025 12:00:03 +0800
Subject: [PATCH] 1、 上片界面/钢化前大理片笼数据推送接口，供第一次进入界面调用
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java | 99 +++++++++++++++++++------------------------------
1 files changed, 38 insertions(+), 61 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 3e82d5c..91c11e4 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,13 @@
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.alarm.entity.ProductAlarmInfo;
+import com.mes.alarm.service.ProductAlarmInfoService;
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,7 +22,7 @@
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;
@@ -71,11 +71,25 @@
@Qualifier("s7SerializerDLPTwo")
private S7Serializer s7SerializerDLPTwo;
- private JSONObject jsonObject = new JSONObject();
+ @Resource
+ private WebSocketUtils webSocketUtils;
- public void queryDataSource1() throws Exception {
- S7DataDLPOne s7DataDLPOne = s7SerializerDLPOne.read(S7DataDLPOne.class);
- S7DataDLPTwo s7DataWLTwo = s7SerializerDLPTwo.read(S7DataDLPTwo.class);
+ @Resource
+ private ProductAlarmInfoService productAlarmInfoService;
+
+
+ private static final String ALARM_MODULE = "閽㈠寲";
+ private static final String ALARM_TYPE = "閽㈠寲澶х悊鐗�";
+ private static final String ALARM_CODE_SIZE = "sizeSame";
+ private static final String ALARM_CODE_ID = "idSame";
+
+
+ public JSONObject queryDataSource1() throws Exception {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.append("alarmInfo", productAlarmInfoService.list(new LambdaQueryWrapper<ProductAlarmInfo>()
+ .eq(ProductAlarmInfo::getState, Const.LOAD_RAW_GLASS_NEW)
+ .eq(ProductAlarmInfo::getAlarmModule, ALARM_MODULE)
+ .eq(ProductAlarmInfo::getAlarmType, ALARM_TYPE)));
List<Double> carPostion = new ArrayList<>();
carPostion.add(0.25);
carPostion.add(0.5);
@@ -83,6 +97,8 @@
//鐣岄潰灞曠ず绗煎瓙淇℃伅
jsonObject.append("bigStorageCageInfos", bigStorageCageDetailsService.querybigStorageCageDetail());
+ S7DataDLPOne s7DataDLPOne = s7SerializerDLPOne.read(S7DataDLPOne.class);
+ S7DataDLPTwo s7DataWLTwo = s7SerializerDLPTwo.read(S7DataDLPTwo.class);
try {
//杩涚墖浠诲姟鏁版嵁
List<BigStorageTaskVO> inTaskList = new ArrayList();
@@ -230,18 +246,13 @@
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"));
-
+ return jsonObject;
}
public void queryDataSource2() throws InterruptedException {
+ JSONObject jsonObject = new JSONObject();
//鍑虹墖闃熷垪
List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list(
new LambdaQueryWrapper<TemperingGlassInfo>()
@@ -256,58 +267,24 @@
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
@Scheduled(fixedDelay = 3000)
- public void plcStorageCageTask() throws InterruptedException {
- jsonObject = new JSONObject();
- try {
- //鏌ヨ浣跨敤鏁版嵁婧�1鏌ヨ鏁版嵁
- queryDataSource1();
- //鏌ヨ浣跨敤鏁版嵁婧�2鏌ヨ鏁版嵁
+ public void plcStorageCageTask() throws Exception {
+ //鏌ヨ浣跨敤鏁版嵁婧�1鏌ヨ鏁版嵁
+ JSONObject jsonObject = 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