From a64dffd4b2b08889460164e18c2d849a94cc9e71 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 03 十一月 2025 17:47:35 +0800
Subject: [PATCH] 钥匙柜信息处理
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 19 +
server/system_timer/src/main/resources/bootstrap-dev.yml | 6
server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml | 4
server/system_timer/src/main/resources/bootstrap-pro.yml | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java | 109 +++++++---
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml | 6
server/visits/admin_timer/src/main/resources/bootstrap-test.yml | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 344 ++++++++++++++++++++++++---------
server/system_gateway/src/main/resources/bootstrap-dev.yml | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java | 8
server/system_gateway/src/main/resources/bootstrap-self.yml | 4
server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml | 6
server/system_timer/src/main/resources/bootstrap-test.yml | 6
server/visits/admin_timer/src/main/resources/bootstrap-pro.yml | 2
server/visits/admin_timer/src/main/resources/bootstrap-dev.yml | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java | 3
server/visits/admin_timer/src/main/resources/bootstrap-self.yml | 6
server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml | 6
server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml | 6
server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 8
server/system_gateway/src/main/resources/bootstrap-test.yml | 4
server/system_timer/src/main/resources/bootstrap-self.yml | 6
server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml | 6
26 files changed, 399 insertions(+), 184 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
index 7cb826c..14830a4 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-dev.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
config:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_dev
# namespace: dev_renkang
username: nacos
@@ -23,7 +23,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dev_renkang
namespace: dmvisit
username: nacos
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
index d0061b0..d1178ca 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-pro.yml
@@ -14,7 +14,7 @@
username: nacos
password: Atwl@2024
# config:
- # server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
index e7893a9..2c5332f 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-self.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
config:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_dev
# namespace: dev_renkang
username: nacos
@@ -23,7 +23,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: wuhu_visit_dev
namespace: dmvisit_dev
username: nacos
diff --git a/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml b/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
index cc75624..f201cd7 100644
--- a/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
+++ b/server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
config:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_test
username: nacos
password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_test
username: nacos
password: nacos
diff --git a/server/system_gateway/src/main/resources/bootstrap-dev.yml b/server/system_gateway/src/main/resources/bootstrap-dev.yml
index 053c927..acef110 100644
--- a/server/system_gateway/src/main/resources/bootstrap-dev.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-dev.yml
@@ -1,11 +1,11 @@
spring:
cloud:
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: wuhu_visit_dev1
username: nacos
diff --git a/server/system_gateway/src/main/resources/bootstrap-self.yml b/server/system_gateway/src/main/resources/bootstrap-self.yml
index b5dfadd..a375799 100644
--- a/server/system_gateway/src/main/resources/bootstrap-self.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-self.yml
@@ -1,11 +1,11 @@
spring:
cloud:
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: wuhu_visit_dev
username: nacos
diff --git a/server/system_gateway/src/main/resources/bootstrap-test.yml b/server/system_gateway/src/main/resources/bootstrap-test.yml
index 34f9986..033273f 100644
--- a/server/system_gateway/src/main/resources/bootstrap-test.yml
+++ b/server/system_gateway/src/main/resources/bootstrap-test.yml
@@ -1,11 +1,11 @@
spring:
cloud:
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: wuhu_visit_test
username: nacos
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index e3459ae..f6daf8d 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -1523,18 +1523,20 @@
public enum WarningConfig {
- ALARM_TEST(10002, "銆愰挜鍖欐煖銆戦厭绮炬祴璇曞紓甯�"),
- GRID_TIME_OUT_INFO(10003, "銆愰挜鍖欐煖銆戝紑闂ㄨ秴鏃舵湭鍏抽棴"),
- KEY_TIME_OUT_BACK(10004, "銆愰挜鍖欐煖銆戦挜鍖欒秴鏃舵湭褰掕繕"),
+ ALARM_TEST(10002, "銆愰挜鍖欐煖銆戦厭绮炬祴璇曞紓甯�",0),
+ GRID_TIME_OUT_INFO(10003, "銆愰挜鍖欐煖銆戝紑闂ㄨ秴鏃舵湭鍏抽棴",0),
+ KEY_TIME_OUT_BACK(10004, "銆愰挜鍖欐煖銆戦挜鍖欒秴鏃舵湭褰掕繕",0),
;
// 鎴愬憳鍙橀噺
private int key;
private String info;
+ private int processArea;
// 鏋勯�犳柟娉�
- WarningConfig(int key,String info) {
+ WarningConfig(int key,String info,int processArea) {
this.key = key;
this.info = info;
+ this.processArea = processArea;
}
@@ -1554,6 +1556,15 @@
this.info = info;
}
+ public int getProcessArea() {
+ return processArea;
+ }
+
+ public void setProcessArea(int processArea) {
+ this.processArea = processArea;
+ }
+
+
}
diff --git a/server/system_timer/src/main/resources/bootstrap-dev.yml b/server/system_timer/src/main/resources/bootstrap-dev.yml
index ad3bb37..2553983 100644
--- a/server/system_timer/src/main/resources/bootstrap-dev.yml
+++ b/server/system_timer/src/main/resources/bootstrap-dev.yml
@@ -12,11 +12,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
- # server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -24,7 +24,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_dev
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap-pro.yml b/server/system_timer/src/main/resources/bootstrap-pro.yml
index 64495e6..caac07c 100644
--- a/server/system_timer/src/main/resources/bootstrap-pro.yml
+++ b/server/system_timer/src/main/resources/bootstrap-pro.yml
@@ -16,7 +16,7 @@
username: nacos
password: nacos
# config:
- # server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
diff --git a/server/system_timer/src/main/resources/bootstrap-self.yml b/server/system_timer/src/main/resources/bootstrap-self.yml
index 28a6e0a..d9a7b7c 100644
--- a/server/system_timer/src/main/resources/bootstrap-self.yml
+++ b/server/system_timer/src/main/resources/bootstrap-self.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
- # server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_dev
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap-test.yml b/server/system_timer/src/main/resources/bootstrap-test.yml
index 2f69748..284ae5b 100644
--- a/server/system_timer/src/main/resources/bootstrap-test.yml
+++ b/server/system_timer/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
- # server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_test
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml b/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
index 02b55bb..f2e0425 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-dev.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_dev
username: nacos
password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml b/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
index 045c13c..c8032c1 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-pro.yml
@@ -14,7 +14,7 @@
username: nacos
password: nacos
# config:
- # server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-self.yml b/server/visits/admin_timer/src/main/resources/bootstrap-self.yml
index e6d644d..a9e0f19 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-self.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-self.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
namespace: dmvisit
username: nacos
password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap-test.yml b/server/visits/admin_timer/src/main/resources/bootstrap-test.yml
index 3d1de90..86e309f 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap-test.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_test
username: nacos
password: nacos
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
index 9730a74..49606a5 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-dev.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: wuhu_visit_dev1
username: nacos
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
index 072d0b7..f0af774 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-pro.yml
@@ -14,7 +14,7 @@
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
index c810f26..3ac195f 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: wuhu_visit_dev
username: nacos
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml
index 733291a..daac276 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap-test.yml
@@ -10,11 +10,11 @@
# 鏆傛椂鍏抽棴缂撳瓨
enabled: false
nacos:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
# username: nacos
# password: nacos
@@ -22,7 +22,7 @@
# group: dev
# data-id: com.doumee.meeting.admin
discovery:
- server-addr: http://192.168.0.212:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_test
username: nacos
password: nacos
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 86e11a3..9dc10e9 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: test
+ active: dev
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
index 62c7d9b..84ed096 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
@@ -72,6 +72,9 @@
@ExcelColumn(name="鎵�鍦ㄤ綅缃�",width=10,index = 5)
private String region;
+ @ApiModelProperty(value = "浣嶇疆涓婚敭")
+ private String regionId;
+
@ApiModelProperty(value = "鍞竴鏍囪瘑")
//@ExcelColumn(name="鍞竴鏍囪瘑")
private String eventId;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java
index 07409cf..9651da0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningRuleDetail.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
@@ -76,4 +77,11 @@
@ExcelColumn(name="鍖哄煙涓婚敭")
private String regionId;
+
+
+ @ApiModelProperty(value = "鍛婅绫诲瀷缂栫爜")
+ @TableField(exist = false)
+ private String code;
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index b1115ac..a14b88a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -26,6 +26,7 @@
import com.doumee.service.business.third.model.PageWrap;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.hikvision.artemis.sdk.config.ArtemisConfig;
+import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +60,8 @@
@Autowired
private JkCabinetLogMapper jkCabinetLogMapper;
+ @Autowired
+ private WarningEventMapper warningEventMapper;
@Autowired
private MemberMapper memberMapper;
@@ -67,6 +70,9 @@
private WarningMapper warningMapper;
@Autowired
private WarningRuleMapper warningRuleMapper;
+
+ @Autowired
+ private WarningRuleDetailMapper warningRuleDetailMapper;
@Autowired
private WarningPushMapper warningPushMapper;
@@ -632,80 +638,195 @@
.eq(JkCabinetGrid::getId,dto.getGridId())
.last(" limit 1 ")
);
-
if(Objects.nonNull(jkCabinetGrid)){
log.error("鏌滄牸寮�闂ㄨ秴鏃舵湭鍏抽棴鍛婅淇℃伅锛歿}"+JSONObject.toJSONString(jkCabinetGrid));
+ //瑙勫垯绫诲瀷
Constants.WarningConfig warningConfig = Constants.WarningConfig.GRID_TIME_OUT_INFO;
Warning warning = warningMapper.selectOne(new QueryWrapper<Warning>().lambda()
- .eq(Warning::getType,Constants.THREE).eq(Warning::getCode,warningConfig.getKey()).eq(Warning::getIsdeleted,Constants.ZERO).last("limt 1"));
+ .eq(Warning::getIsdeleted,Constants.ZERO)
+ .eq(Warning::getStatus,Constants.ONE)
+ .eq(Warning::getCode,warningConfig.getKey())
+ .last("limit 1")
+ );
if(Objects.isNull(warning)){
return;
}
- List<Member> memberList = this.getWarningList(warning);
- if(CollectionUtils.isEmpty(memberList)){
+ List<Integer> ruleIdList = this.processWarnFront(warningConfig);
+ if(CollectionUtils.isEmpty(ruleIdList)){
return;
}
- JkCabinet jkCabinet = jkCabinetMapper.selectById(dto.getCabinetId());
- // 瀛樺偍寮傚父鏃ュ織
- WarningPush warningPush = new WarningPush();
- warningPush.setCreateDate(new Date());
- warningPush.setIsdeleted(Constants.ZERO);
- warningPush.setWarningId(warning.getId());
- warningPush.setTitle(warningConfig.getInfo());
- String content = "銆愰挜鍖欐煖-"+jkCabinetGrid.getCabinetName()+"銆戜笅銆愭煖鏍�-"+jkCabinetGrid.getCode()+"銆戣秴鏃舵湭鍏抽棴";
- warningPush.setContent(content);
- warningPush.setStatus(Constants.ZERO);
- warningPush.setPushType(Constants.ZERO);
- warningPush.setRegion(Objects.nonNull(jkCabinet)&&StringUtils.isNotBlank(jkCabinet.getLocation())?jkCabinet.getLocation():"鏈煡浣嶇疆");
- warningPush.setMemberIds(
- StringUtils.join(memberList.stream().map(i->i.getId()).collect(Collectors.toList()),",")
- );
- warningPush.setMemberIds(
- StringUtils.join(memberList.stream().map(i->i.getId()).collect(Collectors.toList()),",")
- );
- warningPush.setMemberNames(StringUtils.join(memberList.stream().map(i->i.getName()).collect(Collectors.toList()),",")
- );
- //todo 鏆傛椂鍏抽棴 閽夐拤閫氱煡
+ for (Integer ruleId:ruleIdList) {
+ WarningRule warningRule = warningRuleMapper.selectById(ruleId);
+ if(Objects.isNull(warningRule)){
+ continue;
+ }
+ List<Member> memberList = this.getWarningRuleMemberList(warningRule);
+ if(CollectionUtils.isEmpty(memberList)){
+ return;
+ }
-// Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
-// StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
-// dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),content));
-// warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
- warningPushMapper.insert(warningPush);
+ String content = "銆愰挜鍖欐煖-"+jkCabinetGrid.getCabinetName()+"銆戜笅銆愭煖鏍�-"+jkCabinetGrid.getCode()+"銆戣秴鏃舵湭鍏抽棴";
+
+ JkCabinet jkCabinet = jkCabinetMapper.selectById(dto.getCabinetId());
+ //瀛樺偍鎶ヨ寮傚父璁板綍
+ WarningEvent warningEvent = new WarningEvent();
+ warningEvent.setCreateDate(new Date());
+ warningEvent.setWarningId(warning.getId());
+ warningEvent.setTitle(warningConfig.getInfo());
+ warningEvent.setContent(content );
+ warningEvent.setStatus(Constants.ZERO);
+ warningEvent.setRegion(Objects.nonNull(jkCabinet)&&StringUtils.isNotBlank(jkCabinet.getLocation())?jkCabinet.getLocation():"鏈煡浣嶇疆");
+ warningEventMapper.insert(warningEvent);
+
+ try {
+ // 瀛樺偍寮傚父閫氱煡鏃ュ織
+ WarningPush warningPush = new WarningPush();
+ warningPush.setCreateDate(new Date());
+ warningPush.setIsdeleted(Constants.ZERO);
+ warningPush.setWarningId(warning.getId());
+ warningPush.setTitle(warningConfig.getInfo());
+ warningPush.setContent(content);
+ warningPush.setStatus(Constants.ZERO);
+ warningPush.setPushType(Constants.ZERO);
+ warningPush.setRegion(Objects.nonNull(jkCabinet)&&StringUtils.isNotBlank(jkCabinet.getLocation())?jkCabinet.getLocation():"鏈煡浣嶇疆");
+ warningPush.setMemberIds(
+ StringUtils.join(memberList.stream().map(i->i.getId()).collect(Collectors.toList()),",")
+ );
+ warningPush.setMemberIds(
+ StringUtils.join(memberList.stream().map(i->i.getId()).collect(Collectors.toList()),",")
+ );
+ warningPush.setMemberNames(StringUtils.join(memberList.stream().map(i->i.getName()).collect(Collectors.toList()),",")
+ );
+ //todo 鏆傛椂鍏抽棴 閽夐拤閫氱煡
+
+ // Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
+ // StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
+ // dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),content));
+ // warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
+ warningPushMapper.insert(warningPush);
+ warningEvent.setStatus(Constants.ONE);
+ warningEventMapper.updateById(warningEvent);
+ }catch (Exception e){
+ warningEvent.setStatus(Constants.TWO);
+ warningEventMapper.updateById(warningEvent);
+ }
+
+ }
}
}
}
- public List<Member> getWarningList(Warning warning){
- if(Constants.equalsInteger(warning.getStatus(),Constants.ZERO)){
- return null;
- }
- //鏌ヨ閫氱煡浜哄憳
- List<WarningRule> warningRuleList = warningRuleMapper.selectList(new QueryWrapper<WarningRule>().lambda()
- .eq(WarningRule::getIsdeleted,Constants.ZERO)
- .apply(" id in ( select w.RULE_ID from warning_rule_detail w where w.WARNING_ID = '"+warning.getId()+"' and w.ISDELETED = 0 ) ")
+ public List<Integer> processWarnFront(Constants.WarningConfig warningConfig){
+ List<WarningRuleDetail> warningRuleDetailList = warningRuleDetailMapper.selectJoinList(WarningRuleDetail.class,new MPJLambdaWrapper<WarningRuleDetail>()
+ .selectAll(WarningRuleDetail.class)
+ .leftJoin(Warning.class,Warning::getId,WarningRuleDetail::getWarningId)
+ .eq(WarningRuleDetail::getIsdeleted,Constants.ZERO)
+ .eq(Warning::getIsdeleted,Constants.ZERO)
+ .eq(Warning::getStatus,Constants.ONE)
+ .eq(Warning::getCode,warningConfig.getKey())
);
- List<Member> memberList = new ArrayList<>();
- if(org.apache.commons.collections.CollectionUtils.isNotEmpty(warningRuleList)){
- List<String> memberIdStr = warningRuleList.stream().map(i->i.getMemberIds()).collect(Collectors.toList());
- if(org.apache.commons.collections.CollectionUtils.isNotEmpty(memberIdStr)){
- List<String> memberIdList = new ArrayList<>();
- for (String s:memberIdStr) {
- memberIdList.addAll(
- Arrays.asList(s.split(","))
- );
- }
- memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO)
- .notIn(Member::getErpId)
- .in(Member::getId,memberIdList)
+ if(CollectionUtils.isEmpty(warningRuleDetailList)){
+ return new ArrayList<>();
+ }
+ //鎵�鏈夋姤璀﹁鍒欓厤缃俊鎭�
+ List<Integer> ruleIdList = warningRuleDetailList.stream().map(i->i.getRuleId()).collect(Collectors.toList());;
+ Set<Integer> ruleIdSet = new HashSet<>(ruleIdList);
+ if(CollectionUtils.isNotEmpty(ruleIdSet)){
+ List<Integer> resultList = new ArrayList<>();
+ for (Integer ruleId:ruleIdSet) {
+ WarningRule warningRule = warningRuleMapper.selectById(ruleId);
+ //鏌ヨ鍏朵粬瑙勫垯淇℃伅
+ List<WarningRuleDetail> warningRuleDetails = warningRuleDetailMapper.selectJoinList(WarningRuleDetail.class,new MPJLambdaWrapper<WarningRuleDetail>()
+ .selectAll(WarningRuleDetail.class)
+ .selectAs(Warning::getCode,WarningRuleDetail::getCode)
+ .leftJoin(Warning.class,Warning::getId,WarningRuleDetail::getWarningId)
+ .eq(WarningRuleDetail::getIsdeleted,Constants.ZERO)
+ .eq(Warning::getIsdeleted,Constants.ZERO)
+ .eq(Warning::getStatus,Constants.ONE)
+ .eq(WarningRuleDetail::getRuleId,ruleId)
+ .in(Warning::getCode,Constants.WarningConfig.ALARM_TEST.getKey(),
+ Constants.WarningConfig.GRID_TIME_OUT_INFO.getKey(),
+ Constants.WarningConfig.KEY_TIME_OUT_BACK.getKey()
+ )
);
+ //鏃犱换浣曡鍒� 鐩存帴璺宠繃
+ if(CollectionUtils.isEmpty(warningRuleDetails)){
+ return resultList;
+ }else if(!Constants.equalsInteger(warningRuleDetails.stream().filter(i->!i.getCode().equals(warningConfig.getKey())).collect(Collectors.toList()).size(),Constants.ZERO)){
+ List<WarningRuleDetail> wList = warningRuleDetails.stream().filter(i->!i.getCode().equals(warningConfig.getKey())).collect(Collectors.toList());
+ //鑾峰彇鎵�鏈夊叾浠栨墍鏈変簨浠朵富閿俊鎭�
+ List<Integer> warningIdList = wList.stream().map(i->i.getWarningId()).collect(Collectors.toList());
+ Set<Integer> setWarningIdList = new HashSet<>(warningIdList);
+ //鑾峰彇鏃堕棿鍐呮墍鏈変簨浠朵俊鎭�
+ List<WarningEvent> warningEventList = warningEventMapper.selectList(new QueryWrapper<WarningEvent>().lambda()
+ .eq(WarningEvent::getIsdeleted,Constants.ZERO)
+ .in(WarningEvent::getWarningId,setWarningIdList)
+ .apply(" DATE_ADD(CREATE_DATE , INTERVAL "+warningRule.getIntervalSec()+" SECOND) > now() ")
+ );
+ if(this.processWarnFlag(wList,warningEventList)){
+ resultList.add(ruleId);
+ };
+ }else{
+ List<WarningRuleDetail> wList = warningRuleDetails.stream().filter(i->i.getCode().equals(warningConfig.getKey())).collect(Collectors.toList());
+ //鑾峰彇鏈浜嬩欢涓婚敭淇℃伅
+ List<Integer> warningIdList = wList.stream().map(i->i.getWarningId()).collect(Collectors.toList());
+ Set<Integer> setWarningIdList = new HashSet<>(warningIdList);
+ //鑾峰彇鏃堕棿鍐呮墍鏈変簨浠朵俊鎭�
+ List<WarningEvent> warningEventList = warningEventMapper.selectList(new QueryWrapper<WarningEvent>().lambda()
+ .eq(WarningEvent::getIsdeleted,Constants.ZERO)
+ .in(WarningEvent::getWarningId,setWarningIdList)
+ .apply(" DATE_ADD(CREATE_DATE , INTERVAL "+warningRule.getIntervalSec()+" SECOND) > now() ")
+ );
+ if(this.processWarnFlag(wList,warningEventList)){
+ resultList.add(ruleId);
+ }
+ }
+ }
+ return resultList;
+ }
+ return new ArrayList<>();
+
+
+ }
+
+
+
+ /**
+ * 鍒ゆ柇澶勭悊鏄惁鍙互鍙戦�侀�氱煡 褰撳墠鍛婅閰嶇疆鐨勬暟鎹垪琛ㄦ槸鍚︽弧瓒�
+ * @param warningRuleDetails
+ * @return
+ */
+ public boolean processWarnFlag(List<WarningRuleDetail> warningRuleDetails,List<WarningEvent> warningEventList){
+ if(CollectionUtils.isEmpty(warningEventList)){
+ return false;
+ }
+ for (WarningRuleDetail warningRuleDetail:warningRuleDetails) {
+ if(Objects.nonNull(warningRuleDetail.getRegionId())){
+ if(warningEventList.stream().filter(i->Constants.equalsInteger(i.getWarningId(),warningRuleDetail.getWarningId())
+ && StringUtils.isNotBlank(i.getRegionId()) && i.getRegionId().equals(warningRuleDetail.getRegionId())
+ ).collect(Collectors.toList()).size()<=Constants.ZERO){
+ return false;
+ }
+ }else{
+ if(warningEventList.stream().filter(i->Constants.equalsInteger(i.getWarningId(),warningRuleDetail.getWarningId())
+ ).collect(Collectors.toList()).size()<=Constants.ZERO){
+ return false;
+ }
}
}
+ return true;
+ }
+
+
+ public List<Member> getWarningRuleMemberList(WarningRule warningRule){
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().eq(Member::getIsdeleted,Constants.ZERO)
+ .isNotNull(Member::getErpId)
+ .in(Member::getId,Arrays.asList(warningRule.getMemberIds().split(",")))
+ );
return memberList;
}
-
@Override
@@ -722,55 +843,88 @@
JkCabinet jkCabinet = jkCabinetMapper.selectById(dto.getCabinetId());
Constants.WarningConfig warningConfig = Constants.WarningConfig.ALARM_TEST;
Warning warning = warningMapper.selectOne(new QueryWrapper<Warning>().lambda()
- .eq(Warning::getType,Constants.THREE).eq(Warning::getCode,warningConfig.getKey()).eq(Warning::getIsdeleted,Constants.ZERO).last("limt 1"));
+ .eq(Warning::getIsdeleted,Constants.ZERO)
+ .eq(Warning::getStatus,Constants.ONE)
+ .eq(Warning::getCode,warningConfig.getKey())
+ .last("limit 1")
+ );
if(Objects.isNull(warning)){
return;
}
- List<Member> memberList = this.getWarningList(warning);
- if(CollectionUtils.isEmpty(memberList)){
+ List<Integer> ruleIdList = this.processWarnFront(warningConfig);
+ if(CollectionUtils.isEmpty(ruleIdList)){
return;
}
- // 瀛樺偍寮傚父鏃ュ織
- WarningPush warningPush = new WarningPush();
- warningPush.setCreateDate(new Date());
- warningPush.setIsdeleted(Constants.ZERO);
- warningPush.setWarningId(warning.getId());
- warningPush.setTitle(warningConfig.getInfo());
- String content = "";
- if(Objects.nonNull(systemUser.getRealname())){
- content = content + systemUser.getRealname();
+ if(CollectionUtils.isEmpty(ruleIdList)){
+ return;
}
- if(Objects.nonNull(jkCabinet)){
- content = content + "浜�"+jkCabinet.getName()+"閽ュ寵鏌�";
- }
- content = content + "閰掔簿妫�娴嬪紓甯�";
- warningPush.setContent(content + "閰掔簿妫�娴嬪紓甯革紝閰掔簿搴︽暟銆�"+dto.getAlcoholNum()+"掳銆�");
- if(Objects.nonNull(dto.getAlcoholNum())){
- content = content + "锛岄厭绮惧害鏁般��"+dto.getAlcoholNum()+"掳銆�";
- }
- warningPush.setContent(content);
- warningPush.setStatus(Constants.ZERO);
- warningPush.setPushType(Constants.ZERO);
- warningPush.setRegion(Objects.nonNull(jkCabinet)&&StringUtils.isNotBlank(jkCabinet.getLocation())?jkCabinet.getLocation():"鏈煡浣嶇疆");
- warningPush.setMemberId(dto.getMemberId());
- warningPush.setMemberIds(
- StringUtils.join(memberList.stream().map(i->i.getId()).collect(Collectors.toList()),",")
- );
- warningPush.setMemberIds(
- StringUtils.join(memberList.stream().map(i->i.getId()).collect(Collectors.toList()),",")
- );
- warningPush.setMemberNames(StringUtils.join(memberList.stream().map(i->i.getName()).collect(Collectors.toList()),",")
- );
- //todo 鏆傛椂鍏抽棴 閽夐拤閫氱煡
-
-// Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
-// StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
-// dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),warningConfig.getInfo()));
-// warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
- warningPushMapper.insert(warningPush);
- //瀛樺偍寮傚父鏃ュ織
- if(Objects.nonNull(systemUser)){
- log.error("鍙告満閰掔簿妫�娴嬶紝瓒呭嚭閰掔簿鍊煎憡璀︿俊鎭細{}"+JSONObject.toJSONString(systemUser));
+ for (Integer ruleId:ruleIdList) {
+ WarningRule warningRule = warningRuleMapper.selectById(ruleId);
+ if (Objects.isNull(warningRule)) {
+ continue;
+ }
+ List<Member> memberList = this.getWarningRuleMemberList(warningRule);
+
+ String content = "";
+ if(Objects.nonNull(systemUser.getRealname())){
+ content = content + systemUser.getRealname();
+ }
+ if(Objects.nonNull(jkCabinet)){
+ content = content + "浜�"+jkCabinet.getName()+"閽ュ寵鏌�";
+ }
+ content = content + "閰掔簿妫�娴嬪紓甯�";
+ if(Objects.nonNull(dto.getAlcoholNum())){
+ content = content + "锛岄厭绮惧害鏁般��"+dto.getAlcoholNum()+"掳銆�";
+ }
+
+ //瀛樺偍鎶ヨ寮傚父璁板綍
+ WarningEvent warningEvent = new WarningEvent();
+ warningEvent.setCreateDate(new Date());
+ warningEvent.setWarningId(warning.getId());
+ warningEvent.setTitle(warningConfig.getInfo());
+ warningEvent.setContent(content );
+ warningEvent.setStatus(Constants.ZERO);
+ warningEvent.setRegion(Objects.nonNull(jkCabinet)&&StringUtils.isNotBlank(jkCabinet.getLocation())?jkCabinet.getLocation():"鏈煡浣嶇疆");
+ warningEventMapper.insert(warningEvent);
+
+ try{
+ WarningPush warningPush = new WarningPush();
+ warningPush.setCreateDate(new Date());
+ warningPush.setIsdeleted(Constants.ZERO);
+ warningPush.setWarningId(warning.getId());
+ warningPush.setTitle(warningConfig.getInfo());
+ warningPush.setContent(content);
+ warningPush.setStatus(Constants.ZERO);
+ warningPush.setPushType(Constants.ZERO);
+ warningPush.setRegion(Objects.nonNull(jkCabinet)&&StringUtils.isNotBlank(jkCabinet.getLocation())?jkCabinet.getLocation():"鏈煡浣嶇疆");
+ warningPush.setMemberId(dto.getMemberId());
+ warningPush.setMemberIds(
+ StringUtils.join(memberList.stream().map(i->i.getId()).collect(Collectors.toList()),",")
+ );
+ warningPush.setMemberIds(
+ StringUtils.join(memberList.stream().map(i->i.getId()).collect(Collectors.toList()),",")
+ );
+ warningPush.setMemberNames(StringUtils.join(memberList.stream().map(i->i.getName()).collect(Collectors.toList()),",")
+ );
+ //todo 鏆傛椂鍏抽棴 閽夐拤閫氱煡
+ // Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
+ // StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
+ // dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),warningConfig.getInfo()));
+ // warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
+ warningPushMapper.insert(warningPush);
+ warningEvent.setStatus(Constants.ONE);
+ warningEventMapper.updateById(warningEvent);
+ }catch (Exception e){
+ warningEvent.setStatus(Constants.TWO);
+ warningEventMapper.updateById(warningEvent);
+ }
+
+
+ //瀛樺偍寮傚父鏃ュ織
+ if(Objects.nonNull(systemUser)){
+ log.error("鍙告満閰掔簿妫�娴嬶紝瓒呭嚭閰掔簿鍊煎憡璀︿俊鎭細{}"+JSONObject.toJSONString(systemUser));
+ }
+
}
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java
index 6d202cd..56eae5b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetLogServiceImpl.java
@@ -3,16 +3,13 @@
import cn.hutool.core.bean.BeanUtil;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.utils.Constants;
-import com.doumee.dao.business.WarningMapper;
-import com.doumee.dao.business.WarningPushMapper;
-import com.doumee.dao.business.WarningRuleMapper;
+import com.doumee.dao.business.*;
import com.doumee.dao.business.dto.TelecomCabinetLogDTO;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.TelecomJkCabinetLogVO;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.business.JkCabinetLogMapper;
import com.doumee.service.business.JkCabinetLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -49,6 +46,8 @@
@Autowired
private WarningPushMapper warningPushMapper;
+ @Autowired
+ private WarningEventMapper warningEventMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@Override
@@ -192,7 +191,11 @@
public void timeOutUnBackAlarm(JkCabinetGridServiceImpl impl){
Constants.WarningConfig warningConfig = Constants.WarningConfig.KEY_TIME_OUT_BACK;
Warning warning = warningMapper.selectOne(new QueryWrapper<Warning>().lambda()
- .eq(Warning::getType,Constants.THREE).eq(Warning::getCode,warningConfig.getKey()).eq(Warning::getIsdeleted,Constants.ZERO).last("limt 1"));
+ .eq(Warning::getIsdeleted,Constants.ZERO)
+ .eq(Warning::getStatus,Constants.ONE)
+ .eq(Warning::getCode,warningConfig.getKey())
+ .last("limit 1")
+ );
if(Objects.isNull(warning)){
return;
}
@@ -213,37 +216,73 @@
.orderByDesc(JkCabinetLog::getCreateDate);
List<JkCabinetLog> jkCabinetLogs = jkCabinetLogMapper.selectJoinList(JkCabinetLog.class,wrapper);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(jkCabinetLogs)){
- List<Member> memberList = impl.getWarningList(warning);
-
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(memberList)){
- for (JkCabinetLog jkCabinetLog:jkCabinetLogs) {
- WarningPush warningPush = new WarningPush();
- warningPush.setCreateDate(new Date());
- warningPush.setIsdeleted(Constants.ZERO);
- warningPush.setWarningId(warning.getId());
- warningPush.setTitle(warningConfig.getInfo());
- String content = "銆愯溅杈�-"+jkCabinetLog.getCarCode()+"閽ュ寵銆戠敱+"+(StringUtils.isNotBlank(jkCabinetLog.getMemberName())?jkCabinetLog.getMemberName():"鏈煡浜哄憳")+"鍊熷嚭锛岃秴鏃舵湭褰掕繕";
- warningPush.setContent(content);
- warningPush.setStatus(Constants.ZERO);
- warningPush.setPushType(Constants.ZERO);
- warningPush.setRegion( StringUtils.isNotBlank(jkCabinetLog.getLocation())?jkCabinetLog.getLocation():"鏈煡浣嶇疆");
- warningPush.setMemberIds(
- StringUtils.join(memberList.stream().map(i->i.getId()).collect(Collectors.toList()),",")
- );
- warningPush.setMemberIds(
- StringUtils.join(memberList.stream().map(i->i.getId()).collect(Collectors.toList()),",")
- );
- warningPush.setMemberNames(StringUtils.join(memberList.stream().map(i->i.getName()).collect(Collectors.toList()),",")
- );
- //todo 鏆傛椂鍏抽棴 閽夐拤閫氱煡
-
- // Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
- // StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
- // dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),content));
- // warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
- warningPushMapper.insert(warningPush);
-
+ List<Integer> ruleIdList = impl.processWarnFront(warningConfig);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(ruleIdList)){
+ return;
+ }
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(ruleIdList)){
+ return;
+ }
+ for (Integer ruleId:ruleIdList) {
+ WarningRule warningRule = warningRuleMapper.selectById(ruleId);
+ if (Objects.isNull(warningRule)) {
+ continue;
}
+ List<Member> memberList = impl.getWarningRuleMemberList(warningRule);
+ if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(memberList)) {
+ return;
+ }
+ for (JkCabinetLog jkCabinetLog:jkCabinetLogs) {
+
+ String content = "銆愯溅杈�-"+jkCabinetLog.getCarCode()+"閽ュ寵銆戠敱+"+(StringUtils.isNotBlank(jkCabinetLog.getMemberName())?jkCabinetLog.getMemberName():"鏈煡浜哄憳")+"鍊熷嚭锛岃秴鏃舵湭褰掕繕";
+
+ //瀛樺偍鎶ヨ寮傚父璁板綍
+ WarningEvent warningEvent = new WarningEvent();
+ warningEvent.setCreateDate(new Date());
+ warningEvent.setWarningId(warning.getId());
+ warningEvent.setTitle(warningConfig.getInfo());
+ warningEvent.setContent(content );
+ warningEvent.setStatus(Constants.ZERO);
+ warningEvent.setRegion( StringUtils.isNotBlank(jkCabinetLog.getLocation())?jkCabinetLog.getLocation():"鏈煡浣嶇疆");
+ warningEventMapper.insert(warningEvent);
+
+
+ try {
+ WarningPush warningPush = new WarningPush();
+ warningPush.setCreateDate(new Date());
+ warningPush.setIsdeleted(Constants.ZERO);
+ warningPush.setWarningId(warning.getId());
+ warningPush.setTitle(warningConfig.getInfo());
+
+ warningPush.setContent(content);
+ warningPush.setStatus(Constants.ZERO);
+ warningPush.setPushType(Constants.ZERO);
+ warningPush.setRegion(StringUtils.isNotBlank(jkCabinetLog.getLocation()) ? jkCabinetLog.getLocation() : "鏈煡浣嶇疆");
+ warningPush.setMemberIds(
+ StringUtils.join(memberList.stream().map(i -> i.getId()).collect(Collectors.toList()), ",")
+ );
+ warningPush.setMemberIds(
+ StringUtils.join(memberList.stream().map(i -> i.getId()).collect(Collectors.toList()), ",")
+ );
+ warningPush.setMemberNames(StringUtils.join(memberList.stream().map(i -> i.getName()).collect(Collectors.toList()), ",")
+ );
+ //todo 鏆傛椂鍏抽棴 閽夐拤閫氱煡
+
+ // Boolean noticeFlag = dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
+ // StringUtils.join(memberList.stream().filter(i->StringUtils.isNotBlank(i.getDdId())).map(i->i.getDdId()).collect(Collectors.toList()),","),
+ // dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),content));
+ // warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO);
+ warningPushMapper.insert(warningPush);
+ warningEvent.setStatus(Constants.ONE);
+ warningEventMapper.updateById(warningEvent);
+ }catch (Exception e){
+ warningEvent.setStatus(Constants.TWO);
+ warningEventMapper.updateById(warningEvent);
+ }
+ }
+
+
+
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
index d580516..cbcb8bd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
@@ -1323,7 +1323,7 @@
.leftJoin(Category.class,Category::getId,JkLine::getCategoryId )
.leftJoin(Cars.class,Cars::getId,JkLine::getCarId)
.and(StringUtils.isNotBlank(telecomLineInfoDTO.getSearchInfo()),i->i.like(Cars::getCode,telecomLineInfoDTO.getSearchInfo()).or().like(JkLine::getName,telecomLineInfoDTO.getSearchInfo()))
- .eq(StringUtils.isNotBlank(telecomLineInfoDTO.getDateInfo()),JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo())
+ .like(StringUtils.isNotBlank(telecomLineInfoDTO.getDateInfo()),JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo())
.eq(Objects.nonNull(telecomLineInfoDTO.getCategoryId()),JkLine::getCategoryId, telecomLineInfoDTO.getCategoryId())
.eq(Objects.nonNull(telecomLineInfoDTO.getLineId()),JkLine::getId, telecomLineInfoDTO.getLineId());
@@ -1370,7 +1370,7 @@
.select(" ifnull((select count(1) from jk_sketch_customer jc where jc.ISDELETED= 0 and jc.SKETCH_ID = t.id),0)" ,JkSketch::getCustomerNum)
.select(" ifnull((select count(1) from jk_sketch_line jc where jc.TYPE = 0 and jc.SKETCH_ID = t.id),0)" ,JkSketch::getBeforeLineNum)
.leftJoin(Category.class,Category::getId,JkSketch::getCategoryId )
- .eq(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
+ .like(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
List<JkSketch> sketchList = jkSketchMapper.selectJoinList(JkSketch.class,sketchMPJLambdaWrapper);
if(CollectionUtils.isEmpty(sketchList)){
return telecomLineCountVO;
@@ -1439,7 +1439,7 @@
MPJLambdaWrapper<JkSketch> sketchMPJLambdaWrapper = new MPJLambdaWrapper<JkSketch>().selectAll(JkSketch.class )
.selectAs(Category::getName,JkSketch::getCategoryName)
.leftJoin(Category.class,Category::getId,JkSketch::getCategoryId )
- .eq(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
+ .like(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
List<JkSketch> sketchList = jkSketchMapper.selectJoinList(JkSketch.class,sketchMPJLambdaWrapper);
if(CollectionUtils.isEmpty(sketchList)){
return new ArrayList<TelecomCategoryDataVO>();
@@ -1503,7 +1503,7 @@
.eq(Objects.nonNull(telecomLineInfoDTO.getCategoryId()),JkSketchLine::getCategoryId,telecomLineInfoDTO.getCategoryId())
.eq(Objects.nonNull(telecomLineInfoDTO.getLineId()),JkSketchLine::getLineId,telecomLineInfoDTO.getLineId())
.apply(" ( t.TYPE = t1.OPT_STATUS ) ")
- .eq(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
+ .like(JkSketch::getDateInfo, telecomLineInfoDTO.getDateInfo());
List<JkSketchLine> returnLineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper);
// //浼樺寲鍓嶆暟鎹�
--
Gitblit v1.9.3