From 01ddd8351bfd3172e667bb389b6d5a780d8b75e3 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Tue, 13 Aug 2024 10:01:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8isfavor=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=88=A4=E6=96=AD=E6=8E=89=E7=BA=BF=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java | 2 ++ .../com/shxy/xymanager_framework/timeTask/MntnCheckTask.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) 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); } } }