#

Junjie

13 小时以前 fd837cb1e5b3f5ebfba12c29f32fe34dd4c38669

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

@@ -13,6 +13,7 @@
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.CrnDetailVo;
import com.zy.asrs.domain.vo.CrnLatestDataVo;
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.entity.*;
@@ -30,6 +31,7 @@
import com.zy.core.thread.StationThread;
import com.zy.core.thread.RgvThread;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.network.fake.FakeTaskTraceRegistry;

import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +63,8 @@
    private BasMapService basMapService;
    @Autowired
    private StationCycleCapacityService stationCycleCapacityService;
    @Autowired
    private FakeTaskTraceRegistry fakeTaskTraceRegistry;

    @PostMapping("/system/running/status")
    @ManagerAuth(memo = "系统运行状态")
@@ -156,10 +160,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")
@@ -274,6 +278,13 @@
        return R.ok().add(stationCycleCapacityService.getLatestSnapshot());
    }

    @PostMapping("/latest/data/fake/trace")
    @ManagerAuth(memo = "仿真任务轨迹实时数据")
    public R fakeTaskTraceLatestData() {
        List<FakeTaskTraceVo> traceList = fakeTaskTraceRegistry.listActiveTraces();
        return R.ok().add(traceList);
    }

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