1 测试 上电后通信 和 最终完成 定时任务功能

zhmes-agecal-system/src/main/java/com/zehong/system/modbus/business/DeviceStatusReaderAndTimeSetter.java

@@ -110,13 +110,9 @@ public class DeviceStatusReaderAndTimeSetter {
                         log.info("当前  设备ip:{} port:{} device:{}的数据条件未满足，等待重试...", ip,port,deviceId);
                         Thread.sleep(RETRY_DELAY);
                     }
-                } catch (Exception e) {
-                    alarmData = new TEquipmentAlarmData();
-                    alarmData.setfAlarmType("04"); //01.老化柜 02.机械臂 03.老化层 04.点位
-                    alarmData.setfEquipmentCode("ip:" +  ip + ",port:" +  port + ",deviceId:" + deviceId);
-                    alarmData.setfAlarmData("读取失败");
-                    alarmDataService.insertTEquipmentAlarmData(alarmData);
-
+                } catch (Throwable e) {
+                    log.error("设备{}: 第{}次读取异常", deviceId, attempt, e);
+                    recordAlarm("04", "ip:" + ip + ",port:" + port + ",deviceId:" + deviceId, "第" + attempt + "次读取失败");
                     if (attempt <= MAX_RETRIES) {
                         Thread.sleep(RETRY_DELAY);
                     }
@@ -179,18 +175,11 @@ public class DeviceStatusReaderAndTimeSetter {
                     DeviceStatusReaderDto deviceStatusReaderDto = new DeviceStatusReaderDto(ip, port, devId, result);
                     // 3 设置回调数据
                     resultHandler.accept(deviceStatusReaderDto);
-                } catch (ModbusInitException e) {
-                    TEquipmentAlarmData alarmData = new TEquipmentAlarmData();
-                    alarmData.setfAlarmType("03"); //01.老化柜 02.机械臂 03.老化层 04.点位
-                    alarmData.setfEquipmentCode("ip:" +  ip + ",port:" +  port);
-                    alarmData.setfAlarmData("定时任务巡检:Modbus初始化失败");
-                    alarmDataService.insertTEquipmentAlarmData(alarmData);
-                } catch (Exception e) {
-                    TEquipmentAlarmData alarmData = new TEquipmentAlarmData();
-                    alarmData.setfAlarmType("03"); //01.老化柜 02.机械臂 03.老化层 04.点位
-                    alarmData.setfEquipmentCode("ip:" +  ip + ",port:" +  port);
-                    alarmData.setfAlarmData("监控任务异常:" + e.getMessage());
-                    alarmDataService.insertTEquipmentAlarmData(alarmData);
+                } catch (Throwable e) {
+                    log.error("设备{}: 监控任务异常", devId, e);
+                    // 记录告警（区分Error类型）
+                    String alarmMsg = e instanceof OutOfMemoryError ? "内存溢出：" + e.getMessage() : "监控任务异常：" + e.getMessage();
+                    recordAlarm("03", "ip:" + ip + ",port:" + port + ",deviceId:" + devId, alarmMsg);
                 } finally {
                     if (threadMaster != null) threadMaster.destroy();
                     latch.countDown();

zhmes-agecal-system/src/main/java/com/zehong/system/task/DeviceCommunicationJob.java

@@ -126,6 +126,8 @@ public class DeviceCommunicationJob implements Job {
                 log.error("=== 告警记录失败（不影响触发器） ===", alarmEx);
             }
             // 绝对禁止抛出任何异常！！！
+        } finally {
+            log.info("=== DeviceCommunicationJob 执行结束：fStoreyId={} ===", fStoreyIdStr);
         }
     }
 }

zhmes-agecal-system/src/main/java/com/zehong/system/task/FinalExecutionJob.java

@@ -159,6 +159,8 @@ public class FinalExecutionJob implements Job {
                 log.error("=== 告警记录失败 ===", alarmEx);
             }
             // 禁止抛出任何异常！！！
+        } finally {
+            log.error("=== FinalExecutionJob finally：fStoreyId={} ===", fStoreyIdStr);
         }
     }