#

Junjie

2025-05-15 cadb481188032daabaabbda2259b98afead2c41b

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

@@ -13,15 +13,14 @@
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.ChartBean;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.DeviceErrorService;
import com.zy.asrs.service.TaskWrkService;
import com.zy.common.CodeRes;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
@@ -29,6 +28,7 @@
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.DevpType.DevpStateType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
@@ -58,8 +58,6 @@
    @Autowired
    private SlaveProperties slaveProperties;
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private LocMastMapper locMastMapper;
@@ -67,6 +65,12 @@
    private BasCrnErrorMapper basCrnErrorMapper;
    @Autowired
    private ReportQueryMapper reportQueryMapper;
    @Autowired
    private DeviceErrorService deviceErrorService;
    @Autowired
    private BasCrnpService basCrnpService;
    @Autowired
    private TaskWrkService taskWrkService;

    @PostMapping("/system/running/status")
    @ManagerAuth(memo = "系统运行状态")
@@ -112,9 +116,8 @@
            SiteLatestDataVo vo = new SiteLatestDataVo();
            StaProtocol staProtocol = entry.getValue();
            vo.setSiteId(String.valueOf(entry.getKey())); // 站点编号
            vo.setWorkNo(staProtocol.getWorkNo()); // 工作号
            vo.setWorkNo(staProtocol.getWorkNo().shortValue()); // 工作号
            vo.setSiteStatus(SiteStatusType.process(staProtocol));  // 状态
            vo.setNearbySta(staProtocol.getNearbySta());  //RGV位置
            vos.add(vo);
        }
        return R.ok().add(vos);
@@ -148,9 +151,9 @@
                vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
            } else {
                if (crnProtocol.getTaskNo()>0) {
                    WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                    if (wrkMast != null) {
                        vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
                    TaskWrk taskWrk = taskWrkService.selectByWrkNo(crnProtocol.getTaskNo().intValue());
                    if (taskWrk != null) {
                        vo.setCrnStatus(CrnStatusType.process(taskWrk.getIoType()));
                    } else {
                        vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
                    }
@@ -198,6 +201,60 @@
        return R.ok().add(list);
    }

    /**
     * 获取设备详情
     */
    @GetMapping("/deviceInfo")
    @ManagerAuth
    public R getDeviceInfo() {
        ArrayList<HashMap<String, Object>> list = new ArrayList<>();
        for (CrnSlave crn : slaveProperties.getCrn()) {
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            if (crnThread == null) {
                continue;
            }
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            if (crnProtocol == null) {
                continue;
            }

            HashMap<String, Object> map = new HashMap<>();
            map.put("device", "堆垛机");
            map.put("deviceId", crn.getId());
            map.put("battery", "");
            map.put("error", crnProtocol.getFault());
            map.put("status", crnProtocol.getStatusType().desc);
            list.add(map);
        }

        for (DevpSlave devp : slaveProperties.getDevp()) {
            DeviceError deviceError = deviceErrorService.selectByDeviceAndDeviceId("devp", devp.getId());
            HashMap<String, Object> map = new HashMap<>();
            map.put("device", "输送线");
            map.put("deviceId", devp.getId());
            map.put("battery", "");
            map.put("error", deviceError != null);
            map.put("status", deviceError == null ? "" : deviceError.getMsg());
            list.add(map);
        }

        for (Slave scale : slaveProperties.getScale()) {
            DeviceError deviceError = deviceErrorService.selectByDeviceAndDeviceId("scale", scale.getId());
            HashMap<String, Object> map = new HashMap<>();
            map.put("device", "磅秤");
            map.put("deviceId", scale.getId());
            map.put("battery", "");
            map.put("error", deviceError != null);
            map.put("status", deviceError == null ? "" : deviceError.getMsg());
            list.add(map);
        }

        HashMap<String, Object> hashMap = new HashMap<>();
        hashMap.put("records", list);
        return R.ok().add(hashMap);
    }

    /****************************************************************/
    /************************** 详情操作 ******************************/
    /****************************************************************/
@@ -219,22 +276,22 @@
                        return R.error("数据库维护异常");
                    }
                    vo.setSiteId(siteId);   // 站点编号
                    vo.setWorkNo(staProtocol.getWorkNo());   // 工作号
                    vo.setWorkNo(staProtocol.getWorkNo().shortValue());   // 工作号

                    if (staProtocol.getWorkNo() > 0) {
                        WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
                        if (wrkMast != null) {
                            vo.setWrkSts(wrkMast.getWrkSts$());   // 工作状态
                            vo.setIoType(wrkMast.getIoType$());   //  入出库类型
                            vo.setSourceStaNo(wrkMast.getSourceStaNo$());
                            vo.setStaNo(wrkMast.getStaNo$());
                            vo.setSourceLocNo(wrkMast.getSourceLocNo$());
                            vo.setLocNo(wrkMast.getLocNo$());
                        TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo().intValue());
                        if (taskWrk != null) {
                            vo.setWrkSts(taskWrk.getWrkSts$());   // 工作状态
                            vo.setIoType(taskWrk.getIoType$());   //  入出库类型
                            vo.setSourceStaNo(null);
                            vo.setStaNo(null);
                            vo.setSourceLocNo(taskWrk.getStartPoint());
                            vo.setLocNo(taskWrk.getTargetPoint());
                        }
                    }

                    vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); //  自动
                    vo.setLoading(staProtocol.isLoading()?"Y":"N"); //  有物
                    vo.setAutoing(staProtocol.isAutoing() ? "Y" : "N"); //  自动
                    vo.setLoading(staProtocol.isLoading() ? "Y" : "N"); //  有物

                    vo.setCanining(basDevp.getCanining());  //  能入
                    vo.setCanouting(basDevp.getCanouting());    //  能出
@@ -256,6 +313,11 @@
        CrnDetailVo vo = new CrnDetailVo();
        for (CrnSlave crnSlave : slaveProperties.getCrn()) {
            if (crnSlave.getId().equals(crnNo)) {
                BasCrnp basCrnp = basCrnpService.selectById(crnNo);
                if (basCrnp == null) {
                    return R.error("数据库维护异常");
                }

                SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                vo.setCrnNo(crnNo);
@@ -268,18 +330,20 @@
                }

                if (crnProtocol.getTaskNo() > 0) {
                    WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
                    if (wrkMast != null) {
                        vo.setSourceStaNo(wrkMast.getSourceStaNo$());
                        vo.setStaNo(wrkMast.getStaNo$());
                        vo.setWrkSts(wrkMast.getWrkSts$());   // 工作状态
                        vo.setIoType(wrkMast.getIoType$());   //  入出库类型
                        vo.setSourceLocNo(wrkMast.getSourceLocNo$());
                        vo.setLocNo(wrkMast.getLocNo$());
                    TaskWrk taskWrk = taskWrkService.selectByWrkNo(crnProtocol.getTaskNo().intValue());
                    if (taskWrk != null) {
                        vo.setSourceStaNo(null);
                        vo.setStaNo(null);
                        vo.setWrkSts(taskWrk.getWrkSts$());   // 工作状态
                        vo.setIoType(taskWrk.getIoType$());   //  入出库类型
                        vo.setSourceLocNo(taskWrk.getStartPoint());
                        vo.setLocNo(taskWrk.getTargetPoint());
                        vo.setCrnStatus(crnProtocol.getStatusType().desc);
                        vo.setError("");    // todo
                    }
                }
                vo.setInEnable(basCrnp.getInEnable());//可入
                vo.setOutEnable(basCrnp.getOutEnable());//可出
                return R.ok().add(vo);
            }
        }