#

Junjie

2025-11-13 1b4fbdb92537036aed4d648967ef7e7ab8842aec

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

@@ -1,15 +1,15 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.enums.StationStatusType;
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.StationLatestDataVo;
import com.zy.asrs.entity.BasCrnpErr;
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.entity.WrkMast;
@@ -17,15 +17,15 @@
import com.zy.asrs.service.DeviceConfigService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.CrnThread;
import com.zy.core.thread.impl.ZySiemensCrnThread;
import com.zy.core.thread.StationThread;

import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -73,27 +73,46 @@
        return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
    }

//    @PostMapping("/latest/data/site")
//    @ManagerAuth(memo = "站点实时数据")
//    public R siteLatestData(){
//        List<SiteLatestDataVo> vos = new ArrayList<>();
//        Map<Integer, StaProtocol> stations = new HashMap<>();
//        for (DevpSlave devp : slaveProperties.getDevp()) {
//            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
//            if (null != devpThread) {
//                stations.putAll(devpThread.getStation());
//            }
//        }
//        for (Map.Entry<Integer, StaProtocol> entry : stations.entrySet()) {
//            SiteLatestDataVo vo = new SiteLatestDataVo();
//            StaProtocol staProtocol = entry.getValue();
//            vo.setSiteId(String.valueOf(entry.getKey())); // 站点编号
//            vo.setWorkNo(staProtocol.getWorkNo()); // 工作号
//            vo.setSiteStatus(SiteStatusType.process(staProtocol));  // 状态
//            vos.add(vo);
//        }
//        return R.ok().add(vos);
//    }
    @PostMapping("/latest/data/station")
    @ManagerAuth(memo = "站点实时数据")
    public R stationLatestData() {
        List<StationLatestDataVo> vos = new ArrayList<>();

        List<DeviceConfig> devpList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.Devp)));
        for (DeviceConfig deviceConfig : devpList) {
            StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp,
                    deviceConfig.getDeviceNo());
            if (stationThread == null) {
                continue;
            }

            List<StationProtocol> statusList = stationThread.getStatus();
            if (statusList == null || statusList.isEmpty()) {
                continue;
            }
            for (StationProtocol stationProtocol : statusList) {
                StationLatestDataVo vo = new StationLatestDataVo();
                vo.setStationId(stationProtocol.getStationId()); // 站点编号
                vo.setTaskNo(stationProtocol.getTaskNo()); // 任务号
                vo.setTargetStaNo(stationProtocol.getTargetStaNo()); // 目标站点
                vo.setAutoing(stationProtocol.isAutoing()); // 是否自动
                vo.setLoading(stationProtocol.isLoading()); // 是否有物
                vo.setInEnable(stationProtocol.isInEnable()); // 是否可入
                vo.setOutEnable(stationProtocol.isOutEnable()); // 是否可出
                vo.setEmptyMk(stationProtocol.isEmptyMk()); // 是否空板
                vo.setFullPlt(stationProtocol.isFullPlt()); // 是否满板
                vo.setPalletHeight(stationProtocol.getPalletHeight()); // 托盘高度
                vo.setError(stationProtocol.getError()); // 错误码
                vo.setBarcode(stationProtocol.getBarcode()); // 条码
                String stationStatus = StationStatusType.process(stationProtocol).toString().toLowerCase().replaceAll("_", "-");
                vo.setStationStatus(stationStatus);
                vos.add(vo);
            }

        }
        return R.ok().add(vos);
    }

    @PostMapping("/latest/data/crn")
    @ManagerAuth(memo = "堆垛机实时数据")
@@ -129,10 +148,12 @@
                    if (wrkMast != null) {
                        vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
                    } else {
                        vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
                        vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO
                                : CrnStatusType.MACHINE_UN_AUTO);
                    }
                } else {
                    vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
                    vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO) ? CrnStatusType.MACHINE_AUTO
                            : CrnStatusType.MACHINE_UN_AUTO);
                }
            }
            vos.add(vo);
@@ -146,7 +167,8 @@
//        List<RgvLatestDataVo> vos = new ArrayList<>();
//        for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
//            // 获取堆垛机信息
//            RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvSlave.getId());
    // RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv,
    // rgvSlave.getId());
//            if (rgvThread == null) {
//                continue;
//            }
@@ -171,7 +193,8 @@
//    public R barcodeLatestData(){
//        List<BarcodeDataVo> list = new ArrayList<>();
//        for (Slave barcode : slaveProperties.getBarcode()) {
//            BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcode.getId());
    // BarcodeThread barcodeThread = (BarcodeThread)
    // SlaveConnection.get(SlaveType.Barcode, barcode.getId());
//            if (null == barcodeThread) {
//                continue;
//            }
@@ -193,8 +216,7 @@

        DeviceConfig deviceConfig = deviceConfigService.selectOne(new EntityWrapper<DeviceConfig>()
                .eq("device_type", String.valueOf(SlaveType.Crn))
                .eq("device_no", crnNo)
        );
                .eq("device_no", crnNo));

        if (deviceConfig == null) {
            return R.error("设备不存在");