From 8baca8a9f0a4cffc0f57821e33d5d0d3cca88bf7 Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Sun, 7 Apr 2024 09:32:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?#=E6=B0=B4=E4=BD=8D=E8=B4=A8=E9=87=8F?=
=?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java | 2 +-
.../scheduled/service/operation/home/impl/RealTargetServiceImpl.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java
index bb125ac..cff87ff 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/monitor/listener/AlarmListener.java
@@ -46,7 +46,7 @@ public class AlarmListener implements IQueueConsume {
// 步骤4.微信公众号发送
if(ObjectUtil.isNotEmpty(alarm.getIsWxMessage()) && alarm.getIsWxMessage() == 0){
- //messageService.weChatMessage(alarm);
+ messageService.weChatMessage(alarm);
}
}
}
\ No newline at end of file
diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java
index aacaa77..5ada884 100644
--- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/home/impl/RealTargetServiceImpl.java
@@ -1078,6 +1078,10 @@ public class RealTargetServiceImpl implements RealTargetService {
if(System.currentTimeMillis() - date.getTime() > 30 * 60 * 1000L){
return 0.0;
}
+ // 状态限制
+ if(fields.get(0).getQ() != 0){
+ return 0.0;
+ }
return Double.parseDouble(fields.get(0).getValue());
}
From f5a4a315640bf884bac94c1fcc7f7c14988b011f Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Sun, 7 Apr 2024 11:40:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=B7=A1=E6=A3=80?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
index fb991ca..4686006 100644
--- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
+++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml
@@ -191,7 +191,7 @@
LEFT JOIN HZ_ST_EX_TASK_USER b on t.ID=b.TASK_ID and b.IS_DELETED=0
where t.IS_DELETED=0
- and u.USER_ID=#{task.userId}
+ and b.USER_ID=#{task.userId}
GROUP BY t.id
@@ -209,7 +209,7 @@
LEFT JOIN HZ_ST_EX_TASK_USER b on t.ID=b.TASK_ID and b.IS_DELETED=0
where t.IS_DELETED=0
- and u.USER_ID=#{task.userId}
+ and b.USER_ID=#{task.userId}
GROUP BY t.id