From 818cb2051ffaf794f7e2ea12827b6aa30256fd84 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 12 七月 2024 13:46:47 +0800
Subject: [PATCH] 磨边页面参数修改
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index 715ba81..4791b00 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -72,7 +72,7 @@
@Value("${mes.secondLength}")
private String secondLength;
- @Scheduled(fixedDelay = 1000)
+
public void plcHomeEdgTask() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
String taskRequestTypeValue = plcParameterObject.getPlcParameter("A06_request_word").getValue();
@@ -641,8 +641,8 @@
List<Map<String, Object>> currentCutTerritorys = edgStorageCageDetailsService.selectCutTerritory();
jsonObject.append("currentCutTerritory", currentCutTerritorys);
//纾ㄨ竟淇℃伅
- List<Map<String, Object>> EdgTasks1 = taskCacheService.selectEdgInfo("2001");
- List<Map<String, Object>> EdgTasks2 = taskCacheService.selectEdgInfo("2002");
+ List<Map<String, Object>> EdgTasks1 = taskCacheService.selectEdgInfo(Const.A09_OUT_TARGET_POSITION.toString());
+ List<Map<String, Object>> EdgTasks2 = taskCacheService.selectEdgInfo(Const.A10_OUT_TARGET_POSITION.toString());
jsonObject.append("EdgTasks1", EdgTasks1);
jsonObject.append("EdgTasks2", EdgTasks2);
@@ -650,6 +650,7 @@
List<Map<String, Object>> EdgStorageCageinfos = edgStorageCageService.selectEdgStorageCages();
jsonObject.append("EdgStorageCageinfos", EdgStorageCageinfos);
+ log.info("鎺ㄩ�佹暟鎹細{}",jsonObject);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("cacheGlass");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
--
Gitblit v1.8.0