From 7a940af7a0cea67f6dc59f79158229895d2a4dba Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 08 一月 2026 09:28:25 +0800
Subject: [PATCH] 修改简道云人员推送删除功能bug
---
server/system_service/src/main/java/com/doumee/config/DataSyncConfig.java | 5 ++---
server/doc/新增断路器设备功能（2025-12-24）.sql | 12 ++++++------
server/doc/新增告警规则关联监控点（2025-12-10）.sql | 2 +-
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2 +-
server/doc/月台自动加号数据库变动脚本.md | 6 +++---
server/system_gateway/src/main/resources/application-dev.yml | 2 +-
server/system_gateway/src/main/resources/bootstrap.yml | 2 +-
7 files changed, 15 insertions(+), 16 deletions(-)
diff --git "a/server/doc/\346\226\260\345\242\236\345\221\212\350\255\246\350\247\204\345\210\231\345\205\263\350\201\224\347\233\221\346\216\247\347\202\271\357\274\2102025-12-10\357\274\211.sql" "b/server/doc/\346\226\260\345\242\236\345\221\212\350\255\246\350\247\204\345\210\231\345\205\263\350\201\224\347\233\221\346\216\247\347\202\271\357\274\2102025-12-10\357\274\211.sql"
index 2a302bd..33569c1 100644
--- "a/server/doc/\346\226\260\345\242\236\345\221\212\350\255\246\350\247\204\345\210\231\345\205\263\350\201\224\347\233\221\346\216\247\347\202\271\357\274\2102025-12-10\357\274\211.sql"
+++ "b/server/doc/\346\226\260\345\242\236\345\221\212\350\255\246\350\247\204\345\210\231\345\205\263\350\201\224\347\233\221\346\216\247\347\202\271\357\274\2102025-12-10\357\274\211.sql"
@@ -1,3 +1,3 @@
-ALTER TABLE `wuhuyancao`.`warning_rule_detail`
+ALTER TABLE `warning_rule_detail`
ADD COLUMN `DEVICE_NAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '鐩戞帶鐐瑰悕绉�' AFTER `REGION_ID`,
ADD COLUMN `DEVICE_ID` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '鐩戞帶鐐逛富閿�' AFTER `DEVICE_NAME`;
\ No newline at end of file
diff --git "a/server/doc/\346\226\260\345\242\236\346\226\255\350\267\257\345\231\250\350\256\276\345\244\207\345\212\237\350\203\275\357\274\2102025-12-24\357\274\211.sql" "b/server/doc/\346\226\260\345\242\236\346\226\255\350\267\257\345\231\250\350\256\276\345\244\207\345\212\237\350\203\275\357\274\2102025-12-24\357\274\211.sql"
index 32df704..63acdcc 100644
--- "a/server/doc/\346\226\260\345\242\236\346\226\255\350\267\257\345\231\250\350\256\276\345\244\207\345\212\237\350\203\275\357\274\2102025-12-24\357\274\211.sql"
+++ "b/server/doc/\346\226\260\345\242\236\346\226\255\350\267\257\345\231\250\350\256\276\345\244\207\345\212\237\350\203\275\357\274\2102025-12-24\357\274\211.sql"
@@ -1,13 +1,13 @@
-ALTER TABLE `wuhuyancao`.`device`
+ALTER TABLE `device`
MODIFY COLUMN `door_no` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '闂ㄧ鐐圭紪鍙�' AFTER `install_location`;
-INSERT INTO `wuhuyancao`.`quartz_job` (`id`, `bean_name`, `params`, `cron_expres`, `state`, `remark`, `create_time`, `module`) VALUES (NULL, 'visitServiceJob', '{}', '0 0/5 * * * ? *', 1, '銆愭柇璺櫒銆戝紑鍚畾鏃惰繙绋嬫帶鍒舵柇璺櫒鍒嗛椄', '2023-07-26 13:17:17', 'autoCloseCmd');
+INSERT INTO `quartz_job` (`id`, `bean_name`, `params`, `cron_expres`, `state`, `remark`, `create_time`, `module`) VALUES (NULL, 'visitServiceJob', '{}', '0 0/5 * * * ? *', 1, '銆愭柇璺櫒銆戝紑鍚畾鏃惰繙绋嬫帶鍒舵柇璺櫒鍒嗛椄', '2023-07-26 13:17:17', 'autoCloseCmd');
-INSERT INTO `wuhuyancao`.`system_dict_data` (`ID`, `DICT_ID`, `CODE`, `LABEL`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`, `REMARK`) VALUES (314, 18, 'yKSKuO0LoFf06jWGrwwuGudK', 'JDY_SECRET', 0, 0, 1, '2025-12-29 10:32:54', NULL, '2025-12-29 10:31:45', 0, '鏁版嵁鎺ㄩ�佺閽�');
-INSERT INTO `wuhuyancao`.`system_dict_data` (`ID`, `DICT_ID`, `CODE`, `LABEL`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`, `REMARK`) VALUES (315, 18, 'https://api.jiandaoyun.com/api/v1/automation/tenant/6909b792324dc197821895d1/hooks/6909d0fbdb93695219faa27eb068192dc4a9532972993159', 'JDY_MEMBER_PUSH_STATUS_URL', 0, 0, 1, '2025-12-29 14:06:56', NULL, '2025-12-29 14:05:46', 0, '绠�閬撲簯浜哄憳鎺ㄩ�佸鐞嗙粨鏋滈�氱煡鍦板潃');
-INSERT INTO `wuhuyancao`.`system_dict_data` (`ID`, `DICT_ID`, `CODE`, `LABEL`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`, `REMARK`) VALUES (316, 1, '鑺滄箹鐑熻崏鍏徃', 'SYSTEM_TITLE', 0, 0, 1, '2025-12-30 14:49:57', NULL, '2025-12-30 14:48:47', 0, '绯荤粺涓绘爣棰�');
-INSERT INTO `wuhuyancao`.`system_dict_data` (`ID`, `DICT_ID`, `CODE`, `LABEL`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`, `REMARK`) VALUES (317, 1, '鏅烘収鐗╂祦鍥尯瀹夋秷涓�浣撳寲骞冲彴', 'SYSTEM_SUBTITLE', 0, 0, 1, '2025-12-30 14:50:40', NULL, '2025-12-30 14:49:30', 0, '绯荤粺鍓爣棰�');
+INSERT INTO `system_dict_data` (`ID`, `DICT_ID`, `CODE`, `LABEL`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`, `REMARK`) VALUES (314, 18, 'yKSKuO0LoFf06jWGrwwuGudK', 'JDY_SECRET', 0, 0, 1, '2025-12-29 10:32:54', NULL, '2025-12-29 10:31:45', 0, '鏁版嵁鎺ㄩ�佺閽�');
+INSERT INTO `system_dict_data` (`ID`, `DICT_ID`, `CODE`, `LABEL`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`, `REMARK`) VALUES (315, 18, 'https://api.jiandaoyun.com/api/v1/automation/tenant/6909b792324dc197821895d1/hooks/6909d0fbdb93695219faa27eb068192dc4a9532972993159', 'JDY_MEMBER_PUSH_STATUS_URL', 0, 0, 1, '2025-12-29 14:06:56', NULL, '2025-12-29 14:05:46', 0, '绠�閬撲簯浜哄憳鎺ㄩ�佸鐞嗙粨鏋滈�氱煡鍦板潃');
+INSERT INTO `system_dict_data` (`ID`, `DICT_ID`, `CODE`, `LABEL`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`, `REMARK`) VALUES (316, 1, '鑺滄箹鐑熻崏鍏徃', 'SYSTEM_TITLE', 0, 0, 1, '2025-12-30 14:49:57', NULL, '2025-12-30 14:48:47', 0, '绯荤粺涓绘爣棰�');
+INSERT INTO `system_dict_data` (`ID`, `DICT_ID`, `CODE`, `LABEL`, `SORT`, `DISABLED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`, `REMARK`) VALUES (317, 1, '鏅烘収鐗╂祦鍥尯瀹夋秷涓�浣撳寲骞冲彴', 'SYSTEM_SUBTITLE', 0, 0, 1, '2025-12-30 14:50:40', NULL, '2025-12-30 14:49:30', 0, '绯荤粺鍓爣棰�');
CREATE TABLE `device_data` (
diff --git "a/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md" "b/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md"
index 77584e9..b4cdba5 100644
--- "a/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md"
+++ "b/server/doc/\346\234\210\345\217\260\350\207\252\345\212\250\345\212\240\345\217\267\346\225\260\346\215\256\345\272\223\345\217\230\345\212\250\350\204\232\346\234\254.md"
@@ -1,5 +1,5 @@
-ALTER TABLE `antaiwuliu`.`platform_group`
+ALTER TABLE `platform_group`
MODIFY COLUMN `START_TIME` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '宸ヤ綔寮�濮嬫椂闂达紙HH:mm锛�' AFTER `SORTNUM`,
MODIFY COLUMN `END_TIME` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '宸ヤ綔缁撴潫鏃堕棿锛圚H:mm锛�' AFTER `START_TIME`,
ADD COLUMN `AUTO_CALL` int NULL COMMENT '鏄惁鑷姩鍙彿 0鍚� 1鏄�' AFTER `WAIT_CALL_TIME`,
@@ -7,12 +7,12 @@
ADD COLUMN `AUTO_CALL_START_TIME` varchar(100) NULL COMMENT '鑷姩鍙彿鎴鏃堕棿锛圚H:mm锛�' AFTER `IS_VIRTUAL`,
ADD COLUMN `AUTO_CALL_END_TIME` varchar(100) NULL COMMENT '鑷姩鍙彿鎴鏃堕棿锛圚H:mm锛�' AFTER `AUTO_CALL_START_TIME`;
-ALTER TABLE `antaiwuliu`.`platform`
+ALTER TABLE `platform`
ADD COLUMN `TYPE` int NULL COMMENT '绫诲瀷 0鏁存墭鐩� 1鏁ｄ欢' AFTER `LED_CONTENT`,
ADD COLUMN `CALL_READY_NUM` varchar(100) NULL COMMENT '鍚屾椂鍑嗗浣滀笟鏁伴噺' AFTER `TYPE`;
-ALTER TABLE `antaiwuliu`.`platform_job`
+ALTER TABLE `platform_job`
ADD COLUMN `TAG_VIRTUAL` int NULL COMMENT '鏄惁鏇存崲鏈堝彴缁� 0鍚� 1鏄�' AFTER `ORIGIN`,
ADD COLUMN `TAG_VIRTUAL_TIME` datetime NULL COMMENT '鏇存崲鏈堝彴缁勬椂闂�' AFTER `TAG_VIRTUAL`,
ADD COLUMN `TAG_VIRTUAL_USER` int NULL COMMENT '鏇存崲鏈堝彴缁勪汉鍛樼紪鐮�' AFTER `TAG_VIRTUAL_TIME`,
diff --git a/server/system_gateway/src/main/resources/application-dev.yml b/server/system_gateway/src/main/resources/application-dev.yml
index c4cb500..af3aed0 100644
--- a/server/system_gateway/src/main/resources/application-dev.yml
+++ b/server/system_gateway/src/main/resources/application-dev.yml
@@ -1,7 +1,7 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://192.168.0.211:3306/wuhuyancao?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.0.211:3306/dmvisits?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
username: root
password: Doumee@168
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 8390bda..02ca26f 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: test
+ active: dev
application:
name: system_gateway
# 瀹夊叏閰嶇疆
diff --git a/server/system_service/src/main/java/com/doumee/config/DataSyncConfig.java b/server/system_service/src/main/java/com/doumee/config/DataSyncConfig.java
index 9e0ad3f..e3af880 100644
--- a/server/system_service/src/main/java/com/doumee/config/DataSyncConfig.java
+++ b/server/system_service/src/main/java/com/doumee/config/DataSyncConfig.java
@@ -15,14 +15,13 @@
int jdy = 3;
int dingding = 4;
}
-
/**
*
- 鍐呴儴缁勭粐浜哄憳鏁版嵁 0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺 3绠�閬撲簯 4閽夐拤
+ 鍐呴儴缁勭粐浜哄憳鏁版嵁 0鑷缓 2浠ユ捣搴峰畨闃插钩鍙颁负涓� 1鍗庢櫉ERP绯荤粺 3绠�閬撲簯 4閽夐拤
*/
private Integer orgUserDataOrigin;
/**
- * 璁垮鏉ユ簮锛�0鑷缓 2浠ユ捣搴蜂负涓� 1鍗庢櫉ERP绯荤粺 2绠�閬撲簯
+ * 璁垮鏉ユ簮锛�0鑷缓 2浠ユ捣搴峰畨闃插钩鍙颁负涓� 1鍗庢櫉ERP绯荤粺 3绠�閬撲簯
*/
private Integer visitorDataOrigin;
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
# 瀹夊叏閰嶇疆
--
Gitblit v1.9.3