#改造

cpT

2025-07-03 c2f21a3a34b76e1bd90aed3e2ebb394df57123cc

 src/main/java/com/zy/core/thread/RgvThread.java

@@ -126,7 +126,7 @@
                log.error("rgv连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgv", slave.getId(), "rgv连接失败"+e.getMessage());
                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "rgv连接失败"+e.getMessage());
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
@@ -157,7 +157,7 @@
                log.error("RGV数据读取线程异常！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV数据读取线程异常"+e.getMessage());
                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV数据读取线程异常"+e.getMessage());
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
@@ -200,7 +200,7 @@
                log.error("RGV数据任务下发复位线程异常！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV数据任务下发复位线程异常"+e.getMessage());
                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV数据任务下发复位线程异常"+e.getMessage());
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
@@ -266,7 +266,7 @@
//                log.error("RGV任务下发线程异常！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
//                try{
//                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
//                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV任务下发线程异常"+e.getMessage());
//                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV任务下发线程异常"+e.getMessage());
//                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
//                }
@@ -339,18 +339,18 @@
                continue;
            }
            try {
                Thread.sleep(50);
                Thread.sleep(100);
                rgvRun = RgvRunCache.getRgvRun();
//                System.out.println(JSON.toJSON(rgvRun));

                // 休眠 1 秒
                if (System.currentTimeMillis() - rgvRun.currentTimeMilliOld > 100) {
                    rgvRun.currentTimeMilliOld = System.currentTimeMillis()+10;
                if (System.currentTimeMillis() - rgvRun.currentTimeMilliOld > 500L) {
                    rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
                } else {
                    continue;
                }
                if (!deviceDetection()) {
                    rgvRun.currentTimeMilliOld = System.currentTimeMillis()+10;
                    rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
                    rgvRun.setRgvNo(slave.getOtherId());
                    RgvRunCache.updateRgvStatus(rgvRun);
                    if (!errorRgv.equals("无")){
@@ -367,20 +367,20 @@
                    rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
                }
                if (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) || (Math.abs(rgvProtocol.getRgvPos() - rgvProtocol.getRgvPosDestination())>100)){
                    rgvRun.currentTimeMilliOld = System.currentTimeMillis()+10;
                    rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
                    rgvRun.setRgvNo(slave.getOtherId());
                    RgvRunCache.updateRgvStatus(rgvRun);
                    continue;
                }
                if (rgvProtocol.getLoaded() == -1){
                    rgvRun.currentTimeMilliOld = System.currentTimeMillis()+10;
                    rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
                    rgvRun.setRgvNo(slave.getOtherId());
                    RgvRunCache.updateRgvStatus(rgvRun);
                    RgvErrCache.updateRgvErr(slave.getId(),"小车探物物状态异常");
                    continue;
                }
                if (rgvTaskProtocol.getAvoid() != 0) {
                    rgvRun.currentTimeMilliOld = System.currentTimeMillis()+10;
                    rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
                    rgvRun.setRgvNo(slave.getOtherId());
                    RgvRunCache.updateRgvStatus(rgvRun);
                    continue;
@@ -468,19 +468,19 @@
                        }
                    }
                }
                rgvRun.currentTimeMilliOld = System.currentTimeMillis()+10;
                rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
                rgvRun.setRgvNo(slave.getOtherId());
                RgvRunCache.updateRgvStatus(rgvRun);
            } catch (Exception e) {
                log.error("RGV任务下发线程异常！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV任务下发线程异常"+e.getMessage());
                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV任务下发线程异常"+e.getMessage());
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
                rgvRun = RgvRunCache.getRgvRun();
                rgvRun.currentTimeMilliOld = System.currentTimeMillis()+10;
                rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
                rgvRun.setRgvNo(slave.getOtherId());
                RgvRunCache.updateRgvStatus(rgvRun);
                continue;
@@ -608,7 +608,7 @@
                                                errorRgv = "RGV行走目标超出范围";
                                                try{
                                                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                                                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                                                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                                                } catch (Exception e2){
//                                                    log.error("e2:"+e2.getMessage());
                                                }
@@ -700,7 +700,7 @@

                        try{
                            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                            deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                            deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                        } catch (Exception e2){
//                            log.error("e2:"+e2.getMessage());
                        }
@@ -728,7 +728,7 @@

                        try{
                            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                            deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                            deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                        } catch (Exception e2){
//                            log.error("e2:"+e2.getMessage());
                        }
@@ -757,7 +757,7 @@

                            try{
                                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                                deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                                deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                            } catch (Exception e2){
//                                log.error("e2:"+e2.getMessage());
                            }
@@ -814,7 +814,7 @@

                                                try{
                                                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                                                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                                                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                                                } catch (Exception e2){
//                                                    log.error("e2:"+e2.getMessage());
                                                }
@@ -907,7 +907,7 @@

                        try{
                            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                            deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                            deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                        } catch (Exception e2){
//                            log.error("e2:"+e2.getMessage());
                        }
@@ -935,7 +935,7 @@

                        try{
                            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                            deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                            deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                        } catch (Exception e2){
//                            log.error("e2:"+e2.getMessage());
                        }
@@ -965,7 +965,7 @@

                            try{
                                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                                deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                                deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                            } catch (Exception e2){
//                                log.error("e2:"+e2.getMessage());
                            }
@@ -1027,7 +1027,7 @@
            log.error("RGV异常！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            try{
                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV异常"+e.getMessage());
                deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV异常"+e.getMessage());
            } catch (Exception e2){
//                log.error("e2:"+e2.getMessage());
            }
@@ -1066,7 +1066,7 @@
            if (System.currentTimeMillis()-currentTimeMilliConnectRgv>1000*60*10){
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGVplc连接失败");
                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGVplc连接失败");
                } catch (Exception e2){
//                log.error("e2:"+e2.getMessage());
                }
@@ -1170,7 +1170,7 @@

                        try{
                            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                            deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV plc数据库更新失败");
                            deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV plc数据库更新失败");
                        } catch (Exception e2){
//                            log.error("e2:"+e2.getMessage());
                        }
@@ -1191,7 +1191,7 @@

                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgv", slave.getId(), "读取RGV plc状态信息失败");
                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "读取RGV plc状态信息失败");
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
@@ -1203,7 +1203,7 @@

            try{
                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                deviceErrorService.addDeviceError("rgv", slave.getId(), "读取RGV plc状态信息失败");
                deviceErrorService.addDeviceError("rgvErr", slave.getId(), "读取RGV plc状态信息失败");
            } catch (Exception e2){
//                log.error("e2:"+e2.getMessage());
            }
@@ -1220,7 +1220,7 @@

            try{
                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV写入命令为空");
                deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV写入命令为空");
            } catch (Exception e2){
//                log.error("e2:"+e2.getMessage());
            }
@@ -1284,7 +1284,7 @@

            try{
                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV 命令下发"+JSON.toJSON(taskProtocol));
                deviceErrorService.addDeviceError("rgvWrite", slave.getId(), "RGV 命令下发"+JSON.toJSON(taskProtocol));
            } catch (Exception e2){
//                log.error("e2:"+e2.getMessage());
            }
@@ -1341,6 +1341,14 @@
    }


    /**
     * 清除作业启动中
     */
    @Override
    public void setWrkSign() {
        this.wrkSign = 0;
    }

    public void setDelRgvTask() {
        delRgvTask = true;
    }