diff --git a/README.md b/README.md index dd367fa..2054daf 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ## 🐯 平台简介 -**芋道**，以开发者为中心，打造中国第一流的快速开发平台，全部开源，个人与企业可 100% 免费使用。 +**全域**，以开发者为中心，打造中国第一流的快速开发平台，全部开源，个人与企业可 100% 免费使用。 > 有任何问题，或者想要的功能，可以在 _Issues_ 中提给艿艿。 > diff --git a/pom.xml b/pom.xml index 2c64f7c..eb63677 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ ${project.artifactId} - 芋道项目基础脚手架 + 全域项目基础脚手架 https://github.com/YunaiV/ruoyi-vue-pro diff --git a/sql/dm/ruoyi-vue-pro-dm8.sql b/sql/dm/ruoyi-vue-pro-dm8.sql index 14c2816..bd7e2de 100644 --- a/sql/dm/ruoyi-vue-pro-dm8.sql +++ b/sql/dm/ruoyi-vue-pro-dm8.sql @@ -2583,7 +2583,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; -- ---------------------------- -- @formatter:off SET IDENTITY_INSERT system_notice ON; -INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '芋道的公众', '

新版本内容133

', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); +INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '全域的公众', '

新版本内容133

', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知：2018-07-01 系统凌晨维护', '

11112222image3333

', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', '0', 1); INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '

哈哈哈哈123

', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', '0', 121); COMMIT; @@ -4338,7 +4338,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; SET IDENTITY_INSERT system_tenant ON; INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (1, 'ZIEITS', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2023-11-06 11:41:41', '0'); INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, '2026-07-10 00:00:00', 30, '1', '2022-02-22 00:56:14', '1', '2025-04-03 21:33:01', '0'); -INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0'); +INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '全域', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0'); COMMIT; SET IDENTITY_INSERT system_tenant OFF; -- @formatter:on @@ -4536,7 +4536,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; -- @formatter:off SET IDENTITY_INSERT system_users ON; INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, 'admin', '$2a$04$KljJDa/LK7QfDm0lF5OhuePhlPfjRH3tB2Wu351Uidz.oQGJXevPi', 'ZIEITS', '管理员', 103, '[1,2]', '11aoteman@126.com', '18818260277', 2, 'http://test.urbanops.iocoder.cn/test/20250502/avatar_1746154660449.png', 0, '0:0:0:0:0:0:0:1', '2025-05-10 18:03:15', 'admin', '2021-01-05 17:03:47', NULL, '2025-05-10 18:03:15', '0', 1); -INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (100, 'urbanops', '$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', '芋道', '不要吓我', 104, '[1]', 'urbanops@iocoder.cn', '15601691300', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-04-08 09:36:40', '', '2021-01-07 09:07:17', NULL, '2025-04-21 14:23:08', '0', 1); +INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (100, 'urbanops', '$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', '全域', '不要吓我', 104, '[1]', 'urbanops@iocoder.cn', '15601691300', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-04-08 09:36:40', '', '2021-01-07 09:07:17', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (103, 'yuanma', '$2a$04$fUBSmjKCPYAUmnMzOb6qE.eZCGPhHi1JmAKclODbfS/O7fHOl2bH6', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2024-08-11 17:48:12', '', '2021-01-13 23:50:35', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (104, 'test', '$2a$04$BrwaYn303hjA/6TnXqdGoOLhyHOAA0bVrAFu6.1dJKycqKUnIoRz2', '测试号', NULL, 107, '[1,2]', '111@qq.com', '15601691200', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-03-28 20:01:16', '', '2021-01-21 02:13:53', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (107, 'admin107', '$2a$10$dYOOBKMO93v/.ReCqzyFg.o67Tqk.bbc2bhrpyBGkIw9aypCtr2pm', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '', NULL, '1', '2022-02-20 22:59:33', '1', '2025-04-21 14:23:08', '0', 118); @@ -4545,7 +4545,7 @@ INSERT INTO system_users (id, username, password, nickname, remark, dept_id, pos INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (110, 'admin110', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '小王', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2024-07-20 22:23:17', '1', '2022-02-22 00:56:14', NULL, '2025-04-21 14:23:08', '0', 121); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (111, 'test', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '测试用户', NULL, NULL, '[]', '', '', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2023-12-30 11:42:17', '110', '2022-02-23 13:14:33', NULL, '2025-04-21 14:23:08', '0', 121); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (112, 'newobject', '$2a$04$dB0z8Q819fJWz0hbaLe6B.VfHCjYgWx6LFfET5lyz3JwcqlyCkQ4C', '新对象', NULL, 100, '[]', '', '15601691235', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-03-16 23:11:38', '1', '2022-02-23 19:08:03', NULL, '2025-04-21 14:23:08', '0', 1); -INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道1', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '127.0.0.1', '2022-03-19 18:38:51', '1', '2022-03-07 21:37:58', '1', '2025-05-05 15:30:53', '0', 122); +INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '全域1', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '127.0.0.1', '2022-03-19 18:38:51', '1', '2022-03-07 21:37:58', '1', '2025-05-05 15:30:53', '0', 122); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (114, 'hrmgr', '$2a$10$TR4eybBioGRhBmDBWkqWLO6NIh3mzYa8KBKDDB5woiGYFVlRAi.fu', 'hr 小姐姐', NULL, NULL, '[5]', '', '15601691236', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-03-24 22:21:05', '1', '2022-03-19 21:50:58', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (115, 'aotemane', '$2a$04$GcyP0Vyzb2F2Yni5PuIK9ueGxM0tkZGMtDwVRwrNbtMvorzbpNsV2', '阿呆', '11222', 102, '[1,2]', '7648@qq.com', '15601691229', 2, NULL, 0, '', NULL, '1', '2022-04-30 02:55:43', '1', '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (117, 'admin123', '$2a$04$sEtimsHu9YCkYY4/oqElHem2Ijc9ld20eYO6lN.g/21NfLUTDLB9W', '测试号02', '1111', 100, '[2]', '', '15601691234', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-10-02 10:16:20', '1', '2022-07-09 17:40:26', NULL, '2025-04-21 14:23:08', '0', 1); diff --git a/sql/kingbase/ruoyi-vue-pro.sql b/sql/kingbase/ruoyi-vue-pro.sql index 5b04f7f..e88975f 100644 --- a/sql/kingbase/ruoyi-vue-pro.sql +++ b/sql/kingbase/ruoyi-vue-pro.sql @@ -2748,7 +2748,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; -- ---------------------------- -- @formatter:off BEGIN; -INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '芋道的公众', '

新版本内容133

', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); +INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '全域的公众', '

新版本内容133

', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知：2018-07-01 系统凌晨维护', '

11112222image3333

', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', '0', 1); INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '

哈哈哈哈123

', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', '0', 121); COMMIT; @@ -4646,7 +4646,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; BEGIN; INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (1, 'ZIEITS', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2023-11-06 11:41:41', '0'); INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, '2026-07-10 00:00:00', 30, '1', '2022-02-22 00:56:14', '1', '2025-04-03 21:33:01', '0'); -INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0'); +INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '全域', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0'); COMMIT; -- @formatter:on @@ -4872,7 +4872,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; -- @formatter:off BEGIN; INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, 'admin', '$2a$04$KljJDa/LK7QfDm0lF5OhuePhlPfjRH3tB2Wu351Uidz.oQGJXevPi', 'ZIEITS', '管理员', 103, '[1,2]', '11aoteman@126.com', '18818260277', 2, 'http://test.urbanops.iocoder.cn/test/20250502/avatar_1746154660449.png', 0, '0:0:0:0:0:0:0:1', '2025-05-10 18:03:15', 'admin', '2021-01-05 17:03:47', NULL, '2025-05-10 18:03:15', '0', 1); -INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (100, 'urbanops', '$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', '芋道', '不要吓我', 104, '[1]', 'urbanops@iocoder.cn', '15601691300', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-04-08 09:36:40', '', '2021-01-07 09:07:17', NULL, '2025-04-21 14:23:08', '0', 1); +INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (100, 'urbanops', '$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', '全域', '不要吓我', 104, '[1]', 'urbanops@iocoder.cn', '15601691300', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-04-08 09:36:40', '', '2021-01-07 09:07:17', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (103, 'yuanma', '$2a$04$fUBSmjKCPYAUmnMzOb6qE.eZCGPhHi1JmAKclODbfS/O7fHOl2bH6', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2024-08-11 17:48:12', '', '2021-01-13 23:50:35', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (104, 'test', '$2a$04$BrwaYn303hjA/6TnXqdGoOLhyHOAA0bVrAFu6.1dJKycqKUnIoRz2', '测试号', NULL, 107, '[1,2]', '111@qq.com', '15601691200', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-03-28 20:01:16', '', '2021-01-21 02:13:53', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (107, 'admin107', '$2a$10$dYOOBKMO93v/.ReCqzyFg.o67Tqk.bbc2bhrpyBGkIw9aypCtr2pm', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '', NULL, '1', '2022-02-20 22:59:33', '1', '2025-04-21 14:23:08', '0', 118); @@ -4881,7 +4881,7 @@ INSERT INTO system_users (id, username, password, nickname, remark, dept_id, pos INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (110, 'admin110', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '小王', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2024-07-20 22:23:17', '1', '2022-02-22 00:56:14', NULL, '2025-04-21 14:23:08', '0', 121); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (111, 'test', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '测试用户', NULL, NULL, '[]', '', '', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2023-12-30 11:42:17', '110', '2022-02-23 13:14:33', NULL, '2025-04-21 14:23:08', '0', 121); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (112, 'newobject', '$2a$04$dB0z8Q819fJWz0hbaLe6B.VfHCjYgWx6LFfET5lyz3JwcqlyCkQ4C', '新对象', NULL, 100, '[]', '', '15601691235', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-03-16 23:11:38', '1', '2022-02-23 19:08:03', NULL, '2025-04-21 14:23:08', '0', 1); -INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道1', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '127.0.0.1', '2022-03-19 18:38:51', '1', '2022-03-07 21:37:58', '1', '2025-05-05 15:30:53', '0', 122); +INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '全域1', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '127.0.0.1', '2022-03-19 18:38:51', '1', '2022-03-07 21:37:58', '1', '2025-05-05 15:30:53', '0', 122); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (114, 'hrmgr', '$2a$10$TR4eybBioGRhBmDBWkqWLO6NIh3mzYa8KBKDDB5woiGYFVlRAi.fu', 'hr 小姐姐', NULL, NULL, '[5]', '', '15601691236', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-03-24 22:21:05', '1', '2022-03-19 21:50:58', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (115, 'aotemane', '$2a$04$GcyP0Vyzb2F2Yni5PuIK9ueGxM0tkZGMtDwVRwrNbtMvorzbpNsV2', '阿呆', '11222', 102, '[1,2]', '7648@qq.com', '15601691229', 2, NULL, 0, '', NULL, '1', '2022-04-30 02:55:43', '1', '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (117, 'admin123', '$2a$04$sEtimsHu9YCkYY4/oqElHem2Ijc9ld20eYO6lN.g/21NfLUTDLB9W', '测试号02', '1111', 100, '[2]', '', '15601691234', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-10-02 10:16:20', '1', '2022-07-09 17:40:26', NULL, '2025-04-21 14:23:08', '0', 1); diff --git a/sql/mysql/ruoyi-vue-pro.sql b/sql/mysql/ruoyi-vue-pro.sql index def2787..53916dc 100644 --- a/sql/mysql/ruoyi-vue-pro.sql +++ b/sql/mysql/ruoyi-vue-pro.sql @@ -2338,7 +2338,7 @@ CREATE TABLE `system_notice` ( -- Records of system_notice -- ---------------------------- BEGIN; -INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, '芋道的公众', '

新版本内容133222

', 1, 0, 'admin', '2021-01-05 17:03:48', '\"1\"', '2025-08-31 09:38:22', b'0', 1); +INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, '全域的公众', '

新版本内容133222

', 1, 0, 'admin', '2021-01-05 17:03:48', '\"1\"', '2025-08-31 09:38:22', b'0', 1); INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, '维护通知：2018-07-01 系统凌晨维护', '

\"\"11112222\"image\"3333

', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', b'0', 1); INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (4, '我是测试标题', '

哈哈哈哈123

', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', b'0', 121); COMMIT; @@ -3609,7 +3609,7 @@ CREATE TABLE `system_tenant` ( BEGIN; INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `websites`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1, 'ZIEITS', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn,127.0.0.1:3000,wxc4598c446f8a9cb3', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2025-08-19 05:18:41', b'0'); INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `websites`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn,123321', 111, '2026-07-10 00:00:00', 30, '1', '2022-02-22 00:56:14', '1', '2025-08-19 21:19:29', b'0'); -INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `websites`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2025-08-24 14:46:15', b'0'); +INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `websites`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (122, '测试租户', 113, '全域', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2025-08-24 14:46:15', b'0'); COMMIT; -- ---------------------------- @@ -3741,7 +3741,7 @@ CREATE TABLE `system_users` ( -- ---------------------------- BEGIN; INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 'admin', '$2a$04$KljJDa/LK7QfDm0lF5OhuePhlPfjRH3tB2Wu351Uidz.oQGJXevPi', 'ZIEITS', '管理员', 103, '[1,2]', '11aoteman@126.com', '18818260272', 2, 'http://test.urbanops.iocoder.cn/user/avatar/20250709/blob_1752042302026.jpg', 0, '0:0:0:0:0:0:0:1', '2025-08-30 19:57:52', 'admin', '2021-01-05 17:03:47', NULL, '2025-08-30 19:57:52', b'0', 1); -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (100, 'urbanops', '$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', '芋道', '不要吓我', 104, '[1]', 'urbanops@iocoder.cn', '15601691300', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-04-08 09:36:40', '', '2021-01-07 09:07:17', NULL, '2025-04-21 14:23:08', b'0', 1); +INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (100, 'urbanops', '$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', '全域', '不要吓我', 104, '[1]', 'urbanops@iocoder.cn', '15601691300', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-04-08 09:36:40', '', '2021-01-07 09:07:17', NULL, '2025-04-21 14:23:08', b'0', 1); INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (103, 'yuanma', '$2a$04$fUBSmjKCPYAUmnMzOb6qE.eZCGPhHi1JmAKclODbfS/O7fHOl2bH6', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2024-08-11 17:48:12', '', '2021-01-13 23:50:35', '1', '2025-07-09 23:41:58', b'0', 1); INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (104, 'test', '$2a$04$BrwaYn303hjA/6TnXqdGoOLhyHOAA0bVrAFu6.1dJKycqKUnIoRz2', '测试号', NULL, 107, '[1,2]', '111@qq.com', '15601691200', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-03-28 20:01:16', '', '2021-01-21 02:13:53', NULL, '2025-04-21 14:23:08', b'0', 1); INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (107, 'admin107', '$2a$10$dYOOBKMO93v/.ReCqzyFg.o67Tqk.bbc2bhrpyBGkIw9aypCtr2pm', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '', NULL, '1', '2022-02-20 22:59:33', '1', '2025-04-21 14:23:08', b'0', 118); @@ -3750,7 +3750,7 @@ INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (110, 'admin110', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '小王', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2024-07-20 22:23:17', '1', '2022-02-22 00:56:14', NULL, '2025-04-21 14:23:08', b'0', 121); INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (111, 'test', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '测试用户', NULL, NULL, '[]', '', '', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2023-12-30 11:42:17', '110', '2022-02-23 13:14:33', NULL, '2025-04-21 14:23:08', b'0', 121); INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (112, 'newobject', '$2a$04$dB0z8Q819fJWz0hbaLe6B.VfHCjYgWx6LFfET5lyz3JwcqlyCkQ4C', '新对象', NULL, 100, '[]', '', '15601691235', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-03-16 23:11:38', '1', '2022-02-23 19:08:03', NULL, '2025-04-21 14:23:08', b'0', 1); -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道1', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '127.0.0.1', '2022-03-19 18:38:51', '1', '2022-03-07 21:37:58', '1', '2025-05-05 15:30:53', b'0', 122); +INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '全域1', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '127.0.0.1', '2022-03-19 18:38:51', '1', '2022-03-07 21:37:58', '1', '2025-05-05 15:30:53', b'0', 122); INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (114, 'hrmgr', '$2a$10$TR4eybBioGRhBmDBWkqWLO6NIh3mzYa8KBKDDB5woiGYFVlRAi.fu', 'hr 小姐姐', NULL, NULL, '[5]', '', '15601691236', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-03-24 22:21:05', '1', '2022-03-19 21:50:58', NULL, '2025-04-21 14:23:08', b'0', 1); INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (115, 'aotemane', '$2a$04$GcyP0Vyzb2F2Yni5PuIK9ueGxM0tkZGMtDwVRwrNbtMvorzbpNsV2', '阿呆', '11222', 102, '[1,2]', '7648@qq.com', '15601691229', 2, NULL, 0, '', NULL, '1', '2022-04-30 02:55:43', '1', '2025-04-21 14:23:08', b'0', 1); INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (117, 'admin123', '$2a$04$sEtimsHu9YCkYY4/oqElHem2Ijc9ld20eYO6lN.g/21NfLUTDLB9W', '测试号02', '1111', 100, '[2]', '', '15601691234', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-10-02 10:16:20', '1', '2022-07-09 17:40:26', '1', '2025-05-14 09:56:04', b'0', 1); diff --git a/sql/opengauss/ruoyi-vue-pro.sql b/sql/opengauss/ruoyi-vue-pro.sql index cbca788..5b236b1 100644 --- a/sql/opengauss/ruoyi-vue-pro.sql +++ b/sql/opengauss/ruoyi-vue-pro.sql @@ -2748,7 +2748,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; -- ---------------------------- -- @formatter:off BEGIN; -INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '芋道的公众', '

新版本内容133

', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); +INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '全域的公众', '

新版本内容133

', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知：2018-07-01 系统凌晨维护', '

11112222image3333

', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', '0', 1); INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '

哈哈哈哈123

', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', '0', 121); COMMIT; @@ -4646,7 +4646,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; BEGIN; INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (1, 'ZIEITS', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2023-11-06 11:41:41', '0'); INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, '2026-07-10 00:00:00', 30, '1', '2022-02-22 00:56:14', '1', '2025-04-03 21:33:01', '0'); -INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0'); +INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '全域', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0'); COMMIT; -- @formatter:on @@ -4872,7 +4872,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; -- @formatter:off BEGIN; INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, 'admin', '$2a$04$KljJDa/LK7QfDm0lF5OhuePhlPfjRH3tB2Wu351Uidz.oQGJXevPi', 'ZIEITS', '管理员', 103, '[1,2]', '11aoteman@126.com', '18818260277', 2, 'http://test.urbanops.iocoder.cn/test/20250502/avatar_1746154660449.png', 0, '0:0:0:0:0:0:0:1', '2025-05-10 18:03:15', 'admin', '2021-01-05 17:03:47', NULL, '2025-05-10 18:03:15', '0', 1); -INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (100, 'urbanops', '$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', '芋道', '不要吓我', 104, '[1]', 'urbanops@iocoder.cn', '15601691300', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-04-08 09:36:40', '', '2021-01-07 09:07:17', NULL, '2025-04-21 14:23:08', '0', 1); +INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (100, 'urbanops', '$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', '全域', '不要吓我', 104, '[1]', 'urbanops@iocoder.cn', '15601691300', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-04-08 09:36:40', '', '2021-01-07 09:07:17', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (103, 'yuanma', '$2a$04$fUBSmjKCPYAUmnMzOb6qE.eZCGPhHi1JmAKclODbfS/O7fHOl2bH6', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2024-08-11 17:48:12', '', '2021-01-13 23:50:35', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (104, 'test', '$2a$04$BrwaYn303hjA/6TnXqdGoOLhyHOAA0bVrAFu6.1dJKycqKUnIoRz2', '测试号', NULL, 107, '[1,2]', '111@qq.com', '15601691200', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-03-28 20:01:16', '', '2021-01-21 02:13:53', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (107, 'admin107', '$2a$10$dYOOBKMO93v/.ReCqzyFg.o67Tqk.bbc2bhrpyBGkIw9aypCtr2pm', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '', NULL, '1', '2022-02-20 22:59:33', '1', '2025-04-21 14:23:08', '0', 118); @@ -4881,7 +4881,7 @@ INSERT INTO system_users (id, username, password, nickname, remark, dept_id, pos INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (110, 'admin110', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '小王', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2024-07-20 22:23:17', '1', '2022-02-22 00:56:14', NULL, '2025-04-21 14:23:08', '0', 121); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (111, 'test', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '测试用户', NULL, NULL, '[]', '', '', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2023-12-30 11:42:17', '110', '2022-02-23 13:14:33', NULL, '2025-04-21 14:23:08', '0', 121); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (112, 'newobject', '$2a$04$dB0z8Q819fJWz0hbaLe6B.VfHCjYgWx6LFfET5lyz3JwcqlyCkQ4C', '新对象', NULL, 100, '[]', '', '15601691235', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-03-16 23:11:38', '1', '2022-02-23 19:08:03', NULL, '2025-04-21 14:23:08', '0', 1); -INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道1', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '127.0.0.1', '2022-03-19 18:38:51', '1', '2022-03-07 21:37:58', '1', '2025-05-05 15:30:53', '0', 122); +INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '全域1', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '127.0.0.1', '2022-03-19 18:38:51', '1', '2022-03-07 21:37:58', '1', '2025-05-05 15:30:53', '0', 122); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (114, 'hrmgr', '$2a$10$TR4eybBioGRhBmDBWkqWLO6NIh3mzYa8KBKDDB5woiGYFVlRAi.fu', 'hr 小姐姐', NULL, NULL, '[5]', '', '15601691236', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-03-24 22:21:05', '1', '2022-03-19 21:50:58', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (115, 'aotemane', '$2a$04$GcyP0Vyzb2F2Yni5PuIK9ueGxM0tkZGMtDwVRwrNbtMvorzbpNsV2', '阿呆', '11222', 102, '[1,2]', '7648@qq.com', '15601691229', 2, NULL, 0, '', NULL, '1', '2022-04-30 02:55:43', '1', '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (117, 'admin123', '$2a$04$sEtimsHu9YCkYY4/oqElHem2Ijc9ld20eYO6lN.g/21NfLUTDLB9W', '测试号02', '1111', 100, '[2]', '', '15601691234', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-10-02 10:16:20', '1', '2022-07-09 17:40:26', NULL, '2025-04-21 14:23:08', '0', 1); diff --git a/sql/oracle/ruoyi-vue-pro.sql b/sql/oracle/ruoyi-vue-pro.sql index 4fbcfd6..d4dd6ed 100644 --- a/sql/oracle/ruoyi-vue-pro.sql +++ b/sql/oracle/ruoyi-vue-pro.sql @@ -2681,7 +2681,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; -- Records of system_notice -- ---------------------------- -- @formatter:off -INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '芋道的公众', '

新版本内容133

', 1, 0, 'admin', to_date('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2022-05-04 21:00:20', 'SYYYY-MM-DD HH24:MI:SS'), '0', 1); +INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '全域的公众', '

新版本内容133

', 1, 0, 'admin', to_date('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2022-05-04 21:00:20', 'SYYYY-MM-DD HH24:MI:SS'), '0', 1); INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知：2018-07-01 系统凌晨维护', '

11112222image3333

', 2, 1, 'admin', to_date('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2025-04-18 23:56:40', 'SYYYY-MM-DD HH24:MI:SS'), '0', 1); INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '

哈哈哈哈123

', 1, 0, '110', to_date('2022-02-22 01:01:25', 'SYYYY-MM-DD HH24:MI:SS'), '110', to_date('2022-02-22 01:01:46', 'SYYYY-MM-DD HH24:MI:SS'), '0', 121); COMMIT; @@ -4532,7 +4532,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; -- @formatter:off INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (1, 'ZIEITS', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, to_date('2099-02-19 17:14:16', 'SYYYY-MM-DD HH24:MI:SS'), 9999, '1', to_date('2021-01-05 17:03:47', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2023-11-06 11:41:41', 'SYYYY-MM-DD HH24:MI:SS'), '0'); INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, to_date('2026-07-10 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), 30, '1', to_date('2022-02-22 00:56:14', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2025-04-03 21:33:01', 'SYYYY-MM-DD HH24:MI:SS'), '0'); -INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, to_date('2022-04-29 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), 50, '1', to_date('2022-03-07 21:37:58', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2024-09-22 12:10:50', 'SYYYY-MM-DD HH24:MI:SS'), '0'); +INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '全域', '15601691300', 0, 'test.iocoder.cn', 111, to_date('2022-04-29 00:00:00', 'SYYYY-MM-DD HH24:MI:SS'), 50, '1', to_date('2022-03-07 21:37:58', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2024-09-22 12:10:50', 'SYYYY-MM-DD HH24:MI:SS'), '0'); COMMIT; -- @formatter:on @@ -4746,7 +4746,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; -- ---------------------------- -- @formatter:off INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, 'admin', '$2a$04$KljJDa/LK7QfDm0lF5OhuePhlPfjRH3tB2Wu351Uidz.oQGJXevPi', 'ZIEITS', '管理员', 103, '[1,2]', '11aoteman@126.com', '18818260277', 2, 'http://test.urbanops.iocoder.cn/test/20250502/avatar_1746154660449.png', 0, '0:0:0:0:0:0:0:1', to_date('2025-05-10 18:03:15', 'SYYYY-MM-DD HH24:MI:SS'), 'admin', to_date('2021-01-05 17:03:47', 'SYYYY-MM-DD HH24:MI:SS'), NULL, to_date('2025-05-10 18:03:15', 'SYYYY-MM-DD HH24:MI:SS'), '0', 1); -INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (100, 'urbanops', '$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', '芋道', '不要吓我', 104, '[1]', 'urbanops@iocoder.cn', '15601691300', 1, NULL, 0, '0:0:0:0:0:0:0:1', to_date('2025-04-08 09:36:40', 'SYYYY-MM-DD HH24:MI:SS'), '', to_date('2021-01-07 09:07:17', 'SYYYY-MM-DD HH24:MI:SS'), NULL, to_date('2025-04-21 14:23:08', 'SYYYY-MM-DD HH24:MI:SS'), '0', 1); +INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (100, 'urbanops', '$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', '全域', '不要吓我', 104, '[1]', 'urbanops@iocoder.cn', '15601691300', 1, NULL, 0, '0:0:0:0:0:0:0:1', to_date('2025-04-08 09:36:40', 'SYYYY-MM-DD HH24:MI:SS'), '', to_date('2021-01-07 09:07:17', 'SYYYY-MM-DD HH24:MI:SS'), NULL, to_date('2025-04-21 14:23:08', 'SYYYY-MM-DD HH24:MI:SS'), '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (103, 'yuanma', '$2a$04$fUBSmjKCPYAUmnMzOb6qE.eZCGPhHi1JmAKclODbfS/O7fHOl2bH6', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, NULL, 0, '0:0:0:0:0:0:0:1', to_date('2024-08-11 17:48:12', 'SYYYY-MM-DD HH24:MI:SS'), '', to_date('2021-01-13 23:50:35', 'SYYYY-MM-DD HH24:MI:SS'), NULL, to_date('2025-04-21 14:23:08', 'SYYYY-MM-DD HH24:MI:SS'), '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (104, 'test', '$2a$04$BrwaYn303hjA/6TnXqdGoOLhyHOAA0bVrAFu6.1dJKycqKUnIoRz2', '测试号', NULL, 107, '[1,2]', '111@qq.com', '15601691200', 1, NULL, 0, '0:0:0:0:0:0:0:1', to_date('2025-03-28 20:01:16', 'SYYYY-MM-DD HH24:MI:SS'), '', to_date('2021-01-21 02:13:53', 'SYYYY-MM-DD HH24:MI:SS'), NULL, to_date('2025-04-21 14:23:08', 'SYYYY-MM-DD HH24:MI:SS'), '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (107, 'admin107', '$2a$10$dYOOBKMO93v/.ReCqzyFg.o67Tqk.bbc2bhrpyBGkIw9aypCtr2pm', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '', NULL, '1', to_date('2022-02-20 22:59:33', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2025-04-21 14:23:08', 'SYYYY-MM-DD HH24:MI:SS'), '0', 118); @@ -4755,7 +4755,7 @@ INSERT INTO system_users (id, username, password, nickname, remark, dept_id, pos INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (110, 'admin110', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '小王', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '0:0:0:0:0:0:0:1', to_date('2024-07-20 22:23:17', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2022-02-22 00:56:14', 'SYYYY-MM-DD HH24:MI:SS'), NULL, to_date('2025-04-21 14:23:08', 'SYYYY-MM-DD HH24:MI:SS'), '0', 121); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (111, 'test', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '测试用户', NULL, NULL, '[]', '', '', 0, NULL, 0, '0:0:0:0:0:0:0:1', to_date('2023-12-30 11:42:17', 'SYYYY-MM-DD HH24:MI:SS'), '110', to_date('2022-02-23 13:14:33', 'SYYYY-MM-DD HH24:MI:SS'), NULL, to_date('2025-04-21 14:23:08', 'SYYYY-MM-DD HH24:MI:SS'), '0', 121); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (112, 'newobject', '$2a$04$dB0z8Q819fJWz0hbaLe6B.VfHCjYgWx6LFfET5lyz3JwcqlyCkQ4C', '新对象', NULL, 100, '[]', '', '15601691235', 1, NULL, 0, '0:0:0:0:0:0:0:1', to_date('2024-03-16 23:11:38', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2022-02-23 19:08:03', 'SYYYY-MM-DD HH24:MI:SS'), NULL, to_date('2025-04-21 14:23:08', 'SYYYY-MM-DD HH24:MI:SS'), '0', 1); -INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道1', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '127.0.0.1', to_date('2022-03-19 18:38:51', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2022-03-07 21:37:58', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2025-05-05 15:30:53', 'SYYYY-MM-DD HH24:MI:SS'), '0', 122); +INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '全域1', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '127.0.0.1', to_date('2022-03-19 18:38:51', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2022-03-07 21:37:58', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2025-05-05 15:30:53', 'SYYYY-MM-DD HH24:MI:SS'), '0', 122); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (114, 'hrmgr', '$2a$10$TR4eybBioGRhBmDBWkqWLO6NIh3mzYa8KBKDDB5woiGYFVlRAi.fu', 'hr 小姐姐', NULL, NULL, '[5]', '', '15601691236', 1, NULL, 0, '0:0:0:0:0:0:0:1', to_date('2024-03-24 22:21:05', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2022-03-19 21:50:58', 'SYYYY-MM-DD HH24:MI:SS'), NULL, to_date('2025-04-21 14:23:08', 'SYYYY-MM-DD HH24:MI:SS'), '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (115, 'aotemane', '$2a$04$GcyP0Vyzb2F2Yni5PuIK9ueGxM0tkZGMtDwVRwrNbtMvorzbpNsV2', '阿呆', '11222', 102, '[1,2]', '7648@qq.com', '15601691229', 2, NULL, 0, '', NULL, '1', to_date('2022-04-30 02:55:43', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2025-04-21 14:23:08', 'SYYYY-MM-DD HH24:MI:SS'), '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (117, 'admin123', '$2a$04$sEtimsHu9YCkYY4/oqElHem2Ijc9ld20eYO6lN.g/21NfLUTDLB9W', '测试号02', '1111', 100, '[2]', '', '15601691234', 1, NULL, 0, '0:0:0:0:0:0:0:1', to_date('2024-10-02 10:16:20', 'SYYYY-MM-DD HH24:MI:SS'), '1', to_date('2022-07-09 17:40:26', 'SYYYY-MM-DD HH24:MI:SS'), NULL, to_date('2025-04-21 14:23:08', 'SYYYY-MM-DD HH24:MI:SS'), '0', 1); diff --git a/sql/postgresql/ruoyi-vue-pro.sql b/sql/postgresql/ruoyi-vue-pro.sql index c9a0783..8106248 100644 --- a/sql/postgresql/ruoyi-vue-pro.sql +++ b/sql/postgresql/ruoyi-vue-pro.sql @@ -2748,7 +2748,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; -- ---------------------------- -- @formatter:off BEGIN; -INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '芋道的公众', '

新版本内容133

', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); +INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '全域的公众', '

新版本内容133

', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知：2018-07-01 系统凌晨维护', '

11112222image3333

', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', '0', 1); INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '

哈哈哈哈123

', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', '0', 121); COMMIT; @@ -4646,7 +4646,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; BEGIN; INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (1, 'ZIEITS', NULL, '芋艿', '17321315478', 0, 'www.iocoder.cn', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2023-11-06 11:41:41', '0'); INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'zsxq.iocoder.cn', 111, '2026-07-10 00:00:00', 30, '1', '2022-02-22 00:56:14', '1', '2025-04-03 21:33:01', '0'); -INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0'); +INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, '测试租户', 113, '全域', '15601691300', 0, 'test.iocoder.cn', 111, '2022-04-29 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2024-09-22 12:10:50', '0'); COMMIT; -- @formatter:on @@ -4872,7 +4872,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; -- @formatter:off BEGIN; INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, 'admin', '$2a$04$KljJDa/LK7QfDm0lF5OhuePhlPfjRH3tB2Wu351Uidz.oQGJXevPi', 'ZIEITS', '管理员', 103, '[1,2]', '11aoteman@126.com', '18818260277', 2, 'http://test.urbanops.iocoder.cn/test/20250502/avatar_1746154660449.png', 0, '0:0:0:0:0:0:0:1', '2025-05-10 18:03:15', 'admin', '2021-01-05 17:03:47', NULL, '2025-05-10 18:03:15', '0', 1); -INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (100, 'urbanops', '$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', '芋道', '不要吓我', 104, '[1]', 'urbanops@iocoder.cn', '15601691300', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-04-08 09:36:40', '', '2021-01-07 09:07:17', NULL, '2025-04-21 14:23:08', '0', 1); +INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (100, 'urbanops', '$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', '全域', '不要吓我', 104, '[1]', 'urbanops@iocoder.cn', '15601691300', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-04-08 09:36:40', '', '2021-01-07 09:07:17', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (103, 'yuanma', '$2a$04$fUBSmjKCPYAUmnMzOb6qE.eZCGPhHi1JmAKclODbfS/O7fHOl2bH6', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2024-08-11 17:48:12', '', '2021-01-13 23:50:35', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (104, 'test', '$2a$04$BrwaYn303hjA/6TnXqdGoOLhyHOAA0bVrAFu6.1dJKycqKUnIoRz2', '测试号', NULL, 107, '[1,2]', '111@qq.com', '15601691200', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2025-03-28 20:01:16', '', '2021-01-21 02:13:53', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (107, 'admin107', '$2a$10$dYOOBKMO93v/.ReCqzyFg.o67Tqk.bbc2bhrpyBGkIw9aypCtr2pm', '芋艿', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '', NULL, '1', '2022-02-20 22:59:33', '1', '2025-04-21 14:23:08', '0', 118); @@ -4881,7 +4881,7 @@ INSERT INTO system_users (id, username, password, nickname, remark, dept_id, pos INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (110, 'admin110', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '小王', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2024-07-20 22:23:17', '1', '2022-02-22 00:56:14', NULL, '2025-04-21 14:23:08', '0', 121); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (111, 'test', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '测试用户', NULL, NULL, '[]', '', '', 0, NULL, 0, '0:0:0:0:0:0:0:1', '2023-12-30 11:42:17', '110', '2022-02-23 13:14:33', NULL, '2025-04-21 14:23:08', '0', 121); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (112, 'newobject', '$2a$04$dB0z8Q819fJWz0hbaLe6B.VfHCjYgWx6LFfET5lyz3JwcqlyCkQ4C', '新对象', NULL, 100, '[]', '', '15601691235', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-03-16 23:11:38', '1', '2022-02-23 19:08:03', NULL, '2025-04-21 14:23:08', '0', 1); -INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '芋道1', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '127.0.0.1', '2022-03-19 18:38:51', '1', '2022-03-07 21:37:58', '1', '2025-05-05 15:30:53', '0', 122); +INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (113, 'aoteman', '$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', '全域1', NULL, NULL, NULL, '', '15601691300', 0, NULL, 0, '127.0.0.1', '2022-03-19 18:38:51', '1', '2022-03-07 21:37:58', '1', '2025-05-05 15:30:53', '0', 122); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (114, 'hrmgr', '$2a$10$TR4eybBioGRhBmDBWkqWLO6NIh3mzYa8KBKDDB5woiGYFVlRAi.fu', 'hr 小姐姐', NULL, NULL, '[5]', '', '15601691236', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-03-24 22:21:05', '1', '2022-03-19 21:50:58', NULL, '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (115, 'aotemane', '$2a$04$GcyP0Vyzb2F2Yni5PuIK9ueGxM0tkZGMtDwVRwrNbtMvorzbpNsV2', '阿呆', '11222', 102, '[1,2]', '7648@qq.com', '15601691229', 2, NULL, 0, '', NULL, '1', '2022-04-30 02:55:43', '1', '2025-04-21 14:23:08', '0', 1); INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (117, 'admin123', '$2a$04$sEtimsHu9YCkYY4/oqElHem2Ijc9ld20eYO6lN.g/21NfLUTDLB9W', '测试号02', '1111', 100, '[2]', '', '15601691234', 1, NULL, 0, '0:0:0:0:0:0:0:1', '2024-10-02 10:16:20', '1', '2022-07-09 17:40:26', NULL, '2025-04-21 14:23:08', '0', 1); diff --git a/sql/sqlserver/ruoyi-vue-pro.sql b/sql/sqlserver/ruoyi-vue-pro.sql index 9255eb2..f441104 100644 --- a/sql/sqlserver/ruoyi-vue-pro.sql +++ b/sql/sqlserver/ruoyi-vue-pro.sql @@ -6371,7 +6371,7 @@ BEGIN TRANSACTION GO SET IDENTITY_INSERT system_notice ON GO -INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, N'芋道的公众', N'

新版本内容133

', 1, 0, N'admin', N'2021-01-05 17:03:48', N'1', N'2022-05-04 21:00:20', N'0', 1) +INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, N'全域的公众', N'

新版本内容133

', 1, 0, N'admin', N'2021-01-05 17:03:48', N'1', N'2022-05-04 21:00:20', N'0', 1) GO INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, N'维护通知：2018-07-01 系统凌晨维护', N'

11112222image3333

', 2, 1, N'admin', N'2021-01-05 17:03:48', N'1', N'2025-04-18 23:56:40', N'0', 1) GO @@ -10969,7 +10969,7 @@ INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobi GO INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (121, N'小租户', 110, N'小王2', N'15601691300', 0, N'zsxq.iocoder.cn', 111, N'2026-07-10 00:00:00', 30, N'1', N'2022-02-22 00:56:14', N'1', N'2025-04-03 21:33:01', N'0') GO -INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, N'测试租户', 113, N'芋道', N'15601691300', 0, N'test.iocoder.cn', 111, N'2022-04-29 00:00:00', 50, N'1', N'2022-03-07 21:37:58', N'1', N'2024-09-22 12:10:50', N'0') +INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobile, status, websites, package_id, expire_time, account_count, creator, create_time, updater, update_time, deleted) VALUES (122, N'测试租户', 113, N'全域', N'15601691300', 0, N'test.iocoder.cn', 111, N'2022-04-29 00:00:00', 50, N'1', N'2022-03-07 21:37:58', N'1', N'2024-09-22 12:10:50', N'0') GO SET IDENTITY_INSERT system_tenant OFF GO @@ -11533,7 +11533,7 @@ SET IDENTITY_INSERT system_users ON GO INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, N'admin', N'$2a$04$KljJDa/LK7QfDm0lF5OhuePhlPfjRH3tB2Wu351Uidz.oQGJXevPi', N'ZIEITS', N'管理员', 103, N'[1,2]', N'11aoteman@126.com', N'18818260277', 2, N'http://test.urbanops.iocoder.cn/test/20250502/avatar_1746154660449.png', 0, N'0:0:0:0:0:0:0:1', N'2025-05-10 18:03:15', N'admin', N'2021-01-05 17:03:47', NULL, N'2025-05-10 18:03:15', N'0', 1) GO -INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (100, N'urbanops', N'$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', N'芋道', N'不要吓我', 104, N'[1]', N'urbanops@iocoder.cn', N'15601691300', 1, NULL, 0, N'0:0:0:0:0:0:0:1', N'2025-04-08 09:36:40', N'', N'2021-01-07 09:07:17', NULL, N'2025-04-21 14:23:08', N'0', 1) +INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (100, N'urbanops', N'$2a$04$h.aaPKgO.odHepnk5PCsWeEwKdojFWdTItxGKfx1r0e1CSeBzsTJ6', N'全域', N'不要吓我', 104, N'[1]', N'urbanops@iocoder.cn', N'15601691300', 1, NULL, 0, N'0:0:0:0:0:0:0:1', N'2025-04-08 09:36:40', N'', N'2021-01-07 09:07:17', NULL, N'2025-04-21 14:23:08', N'0', 1) GO INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (103, N'yuanma', N'$2a$04$fUBSmjKCPYAUmnMzOb6qE.eZCGPhHi1JmAKclODbfS/O7fHOl2bH6', N'源码', NULL, 106, NULL, N'yuanma@iocoder.cn', N'15601701300', 0, NULL, 0, N'0:0:0:0:0:0:0:1', N'2024-08-11 17:48:12', N'', N'2021-01-13 23:50:35', NULL, N'2025-04-21 14:23:08', N'0', 1) GO @@ -11551,7 +11551,7 @@ INSERT INTO system_users (id, username, password, nickname, remark, dept_id, pos GO INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (112, N'newobject', N'$2a$04$dB0z8Q819fJWz0hbaLe6B.VfHCjYgWx6LFfET5lyz3JwcqlyCkQ4C', N'新对象', NULL, 100, N'[]', N'', N'15601691235', 1, NULL, 0, N'0:0:0:0:0:0:0:1', N'2024-03-16 23:11:38', N'1', N'2022-02-23 19:08:03', NULL, N'2025-04-21 14:23:08', N'0', 1) GO -INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (113, N'aoteman', N'$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', N'芋道1', NULL, NULL, NULL, N'', N'15601691300', 0, NULL, 0, N'127.0.0.1', N'2022-03-19 18:38:51', N'1', N'2022-03-07 21:37:58', N'1', N'2025-05-05 15:30:53', N'0', 122) +INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (113, N'aoteman', N'$2a$10$0acJOIk2D25/oC87nyclE..0lzeu9DtQ/n3geP4fkun/zIVRhHJIO', N'全域1', NULL, NULL, NULL, N'', N'15601691300', 0, NULL, 0, N'127.0.0.1', N'2022-03-19 18:38:51', N'1', N'2022-03-07 21:37:58', N'1', N'2025-05-05 15:30:53', N'0', 122) GO INSERT INTO system_users (id, username, password, nickname, remark, dept_id, post_ids, email, mobile, sex, avatar, status, login_ip, login_date, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (114, N'hrmgr', N'$2a$10$TR4eybBioGRhBmDBWkqWLO6NIh3mzYa8KBKDDB5woiGYFVlRAi.fu', N'hr 小姐姐', NULL, NULL, N'[5]', N'', N'15601691236', 1, NULL, 0, N'0:0:0:0:0:0:0:1', N'2024-03-24 22:21:05', N'1', N'2022-03-19 21:50:58', NULL, N'2025-04-21 14:23:08', N'0', 1) GO diff --git a/sql/tools/convertor.py b/sql/tools/convertor.py index 846b47f..b019b18 100644 --- a/sql/tools/convertor.py +++ b/sql/tools/convertor.py @@ -1,5 +1,5 @@ # encoding=utf8 -"""芋道系统数据库迁移工具 +"""全域系统数据库迁移工具 Author: dhb52 (https://gitee.com/dhb52) @@ -915,7 +915,7 @@ class OpengaussConvertor(KingbaseConvertor): def main(): - parser = argparse.ArgumentParser(description="芋道系统数据库转换工具") + parser = argparse.ArgumentParser(description="全域系统数据库转换工具") parser.add_argument( "type", type=str, diff --git a/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/biz/system/logger/dto/OperateLogCreateReqDTO.java b/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/biz/system/logger/dto/OperateLogCreateReqDTO.java index da63c82..4c075f3 100644 --- a/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/biz/system/logger/dto/OperateLogCreateReqDTO.java +++ b/urbanops-framework/urbanops-common/src/main/java/com/zteits/urbanops/framework/common/biz/system/logger/dto/OperateLogCreateReqDTO.java @@ -50,7 +50,7 @@ public class OperateLogCreateReqDTO { private Long bizId; /** * 操作内容，记录整个操作的明细 - * 例如说，修改编号为 1 的用户信息，将性别从男改成女，将姓名从芋道改成源码。 + * 例如说，修改编号为 1 的用户信息，将性别从男改成女，将姓名从全域改成源码。 */ @NotEmpty(message = "操作内容不能为空") private String action; diff --git a/urbanops-framework/urbanops-spring-boot-starter-security/src/main/java/com/zteits/urbanops/framework/operatelog/core/service/LogRecordServiceImpl.java b/urbanops-framework/urbanops-spring-boot-starter-security/src/main/java/com/zteits/urbanops/framework/operatelog/core/service/LogRecordServiceImpl.java index c9973bc..695951f 100644 --- a/urbanops-framework/urbanops-spring-boot-starter-security/src/main/java/com/zteits/urbanops/framework/operatelog/core/service/LogRecordServiceImpl.java +++ b/urbanops-framework/urbanops-spring-boot-starter-security/src/main/java/com/zteits/urbanops/framework/operatelog/core/service/LogRecordServiceImpl.java @@ -61,7 +61,7 @@ public class LogRecordServiceImpl implements ILogRecordService { reqDTO.setType(logRecord.getType()); // 大模块类型，例如：CRM 客户 reqDTO.setSubType(logRecord.getSubType());// 操作名称，例如：转移客户 reqDTO.setBizId(Long.parseLong(logRecord.getBizNo())); // 业务编号，例如：客户编号 - reqDTO.setAction(logRecord.getAction());// 操作内容，例如：修改编号为 1 的用户信息，将性别从男改成女，将姓名从芋道改成源码。 + reqDTO.setAction(logRecord.getAction());// 操作内容，例如：修改编号为 1 的用户信息，将性别从男改成女，将姓名从全域改成源码。 reqDTO.setExtra(logRecord.getExtra()); // 拓展字段，有些复杂的业务，需要记录一些字段 ( JSON 格式 )，例如说，记录订单编号，{ orderId: "1"} } @@ -88,4 +88,4 @@ public class LogRecordServiceImpl implements ILogRecordService { throw new UnsupportedOperationException("使用 OperateLogApi 进行操作日志的查询"); } -} \ No newline at end of file +} diff --git a/urbanops-framework/urbanops-spring-boot-starter-security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md b/urbanops-framework/urbanops-spring-boot-starter-security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md index 7c13ca1..84602fb 100644 --- a/urbanops-framework/urbanops-spring-boot-starter-security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md +++ b/urbanops-framework/urbanops-spring-boot-starter-security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md @@ -1,2 +1,2 @@ -* 芋道 Spring Security 入门： +* 全域 Spring Security 入门： * Spring Security 基本概念： diff --git a/urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/AiAutoConfiguration.java b/urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/AiAutoConfiguration.java index 49b490b..83cb144 100644 --- a/urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/AiAutoConfiguration.java +++ b/urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/AiAutoConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Configuration; import java.util.List; /** - * 芋道 AI 自动配置 + * 全域 AI 自动配置 * * @author fansili */ @@ -285,4 +285,4 @@ public class AiAutoConfiguration { return List.of(ToolCallbacks.from(personService)); } -} \ No newline at end of file +} diff --git a/urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/UrbanopsAiProperties.java b/urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/UrbanopsAiProperties.java index 7643686..f453a83 100644 --- a/urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/UrbanopsAiProperties.java +++ b/urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/UrbanopsAiProperties.java @@ -4,7 +4,7 @@ import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * 芋道 AI 配置类 + * 全域 AI 配置类 * * @author fansili * @since 1.0 diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java index a6ce6c6..6ef5ece 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/form/BpmFormPageReqVO.java @@ -10,7 +10,7 @@ import lombok.ToString; @Data public class BpmFormPageReqVO extends PageParam { - @Schema(description = "表单名称", example = "芋道") + @Schema(description = "表单名称", example = "全域") private String name; } diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java index 19fc159..0528ba4 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/form/BpmFormRespVO.java @@ -14,7 +14,7 @@ public class BpmFormRespVO { @Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") @NotNull(message = "表单名称不能为空") private String name; diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/form/BpmFormSaveReqVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/form/BpmFormSaveReqVO.java index ba32fc8..5c67363 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/form/BpmFormSaveReqVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/form/BpmFormSaveReqVO.java @@ -12,7 +12,7 @@ public class BpmFormSaveReqVO { @Schema(description = "表单编号", example = "1024") private Long id; - @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") @NotNull(message = "表单名称不能为空") private String name; diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java index 045763f..de75a81 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/group/BpmUserGroupPageReqVO.java @@ -17,7 +17,7 @@ public class BpmUserGroupPageReqVO extends PageParam { @Schema(description = "编号", example = "1024") private Long id; - @Schema(description = "组名", example = "芋道") + @Schema(description = "组名", example = "全域") private String name; @Schema(description = "状态", example = "1") diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java index 0de92f9..9e34b15 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/group/BpmUserGroupRespVO.java @@ -13,7 +13,7 @@ public class BpmUserGroupRespVO { @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZIEITS") diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSaveReqVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSaveReqVO.java index 7e5709e..dc6825c 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSaveReqVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/group/BpmUserGroupSaveReqVO.java @@ -12,7 +12,7 @@ public class BpmUserGroupSaveReqVO { @Schema(description = "编号", example = "1024") private Long id; - @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") @NotNull(message = "组名不能为空") private String name; diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java index 596654b..2728202 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/model/BpmModelRespVO.java @@ -20,7 +20,7 @@ public class BpmModelRespVO extends BpmModelMetaInfoVO { @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "process_urbanops") private String key; - @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "流程图标", example = "https://www.iocoder.cn/urbanops.jpg") diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java index bc9c217..fe0e86b 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java @@ -17,7 +17,7 @@ public class BpmModelSaveReqVO extends BpmModelMetaInfoVO { @NotEmpty(message = "流程标识不能为空") private String key; - @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") @NotEmpty(message = "流程名称不能为空") private String name; diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java index e8fe800..a0faa4c 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/definition/vo/process/BpmProcessDefinitionRespVO.java @@ -17,7 +17,7 @@ public class BpmProcessDefinitionRespVO extends BpmModelMetaInfoVO { @Schema(description = "版本", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Integer version; - @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "youdao") diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCopyPageReqVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCopyPageReqVO.java index d482caf..c5f204a 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCopyPageReqVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCopyPageReqVO.java @@ -13,7 +13,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE @Data public class BpmProcessInstanceCopyPageReqVO extends PageParam { - @Schema(description = "流程名称", example = "芋道") + @Schema(description = "流程名称", example = "全域") private String processInstanceName; @Schema(description = "创建时间") diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageReqVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageReqVO.java index aa8a6ea..4fb6ac4 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageReqVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageReqVO.java @@ -15,7 +15,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE @Data public class BpmProcessInstancePageReqVO extends PageParam { - @Schema(description = "流程名称", example = "芋道") + @Schema(description = "流程名称", example = "全域") private String name; @Schema(description = "流程定义的标识", example = "2048") diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java index 52c5b16..9ea3f1d 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java @@ -18,7 +18,7 @@ public class BpmProcessInstanceRespVO { @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private String id; - @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "流程摘要") @@ -71,7 +71,7 @@ public class BpmProcessInstanceRespVO { @Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private String id; - @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "任务分配人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2048") diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java index cbf3453..ac09098 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/instance/BpmProcessPrintDataRespVO.java @@ -28,7 +28,7 @@ public class BpmProcessPrintDataRespVO { @Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private String id; - @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "签名 URL", example = "https://www.iocoder.cn/sign.png") diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/task/BpmTaskPageReqVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/task/BpmTaskPageReqVO.java index fdf87e6..79e3f67 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/task/BpmTaskPageReqVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/task/BpmTaskPageReqVO.java @@ -14,7 +14,7 @@ import java.time.LocalDateTime; @Data public class BpmTaskPageReqVO extends PageParam { - @Schema(description = "流程任务名", example = "芋道") + @Schema(description = "流程任务名", example = "全域") private String name; @Schema(description = "流程分类", example = "1") diff --git a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java index 3217856..a18d186 100644 --- a/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java +++ b/urbanops-module-bpm/src/main/java/com/zteits/urbanops/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java @@ -17,7 +17,7 @@ public class BpmTaskRespVO { @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private String id; - @Schema(description = "任务名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "任务名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @@ -95,7 +95,7 @@ public class BpmTaskRespVO { @Schema(description = "流程实例编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private String id; - @Schema(description = "流程实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "流程实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-bpm/src/test/java/com/zteits/urbanops/module/bpm/service/definition/BpmFormServiceTest.java b/urbanops-module-bpm/src/test/java/com/zteits/urbanops/module/bpm/service/definition/BpmFormServiceTest.java index e37e560..478bcf7 100644 --- a/urbanops-module-bpm/src/test/java/com/zteits/urbanops/module/bpm/service/definition/BpmFormServiceTest.java +++ b/urbanops-module-bpm/src/test/java/com/zteits/urbanops/module/bpm/service/definition/BpmFormServiceTest.java @@ -124,7 +124,7 @@ public class BpmFormServiceTest extends BaseDbUnitTest { formMapper.insert(cloneIgnoreId(dbForm, o -> o.setName("源码"))); // 准备参数 BpmFormPageReqVO reqVO = new BpmFormPageReqVO(); - reqVO.setName("芋道"); + reqVO.setName("全域"); // 调用 PageResult pageResult = formService.getFormPage(reqVO); diff --git a/urbanops-module-bpm/src/test/java/com/zteits/urbanops/module/bpm/service/definition/BpmUserGroupServiceTest.java b/urbanops-module-bpm/src/test/java/com/zteits/urbanops/module/bpm/service/definition/BpmUserGroupServiceTest.java index 7c3864f..aeaee62 100644 --- a/urbanops-module-bpm/src/test/java/com/zteits/urbanops/module/bpm/service/definition/BpmUserGroupServiceTest.java +++ b/urbanops-module-bpm/src/test/java/com/zteits/urbanops/module/bpm/service/definition/BpmUserGroupServiceTest.java @@ -108,7 +108,7 @@ public class BpmUserGroupServiceTest extends BaseDbUnitTest { }); userGroupMapper.insert(dbUserGroup); // 测试 name 不匹配 - userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setName("芋道"))); + userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setName("全域"))); // 测试 status 不匹配 userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus()))); // 测试 createTime 不匹配 diff --git a/urbanops-module-bpm/src/test/resources/application-unit-test.yaml b/urbanops-module-bpm/src/test/resources/application-unit-test.yaml index 8df6385..1864d68 100644 --- a/urbanops-module-bpm/src/test/resources/application-unit-test.yaml +++ b/urbanops-module-bpm/src/test/resources/application-unit-test.yaml @@ -34,9 +34,9 @@ mybatis-plus: --- #################### 监控相关配置 #################### ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 urbanops: info: base-package: com.zteits.urbanops.module diff --git a/urbanops-module-crm/src/main/java/com/zteits/urbanops/module/crm/controller/admin/customer/CrmCustomerController.java b/urbanops-module-crm/src/main/java/com/zteits/urbanops/module/crm/controller/admin/customer/CrmCustomerController.java index c701046..d56336a 100644 --- a/urbanops-module-crm/src/main/java/com/zteits/urbanops/module/crm/controller/admin/customer/CrmCustomerController.java +++ b/urbanops-module-crm/src/main/java/com/zteits/urbanops/module/crm/controller/admin/customer/CrmCustomerController.java @@ -249,7 +249,7 @@ public class CrmCustomerController { public void importTemplate(HttpServletResponse response) throws IOException { // 手动创建导出 demo List list = Arrays.asList( - CrmCustomerImportExcelVO.builder().name("芋道").industryId(1).level(1).source(1) + CrmCustomerImportExcelVO.builder().name("全域").industryId(1).level(1).source(1) .mobile("15601691300").telephone("").qq("").wechat("").email("yunai@iocoder.cn") .areaId(null).detailAddress("").remark("").build(), CrmCustomerImportExcelVO.builder().name("源码").industryId(1).level(1).source(1) diff --git a/urbanops-module-crm/src/test/resources/application-unit-test.yaml b/urbanops-module-crm/src/test/resources/application-unit-test.yaml index abd6205..5ef2dcf 100644 --- a/urbanops-module-crm/src/test/resources/application-unit-test.yaml +++ b/urbanops-module-crm/src/test/resources/application-unit-test.yaml @@ -41,9 +41,9 @@ mybatis-plus: --- #################### 监控相关配置 #################### ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 urbanops: info: base-package: com.zteits.urbanops diff --git a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentRespVO.java b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentRespVO.java index d8fdfd2..b2ac794 100644 --- a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentRespVO.java +++ b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentRespVO.java @@ -54,9 +54,9 @@ public class ErpFinancePaymentRespVO { @Schema(description = "备注", example = "你猜") private String remark; - @Schema(description = "创建人", example = "芋道") + @Schema(description = "创建人", example = "全域") private String creator; - @Schema(description = "创建人名称", example = "芋道") + @Schema(description = "创建人名称", example = "全域") private String creatorName; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/finance/vo/receipt/ErpFinanceReceiptRespVO.java b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/finance/vo/receipt/ErpFinanceReceiptRespVO.java index 69f2da1..f529696 100644 --- a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/finance/vo/receipt/ErpFinanceReceiptRespVO.java +++ b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/finance/vo/receipt/ErpFinanceReceiptRespVO.java @@ -54,9 +54,9 @@ public class ErpFinanceReceiptRespVO { @Schema(description = "备注", example = "你猜") private String remark; - @Schema(description = "创建人", example = "芋道") + @Schema(description = "创建人", example = "全域") private String creator; - @Schema(description = "创建人名称", example = "芋道") + @Schema(description = "创建人名称", example = "全域") private String creatorName; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java index ea36879..41e490b 100644 --- a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java +++ b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java @@ -29,7 +29,7 @@ public class ErpPurchaseInRespVO { @Schema(description = "供应商编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") private Long supplierId; - @Schema(description = "供应商名称", example = "芋道") + @Schema(description = "供应商名称", example = "全域") @ExcelProperty("供应商名称") private String supplierName; @@ -78,9 +78,9 @@ public class ErpPurchaseInRespVO { @ExcelProperty("备注") private String remark; - @Schema(description = "创建人", example = "芋道") + @Schema(description = "创建人", example = "全域") private String creator; - @Schema(description = "创建人名称", example = "芋道") + @Schema(description = "创建人名称", example = "全域") private String creatorName; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java index fd43ac4..f161b6e 100644 --- a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java +++ b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java @@ -29,7 +29,7 @@ public class ErpPurchaseOrderRespVO { @Schema(description = "供应商编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") private Long supplierId; - @Schema(description = "供应商名称", example = "芋道") + @Schema(description = "供应商名称", example = "全域") @ExcelProperty("供应商名称") private String supplierName; @@ -71,9 +71,9 @@ public class ErpPurchaseOrderRespVO { @ExcelProperty("备注") private String remark; - @Schema(description = "创建人", example = "芋道") + @Schema(description = "创建人", example = "全域") private String creator; - @Schema(description = "创建人名称", example = "芋道") + @Schema(description = "创建人名称", example = "全域") private String creatorName; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java index 51bf008..54c6623 100644 --- a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java +++ b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java @@ -29,7 +29,7 @@ public class ErpPurchaseReturnRespVO { @Schema(description = "供应商编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") private Long supplierId; - @Schema(description = "供应商名称", example = "芋道") + @Schema(description = "供应商名称", example = "全域") @ExcelProperty("供应商名称") private String supplierName; @@ -78,9 +78,9 @@ public class ErpPurchaseReturnRespVO { @ExcelProperty("备注") private String remark; - @Schema(description = "创建人", example = "芋道") + @Schema(description = "创建人", example = "全域") private String creator; - @Schema(description = "创建人名称", example = "芋道") + @Schema(description = "创建人名称", example = "全域") private String creatorName; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java index a6bd632..8940002 100644 --- a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java +++ b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java @@ -29,7 +29,7 @@ public class ErpSaleOrderRespVO { @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") private Long customerId; - @Schema(description = "客户名称", example = "芋道") + @Schema(description = "客户名称", example = "全域") @ExcelProperty("客户名称") private String customerName; @@ -74,9 +74,9 @@ public class ErpSaleOrderRespVO { @ExcelProperty("备注") private String remark; - @Schema(description = "创建人", example = "芋道") + @Schema(description = "创建人", example = "全域") private String creator; - @Schema(description = "创建人名称", example = "芋道") + @Schema(description = "创建人名称", example = "全域") private String creatorName; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/sale/vo/out/ErpSaleOutRespVO.java b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/sale/vo/out/ErpSaleOutRespVO.java index 410dc71..c86e4c4 100644 --- a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/sale/vo/out/ErpSaleOutRespVO.java +++ b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/sale/vo/out/ErpSaleOutRespVO.java @@ -29,7 +29,7 @@ public class ErpSaleOutRespVO { @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") private Long customerId; - @Schema(description = "客户名称", example = "芋道") + @Schema(description = "客户名称", example = "全域") @ExcelProperty("客户名称") private String customerName; @@ -81,9 +81,9 @@ public class ErpSaleOutRespVO { @ExcelProperty("备注") private String remark; - @Schema(description = "创建人", example = "芋道") + @Schema(description = "创建人", example = "全域") private String creator; - @Schema(description = "创建人名称", example = "芋道") + @Schema(description = "创建人名称", example = "全域") private String creatorName; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/sale/vo/returns/ErpSaleReturnRespVO.java b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/sale/vo/returns/ErpSaleReturnRespVO.java index 422e9bf..ee35eeb 100644 --- a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/sale/vo/returns/ErpSaleReturnRespVO.java +++ b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/sale/vo/returns/ErpSaleReturnRespVO.java @@ -29,7 +29,7 @@ public class ErpSaleReturnRespVO { @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") private Long customerId; - @Schema(description = "客户名称", example = "芋道") + @Schema(description = "客户名称", example = "全域") @ExcelProperty("客户名称") private String customerName; @@ -81,9 +81,9 @@ public class ErpSaleReturnRespVO { @ExcelProperty("备注") private String remark; - @Schema(description = "创建人", example = "芋道") + @Schema(description = "创建人", example = "全域") private String creator; - @Schema(description = "创建人名称", example = "芋道") + @Schema(description = "创建人名称", example = "全域") private String creatorName; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/check/ErpStockCheckRespVO.java b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/check/ErpStockCheckRespVO.java index 9b18604..05bc7d4 100644 --- a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/check/ErpStockCheckRespVO.java +++ b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/check/ErpStockCheckRespVO.java @@ -51,9 +51,9 @@ public class ErpStockCheckRespVO { @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") private String fileUrl; - @Schema(description = "创建人", example = "芋道") + @Schema(description = "创建人", example = "全域") private String creator; - @Schema(description = "创建人名称", example = "芋道") + @Schema(description = "创建人名称", example = "全域") private String creatorName; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/in/ErpStockInRespVO.java b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/in/ErpStockInRespVO.java index 7bae8b1..9cbd78f 100644 --- a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/in/ErpStockInRespVO.java +++ b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/in/ErpStockInRespVO.java @@ -28,7 +28,7 @@ public class ErpStockInRespVO { @Schema(description = "供应商编号", example = "3113") private Long supplierId; - @Schema(description = "供应商名称", example = "芋道") + @Schema(description = "供应商名称", example = "全域") @ExcelProperty("供应商名称") private String supplierName; @@ -56,9 +56,9 @@ public class ErpStockInRespVO { @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") private String fileUrl; - @Schema(description = "创建人", example = "芋道") + @Schema(description = "创建人", example = "全域") private String creator; - @Schema(description = "创建人名称", example = "芋道") + @Schema(description = "创建人名称", example = "全域") private String creatorName; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/move/ErpStockMoveRespVO.java b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/move/ErpStockMoveRespVO.java index 2feaa2c..f829603 100644 --- a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/move/ErpStockMoveRespVO.java +++ b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/move/ErpStockMoveRespVO.java @@ -50,9 +50,9 @@ public class ErpStockMoveRespVO { @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") private String fileUrl; - @Schema(description = "创建人", example = "芋道") + @Schema(description = "创建人", example = "全域") private String creator; - @Schema(description = "创建人名称", example = "芋道") + @Schema(description = "创建人名称", example = "全域") private String creatorName; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/out/ErpStockOutRespVO.java b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/out/ErpStockOutRespVO.java index 1177f2f..d28cb25 100644 --- a/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/out/ErpStockOutRespVO.java +++ b/urbanops-module-erp/src/main/java/com/zteits/urbanops/module/erp/controller/admin/stock/vo/out/ErpStockOutRespVO.java @@ -28,7 +28,7 @@ public class ErpStockOutRespVO { @Schema(description = "客户编号", example = "3113") private Long customerId; - @Schema(description = "客户名称", example = "芋道") + @Schema(description = "客户名称", example = "全域") @ExcelProperty("客户名称") private String customerName; @@ -56,9 +56,9 @@ public class ErpStockOutRespVO { @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") private String fileUrl; - @Schema(description = "创建人", example = "芋道") + @Schema(description = "创建人", example = "全域") private String creator; - @Schema(description = "创建人名称", example = "芋道") + @Schema(description = "创建人名称", example = "全域") private String creatorName; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java new file mode 100644 index 0000000..4532c35 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java @@ -0,0 +1,16 @@ +package com.zteits.urbanops.module.garden.api.road; + +import com.zteits.urbanops.module.garden.api.road.dto.RoadReqDTO; +import com.zteits.urbanops.module.garden.api.road.dto.RoadRespDTO; + +import java.util.List; + +/** + * @author yanhuiqing + * @version 1.0 + * @description: 道路api 通过经纬度 系统编码获取道路信息 + * @date 2025/12/9 22:12 + */ +public interface RoadApi { + public List getRoadInfoBy(RoadReqDTO reqDTO); +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java new file mode 100644 index 0000000..d0b724c --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java @@ -0,0 +1,57 @@ +package com.zteits.urbanops.module.garden.api.road; + +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; +import com.zteits.urbanops.framework.common.util.http.HttpUtils; +import com.zteits.urbanops.module.garden.api.road.dto.RoadReqDTO; +import com.zteits.urbanops.module.garden.api.road.dto.RoadRespDTO; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author yanhuiqing + * @version 1.0 + * @description: 道路api实现类 + * @date 2025/12/9 22:18 + */ +@Slf4j +@Service +public class RoadApiImpl implements RoadApi{ + + @Value("${siot.roadUrl}") + private String roadInfoUrl; + + @Override + public List getRoadInfoBy(RoadReqDTO reqDTO) { + Map param = new HashMap<>(); + param.put("companyCode", reqDTO.getCompanyCode()); + param.put("longitude", reqDTO.getLongitude()); + param.put("latitude", reqDTO.getLatitude()); + + String responseBody = HttpUtils.post(roadInfoUrl, null, JSON.toJSONString(param)); + log.info("获取道路信息接口,系统：{},经度：{},维度:{},返回结果:{}", reqDTO.getCompanyCode(), reqDTO.getLongitude(), reqDTO.getLatitude(), responseBody); + JSONObject response = JSONUtil.parseObj(responseBody); + if (response.getInt("code") != 200) { + return new ArrayList<>(); + } + JSONObject data = response.getJSONObject("data"); + if (data == null) { + return new ArrayList<>(); + } + return data.getJSONArray("roadList").stream().map(item -> { + JSONObject entries = JSONUtil.parseObj(item); + RoadRespDTO roadInfo = new RoadRespDTO(); + roadInfo.setRoadCode(entries.getStr("roadCode")); + roadInfo.setRoadName(entries.getStr("roadName")); + return roadInfo; + }).collect(Collectors.toList()); + } +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadReqDTO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadReqDTO.java new file mode 100644 index 0000000..624993e --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadReqDTO.java @@ -0,0 +1,25 @@ +package com.zteits.urbanops.module.garden.api.road.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * @author yanhuiqing + * @version 1.0 + * @description: TODO + * @date 2025/12/9 22:43 + */ +@Data +public class RoadReqDTO { + @NotNull + @Schema(description = "系统编码", example = "sls") + private String companyCode; + @NotNull + @Schema(description = "经度", example = "44.962685") + private String longitude; + @NotNull + @Schema(description = "维度", example = "121.40476") + private String latitude; + +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadRespDTO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadRespDTO.java new file mode 100644 index 0000000..8b19b76 --- /dev/null +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadRespDTO.java @@ -0,0 +1,21 @@ +package com.zteits.urbanops.module.garden.api.road.dto; + +import lombok.Data; + +/** + * @author yanhuiqing + * @version 1.0 + * @description: TODO + * @date 2025/12/9 22:21 + */ +@Data +public class RoadRespDTO { + /** + * 道路编码 + */ + private String roadCode; + /** + * 道路名称 + */ + private String roadName; +} diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java index c6f5494..72b662c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/AssignTasksController.java @@ -8,6 +8,7 @@ import com.zteits.urbanops.framework.common.pojo.PageParam; import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.object.BeanUtils; import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; +import com.zteits.urbanops.framework.translate.core.TranslateUtils; import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksPageReqVO; import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksRespVO; import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksSaveReqVO; @@ -84,6 +85,9 @@ public class AssignTasksController { @PreAuthorize("@ss.hasPermission('garden:assign-tasks:query')") public CommonResult getAssignTasks(@RequestParam("id") Long id) { AssignTasksDO assignTasks = assignTasksService.getAssignTasks(id); + if (assignTasks == null) { + return success(null); + } AssignTasksRespVO assignTasksRespVO = BeanUtils.toBean(assignTasks, AssignTasksRespVO.class); List assignTaskInfoList = asignTasksInfoService.getAssignTasksInfos(assignTasks.getId()); assignTasksRespVO.setAssignTaskInfoList(assignTaskInfoList); @@ -124,9 +128,9 @@ public class AssignTasksController { HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = assignTasksService.getAssignTasksPage(pageReqVO).getList(); - // 导出 Excel + List respVolist = BeanUtils.toBean(list, AssignTasksRespVO.class); ExcelUtils.write(response, "派单任务主表（记录派单任务基本信息）.xls", "数据", AssignTasksRespVO.class, - BeanUtils.toBean(list, AssignTasksRespVO.class)); + respVolist ); } @Operation(summary = "任务确认" ) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksPageReqVO.java index c236f27..23b29bd 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksPageReqVO.java @@ -23,27 +23,14 @@ public class AssignTasksPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] deadline; - @Schema(description = "派单模板文件路径（如：任务详情模板、填报表格等）") - private String templateFile; - @Schema(description = "任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）") private Integer parentFinish; - @Schema(description = "整体完成时间（仅当parent_finish=1时有值）") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] finishTime; - - @Schema(description = "任务备注（如：特殊要求、注意事项等）") - private String note; - - @Schema(description = "创建人（关联用户ID，任务派发人）") - private String creator; - @Schema(description = "任务创建时间（派单时间）") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "修改人（关联用户ID，最后修改人）") - private String updater; + private String deadlineBeginTime; + private String deadlineEndTime; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java index c288d5d..7950b17 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasks/vo/AssignTasksRespVO.java @@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo; import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fhs.core.trans.vo.VO; import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -18,54 +19,85 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE public class AssignTasksRespVO { @Schema(description = "自增ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3654") - @ExcelProperty("自增ID") private Long id; @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @ExcelProperty("任务名称") private String taskName; - @Schema(description = "任务类型（关联数据字典，如：日常巡检、紧急维修等）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("任务类型（关联数据字典，如：日常巡检、紧急维修等）") + @Schema(description = "任务类型（关联数据字典，1=日常任务,2=古树任务,3=屋顶绿化）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private String taskType; + @ExcelProperty(value = "任务类型") + private String taskTypeName; + + @Schema(description = "任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer parentFinish; + + @ExcelProperty(value = "任务整体完成状态") + private String parentFinishName; + + @Schema(description = "任务创建时间（派单时间）", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("派达时间") + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private Date createTime; @Schema(description = "任务截止时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("任务截止时间") @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private Date deadline; + @Schema(description = "任务备注（如：特殊要求、注意事项等）") + @ExcelProperty("任务备注") + private String note; + @Schema(description = "派单模板文件路径（如：任务详情模板、填报表格等）") - @ExcelProperty("派单模板文件路径（如：任务详情模板、填报表格等）") private String templateFile; - @Schema(description = "任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("任务整体完成状态（0：未完成，1：已完成；所有关联单位均完成时自动更新为1）") - private Integer parentFinish; - @Schema(description = "整体完成时间（仅当parent_finish=1时有值）") - @ExcelProperty("整体完成时间（仅当parent_finish=1时有值）") @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private Date finishTime; - @Schema(description = "任务备注（如：特殊要求、注意事项等）") - @ExcelProperty("任务备注（如：特殊要求、注意事项等）") - private String note; - @Schema(description = "创建人（关联用户ID，任务派发人）", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("创建人（关联用户ID，任务派发人）") private String creator; - @Schema(description = "任务创建时间（派单时间）", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("任务创建时间（派单时间）") - @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private Date createTime; - @Schema(description = "修改人（关联用户ID，最后修改人）") - @ExcelProperty("修改人（关联用户ID，最后修改人）") private String updater; private List companyIds; private List assignTaskInfoList; - + public void setParentFinish(Integer parentFinish) { + this.parentFinish = parentFinish; + // 手动固定值映射：0→未完成，1→已完成，其他→未知状态 + switch (parentFinish) { + case 0: + this.parentFinishName = "未完成"; + break; + case 1: + this.parentFinishName = "已完成"; + break; + default: // 包含null、2、3等非法值 + this.parentFinishName = "未知状态"; + break; + } + } + + public void setTaskType(String taskType) { + this.taskType = taskType; + //1=日常任务,2=古树任务,3=屋顶绿化 + switch (taskType) { + case "1": + this.taskTypeName = "日常任务"; + break; + case "2": + this.taskTypeName = "古树任务"; + break; + case "3": + this.taskTypeName = "屋顶绿化"; + break; + default: + this.taskTypeName = "未知"; + break; + } + } } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java index 9c7e538..0808551 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoPageReqVO.java @@ -13,57 +13,19 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE @Data public class AssignTasksInfoPageReqVO extends PageParam { - @Schema(description = "关联派单任务主表ID（外键，关联td_assign_tasks.id）", example = "1875") - private Long taskId; @Schema(description = "单位ID（关联单位表主键）", example = "11926") private String companyId; - @Schema(description = "单位ID（关联单位表主键）", example = "张三") - private String companyName; - @Schema(description = "填报人ID（单位指定的任务负责人）", example = "28216") private String writePersonId; - @Schema(description = "填报人姓名") - private String writePerson; - - @Schema(description = "填报人手机号") - private String writePersonPhone; - - @Schema(description = "填报时间（仅当finish=1时有值）") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] writeTime; - @Schema(description = "单位任务完成状态（0：未完成，1：已完成）") private Integer finish; @Schema(description = "是否超期（0：未超期，1：超期；NULL：未到截止时间）") private Integer isOverdue; - @Schema(description = "单位提交的任务文件路径（如：填报表格、现场照片等）") - private String dataFile; - - @Schema(description = "催缴次数（未完成时的提醒次数）") - private Integer rushNum; - - @Schema(description = "新任务标记（0：未读，1：已读）") - private Integer newFlag; - - @Schema(description = "已读时间（仅当new_flag=1时有值）") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] newFlagTime; - - @Schema(description = "驳回备注（当finish=2时，说明驳回原因）", example = "你说的对") - private String rejectRemark; - - @Schema(description = "单位任务确认状态（已确认/未确认，单位接收任务后需确认）") - private String confirm; - - @Schema(description = "确认时间（单位确认接收任务的时间）") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] confirmTime; - @Schema(description = "创建人（关联用户ID，将任务派给该单位的操作人）") private String creator; @@ -71,16 +33,7 @@ public class AssignTasksInfoPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "修改人（关联用户ID，最后修改该记录的操作人）") - private String updater; - - @Schema(description = "备注", example = "你猜") - private String remark; - @Schema(description = "是否打回0：正常 1：打回") private Integer isReject; - @Schema(description = "0:正常1:停用", example = "1") - private Integer status; - } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java index d2c0d2a..746b13e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java @@ -1,11 +1,15 @@ package com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; +import lombok.Data; + import java.time.LocalDateTime; -import cn.idev.excel.annotation.*; +import java.util.Date; + +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 派单任务-单位关联表（记录单位接收派单后的执行详情） Response VO") @Data @@ -13,15 +17,27 @@ import cn.idev.excel.annotation.*; public class AssignTasksInfoRespVO { @Schema(description = "自增ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12148") - @ExcelProperty("自增ID") private Long id; @Schema(description = "关联派单任务主表ID（外键，关联td_assign_tasks.id）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1875") - @ExcelProperty("关联派单任务主表ID（外键，关联td_assign_tasks.id）") + //@ExcelProperty("关联派单任务主表ID（外键，关联td_assign_tasks.id）") private Long taskId; + @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") + @ExcelProperty("任务名称") + private String taskName; + + @Schema(description = "任务类型（关联数据字典，1=日常任务,2=古树任务,3=屋顶绿化）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + private String taskType; + @ExcelProperty(value = "任务类型") + private String taskTypeName; + + @Schema(description = "任务截止时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("任务截止时间") + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private Date deadline; + @Schema(description = "单位ID（关联单位表主键）", requiredMode = Schema.RequiredMode.REQUIRED, example = "11926") - @ExcelProperty("单位ID（关联单位表主键）") private String companyId; @Schema(description = "单位ID（关联单位表主键）", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") @@ -29,7 +45,6 @@ public class AssignTasksInfoRespVO { private String companyName; @Schema(description = "填报人ID（单位指定的任务负责人）", example = "28216") - @ExcelProperty("填报人ID（单位指定的任务负责人）") private String writePersonId; @Schema(description = "填报人姓名") @@ -86,7 +101,8 @@ public class AssignTasksInfoRespVO { @Schema(description = "关联记录创建时间（派单给单位的时间）", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("关联记录创建时间（派单给单位的时间）") - private LocalDateTime createTime; + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private Date createTime; @Schema(description = "修改人（关联用户ID，最后修改该记录的操作人）") @ExcelProperty("修改人（关联用户ID，最后修改该记录的操作人）") @@ -104,4 +120,24 @@ public class AssignTasksInfoRespVO { @ExcelProperty("0:正常1:停用") private Integer status; + public void setTaskType(String taskType) { + this.taskType = taskType; + //1=日常任务,2=古树任务,3=屋顶绿化 + switch (taskType) { + case "1": + this.taskTypeName = "日常任务"; + break; + case "2": + this.taskTypeName = "古树任务"; + break; + case "3": + this.taskTypeName = "屋顶绿化"; + break; + default: + this.taskTypeName = "未知"; + break; + } + } + + } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java index ea1b666..7f34021 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java @@ -106,4 +106,16 @@ public class AssignTasksInfoDO extends BaseDO { */ private Integer isReject; + /** + * 任务名称 + */ + private String taskName; + /** + * 任务类型（关联数据字典，如：日常巡检、紧急维修等） + */ + private String taskType; + /** + * 任务截止时间 + */ + private LocalDateTime deadline; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java index 93b735a..74b992a 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasks/AssignTasksMapper.java @@ -22,13 +22,8 @@ public interface AssignTasksMapper extends BaseMapperX { .likeIfPresent(AssignTasksDO::getTaskName, reqVO.getTaskName()) .eqIfPresent(AssignTasksDO::getTaskType, reqVO.getTaskType()) .eqIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline()) - .eqIfPresent(AssignTasksDO::getTemplateFile, reqVO.getTemplateFile()) .eqIfPresent(AssignTasksDO::getParentFinish, reqVO.getParentFinish()) - .betweenIfPresent(AssignTasksDO::getFinishTime, reqVO.getFinishTime()) - .eqIfPresent(AssignTasksDO::getNote, reqVO.getNote()) - .eqIfPresent(AssignTasksDO::getCreator, reqVO.getCreator()) .betweenIfPresent(AssignTasksDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(AssignTasksDO::getUpdater, reqVO.getUpdater()) .betweenIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline()) .orderByDesc(AssignTasksDO::getId)); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java index 5f3219d..c071bed 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/assigntasksinfo/AssignTasksInfoMapper.java @@ -20,26 +20,11 @@ public interface AssignTasksInfoMapper extends BaseMapperX { default PageResult selectPage(AssignTasksInfoPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(AssignTasksInfoDO::getTaskId, reqVO.getTaskId()) .eqIfPresent(AssignTasksInfoDO::getCompanyId, reqVO.getCompanyId()) - .likeIfPresent(AssignTasksInfoDO::getCompanyName, reqVO.getCompanyName()) .eqIfPresent(AssignTasksInfoDO::getWritePersonId, reqVO.getWritePersonId()) - .eqIfPresent(AssignTasksInfoDO::getWritePerson, reqVO.getWritePerson()) - .eqIfPresent(AssignTasksInfoDO::getWritePersonPhone, reqVO.getWritePersonPhone()) - .betweenIfPresent(AssignTasksInfoDO::getWriteTime, reqVO.getWriteTime()) .eqIfPresent(AssignTasksInfoDO::getFinish, reqVO.getFinish()) .eqIfPresent(AssignTasksInfoDO::getIsOverdue, reqVO.getIsOverdue()) - .eqIfPresent(AssignTasksInfoDO::getDataFile, reqVO.getDataFile()) - .eqIfPresent(AssignTasksInfoDO::getRushNum, reqVO.getRushNum()) - .eqIfPresent(AssignTasksInfoDO::getNewFlag, reqVO.getNewFlag()) - .betweenIfPresent(AssignTasksInfoDO::getNewFlagTime, reqVO.getNewFlagTime()) - .eqIfPresent(AssignTasksInfoDO::getRejectRemark, reqVO.getRejectRemark()) - .eqIfPresent(AssignTasksInfoDO::getConfirm, reqVO.getConfirm()) - .betweenIfPresent(AssignTasksInfoDO::getConfirmTime, reqVO.getConfirmTime()) - .eqIfPresent(AssignTasksInfoDO::getCreator, reqVO.getCreator()) .betweenIfPresent(AssignTasksInfoDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(AssignTasksInfoDO::getUpdater, reqVO.getUpdater()) - .eqIfPresent(AssignTasksInfoDO::getRemark, reqVO.getRemark()) .eqIfPresent(AssignTasksInfoDO::getIsReject, reqVO.getIsReject()) .orderByDesc(AssignTasksInfoDO::getId)); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java index 975051d..1fcf54a 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java @@ -28,8 +28,7 @@ import java.util.Objects; import java.util.stream.Collectors; import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDeptId; -import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.*; import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.ASSIGN_TASKS_NOT_EXISTS; import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.ASSIGN_TASKS_NOT_EXISTS_002; @@ -65,7 +64,7 @@ public class AssignTasksServiceImpl implements AssignTasksService { AssignTasksDO assignTasks = BeanUtils.toBean(createReqVO, AssignTasksDO.class); assignTasksMapper.insert(assignTasks); //保存单位明细 - assignTasksInfoService.saveAssignTasksInfos(createReqVO.getCompanyIds(), assignTasks.getId()); + assignTasksInfoService.saveAssignTasksInfos(createReqVO.getCompanyIds(), assignTasks); //保存单位明细 // 返回 @@ -111,7 +110,7 @@ public class AssignTasksServiceImpl implements AssignTasksService { .filter(Objects::nonNull) .filter(id -> !existingCompanyIds.contains(id)) // 直接用列表 contains() .collect(Collectors.toList()); - assignTasksInfoService.saveAssignTasksInfos(filteredCompanyIds, updateObj.getId()); + assignTasksInfoService.saveAssignTasksInfos(filteredCompanyIds, updateObj); } @Override @@ -150,8 +149,7 @@ public class AssignTasksServiceImpl implements AssignTasksService { @Override public PageResult getAssignTasksPage(AssignTasksPageReqVO pageReqVO) { //add by wq 派单任务只能总公司查询 - DeptRespDTO deptRespDTO = deptApi.getDept(getLoginUserDeptId()); - if (deptRespDTO.getParentId() != 0) { + if (getCompanyId() != 100) { return null; } //add by wq 派单任务只能总公司查询 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java index 289bd6a..bcde302 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java @@ -1,11 +1,13 @@ package com.zteits.urbanops.module.garden.service.assigntasksinfo; -import java.util.*; -import jakarta.validation.*; -import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.*; -import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO; import com.zteits.urbanops.framework.common.pojo.PageResult; -import com.zteits.urbanops.framework.common.pojo.PageParam; +import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoPageReqVO; +import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoSaveReqVO; +import com.zteits.urbanops.module.garden.dal.dataobject.assigntasks.AssignTasksDO; +import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO; +import jakarta.validation.Valid; + +import java.util.List; /** * 派单任务-单位关联表（记录单位接收派单后的执行详情） Service 接口 @@ -64,10 +66,10 @@ public interface AssignTasksInfoService { * @Description 同步保存单位派单详情 * @Date 2025/11/16 17:07 * @Param companyIds - * @param taskId + * @param assignTasks * @Return java.lang.Long */ - public void saveAssignTasksInfos(List companyIds, Long taskId); + public void saveAssignTasksInfos(List companyIds, AssignTasksDO assignTasks); /** * @Author wangqian diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java index 22cbd83..1b8025b 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java @@ -114,7 +114,7 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { } @Override - public void saveAssignTasksInfos(List companyIds, Long taskId) { + public void saveAssignTasksInfos(List companyIds, AssignTasksDO assignTasks) { // 获得用户基本信息 if (companyIds != null && companyIds.size() > 0) { //1、获取单位集合 @@ -129,13 +129,14 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { (oldValue, newValue) -> newValue )); for (String companyId : companyIds) { - AssignTasksInfoSaveReqVO assignTaskInfo = new AssignTasksInfoSaveReqVO(); + AssignTasksInfoDO assignTaskInfo = new AssignTasksInfoDO(); assignTaskInfo.setCompanyId(companyId); assignTaskInfo.setCompanyName(companyIdToNameMap.get(Long.valueOf(companyId))); - assignTaskInfo.setTaskId(taskId); - AssignTasksInfoDO assignTasksInfo = BeanUtils.toBean(assignTaskInfo, AssignTasksInfoDO.class); - - assignTasksInfoMapper.insert(assignTasksInfo); + assignTaskInfo.setTaskId(assignTasks.getId()); + assignTaskInfo.setTaskName(assignTasks.getTaskName()); + assignTaskInfo.setTaskType(assignTasks.getTaskType()); + assignTaskInfo.setDeadline(assignTasks.getDeadline()); + assignTasksInfoMapper.insert(assignTaskInfo); } } } diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/flowpathidea/FlowpathIdeaDO.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/flowpathidea/FlowpathIdeaDO.java index bf86e2e..0b6a08e 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/flowpathidea/FlowpathIdeaDO.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/flowpathidea/FlowpathIdeaDO.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; /** * 流程审核意见 DO * - * @author 芋道源码 + * @author 全域源码 */ @TableName("global_flowpath_idea") @KeySequence("global_flowpath_idea_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/problems/ProblemsDO.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/problems/ProblemsDO.java index 727279b..e4b94d9 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/problems/ProblemsDO.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/problems/ProblemsDO.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; /** * 事件表--问题单 DO * - * @author 芋道源码 + * @author 全域源码 */ @TableName(value = "global_problems", autoResultMap = true) @KeySequence("global_problems_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/roadinfo/RoadInfoDO.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/roadinfo/RoadInfoDO.java index f951587..1916507 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/roadinfo/RoadInfoDO.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/roadinfo/RoadInfoDO.java @@ -9,7 +9,7 @@ import lombok.*; /** * 道路信息对应关系 DO * - * @author 芋道源码 + * @author 全域源码 */ @TableName("global_master_road_info") @KeySequence("global_master_road_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorders/WorkOrdersDO.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorders/WorkOrdersDO.java index ead1d0b..f3f68f6 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorders/WorkOrdersDO.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorders/WorkOrdersDO.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** * 工单 DO * - * @author 芋道源码 + * @author 全域源码 */ @TableName("global_work_orders") @KeySequence("global_work_orders_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorderscommitdetail/WorkOrdersCommitDetailDO.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorderscommitdetail/WorkOrdersCommitDetailDO.java index 20a5e98..8687ab3 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorderscommitdetail/WorkOrdersCommitDetailDO.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorderscommitdetail/WorkOrdersCommitDetailDO.java @@ -15,7 +15,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE /** * 任务处理结果 DO * - * @author 芋道源码 + * @author 全域源码 */ @TableName(value = "global_work_orders_commit_detail",autoResultMap = true) @KeySequence("global_work_orders_commit_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/flowpathidea/FlowpathIdeaMapper.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/flowpathidea/FlowpathIdeaMapper.java index a77e905..4291e06 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/flowpathidea/FlowpathIdeaMapper.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/flowpathidea/FlowpathIdeaMapper.java @@ -12,7 +12,7 @@ import java.util.List; /** * 流程审核意见 Mapper * - * @author 芋道源码 + * @author 全域源码 */ @Mapper public interface FlowpathIdeaMapper extends BaseMapperX { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/problems/ProblemsMapper.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/problems/ProblemsMapper.java index 1640269..3479d9d 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/problems/ProblemsMapper.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/problems/ProblemsMapper.java @@ -15,7 +15,7 @@ import java.util.Map; /** * 事件表--问题单 Mapper * - * @author 芋道源码 + * @author 全域源码 */ @Mapper public interface ProblemsMapper extends BaseMapperX { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/roadinfo/RoadInfoMapper.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/roadinfo/RoadInfoMapper.java index 083acc4..43cac1e 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/roadinfo/RoadInfoMapper.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/roadinfo/RoadInfoMapper.java @@ -14,7 +14,7 @@ import java.util.List; /** * 道路信息对应关系 Mapper * - * @author 芋道源码 + * @author 全域源码 */ @Mapper public interface RoadInfoMapper extends BaseMapperX { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/workorders/WorkOrdersMapper.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/workorders/WorkOrdersMapper.java index ef1efee..f336aa5 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/workorders/WorkOrdersMapper.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/workorders/WorkOrdersMapper.java @@ -14,7 +14,7 @@ import java.util.Map; /** * 工单 Mapper * - * @author 芋道源码 + * @author 全域源码 */ @Mapper public interface WorkOrdersMapper extends BaseMapperX { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/workorderscommitdetail/WorkOrdersCommitDetailMapper.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/workorderscommitdetail/WorkOrdersCommitDetailMapper.java index 475156c..afce6af 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/workorderscommitdetail/WorkOrdersCommitDetailMapper.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/workorderscommitdetail/WorkOrdersCommitDetailMapper.java @@ -14,7 +14,7 @@ import java.util.List; /** * 任务处理结果 Mapper * - * @author 芋道源码 + * @author 全域源码 */ @Mapper public interface WorkOrdersCommitDetailMapper extends BaseMapperX { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/redis/RedisKeyConstants.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/redis/RedisKeyConstants.java index fbb336c..eb37de4 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/redis/RedisKeyConstants.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/redis/RedisKeyConstants.java @@ -3,7 +3,7 @@ package com.zteits.urbanops.module.gloabl.dal.redis; /** * ERP Redis Key 枚举类 * - * @author 芋道源码 + * @author 全域源码 */ public interface RedisKeyConstants { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/flowpathidea/FlowpathIdeaService.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/flowpathidea/FlowpathIdeaService.java index eec756f..85e680e 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/flowpathidea/FlowpathIdeaService.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/flowpathidea/FlowpathIdeaService.java @@ -13,7 +13,7 @@ import java.util.List; /** * 流程审核意见 Service 接口 * - * @author 芋道源码 + * @author 全域源码 */ public interface FlowpathIdeaService { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/flowpathidea/FlowpathIdeaServiceImpl.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/flowpathidea/FlowpathIdeaServiceImpl.java index 7e23271..ec56936 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/flowpathidea/FlowpathIdeaServiceImpl.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/flowpathidea/FlowpathIdeaServiceImpl.java @@ -27,7 +27,7 @@ import static com.zteits.urbanops.module.gloabl.enums.ErrorCodeConstants.FLOWPAT /** * 流程审核意见 Service 实现类 * - * @author 芋道源码 + * @author 全域源码 */ @Service @Validated diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/problems/ProblemsService.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/problems/ProblemsService.java index 54dfeb6..677fd4c 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/problems/ProblemsService.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/problems/ProblemsService.java @@ -17,7 +17,7 @@ import java.util.Map; /** * 事件表--问题单 Service 接口 * - * @author 芋道源码 + * @author 全域源码 */ public interface ProblemsService { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/problems/ProblemsServiceImpl.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/problems/ProblemsServiceImpl.java index ed0ec43..8f49fcc 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/problems/ProblemsServiceImpl.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/problems/ProblemsServiceImpl.java @@ -48,7 +48,7 @@ import static com.zteits.urbanops.module.gloabl.enums.ErrorCodeConstants.PROBLEM /** * 事件表--问题单 Service 实现类 * - * @author 芋道源码 + * @author 全域源码 */ @Service @Validated diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/roadinfo/RoadInfoService.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/roadinfo/RoadInfoService.java index 57a452a..9e643ec 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/roadinfo/RoadInfoService.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/roadinfo/RoadInfoService.java @@ -13,7 +13,7 @@ import java.util.List; /** * 道路信息对应关系 Service 接口 * - * @author 芋道源码 + * @author 全域源码 */ public interface RoadInfoService { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/roadinfo/RoadInfoServiceImpl.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/roadinfo/RoadInfoServiceImpl.java index ba9673e..b460fc8 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/roadinfo/RoadInfoServiceImpl.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/roadinfo/RoadInfoServiceImpl.java @@ -32,7 +32,7 @@ import static com.zteits.urbanops.module.gloabl.enums.ErrorCodeConstants.ROAD_IN /** * 道路信息对应关系 Service 实现类 * - * @author 芋道源码 + * @author 全域源码 */ @Service @Validated diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorders/WorkOrdersService.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorders/WorkOrdersService.java index 0efccc6..9e26373 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorders/WorkOrdersService.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorders/WorkOrdersService.java @@ -14,7 +14,7 @@ import java.util.Map; /** * 工单 Service 接口 * - * @author 芋道源码 + * @author 全域源码 */ public interface WorkOrdersService { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorders/WorkOrdersServiceImpl.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorders/WorkOrdersServiceImpl.java index 47459fc..b14645c 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorders/WorkOrdersServiceImpl.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorders/WorkOrdersServiceImpl.java @@ -61,7 +61,7 @@ import static com.zteits.urbanops.module.gloabl.enums.ErrorCodeConstants.WORK_OR /** * 工单 Service 实现类 * - * @author 芋道源码 + * @author 全域源码 */ @Service @Validated diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorderscommitdetail/WorkOrdersCommitDetailService.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorderscommitdetail/WorkOrdersCommitDetailService.java index bd0cc21..8f7f46f 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorderscommitdetail/WorkOrdersCommitDetailService.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorderscommitdetail/WorkOrdersCommitDetailService.java @@ -13,7 +13,7 @@ import java.util.List; /** * 任务处理结果 Service 接口 * - * @author 芋道源码 + * @author 全域源码 */ public interface WorkOrdersCommitDetailService { diff --git a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorderscommitdetail/WorkOrdersCommitDetailServiceImpl.java b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorderscommitdetail/WorkOrdersCommitDetailServiceImpl.java index 14897ea..6eea631 100644 --- a/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorderscommitdetail/WorkOrdersCommitDetailServiceImpl.java +++ b/urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorderscommitdetail/WorkOrdersCommitDetailServiceImpl.java @@ -30,7 +30,7 @@ import static com.zteits.urbanops.module.gloabl.enums.ErrorCodeConstants.WORK_OR /** * 任务处理结果 Service 实现类 * - * @author 芋道源码 + * @author 全域源码 */ @Service @Validated diff --git a/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/CodegenController.java b/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/CodegenController.java index 7fc76f4..1255c33 100644 --- a/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/CodegenController.java +++ b/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/CodegenController.java @@ -51,7 +51,7 @@ public class CodegenController { @Parameters({ @Parameter(name = "dataSourceConfigId", description = "数据源配置的编号", required = true, example = "1"), @Parameter(name = "name", description = "表名，模糊匹配", example = "urbanops"), - @Parameter(name = "comment", description = "描述，模糊匹配", example = "芋道") + @Parameter(name = "comment", description = "描述，模糊匹配", example = "全域") }) @PreAuthorize("@ss.hasPermission('infra:codegen:query')") public CommonResult> getDatabaseTableList( diff --git a/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java b/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java index c348ae5..660b897 100644 --- a/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java +++ b/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java @@ -16,7 +16,7 @@ public class CodegenTablePageReqVO extends PageParam { @Schema(description = "表名称，模糊匹配", example = "urbanops") private String tableName; - @Schema(description = "表描述，模糊匹配", example = "芋道") + @Schema(description = "表描述，模糊匹配", example = "全域") private String tableComment; @Schema(description = "实体，模糊匹配", example = "Urbanops") diff --git a/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java b/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java index c19bd46..6cecd84 100644 --- a/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java +++ b/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/vo/table/CodegenTableRespVO.java @@ -18,7 +18,7 @@ public class CodegenTableRespVO { @Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "urbanops") private String tableName; - @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String tableComment; @Schema(description = "备注", example = "我是备注") diff --git a/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java b/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java index a7d41c3..c6694f6 100644 --- a/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java +++ b/urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/vo/table/CodegenTableSaveReqVO.java @@ -24,7 +24,7 @@ public class CodegenTableSaveReqVO { @NotNull(message = "表名称不能为空") private String tableName; - @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") @NotNull(message = "表描述不能为空") private String tableComment; diff --git a/urbanops-module-infra/src/test/java/com/zteits/urbanops/module/infra/service/file/FileConfigServiceImplTest.java b/urbanops-module-infra/src/test/java/com/zteits/urbanops/module/infra/service/file/FileConfigServiceImplTest.java index 9d7aeef..78598a8 100644 --- a/urbanops-module-infra/src/test/java/com/zteits/urbanops/module/infra/service/file/FileConfigServiceImplTest.java +++ b/urbanops-module-infra/src/test/java/com/zteits/urbanops/module/infra/service/file/FileConfigServiceImplTest.java @@ -191,7 +191,7 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest { fileConfigMapper.insert(cloneIgnoreId(dbFileConfig, o -> o.setCreateTime(LocalDateTimeUtil.parse("2020-11-23", DatePattern.NORM_DATE_PATTERN)))); // 准备参数 FileConfigPageReqVO reqVO = new FileConfigPageReqVO(); - reqVO.setName("芋道"); + reqVO.setName("全域"); reqVO.setStorage(FileStorageEnum.LOCAL.getStorage()); reqVO.setCreateTime((new LocalDateTime[]{buildTime(2020, 1, 1), buildTime(2020, 1, 24)})); diff --git a/urbanops-module-infra/src/test/resources/application-unit-test.yaml b/urbanops-module-infra/src/test/resources/application-unit-test.yaml index 0b3bd81..fa98411 100644 --- a/urbanops-module-infra/src/test/resources/application-unit-test.yaml +++ b/urbanops-module-infra/src/test/resources/application-unit-test.yaml @@ -42,9 +42,9 @@ mybatis-plus: --- #################### 监控相关配置 #################### ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 urbanops: info: base-package: com.zteits.urbanops diff --git a/urbanops-module-iot/urbanops-module-iot-biz/src/main/java/com/zteits/urbanops/module/iot/framework/iot/config/UrbanopsIotProperties.java b/urbanops-module-iot/urbanops-module-iot-biz/src/main/java/com/zteits/urbanops/module/iot/framework/iot/config/UrbanopsIotProperties.java index 18da456..3f4c71c 100644 --- a/urbanops-module-iot/urbanops-module-iot-biz/src/main/java/com/zteits/urbanops/module/iot/framework/iot/config/UrbanopsIotProperties.java +++ b/urbanops-module-iot/urbanops-module-iot-biz/src/main/java/com/zteits/urbanops/module/iot/framework/iot/config/UrbanopsIotProperties.java @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; import java.time.Duration; /** - * 芋道 IoT 全局配置类 + * 全域 IoT 全局配置类 * * @author ZIEITS */ diff --git a/urbanops-module-iot/urbanops-module-iot-biz/src/test/resources/application-unit-test.yaml b/urbanops-module-iot/urbanops-module-iot-biz/src/test/resources/application-unit-test.yaml index 7f593c1..42c77c2 100644 --- a/urbanops-module-iot/urbanops-module-iot-biz/src/test/resources/application-unit-test.yaml +++ b/urbanops-module-iot/urbanops-module-iot-biz/src/test/resources/application-unit-test.yaml @@ -39,9 +39,9 @@ logging: --- #################### 监控相关配置 #################### ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 urbanops: info: base-package: com.zteits.urbanops diff --git a/urbanops-module-mall/urbanops-module-product/src/main/java/com/zteits/urbanops/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java b/urbanops-module-mall/urbanops-module-product/src/main/java/com/zteits/urbanops/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java index 8446b18..7d9441e 100644 --- a/urbanops-module-mall/urbanops-module-product/src/main/java/com/zteits/urbanops/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java +++ b/urbanops-module-mall/urbanops-module-product/src/main/java/com/zteits/urbanops/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java @@ -15,7 +15,7 @@ public class AppProductSpuDetailRespVO { // ========== 基本信息 ========= - @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "商品简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是一个快乐简介") diff --git a/urbanops-module-mall/urbanops-module-product/src/main/java/com/zteits/urbanops/module/product/controller/app/spu/vo/AppProductSpuRespVO.java b/urbanops-module-mall/urbanops-module-product/src/main/java/com/zteits/urbanops/module/product/controller/app/spu/vo/AppProductSpuRespVO.java index 8469902..56046f1 100644 --- a/urbanops-module-mall/urbanops-module-product/src/main/java/com/zteits/urbanops/module/product/controller/app/spu/vo/AppProductSpuRespVO.java +++ b/urbanops-module-mall/urbanops-module-product/src/main/java/com/zteits/urbanops/module/product/controller/app/spu/vo/AppProductSpuRespVO.java @@ -12,7 +12,7 @@ public class AppProductSpuRespVO { @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long id; - @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "商品简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "清凉小短袖简介") diff --git a/urbanops-module-mall/urbanops-module-product/src/test/java/com/zteits/urbanops/module/product/service/brand/ProductBrandServiceImplTest.java b/urbanops-module-mall/urbanops-module-product/src/test/java/com/zteits/urbanops/module/product/service/brand/ProductBrandServiceImplTest.java index bd0aaa0..9c9207f 100644 --- a/urbanops-module-mall/urbanops-module-product/src/test/java/com/zteits/urbanops/module/product/service/brand/ProductBrandServiceImplTest.java +++ b/urbanops-module-mall/urbanops-module-product/src/test/java/com/zteits/urbanops/module/product/service/brand/ProductBrandServiceImplTest.java @@ -120,7 +120,7 @@ public class ProductBrandServiceImplTest extends BaseDbUnitTest { brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCreateTime(buildTime(2022, 3, 1)))); // 准备参数 ProductBrandPageReqVO reqVO = new ProductBrandPageReqVO(); - reqVO.setName("芋道"); + reqVO.setName("全域"); reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); reqVO.setCreateTime((new LocalDateTime[]{buildTime(2022, 1, 1), buildTime(2022, 2, 25)})); diff --git a/urbanops-module-mall/urbanops-module-product/src/test/resources/application-unit-test.yaml b/urbanops-module-mall/urbanops-module-product/src/test/resources/application-unit-test.yaml index a23c332..012bf00 100644 --- a/urbanops-module-mall/urbanops-module-product/src/test/resources/application-unit-test.yaml +++ b/urbanops-module-mall/urbanops-module-product/src/test/resources/application-unit-test.yaml @@ -41,9 +41,9 @@ mybatis-plus: --- #################### 监控相关配置 #################### ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 urbanops: info: base-package: com.zteits.urbanops diff --git a/urbanops-module-mall/urbanops-module-promotion/src/main/java/com/zteits/urbanops/module/promotion/controller/admin/kefu/vo/conversation/KeFuConversationRespVO.java b/urbanops-module-mall/urbanops-module-promotion/src/main/java/com/zteits/urbanops/module/promotion/controller/admin/kefu/vo/conversation/KeFuConversationRespVO.java index f10d161..863049e 100644 --- a/urbanops-module-mall/urbanops-module-promotion/src/main/java/com/zteits/urbanops/module/promotion/controller/admin/kefu/vo/conversation/KeFuConversationRespVO.java +++ b/urbanops-module-mall/urbanops-module-promotion/src/main/java/com/zteits/urbanops/module/promotion/controller/admin/kefu/vo/conversation/KeFuConversationRespVO.java @@ -16,7 +16,7 @@ public class KeFuConversationRespVO { private Long userId; @Schema(description = "会话所属用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://urbanops.com/images/avatar.jpg") private String userAvatar; - @Schema(description = "会话所属用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "会话所属用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String userNickname; @Schema(description = "最后聊天时间", requiredMode = Schema.RequiredMode.REQUIRED) @@ -43,4 +43,4 @@ public class KeFuConversationRespVO { @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) private LocalDateTime createTime; -} \ No newline at end of file +} diff --git a/urbanops-module-mall/urbanops-module-promotion/src/test/resources/application-unit-test.yaml b/urbanops-module-mall/urbanops-module-promotion/src/test/resources/application-unit-test.yaml index 4b633ee..6696f86 100644 --- a/urbanops-module-mall/urbanops-module-promotion/src/test/resources/application-unit-test.yaml +++ b/urbanops-module-mall/urbanops-module-promotion/src/test/resources/application-unit-test.yaml @@ -40,9 +40,9 @@ mybatis: --- #################### 监控相关配置 #################### ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 urbanops: info: base-package: com.zteits.urbanops.module diff --git a/urbanops-module-mall/urbanops-module-trade/src/main/java/com/zteits/urbanops/module/trade/controller/app/base/spu/AppProductSpuBaseRespVO.java b/urbanops-module-mall/urbanops-module-trade/src/main/java/com/zteits/urbanops/module/trade/controller/app/base/spu/AppProductSpuBaseRespVO.java index 54f2561..07eaac4 100644 --- a/urbanops-module-mall/urbanops-module-trade/src/main/java/com/zteits/urbanops/module/trade/controller/app/base/spu/AppProductSpuBaseRespVO.java +++ b/urbanops-module-mall/urbanops-module-trade/src/main/java/com/zteits/urbanops/module/trade/controller/app/base/spu/AppProductSpuBaseRespVO.java @@ -14,7 +14,7 @@ public class AppProductSpuBaseRespVO { @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "商品 SPU 名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "商品 SPU 名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "商品主图地址", example = "https://www.iocoder.cn/xx.png") diff --git a/urbanops-module-mall/urbanops-module-trade/src/test/resources/application-unit-test.yaml b/urbanops-module-mall/urbanops-module-trade/src/test/resources/application-unit-test.yaml index 4bd9858..02f9959 100644 --- a/urbanops-module-mall/urbanops-module-trade/src/test/resources/application-unit-test.yaml +++ b/urbanops-module-mall/urbanops-module-trade/src/test/resources/application-unit-test.yaml @@ -40,9 +40,9 @@ mybatis: --- #################### 监控相关配置 #################### ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 urbanops: info: base-package: com.zteits.urbanops.module @@ -57,4 +57,4 @@ urbanops: kd100: customer: xxxxx key: xxxxx - client: not_provide \ No newline at end of file + client: not_provide diff --git a/urbanops-module-member/src/test/resources/application-unit-test.yaml b/urbanops-module-member/src/test/resources/application-unit-test.yaml index 4b633ee..6696f86 100644 --- a/urbanops-module-member/src/test/resources/application-unit-test.yaml +++ b/urbanops-module-member/src/test/resources/application-unit-test.yaml @@ -40,9 +40,9 @@ mybatis: --- #################### 监控相关配置 #################### ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 urbanops: info: base-package: com.zteits.urbanops.module diff --git a/urbanops-module-mp/src/main/java/com/zteits/urbanops/module/mp/controller/admin/user/vo/MpUserRespVO.java b/urbanops-module-mp/src/main/java/com/zteits/urbanops/module/mp/controller/admin/user/vo/MpUserRespVO.java index 6ef7b98..8268027 100644 --- a/urbanops-module-mp/src/main/java/com/zteits/urbanops/module/mp/controller/admin/user/vo/MpUserRespVO.java +++ b/urbanops-module-mp/src/main/java/com/zteits/urbanops/module/mp/controller/admin/user/vo/MpUserRespVO.java @@ -26,7 +26,7 @@ public class MpUserRespVO { @Schema(description = "取消关注时间") private LocalDateTime unsubscribeTime; - @Schema(description = "昵称", example = "芋道") + @Schema(description = "昵称", example = "全域") private String nickname; @Schema(description = "头像地址", example = "https://www.iocoder.cn/1.png") private String headImageUrl; diff --git a/urbanops-module-mp/src/main/java/com/zteits/urbanops/module/mp/controller/admin/user/vo/MpUserUpdateReqVO.java b/urbanops-module-mp/src/main/java/com/zteits/urbanops/module/mp/controller/admin/user/vo/MpUserUpdateReqVO.java index 9530e34..0ff102c 100644 --- a/urbanops-module-mp/src/main/java/com/zteits/urbanops/module/mp/controller/admin/user/vo/MpUserUpdateReqVO.java +++ b/urbanops-module-mp/src/main/java/com/zteits/urbanops/module/mp/controller/admin/user/vo/MpUserUpdateReqVO.java @@ -14,7 +14,7 @@ public class MpUserUpdateReqVO { @NotNull(message = "编号不能为空") private Long id; - @Schema(description = "昵称", example = "芋道") + @Schema(description = "昵称", example = "全域") private String nickname; @Schema(description = "备注", example = "你是一个芋头嘛") diff --git a/urbanops-module-pay/src/test/resources/application-unit-test.yaml b/urbanops-module-pay/src/test/resources/application-unit-test.yaml index 4b633ee..6696f86 100644 --- a/urbanops-module-pay/src/test/resources/application-unit-test.yaml +++ b/urbanops-module-pay/src/test/resources/application-unit-test.yaml @@ -40,9 +40,9 @@ mybatis: --- #################### 监控相关配置 #################### ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 urbanops: info: base-package: com.zteits.urbanops.module diff --git a/urbanops-module-report/src/test/java/com/zteits/urbanops/module/report/service/goview/GoViewDataServiceImplTest.java b/urbanops-module-report/src/test/java/com/zteits/urbanops/module/report/service/goview/GoViewDataServiceImplTest.java index 38dc2dc..17b729c 100644 --- a/urbanops-module-report/src/test/java/com/zteits/urbanops/module/report/service/goview/GoViewDataServiceImplTest.java +++ b/urbanops-module-report/src/test/java/com/zteits/urbanops/module/report/service/goview/GoViewDataServiceImplTest.java @@ -40,7 +40,7 @@ public class GoViewDataServiceImplTest extends BaseDbUnitTest { // mock 数据明细 when(sqlRowSet.next()).thenReturn(true).thenReturn(true).thenReturn(false); when(sqlRowSet.getObject("id")).thenReturn(1L).thenReturn(2L); - when(sqlRowSet.getObject("name")).thenReturn("ZIEITS").thenReturn("芋道"); + when(sqlRowSet.getObject("name")).thenReturn("ZIEITS").thenReturn("全域"); // 调用 GoViewDataRespVO dataBySQL = goViewDataService.getDataBySQL(sql); @@ -52,7 +52,7 @@ public class GoViewDataServiceImplTest extends BaseDbUnitTest { assertEquals("ZIEITS", dataBySQL.getSource().get(0).get("name")); assertEquals(2, dataBySQL.getSource().get(1).size()); assertEquals(2L, dataBySQL.getSource().get(1).get("id")); - assertEquals("芋道", dataBySQL.getSource().get(1).get("name")); + assertEquals("全域", dataBySQL.getSource().get(1).get("name")); } } diff --git a/urbanops-module-report/src/test/resources/application-unit-test.yaml b/urbanops-module-report/src/test/resources/application-unit-test.yaml index 4b633ee..6696f86 100644 --- a/urbanops-module-report/src/test/resources/application-unit-test.yaml +++ b/urbanops-module-report/src/test/resources/application-unit-test.yaml @@ -40,9 +40,9 @@ mybatis: --- #################### 监控相关配置 #################### ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 urbanops: info: base-package: com.zteits.urbanops.module diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthMenuRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthMenuRespVO.java index 4441c58..a768704 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthMenuRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthMenuRespVO.java @@ -15,13 +15,13 @@ import java.util.List; @Builder public class AuthMenuRespVO { - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private Long id; @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long parentId; - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "路由地址,仅菜单类型为菜单或者目录时，才需要传", example = "post") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java index 9aabd57..159697f 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java @@ -69,13 +69,13 @@ public class AuthPermissionInfoRespVO { @Builder public static class MenuVO { - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private Long id; @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long parentId; - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "路由地址,仅菜单类型为菜单或者目录时，才需要传", example = "post") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java index 7426dae..68686d0 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java @@ -7,7 +7,7 @@ import lombok.Data; @Data public class DeptListReqVO { - @Schema(description = "部门名称，模糊匹配", example = "芋道") + @Schema(description = "部门名称，模糊匹配", example = "全域") private String name; @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptRespVO.java index 4537e95..a6ee4e8 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptRespVO.java @@ -12,7 +12,7 @@ public class DeptRespVO { @Schema(description = "部门编号", example = "1024") private Long id; - @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "父部门 ID", example = "1024") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java index 3de6d2b..59a5e20 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java @@ -17,7 +17,7 @@ public class DeptSaveReqVO { @Schema(description = "部门编号", example = "1024") private Long id; - @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") @NotBlank(message = "部门名称不能为空") @Size(max = 30, message = "部门名称长度不能超过 30 个字符") private String name; diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java index 2394f24..de90d34 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/dept/DeptSimpleRespVO.java @@ -14,7 +14,7 @@ public class DeptSimpleRespVO { @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/post/PostPageReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/post/PostPageReqVO.java index 93bf42c..672ff0d 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/post/PostPageReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dept/vo/post/PostPageReqVO.java @@ -13,7 +13,7 @@ public class PostPageReqVO extends PageParam { @Schema(description = "岗位编码，模糊匹配", example = "urbanops") private String code; - @Schema(description = "岗位名称，模糊匹配", example = "芋道") + @Schema(description = "岗位名称，模糊匹配", example = "全域") private String name; @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java index 5c372e7..2b6f5a5 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java @@ -14,7 +14,7 @@ import jakarta.validation.constraints.Size; @EqualsAndHashCode(callSuper = true) public class DictDataPageReqVO extends PageParam { - @Schema(description = "字典标签", example = "芋道") + @Schema(description = "字典标签", example = "全域") @Size(max = 100, message = "字典标签长度不能超过100个字符") private String label; diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/data/DictDataRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/data/DictDataRespVO.java index 88e4448..e357b7d 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/data/DictDataRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/data/DictDataRespVO.java @@ -23,7 +23,7 @@ public class DictDataRespVO { @ExcelProperty("字典排序") private Integer sort; - @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") @ExcelProperty("字典标签") private String label; diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java index 88d3a36..ae3874d 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java @@ -20,7 +20,7 @@ public class DictDataSaveReqVO { @NotNull(message = "显示顺序不能为空") private Integer sort; - @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") @NotBlank(message = "字典标签不能为空") @Size(max = 100, message = "字典标签长度不能超过100个字符") private String label; diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java index a2ec28a..5e299aa 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/type/DictTypePageReqVO.java @@ -16,7 +16,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE @EqualsAndHashCode(callSuper = true) public class DictTypePageReqVO extends PageParam { - @Schema(description = "字典类型名称，模糊匹配", example = "芋道") + @Schema(description = "字典类型名称，模糊匹配", example = "全域") private String name; @Schema(description = "字典类型，模糊匹配", example = "sys_common_sex") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java index e0fea9a..742b864 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/dict/vo/type/DictTypeSimpleRespVO.java @@ -10,7 +10,7 @@ public class DictTypeSimpleRespVO { @Schema(description = "字典类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "字典类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "字典类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "sys_common_sex") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java index 0a3de11..a7004f0 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/logger/vo/loginlog/LoginLogPageReqVO.java @@ -18,7 +18,7 @@ public class LoginLogPageReqVO extends PageParam { @Schema(description = "用户 IP，模拟匹配", example = "127.0.0.1") private String userIp; - @Schema(description = "用户账号，模拟匹配", example = "芋道") + @Schema(description = "用户账号，模拟匹配", example = "全域") private String username; @Schema(description = "操作状态", example = "true") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java index 4288df1..b5c093f 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/logger/vo/operatelog/OperateLogPageReqVO.java @@ -13,7 +13,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE @Data public class OperateLogPageReqVO extends PageParam { - @Schema(description = "用户编号", example = "芋道") + @Schema(description = "用户编号", example = "全域") private Long userId; @Schema(description = "操作模块业务编号", example = "1") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java index 2f3c006..a47f9ab 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java @@ -43,7 +43,7 @@ public class OperateLogRespVO implements VO { @ExcelProperty("操作模块业务编号") private Long bizId; - @Schema(description = "操作明细", example = "修改编号为 1 的用户信息，将性别从男改成女，将姓名从芋道改成源码。") + @Schema(description = "操作明细", example = "修改编号为 1 的用户信息，将性别从男改成女，将姓名从全域改成源码。") private String action; @Schema(description = "拓展字段", example = "{'orderId': 1}") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/notice/vo/NoticePageReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/notice/vo/NoticePageReqVO.java index 876f4df..3847b3c 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/notice/vo/NoticePageReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/notice/vo/NoticePageReqVO.java @@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class NoticePageReqVO extends PageParam { - @Schema(description = "通知公告名称，模糊匹配", example = "芋道") + @Schema(description = "通知公告名称，模糊匹配", example = "全域") private String title; @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java index d1c0c10..db57ccb 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/oauth2/vo/user/OAuth2UserInfoRespVO.java @@ -19,7 +19,7 @@ public class OAuth2UserInfoRespVO { @Schema(description = "用户账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") private String username; - @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String nickname; @Schema(description = "用户邮箱", example = "urbanops@iocoder.cn") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java index ab96349..f0c0718 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuListReqVO.java @@ -7,7 +7,7 @@ import lombok.Data; @Data public class MenuListReqVO { - @Schema(description = "菜单名称，模糊匹配", example = "芋道") + @Schema(description = "菜单名称，模糊匹配", example = "全域") private String name; @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuRespVO.java index cc87530..77f1c86 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuRespVO.java @@ -15,7 +15,7 @@ public class MenuRespVO { @Schema(description = "菜单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") @NotBlank(message = "菜单名称不能为空") @Size(max = 50, message = "菜单名称长度不能超过50个字符") private String name; diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java index 6c38750..527eef7 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java @@ -14,7 +14,7 @@ public class MenuSaveVO { @Schema(description = "菜单编号", example = "1024") private Long id; - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") @NotBlank(message = "菜单名称不能为空") @Size(max = 50, message = "菜单名称长度不能超过50个字符") private String name; diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java index de5a0e1..696dc75 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/menu/MenuSimpleRespVO.java @@ -10,7 +10,7 @@ public class MenuSimpleRespVO { @Schema(description = "菜单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RolePageReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RolePageReqVO.java index 43e5c3b..8b7d4a5 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RolePageReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RolePageReqVO.java @@ -15,7 +15,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE @EqualsAndHashCode(callSuper = true) public class RolePageReqVO extends PageParam { - @Schema(description = "角色名称，模糊匹配", example = "芋道") + @Schema(description = "角色名称，模糊匹配", example = "全域") private String name; @Schema(description = "角色标识，模糊匹配", example = "urbanops") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java index cd4d1ba..c507316 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/permission/vo/role/RoleSimpleRespVO.java @@ -12,7 +12,7 @@ public class RoleSimpleRespVO { @Schema(description = "角色编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "角色名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "角色名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/TenantController.http b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/TenantController.http index 3ab250d..88ce994 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/TenantController.http +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/TenantController.http @@ -8,7 +8,7 @@ Authorization: Bearer {{token}} tenant-id: {{adminTenantId}} { - "name": "芋道", + "name": "全域", "contactName": "芋艿", "contactMobile": "15601691300", "status": 0, diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java index b99974b..9c5ddfa 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/vo/tenant/TenantPageReqVO.java @@ -17,7 +17,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE @ToString(callSuper = true) public class TenantPageReqVO extends PageParam { - @Schema(description = "租户名", example = "芋道") + @Schema(description = "租户名", example = "全域") private String name; @Schema(description = "联系人", example = "芋艿") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java index 57cddfd..e5ae52c 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/vo/tenant/TenantRespVO.java @@ -20,7 +20,7 @@ public class TenantRespVO { @ExcelProperty("租户编号") private Long id; - @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") @ExcelProperty("租户名") private String name; diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java index df5d7b1..9c9f4e5 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/vo/tenant/TenantSaveReqVO.java @@ -20,7 +20,7 @@ public class TenantSaveReqVO { @Schema(description = "租户编号", example = "1024") private Long id; - @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") @NotNull(message = "租户名不能为空") private String name; diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/UserController.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/UserController.java index 99c023c..3350684 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/UserController.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/UserController.java @@ -172,7 +172,7 @@ public class UserController { // 手动创建导出 demo List list = Arrays.asList( UserImportExcelVO.builder().username("yunai").deptId(1L).email("yunai@iocoder.cn").mobile("15601691300") - .nickname("芋道").status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(), + .nickname("全域").status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(), UserImportExcelVO.builder().username("yuanma").deptId(2L).email("yuanma@iocoder.cn").mobile("15601701300") .nickname("源码").status(CommonStatusEnum.DISABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build() ); diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java index 7f57412..e90ab17 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java @@ -14,7 +14,7 @@ public class UserSimpleRespVO { @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String nickname; @Schema(description = "部门ID", example = "我是一个用户") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/dict/vo/AppDictDataRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/dict/vo/AppDictDataRespVO.java index b5d42bb..cb9a544 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/dict/vo/AppDictDataRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/dict/vo/AppDictDataRespVO.java @@ -14,7 +14,7 @@ public class AppDictDataRespVO { @Schema(description = "字典数据编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String label; @Schema(description = "字典值", requiredMode = Schema.RequiredMode.REQUIRED, example = "iocoder") diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/tenant/vo/AppTenantRespVO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/tenant/vo/AppTenantRespVO.java index 826b8e9..ba8019d 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/tenant/vo/AppTenantRespVO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/tenant/vo/AppTenantRespVO.java @@ -10,7 +10,7 @@ public class AppTenantRespVO { @Schema(description = "租户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; - @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") + @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") private String name; } diff --git a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/dataobject/logger/OperateLogDO.java b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/dataobject/logger/OperateLogDO.java index 4162547..b722e50 100644 --- a/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/dataobject/logger/OperateLogDO.java +++ b/urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/dataobject/logger/OperateLogDO.java @@ -55,7 +55,7 @@ public class OperateLogDO extends BaseDO { /** * 日志内容，记录整个操作的明细 * - * 例如说，修改编号为 1 的用户信息，将性别从男改成女，将姓名从芋道改成源码。 + * 例如说，修改编号为 1 的用户信息，将性别从男改成女，将姓名从全域改成源码。 */ private String action; /** diff --git a/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/mail/MailTemplateServiceImplTest.java b/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/mail/MailTemplateServiceImplTest.java index e03521a..62630fd 100644 --- a/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/mail/MailTemplateServiceImplTest.java +++ b/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/mail/MailTemplateServiceImplTest.java @@ -115,7 +115,7 @@ public class MailTemplateServiceImplTest extends BaseDbUnitTest { }); mailTemplateMapper.insert(dbMailTemplate); // 测试 name 不匹配 - mailTemplateMapper.insert(cloneIgnoreId(dbMailTemplate, o -> o.setName("芋道"))); + mailTemplateMapper.insert(cloneIgnoreId(dbMailTemplate, o -> o.setName("全域"))); // 测试 code 不匹配 mailTemplateMapper.insert(cloneIgnoreId(dbMailTemplate, o -> o.setCode("test_02"))); // 测试 accountId 不匹配 diff --git a/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/sms/SmsChannelServiceTest.java b/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/sms/SmsChannelServiceTest.java index 70f8781..3f9489b 100644 --- a/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/sms/SmsChannelServiceTest.java +++ b/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/sms/SmsChannelServiceTest.java @@ -171,7 +171,7 @@ public class SmsChannelServiceTest extends BaseDbUnitTest { smsChannelMapper.insert(cloneIgnoreId(dbSmsChannel, o -> o.setCreateTime(buildTime(2020, 11, 11)))); // 准备参数 SmsChannelPageReqVO reqVO = new SmsChannelPageReqVO(); - reqVO.setSignature("芋道"); + reqVO.setSignature("全域"); reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); reqVO.setCreateTime(buildBetweenTime(2020, 12, 1, 2020, 12, 24)); diff --git a/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/sms/SmsTemplateServiceImplTest.java b/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/sms/SmsTemplateServiceImplTest.java index 6a1da34..6e1b46c 100644 --- a/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/sms/SmsTemplateServiceImplTest.java +++ b/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/sms/SmsTemplateServiceImplTest.java @@ -231,7 +231,7 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest { reqVO.setType(SmsTemplateTypeEnum.PROMOTION.getType()); reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); reqVO.setCode("tu"); - reqVO.setContent("芋道"); + reqVO.setContent("全域"); reqVO.setApiTemplateId("yu"); reqVO.setChannelId(1L); reqVO.setCreateTime(buildBetweenTime(2021, 11, 1, 2021, 12, 1)); diff --git a/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/tenant/TenantPackageServiceImplTest.java b/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/tenant/TenantPackageServiceImplTest.java index f16fa51..073a7b1 100644 --- a/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/tenant/TenantPackageServiceImplTest.java +++ b/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/tenant/TenantPackageServiceImplTest.java @@ -157,7 +157,7 @@ public class TenantPackageServiceImplTest extends BaseDbUnitTest { tenantPackageMapper.insert(cloneIgnoreId(dbTenantPackage, o -> o.setCreateTime(buildTime(2022, 11, 11)))); // 准备参数 TenantPackagePageReqVO reqVO = new TenantPackagePageReqVO(); - reqVO.setName("芋道"); + reqVO.setName("全域"); reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); reqVO.setRemark("源码"); reqVO.setCreateTime(buildBetweenTime(2022, 10, 9, 2022, 10, 11)); diff --git a/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/tenant/TenantServiceImplTest.java b/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/tenant/TenantServiceImplTest.java index 080a18e..1770245 100644 --- a/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/tenant/TenantServiceImplTest.java +++ b/urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/tenant/TenantServiceImplTest.java @@ -146,14 +146,14 @@ public class TenantServiceImplTest extends BaseDbUnitTest { when(userService.createUser(argThat(user -> { assertEquals("yunai", user.getUsername()); assertEquals("yuanma", user.getPassword()); - assertEquals("芋道", user.getNickname()); + assertEquals("全域", user.getNickname()); assertEquals("15601691300", user.getMobile()); return true; }))).thenReturn(300L); // 准备参数 TenantSaveReqVO reqVO = randomPojo(TenantSaveReqVO.class, o -> { - o.setContactName("芋道"); + o.setContactName("全域"); o.setContactMobile("15601691300"); o.setPackageId(100L); o.setStatus(randomCommonStatus()); @@ -307,7 +307,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest { tenantMapper.insert(cloneIgnoreId(dbTenant, o -> o.setCreateTime(buildTime(2021, 12, 12)))); // 准备参数 TenantPageReqVO reqVO = new TenantPageReqVO(); - reqVO.setName("芋道"); + reqVO.setName("全域"); reqVO.setContactName("艿"); reqVO.setContactMobile("1560"); reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); @@ -324,11 +324,11 @@ public class TenantServiceImplTest extends BaseDbUnitTest { @Test public void testGetTenantByName() { // mock 数据 - TenantDO dbTenant = randomPojo(TenantDO.class, o -> o.setName("芋道")); + TenantDO dbTenant = randomPojo(TenantDO.class, o -> o.setName("全域")); tenantMapper.insert(dbTenant);// @Sql: 先插入出一条存在的数据 // 调用 - TenantDO result = tenantService.getTenantByName("芋道"); + TenantDO result = tenantService.getTenantByName("全域"); // 校验存在 assertPojoEquals(result, dbTenant); } diff --git a/urbanops-module-system/src/test/resources/application-unit-test.yaml b/urbanops-module-system/src/test/resources/application-unit-test.yaml index f9ff805..4986502 100644 --- a/urbanops-module-system/src/test/resources/application-unit-test.yaml +++ b/urbanops-module-system/src/test/resources/application-unit-test.yaml @@ -40,9 +40,9 @@ mybatis: --- #################### 监控相关配置 #################### ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 urbanops: info: base-package: com.zteits.urbanops.module diff --git a/urbanops-module-workorder/pom.xml b/urbanops-module-workorder/pom.xml index b481e7c..a713790 100644 --- a/urbanops-module-workorder/pom.xml +++ b/urbanops-module-workorder/pom.xml @@ -131,7 +131,12 @@ urbanops-module-bpm ${revision} - + + com.zteits.boot + urbanops-module-garden + ${revision} + compile + diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java index e3366c2..04b56b1 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderController.java @@ -3,6 +3,9 @@ package com.zteits.urbanops.module.workorder.controller.app.garden; import com.zteits.urbanops.framework.common.pojo.CommonResult; import com.zteits.urbanops.framework.common.pojo.PageResult; import com.zteits.urbanops.framework.common.util.object.BeanUtils; +import com.zteits.urbanops.module.garden.api.road.RoadApi; +import com.zteits.urbanops.module.garden.api.road.dto.RoadReqDTO; +import com.zteits.urbanops.module.garden.api.road.dto.RoadRespDTO; import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderPageReqVO; import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderRespVO; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderPageReqVO; @@ -18,6 +21,8 @@ import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import java.util.List; + import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @@ -33,6 +38,8 @@ import static com.zteits.urbanops.framework.security.core.util.SecurityFramework public class AppGardenWorkOrderController { @Resource private BpmGardenService gardenService; + @Resource + private RoadApi roadApi; @PostMapping("/create") //@PreAuthorize("@ss.hasPermission('bpm:garden-workorder:create')") @@ -65,4 +72,11 @@ public class AppGardenWorkOrderController { return success(BeanUtils.toBean(pageResult, AppGardenWorkOrderRespVO.class)); } + @GetMapping("/listRoadInfo") + //@PreAuthorize("@ss.hasPermission('bpm:garden-workorder:query')") + @Operation(summary = "app-获取道路信息") + public List getRoadInfoBy(@Valid RoadReqDTO reqDTO) { + return roadApi.getRoadInfoBy(reqDTO); + } + } diff --git a/urbanops-server/src/main/resources/application-dev.yaml b/urbanops-server/src/main/resources/application-dev.yaml index 8f63336..0b4e707 100644 --- a/urbanops-server/src/main/resources/application-dev.yaml +++ b/urbanops-server/src/main/resources/application-dev.yaml @@ -177,9 +177,9 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta key-prefix: wa # Redis Key 的前缀 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 urbanops: pay: order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址 diff --git a/urbanops-server/src/main/resources/application-local.yaml b/urbanops-server/src/main/resources/application-local.yaml index b1085f0..ec3dc5c 100644 --- a/urbanops-server/src/main/resources/application-local.yaml +++ b/urbanops-server/src/main/resources/application-local.yaml @@ -219,9 +219,9 @@ wx: key-prefix: wa # Redis Key 的前缀 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 urbanops: captcha: enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试； @@ -265,4 +265,4 @@ justauth: cache: type: REDIS prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE:: - timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟 \ No newline at end of file + timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟 diff --git a/urbanops-server/src/main/resources/application-prod.yaml b/urbanops-server/src/main/resources/application-prod.yaml index efa8041..8168222 100644 --- a/urbanops-server/src/main/resources/application-prod.yaml +++ b/urbanops-server/src/main/resources/application-prod.yaml @@ -207,9 +207,9 @@ wx: key-prefix: wa # Redis Key 的前缀 http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### -# 芋道配置项，设置当前项目所有自定义的配置 +# 全域配置项，设置当前项目所有自定义的配置 global: captcha: enable: true # 本地环境，暂时关闭图片验证码，方便登录等接口的测试； diff --git a/urbanops-server/src/main/resources/application.yaml b/urbanops-server/src/main/resources/application.yaml index 538e055..d67b2e4 100644 --- a/urbanops-server/src/main/resources/application.yaml +++ b/urbanops-server/src/main/resources/application.yaml @@ -254,7 +254,7 @@ urbanops: enable: true api-key: sk-40500e52840f4d24b956d0b1d80d9abe ---- #################### 芋道相关配置 #################### +--- #################### 全域相关配置 #################### urbanops: info: @@ -292,7 +292,7 @@ urbanops: topic: ${spring.application.name}-websocket # 消息发送的 Kafka Topic consumer-group: ${spring.application.name}-websocket-consumer # 消息发送的 Kafka Consumer Group swagger: - title: 芋道快速开发平台 + title: 全域快速开发平台 description: 提供管理后台、用户 App 的所有功能 version: ${urbanops.info.version} url: ${urbanops.web.admin-ui.url}