diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java index 338a6b0..0699bd9 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java @@ -66,6 +66,8 @@ public class UpdateTerminalVo { @ApiModelProperty(value = "设备类型") private Integer devType; + private Integer isfavor; + @ApiModelProperty(value = "投运日期") private Date workingDate; diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/MntnCheckTask.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/MntnCheckTask.java index 8aaab9b..f220280 100644 --- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/MntnCheckTask.java +++ b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/timeTask/MntnCheckTask.java @@ -79,7 +79,7 @@ public class MntnCheckTask { long count = rawReportsMapper.countByExample(example); if (count > maxCount) { this.sendWarningCount(term, count); - } else if (count <= 0) { + } else if (count <= 0 && term.getIsfavor() != null && term.getIsfavor().intValue() == 1) { example = new MntnRawReportsExample(); criteria = example.createCriteria(); criteria.andTermIdEqualTo(termId); @@ -91,7 +91,7 @@ public class MntnCheckTask { long days = (System.currentTimeMillis() / 1000 - lasttime) / 60 / 60 / 24; if (days > maxDay) { Date date = new Date(lasttime * 1000); -// this.sendWarningDay(term, date, days); + this.sendWarningDay(term, date, days); } } }