#

Junjie

1 天以前 f7419832fc4895d15b2d7b3b0ce30edb4b374fbd

 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 = "系统运行状态")
@@ -129,6 +133,7 @@
                vo.setError(stationProtocol.getError()); // 错误码
                vo.setErrorMsg(stationProtocol.getErrorMsg()); // 报警信息
                vo.setBarcode(stationProtocol.getBarcode()); // 条码
                vo.setSystemWarning(stationProtocol.getSystemWarning()); // 系统告警/业务提示
                vo.setWeight(stationProtocol.getWeight());//重量
                vo.setTaskWriteIdx(stationProtocol.getTaskWriteIdx());//任务可写区
                String stationStatus = StationStatusType.process(stationProtocol).toString().toLowerCase().replaceAll("_", "-");
@@ -285,6 +290,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(){