#提升机状态

zjj

2024-05-24 92ac16fad20cbd4c0035501ef04605bdb960fc18

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

@@ -17,6 +17,7 @@
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.DeviceErrorService;
import com.zy.asrs.service.WrkMastService;
@@ -67,6 +68,8 @@
    private ReportQueryMapper reportQueryMapper;
    @Autowired
    private DeviceErrorService deviceErrorService;
    @Autowired
    private BasCrnpService basCrnpService;

    @PostMapping("/system/running/status")
    @ManagerAuth(memo = "系统运行状态")
@@ -115,6 +118,28 @@
            vo.setWorkNo(staProtocol.getWorkNo()); // 工作号
            vo.setSiteStatus(SiteStatusType.process(staProtocol));  // 状态
            vo.setNearbySta(staProtocol.getNearbySta());  //RGV位置
            vos.add(vo);
        }
        return R.ok().add(vos);
    }


    @PostMapping("/latest/data/hoist")
    @ManagerAuth(memo = "提升机实时数据")
    public R hoistLatestData(){
        List<HoistDataVo> 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()) {
            HoistDataVo vo = new HoistDataVo();
            StaProtocol staProtocol = entry.getValue();
            vo.setHoistId(String.valueOf(entry.getKey()));
            vo.setPlace(staProtocol.getPlace());
            vos.add(vo);
        }
        return R.ok().add(vos);
@@ -310,6 +335,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);
@@ -334,6 +364,8 @@
                        vo.setError("");    // todo
                    }
                }
                vo.setInEnable(basCrnp.getInEnable());//可入
                vo.setOutEnable(basCrnp.getOutEnable());//可出
                return R.ok().add(vo);
            }
        }