From b291560f1c80f0a9059e929220603692c2a8c099 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 21 六月 2025 08:44:21 +0800
Subject: [PATCH] 大屏任务拉取优化
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java | 3 ++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java | 19 ++++++++++++++++---
construction-data/src/components/datav/index.vue | 4 ++--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/utils/HttpEssUtils.java | 1 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java | 2 +-
5 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/construction-data/src/components/datav/index.vue b/construction-data/src/components/datav/index.vue
index 6352579..250631f 100644
--- a/construction-data/src/components/datav/index.vue
+++ b/construction-data/src/components/datav/index.vue
@@ -191,7 +191,7 @@
created () {
let that = this
setInterval(() => {
- that.fetch()
+ that.refreshData()
}, 10000)
},
@@ -207,7 +207,7 @@
}
},
methods: {
- fetch() {
+ refreshData() {
//鑾峰彇褰撳墠鎵ц浠诲姟
this.getWaves()
//鑾峰彇褰撳墠鎾澧欏簱浣嶄俊鎭�
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
index c62d794..d59b241 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
@@ -92,7 +92,8 @@
*/
@GetMapping("/sow/tasks")
public R getTasks() {
- return waveManagentService.getTask();
+ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+ return waveManagentService.getTask(request);
}
/**
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
index fff757e..68306a7 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.List;
import static com.zy.asrs.wms.utils.HttpUtils.getClientIpAddress;
@@ -67,9 +68,21 @@
}
@Override
- public R getTask() {
- List<LargeScreenTaskDto> taskDtos = taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id).orderByAsc(Task::getUpdateTime).last("limit 1"));
-
+ public R getTask(HttpServletRequest request) {
+ log.info("ip鍦板潃====>锛� {}", getClientIpAddress(request));
+ String locIp = getClientIpAddress(request);
+ List<LargeScreenTaskDto> taskDtos;
+ if (locIp.equals(HttpEssUtils.S2_SITE_NO)) {
+ taskDtos = taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id)
+ .eq(Task::getTargetSite, "S2")
+ .orderByAsc(Task::getUpdateTime).last("limit 1"));
+ } else {
+ taskDtos = taskMapper.getTaskIntegrateByTaskNo(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id)
+ .eq(Task::getTargetSite, "S1")
+ .orderByAsc(Task::getUpdateTime).last("limit 1"));
+ }
return R.ok(taskDtos);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
index edf791c..aea114e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
@@ -13,7 +13,7 @@
int removeSowSeed(Long id);
- R getTask();
+ R getTask(HttpServletRequest request);
R getTaskDetl(String taskNo);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/utils/HttpEssUtils.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/utils/HttpEssUtils.java
index 7b4848a..a2c3c5e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/utils/HttpEssUtils.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/utils/HttpEssUtils.java
@@ -27,6 +27,7 @@
*/
public static final String baseUrl = "http://192.168.2.200:9046";
+ /** //fixme S2绔欑偣鍥哄畾鍦板潃锛屼笉鍙慨鏀� */
public static final String S2_SITE_NO = "192.168.2.42";
/**
--
Gitblit v1.9.1