From f2889bd1adbd3021f6ca0c596eb8633d41c79cfb Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 29 五月 2026 11:36:02 +0800
Subject: [PATCH] 报表数据
---
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/admin_timer/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttPushCallback.java | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap-self.yml | 6 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttSubServiceImpl.java | 1
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 | 32 ++++++++++
server/system_gateway/src/main/resources/bootstrap-dev.yml | 4
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/service/business/impl/InoutRecordServiceImpl.java | 21 ++++++
server/visits/admin_timer/src/main/resources/bootstrap-self.yml | 6 +-
server/system_timer/src/main/resources/bootstrap.yml | 2
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/system_gateway/src/main/resources/bootstrap-test.yml | 4
server/system_timer/src/main/resources/bootstrap-self.yml | 6 +-
server/system_service/src/main/java/com/doumee/dao/business/model/Company.java | 14 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 6 +
server/meeting/meeting_admin/src/main/resources/bootstrap-test.yml | 6 +-
27 files changed, 118 insertions(+), 52 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 14830a4..f67f09c 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
config:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3: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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3: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 d1178ca..cde3b9e 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.7:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.3: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 2c5332f..7b6e26f 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
config:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3: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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3: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 f201cd7..953fc75 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
config:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3: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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3: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 a375799..dc33362 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: wuhu_visit_dev
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 a375799..dc33362 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3: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 033273f..31e99a1 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: wuhu_visit_test
username: nacos
diff --git a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
index 35d5149..249db47 100644
--- a/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
+++ b/server/system_service/src/main/java/com/doumee/dao/business/model/Company.java
@@ -157,6 +157,20 @@
@ExcelColumn(name="椋炰功鏈�杩戝悓姝ユ椂闂�")
private Date fsDate;
+ @ApiModelProperty(value = "鐩稿叧鏂逛娇鐢� 瀵规帴缁勭粐")
+ private Integer relationCompanyId;
+
+ @ApiModelProperty(value = "鐩稿叧鏂逛娇鐢� 瀵规帴浜哄憳")
+ private Integer relationUserId;
+
+ @ApiModelProperty(value = "鐩稿叧鏂逛娇鐢� 瀵规帴缁勭粐鍚嶇О")
+ @TableField(exist = false)
+ private String relationCompanyName;
+
+ @ApiModelProperty(value = "鐩稿叧鏂逛娇鐢� 瀵规帴浜哄憳鍚嶇О")
+ @TableField(exist = false)
+ private String relationUserName;
+
@ApiModelProperty(value = "鍒嗙被缂栫爜鍚嶇О")
@TableField(exist = false)
private String categoryName;
diff --git a/server/system_timer/src/main/resources/bootstrap-dev.yml b/server/system_timer/src/main/resources/bootstrap-dev.yml
index 2553983..53d7859 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
- # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.3: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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3: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 caac07c..acbfbc6 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.7:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.3: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 d9a7b7c..1bd02a6 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
- # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.3: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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3: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 284ae5b..f26e380 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
- # server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.3: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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_test
username: nacos
password: nacos
\ No newline at end of file
diff --git a/server/system_timer/src/main/resources/bootstrap.yml b/server/system_timer/src/main/resources/bootstrap.yml
index 05a83ce..107b53b 100644
--- a/server/system_timer/src/main/resources/bootstrap.yml
+++ b/server/system_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: systemTimer
# 瀹夊叏閰嶇疆
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 f2e0425..fe9206b 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.3: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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3: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 c8032c1..5de140f 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.7:8848 #閰嶇疆Nacos鍦板潃
+ # server-addr: http://192.168.0.3: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 a9e0f19..6a5b70a 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.3: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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3: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 86e309f..406209d 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.3: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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_test
username: nacos
password: nacos
diff --git a/server/visits/admin_timer/src/main/resources/bootstrap.yml b/server/visits/admin_timer/src/main/resources/bootstrap.yml
index b5b65b7..efae338 100644
--- a/server/visits/admin_timer/src/main/resources/bootstrap.yml
+++ b/server/visits/admin_timer/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: visitsTimer
# 瀹夊叏閰嶇疆
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 3be58d6..6f0c886 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
discovery:
- server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
# namespace: dmvisit
namespace: wuhu_visit_dev
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 f0af774..3e22c6f 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.7:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.3: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 3ac195f..cd47c67 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.3: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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3: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 daac276..8bd85ef 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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
username: nacos
password: nacos
# config:
-# server-addr: http://192.168.0.7:8848 #閰嶇疆Nacos鍦板潃
+# server-addr: http://192.168.0.3: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.7:8848 #閰嶇疆Nacos鍦板潃
+ server-addr: http://192.168.0.3:8848 #閰嶇疆Nacos鍦板潃
namespace: wuhu_visit_test
username: nacos
password: nacos
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 5678c61..7db147e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -597,13 +597,13 @@
queryWrapper.ge(Company::getFsDate, Utils.Date.getStart(pageWrap.getModel().getFsDate()));
queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(pageWrap.getModel().getFsDate()));
}
- queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
/* .leftJoin(Member.class, Member::getId,Company::getHeadId)*/
/* queryWrapper.leftJoin(" company c on c.id=t.parent_id");*/
queryWrapper.selectAll(Company.class)
.select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum") ;
queryWrapper.select("t1.name",Company::getParentName);
queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
+ queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,Constants.ZERO);
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"c.name",pageWrap.getModel().getParentName());
@@ -713,9 +713,13 @@
queryWrapper.select("t1.name",Company::getParentName);
queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
queryWrapper.select("t1.type",Company::getParentType);
+ queryWrapper.select("c1.NAME",Company::getRelationCompanyName);
+ queryWrapper.select("s1.NAME",Company::getRelationUserName);
queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
queryWrapper.leftJoin(Member.class,Member::getId,Company::getHeadId);
queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Company::getEditor);
+ queryWrapper.leftJoin("company c1 on t.RELATION_COMPANY_ID = c1.id");
+ queryWrapper.leftJoin("member s1 on t.RELATION_USER_ID = s1.id");
queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
if(Objects.nonNull(type) && ( Constants.equalsInteger(type,Constants.ONE) || Constants.equalsInteger(type,Constants.ZERO))){
// queryWrapper.eq(type!=null,Company::getType,type);
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
index cc8b29e..a4d1e82 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
@@ -7,9 +7,11 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CategoryMapper;
+import com.doumee.dao.business.InoutDayCountMapper;
import com.doumee.dao.business.InoutRecordMapper;
import com.doumee.dao.business.dto.InParkDataDTO;
import com.doumee.dao.business.model.Category;
+import com.doumee.dao.business.model.InoutDayCount;
import com.doumee.dao.business.model.InoutRecord;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.vo.GeneralDataVO;
@@ -56,6 +58,9 @@
@Autowired
private CategoryMapper categoryMapper;
+
+ @Autowired
+ private InoutDayCountMapper inoutDayCountMapper;
@Override
public Integer create(InoutRecord inoutRecord) {
@@ -556,7 +561,19 @@
TelecomInParkDataVO telecomInParkDataVO = new TelecomInParkDataVO();
telecomInParkDataVO.setInCarNum(Constants.ZERO);
telecomInParkDataVO.setInUserNum(Constants.ZERO);
- List<InoutRecord> listCar = inoutRecordMapper.selectList(new MPJLambdaWrapper<InoutRecord>()
+
+ InoutDayCount inoutDayCount = inoutDayCountMapper.selectOne(new QueryWrapper<InoutDayCount>()
+ .lambda()
+ .apply(" DATE(TIME_INFO) = CURDATE() ")
+ .last(" limit 1 ")
+ );
+
+ if(Objects.nonNull(inoutDayCount)){
+ telecomInParkDataVO.setInUserNum(inoutDayCount.getInMemberNum());
+ telecomInParkDataVO.setInCarNum(inoutDayCount.getInCarNum());
+ }
+
+ /* List<InoutRecord> listCar = inoutRecordMapper.selectList(new MPJLambdaWrapper<InoutRecord>()
.eq(InoutRecord::getIsdeleted,Constants.ZERO)
.eq(InoutRecord::getInOrOut,Constants.ZERO)
.isNotNull(InoutRecord::getCarCode)
@@ -577,7 +594,7 @@
telecomInParkDataVO.setInUserNum(
new HashSet<>(listUser.stream().map(i->i.getMemberPhone()).collect(Collectors.toList())).size()
);
- }
+ }*/
return telecomInParkDataVO;
}
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 1afb5ca..993bdae 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
@@ -4,7 +4,6 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.dingTalk.DingTalk;
-import com.doumee.core.dingTalk.DingTalkStream;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.jiandaoyun.api.arch.DeptApiClient;
@@ -1189,6 +1188,7 @@
.selectAs(JkKeys::getCarCode,JkCabinetGrid::getCarCode)
.selectAs(JkKeys::getRfidLable,JkCabinetGrid::getKeyCode)
.selectAs(JkKeys::getStatus,JkCabinetGrid::getKeyStatus)
+ .selectAs(JkKeys::getCarId,JkCabinetGrid::getCarId)
.leftJoin(JkKeys.class,JkKeys::getId,JkCabinetGrid::getKeyId)
.leftJoin(JkCabinet.class,JkCabinet::getId,JkCabinetGrid::getCabinetId)
.eq(JkCabinet::getCode,dto.getCode())
@@ -1219,6 +1219,21 @@
.eq(JkKeys::getId,jkCabinetGrid.getKeyId())
);
log.error("閽ュ寵鏌滀俊鎭帹閫佸疄闄呴挜鍖欏彉鍖栵細"+jkCabinetGrid.getKeyCode());
+ JkCabinetLog cabinetLog = new JkCabinetLog();
+ cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
+ cabinetLog.setGridId(jkCabinetGrid.getId());
+ cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
+ cabinetLog.setCarId(jkCabinetGrid.getCarId());
+ cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
+ cabinetLog.setType(Constants.ONE);
+ cabinetLog.setStatus(Constants.ZERO);
+ cabinetLog.setAuthType(3);
+ cabinetLog.setKeyStatus(Constants.TWO);
+ cabinetLog.setIsNotice(Constants.ZERO);
+ cabinetLog.setInfo("纭欢鍚屾-閽ュ寵涓嶅湪浣�");
+ cabinetLog.setIsdeleted(Constants.ZERO);
+ cabinetLog.setCreateDate(new Date());
+ jkCabinetLogMapper.insert(cabinetLog);
}
}else{
if(!Constants.equalsInteger(jkCabinetGrid.getKeyStatus(),Constants.ONE)){
@@ -1227,6 +1242,21 @@
.eq(JkKeys::getId,jkCabinetGrid.getKeyId())
);
log.error("閽ュ寵鏌滀俊鎭帹閫佸疄闄呴挜鍖欏彉鍖栵細"+jkCabinetGrid.getKeyCode());
+ JkCabinetLog cabinetLog = new JkCabinetLog();
+ cabinetLog.setCabinetId(jkCabinetGrid.getCabinetId());
+ cabinetLog.setGridId(jkCabinetGrid.getId());
+ cabinetLog.setKeyId(jkCabinetGrid.getKeyId());
+ cabinetLog.setCarId(jkCabinetGrid.getCarId());
+ cabinetLog.setKeyInfo(jkCabinetGrid.getCarCode() + " " + jkCabinetGrid.getKeyCode());
+ cabinetLog.setType(Constants.ONE);
+ cabinetLog.setStatus(Constants.ZERO);
+ cabinetLog.setAuthType(3);
+ cabinetLog.setKeyStatus(Constants.ONE);
+ cabinetLog.setIsNotice(Constants.ZERO);
+ cabinetLog.setInfo("纭欢鍚屾-閽ュ寵鍦ㄤ綅");
+ cabinetLog.setIsdeleted(Constants.ZERO);
+ cabinetLog.setCreateDate(new Date());
+ jkCabinetLogMapper.insert(cabinetLog);
}
}
// if(StringUtils.isBlank(jkCabinetGrid.getKeyCode())
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttPushCallback.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttPushCallback.java
index a4372cf..2c2acbe 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttPushCallback.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttPushCallback.java
@@ -27,7 +27,7 @@
/**
* @author T14
*/
-@Service
+@Service("deviceMqttPushCallback")
@Slf4j
public class MqttPushCallback implements MqttCallback {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttSubServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttSubServiceImpl.java
index a3a9859..0ccac6a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttSubServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/mqtt/MqttSubServiceImpl.java
@@ -17,6 +17,7 @@
@Slf4j
public class MqttSubServiceImpl implements MqttBizService {
@Autowired
+ @org.springframework.beans.factory.annotation.Qualifier("deviceMqttPushCallback")
private MqttPushCallback callBack ;
@Override
public MqttClient subscribe(MqttClient client,MqttConfig config,String[] topics){
--
Gitblit v1.9.3