diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmThresholdDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmThresholdDTO.java index bc020d7..2864f67 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmThresholdDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmThresholdDTO.java @@ -26,7 +26,7 @@ /** * 机器人动力电量 */ - private Double robotPowerBattery; + private Double robotBattery; /** * 机器人仪表电量 @@ -47,7 +47,7 @@ this.typhoonDistance = threshold.getTyphoonDistance(); this.typhoonSpeed = threshold.getTyphoonSpeed(); this.shipDistance = threshold.getShipDistance(); - this.robotPowerBattery = threshold.getRobotBattery(); + this.robotBattery = threshold.getRobotBattery(); this.robotMeterBattery = threshold.getMeterBattery(); this.robotDistance = threshold.getRobotDistance(); this.satelliteSignal = threshold.getSatelliteSignal(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmThresholdDTO.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmThresholdDTO.java index bc020d7..2864f67 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmThresholdDTO.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmThresholdDTO.java @@ -26,7 +26,7 @@ /** * 机器人动力电量 */ - private Double robotPowerBattery; + private Double robotBattery; /** * 机器人仪表电量 @@ -47,7 +47,7 @@ this.typhoonDistance = threshold.getTyphoonDistance(); this.typhoonSpeed = threshold.getTyphoonSpeed(); this.shipDistance = threshold.getShipDistance(); - this.robotPowerBattery = threshold.getRobotBattery(); + this.robotBattery = threshold.getRobotBattery(); this.robotMeterBattery = threshold.getMeterBattery(); this.robotDistance = threshold.getRobotDistance(); this.satelliteSignal = threshold.getSatelliteSignal(); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java index 6fdb8cc..1a21708 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmServiceImpl.java @@ -57,7 +57,7 @@ int robotId = (int) robotMap.get("robotId"); float instrumentE = (float) robotMap.get("instrumentE"); float powerE = (float) robotMap.get("powerE"); - if (powerE < thresholdDTO.getRobotPowerBattery()) { + if (powerE < thresholdDTO.getRobotBattery()) { //存库 save(creatAlarm(String.valueOf(robotId), "1", "机器人" + robotId + "动力电量低", powerE)); }