#

Junjie

9 小时以前 e9b531edd2917b01a80dfa14e917ec21ddad8882

 src/main/java/com/zy/asrs/controller/ConsoleController.java

@@ -16,6 +16,7 @@
import com.zy.asrs.domain.vo.FakeTaskTraceVo;
import com.zy.asrs.domain.vo.StationLatestDataVo;
import com.zy.asrs.domain.vo.RgvLatestDataVo;
import com.zy.asrs.domain.vo.StationTaskTraceVo;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
@@ -32,6 +33,7 @@
import com.zy.core.thread.RgvThread;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.network.fake.FakeTaskTraceRegistry;
import com.zy.core.trace.StationTaskTraceRegistry;

import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -65,6 +67,8 @@
    private StationCycleCapacityService stationCycleCapacityService;
    @Autowired
    private FakeTaskTraceRegistry fakeTaskTraceRegistry;
    @Autowired
    private StationTaskTraceRegistry stationTaskTraceRegistry;

    @PostMapping("/system/running/status")
    @ManagerAuth(memo = "系统运行状态")
@@ -160,10 +164,10 @@
    }

    private boolean isInRange(Integer taskNo, WrkLastno taskRange) {
        if (taskRange == null || taskRange.getSNo() == null || taskRange.getENo() == null) {
        if (taskRange == null || taskRange.getsNo() == null || taskRange.geteNo() == null) {
            return false;
        }
        return taskNo >= taskRange.getSNo() && taskNo <= taskRange.getENo();
        return taskNo >= taskRange.getsNo() && taskNo <= taskRange.geteNo();
    }

    @PostMapping("/latest/data/crn")
@@ -285,6 +289,13 @@
        return R.ok().add(traceList);
    }

    @PostMapping("/latest/data/station/trace")
    @ManagerAuth(memo = "输送任务轨迹实时数据")
    public R stationTaskTraceLatestData() {
        List<StationTaskTraceVo> traceList = stationTaskTraceRegistry.listLatestTraces();
        return R.ok().add(traceList);
    }

    // @PostMapping("/latest/data/barcode")
    // @ManagerAuth(memo = "条码扫描仪实时数据")
    // public R barcodeLatestData(){