*
lsh
2025-11-10 ffee4b305f9ab02f828555100d44cba6b3c043fb
src/main/java/com/zy/core/thread/RgvThread.java
@@ -78,20 +78,6 @@
    @SuppressWarnings("InfiniteLoopStatement")
    public void run() {
        initRgv();
        try{
            Thread.sleep(2000);
        } catch (Exception e){
        }
        connectRgv = this.connect();
        while(!connectRgv){
            try {
                connectRgv = this.connect();
                Thread.sleep(100);
            } catch (Exception e){
            }
        }
        // 启动线程自动重连
        new Thread(this::rgvConnect).start();
@@ -126,7 +112,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 +143,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 +186,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 +252,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());
//                }
@@ -283,7 +269,7 @@
            try {
                if(!connectRgv){
                    try {
                        Thread.sleep(1000L);
                        Thread.sleep(100L);
                    } catch (Exception e){
                    }
@@ -475,7 +461,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());
                }
@@ -608,7 +594,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 +686,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 +714,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 +743,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 +800,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 +893,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 +921,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 +951,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 +1013,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 +1052,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 +1156,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 +1177,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 +1189,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 +1206,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 +1270,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());
            }