大屏任务拉取优化

skyouc

2025-06-21 b291560f1c80f0a9059e929220603692c2a8c099

大屏任务拉取优化

 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()
      //获取当前播种墙库位信息

 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);
    }

    /**

 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);
    }


 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);


 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";

    /**