Commit c9a77016fadfb20835054a9e62ee7b3980d6b7d6
Merge remote-tracking branch 'origin/dev' into dev
Showing
149 changed files
with
480 additions
and
337 deletions
README.md
pom.xml
| @@ -31,7 +31,7 @@ | @@ -31,7 +31,7 @@ | ||
| 31 | </modules> | 31 | </modules> |
| 32 | 32 | ||
| 33 | <name>${project.artifactId}</name> | 33 | <name>${project.artifactId}</name> |
| 34 | - <description>芋道项目基础脚手架</description> | 34 | + <description>全域项目基础脚手架</description> |
| 35 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> | 35 | <url>https://github.com/YunaiV/ruoyi-vue-pro</url> |
| 36 | 36 | ||
| 37 | <properties> | 37 | <properties> |
sql/dm/ruoyi-vue-pro-dm8.sql
| @@ -2583,7 +2583,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; | @@ -2583,7 +2583,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; | ||
| 2583 | -- ---------------------------- | 2583 | -- ---------------------------- |
| 2584 | -- @formatter:off | 2584 | -- @formatter:off |
| 2585 | SET IDENTITY_INSERT system_notice ON; | 2585 | SET IDENTITY_INSERT system_notice ON; |
| 2586 | -INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '芋道的公众', '<p>新版本内容133</p>', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); | 2586 | +INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '全域的公众', '<p>新版本内容133</p>', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); |
| 2587 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知:2018-07-01 系统凌晨维护', '<p><img src="http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg" alt="" data-href="">11112222<img src="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png" alt="image" data-href="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png">3333</p>', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', '0', 1); | 2587 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知:2018-07-01 系统凌晨维护', '<p><img src="http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg" alt="" data-href="">11112222<img src="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png" alt="image" data-href="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png">3333</p>', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', '0', 1); |
| 2588 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', '0', 121); | 2588 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', '0', 121); |
| 2589 | COMMIT; | 2589 | COMMIT; |
| @@ -4338,7 +4338,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; | @@ -4338,7 +4338,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; | ||
| 4338 | SET IDENTITY_INSERT system_tenant ON; | 4338 | SET IDENTITY_INSERT system_tenant ON; |
| 4339 | 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'); | 4339 | 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'); |
| 4340 | 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'); | 4340 | 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'); |
| 4341 | -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'); | 4341 | +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'); |
| 4342 | COMMIT; | 4342 | COMMIT; |
| 4343 | SET IDENTITY_INSERT system_tenant OFF; | 4343 | SET IDENTITY_INSERT system_tenant OFF; |
| 4344 | -- @formatter:on | 4344 | -- @formatter:on |
| @@ -4536,7 +4536,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; | @@ -4536,7 +4536,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; | ||
| 4536 | -- @formatter:off | 4536 | -- @formatter:off |
| 4537 | SET IDENTITY_INSERT system_users ON; | 4537 | SET IDENTITY_INSERT system_users ON; |
| 4538 | 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); | 4538 | 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); |
| 4539 | -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); | 4539 | +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); |
| 4540 | 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); | 4540 | 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); |
| 4541 | 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); | 4541 | 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); |
| 4542 | 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); | 4542 | 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 | @@ -4545,7 +4545,7 @@ INSERT INTO system_users (id, username, password, nickname, remark, dept_id, pos | ||
| 4545 | 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); | 4545 | 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); |
| 4546 | 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); | 4546 | 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); |
| 4547 | 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); | 4547 | 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); |
| 4548 | -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); | 4548 | +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); |
| 4549 | 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); | 4549 | 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); |
| 4550 | 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); | 4550 | 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); |
| 4551 | 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); | 4551 | 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); |
sql/kingbase/ruoyi-vue-pro.sql
| @@ -2748,7 +2748,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; | @@ -2748,7 +2748,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; | ||
| 2748 | -- ---------------------------- | 2748 | -- ---------------------------- |
| 2749 | -- @formatter:off | 2749 | -- @formatter:off |
| 2750 | BEGIN; | 2750 | BEGIN; |
| 2751 | -INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '芋道的公众', '<p>新版本内容133</p>', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); | 2751 | +INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '全域的公众', '<p>新版本内容133</p>', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); |
| 2752 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知:2018-07-01 系统凌晨维护', '<p><img src="http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg" alt="" data-href="">11112222<img src="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png" alt="image" data-href="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png">3333</p>', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', '0', 1); | 2752 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知:2018-07-01 系统凌晨维护', '<p><img src="http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg" alt="" data-href="">11112222<img src="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png" alt="image" data-href="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png">3333</p>', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', '0', 1); |
| 2753 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', '0', 121); | 2753 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', '0', 121); |
| 2754 | COMMIT; | 2754 | COMMIT; |
| @@ -4646,7 +4646,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; | @@ -4646,7 +4646,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; | ||
| 4646 | BEGIN; | 4646 | BEGIN; |
| 4647 | 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'); | 4647 | 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'); |
| 4648 | 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'); | 4648 | 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'); |
| 4649 | -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'); | 4649 | +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'); |
| 4650 | COMMIT; | 4650 | COMMIT; |
| 4651 | -- @formatter:on | 4651 | -- @formatter:on |
| 4652 | 4652 | ||
| @@ -4872,7 +4872,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; | @@ -4872,7 +4872,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; | ||
| 4872 | -- @formatter:off | 4872 | -- @formatter:off |
| 4873 | BEGIN; | 4873 | BEGIN; |
| 4874 | 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); | 4874 | 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); |
| 4875 | -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); | 4875 | +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); |
| 4876 | 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); | 4876 | 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); |
| 4877 | 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); | 4877 | 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); |
| 4878 | 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); | 4878 | 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 | @@ -4881,7 +4881,7 @@ INSERT INTO system_users (id, username, password, nickname, remark, dept_id, pos | ||
| 4881 | 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); | 4881 | 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); |
| 4882 | 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); | 4882 | 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); |
| 4883 | 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); | 4883 | 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); |
| 4884 | -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); | 4884 | +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); |
| 4885 | 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); | 4885 | 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); |
| 4886 | 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); | 4886 | 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); |
| 4887 | 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); | 4887 | 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); |
sql/mysql/ruoyi-vue-pro.sql
| @@ -2338,7 +2338,7 @@ CREATE TABLE `system_notice` ( | @@ -2338,7 +2338,7 @@ CREATE TABLE `system_notice` ( | ||
| 2338 | -- Records of system_notice | 2338 | -- Records of system_notice |
| 2339 | -- ---------------------------- | 2339 | -- ---------------------------- |
| 2340 | BEGIN; | 2340 | BEGIN; |
| 2341 | -INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, '芋道的公众', '<p>新版本内容133222</p>', 1, 0, 'admin', '2021-01-05 17:03:48', '\"1\"', '2025-08-31 09:38:22', b'0', 1); | 2341 | +INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, '全域的公众', '<p>新版本内容133222</p>', 1, 0, 'admin', '2021-01-05 17:03:48', '\"1\"', '2025-08-31 09:38:22', b'0', 1); |
| 2342 | INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, '维护通知:2018-07-01 系统凌晨维护', '<p><img src=\"http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg\" alt=\"\" data-href=\"\">11112222<img src=\"http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png\" alt=\"image\" data-href=\"http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png\">3333</p>', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', b'0', 1); | 2342 | INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, '维护通知:2018-07-01 系统凌晨维护', '<p><img src=\"http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg\" alt=\"\" data-href=\"\">11112222<img src=\"http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png\" alt=\"image\" data-href=\"http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png\">3333</p>', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', b'0', 1); |
| 2343 | INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', b'0', 121); | 2343 | INSERT INTO `system_notice` (`id`, `title`, `content`, `type`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', b'0', 121); |
| 2344 | COMMIT; | 2344 | COMMIT; |
| @@ -3609,7 +3609,7 @@ CREATE TABLE `system_tenant` ( | @@ -3609,7 +3609,7 @@ CREATE TABLE `system_tenant` ( | ||
| 3609 | BEGIN; | 3609 | BEGIN; |
| 3610 | 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'); | 3610 | 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'); |
| 3611 | 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'); | 3611 | 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'); |
| 3612 | -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'); | 3612 | +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'); |
| 3613 | COMMIT; | 3613 | COMMIT; |
| 3614 | 3614 | ||
| 3615 | -- ---------------------------- | 3615 | -- ---------------------------- |
| @@ -3741,7 +3741,7 @@ CREATE TABLE `system_users` ( | @@ -3741,7 +3741,7 @@ CREATE TABLE `system_users` ( | ||
| 3741 | -- ---------------------------- | 3741 | -- ---------------------------- |
| 3742 | BEGIN; | 3742 | BEGIN; |
| 3743 | 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); | 3743 | 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); |
| 3744 | -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); | 3744 | +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); |
| 3745 | 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); | 3745 | 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); |
| 3746 | 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); | 3746 | 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); |
| 3747 | 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); | 3747 | 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`, | @@ -3750,7 +3750,7 @@ INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, | ||
| 3750 | 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); | 3750 | 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); |
| 3751 | 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); | 3751 | 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); |
| 3752 | 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); | 3752 | 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); |
| 3753 | -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); | 3753 | +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); |
| 3754 | 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); | 3754 | 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); |
| 3755 | 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); | 3755 | 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); |
| 3756 | 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); | 3756 | 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); |
sql/opengauss/ruoyi-vue-pro.sql
| @@ -2748,7 +2748,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; | @@ -2748,7 +2748,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; | ||
| 2748 | -- ---------------------------- | 2748 | -- ---------------------------- |
| 2749 | -- @formatter:off | 2749 | -- @formatter:off |
| 2750 | BEGIN; | 2750 | BEGIN; |
| 2751 | -INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '芋道的公众', '<p>新版本内容133</p>', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); | 2751 | +INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '全域的公众', '<p>新版本内容133</p>', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); |
| 2752 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知:2018-07-01 系统凌晨维护', '<p><img src="http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg" alt="" data-href="">11112222<img src="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png" alt="image" data-href="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png">3333</p>', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', '0', 1); | 2752 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知:2018-07-01 系统凌晨维护', '<p><img src="http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg" alt="" data-href="">11112222<img src="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png" alt="image" data-href="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png">3333</p>', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', '0', 1); |
| 2753 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', '0', 121); | 2753 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', '0', 121); |
| 2754 | COMMIT; | 2754 | COMMIT; |
| @@ -4646,7 +4646,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; | @@ -4646,7 +4646,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; | ||
| 4646 | BEGIN; | 4646 | BEGIN; |
| 4647 | 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'); | 4647 | 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'); |
| 4648 | 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'); | 4648 | 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'); |
| 4649 | -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'); | 4649 | +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'); |
| 4650 | COMMIT; | 4650 | COMMIT; |
| 4651 | -- @formatter:on | 4651 | -- @formatter:on |
| 4652 | 4652 | ||
| @@ -4872,7 +4872,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; | @@ -4872,7 +4872,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; | ||
| 4872 | -- @formatter:off | 4872 | -- @formatter:off |
| 4873 | BEGIN; | 4873 | BEGIN; |
| 4874 | 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); | 4874 | 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); |
| 4875 | -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); | 4875 | +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); |
| 4876 | 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); | 4876 | 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); |
| 4877 | 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); | 4877 | 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); |
| 4878 | 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); | 4878 | 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 | @@ -4881,7 +4881,7 @@ INSERT INTO system_users (id, username, password, nickname, remark, dept_id, pos | ||
| 4881 | 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); | 4881 | 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); |
| 4882 | 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); | 4882 | 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); |
| 4883 | 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); | 4883 | 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); |
| 4884 | -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); | 4884 | +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); |
| 4885 | 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); | 4885 | 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); |
| 4886 | 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); | 4886 | 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); |
| 4887 | 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); | 4887 | 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); |
sql/oracle/ruoyi-vue-pro.sql
| @@ -2681,7 +2681,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; | @@ -2681,7 +2681,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; | ||
| 2681 | -- Records of system_notice | 2681 | -- Records of system_notice |
| 2682 | -- ---------------------------- | 2682 | -- ---------------------------- |
| 2683 | -- @formatter:off | 2683 | -- @formatter:off |
| 2684 | -INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '芋道的公众', '<p>新版本内容133</p>', 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); | 2684 | +INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '全域的公众', '<p>新版本内容133</p>', 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); |
| 2685 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知:2018-07-01 系统凌晨维护', '<p><img src="http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg" alt="" data-href="">11112222<img src="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png" alt="image" data-href="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png">3333</p>', 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); | 2685 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知:2018-07-01 系统凌晨维护', '<p><img src="http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg" alt="" data-href="">11112222<img src="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png" alt="image" data-href="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png">3333</p>', 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); |
| 2686 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 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); | 2686 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 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); |
| 2687 | COMMIT; | 2687 | COMMIT; |
| @@ -4532,7 +4532,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; | @@ -4532,7 +4532,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; | ||
| 4532 | -- @formatter:off | 4532 | -- @formatter:off |
| 4533 | 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'); | 4533 | 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'); |
| 4534 | 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'); | 4534 | 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'); |
| 4535 | -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'); | 4535 | +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'); |
| 4536 | COMMIT; | 4536 | COMMIT; |
| 4537 | -- @formatter:on | 4537 | -- @formatter:on |
| 4538 | 4538 | ||
| @@ -4746,7 +4746,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; | @@ -4746,7 +4746,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; | ||
| 4746 | -- ---------------------------- | 4746 | -- ---------------------------- |
| 4747 | -- @formatter:off | 4747 | -- @formatter:off |
| 4748 | 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); | 4748 | 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); |
| 4749 | -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); | 4749 | +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); |
| 4750 | 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); | 4750 | 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); |
| 4751 | 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); | 4751 | 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); |
| 4752 | 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); | 4752 | 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 | @@ -4755,7 +4755,7 @@ INSERT INTO system_users (id, username, password, nickname, remark, dept_id, pos | ||
| 4755 | 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); | 4755 | 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); |
| 4756 | 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); | 4756 | 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); |
| 4757 | 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); | 4757 | 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); |
| 4758 | -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); | 4758 | +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); |
| 4759 | 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); | 4759 | 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); |
| 4760 | 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); | 4760 | 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); |
| 4761 | 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); | 4761 | 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); |
sql/postgresql/ruoyi-vue-pro.sql
| @@ -2748,7 +2748,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; | @@ -2748,7 +2748,7 @@ COMMENT ON TABLE system_notice IS '通知公告表'; | ||
| 2748 | -- ---------------------------- | 2748 | -- ---------------------------- |
| 2749 | -- @formatter:off | 2749 | -- @formatter:off |
| 2750 | BEGIN; | 2750 | BEGIN; |
| 2751 | -INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '芋道的公众', '<p>新版本内容133</p>', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); | 2751 | +INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, '全域的公众', '<p>新版本内容133</p>', 1, 0, 'admin', '2021-01-05 17:03:48', '1', '2022-05-04 21:00:20', '0', 1); |
| 2752 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知:2018-07-01 系统凌晨维护', '<p><img src="http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg" alt="" data-href="">11112222<img src="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png" alt="image" data-href="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png">3333</p>', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', '0', 1); | 2752 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (2, '维护通知:2018-07-01 系统凌晨维护', '<p><img src="http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg" alt="" data-href="">11112222<img src="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png" alt="image" data-href="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png">3333</p>', 2, 1, 'admin', '2021-01-05 17:03:48', '1', '2025-04-18 23:56:40', '0', 1); |
| 2753 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', '0', 121); | 2753 | INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (4, '我是测试标题', '<p>哈哈哈哈123</p>', 1, 0, '110', '2022-02-22 01:01:25', '110', '2022-02-22 01:01:46', '0', 121); |
| 2754 | COMMIT; | 2754 | COMMIT; |
| @@ -4646,7 +4646,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; | @@ -4646,7 +4646,7 @@ COMMENT ON TABLE system_tenant IS '租户表'; | ||
| 4646 | BEGIN; | 4646 | BEGIN; |
| 4647 | 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'); | 4647 | 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'); |
| 4648 | 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'); | 4648 | 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'); |
| 4649 | -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'); | 4649 | +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'); |
| 4650 | COMMIT; | 4650 | COMMIT; |
| 4651 | -- @formatter:on | 4651 | -- @formatter:on |
| 4652 | 4652 | ||
| @@ -4872,7 +4872,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; | @@ -4872,7 +4872,7 @@ COMMENT ON TABLE system_users IS '用户信息表'; | ||
| 4872 | -- @formatter:off | 4872 | -- @formatter:off |
| 4873 | BEGIN; | 4873 | BEGIN; |
| 4874 | 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); | 4874 | 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); |
| 4875 | -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); | 4875 | +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); |
| 4876 | 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); | 4876 | 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); |
| 4877 | 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); | 4877 | 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); |
| 4878 | 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); | 4878 | 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 | @@ -4881,7 +4881,7 @@ INSERT INTO system_users (id, username, password, nickname, remark, dept_id, pos | ||
| 4881 | 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); | 4881 | 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); |
| 4882 | 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); | 4882 | 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); |
| 4883 | 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); | 4883 | 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); |
| 4884 | -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); | 4884 | +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); |
| 4885 | 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); | 4885 | 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); |
| 4886 | 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); | 4886 | 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); |
| 4887 | 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); | 4887 | 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); |
sql/sqlserver/ruoyi-vue-pro.sql
| @@ -6371,7 +6371,7 @@ BEGIN TRANSACTION | @@ -6371,7 +6371,7 @@ BEGIN TRANSACTION | ||
| 6371 | GO | 6371 | GO |
| 6372 | SET IDENTITY_INSERT system_notice ON | 6372 | SET IDENTITY_INSERT system_notice ON |
| 6373 | GO | 6373 | GO |
| 6374 | -INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, N'芋道的公众', N'<p>新版本内容133</p>', 1, 0, N'admin', N'2021-01-05 17:03:48', N'1', N'2022-05-04 21:00:20', N'0', 1) | 6374 | +INSERT INTO system_notice (id, title, content, type, status, creator, create_time, updater, update_time, deleted, tenant_id) VALUES (1, N'全域的公众', N'<p>新版本内容133</p>', 1, 0, N'admin', N'2021-01-05 17:03:48', N'1', N'2022-05-04 21:00:20', N'0', 1) |
| 6375 | GO | 6375 | GO |
| 6376 | 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'<p><img src="http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg" alt="" data-href="">11112222<img src="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png" alt="image" data-href="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png">3333</p>', 2, 1, N'admin', N'2021-01-05 17:03:48', N'1', N'2025-04-18 23:56:40', N'0', 1) | 6376 | 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'<p><img src="http://test.urbanops.iocoder.cn/b7cb3cf49b4b3258bf7309a09dd2f4e5.jpg" alt="" data-href="">11112222<img src="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png" alt="image" data-href="http://test.urbanops.iocoder.cn/fe44fc7bdb82ca421184b2eebbaee9e2148d4a1827479a4eb4521e11d2a062ba.png">3333</p>', 2, 1, N'admin', N'2021-01-05 17:03:48', N'1', N'2025-04-18 23:56:40', N'0', 1) |
| 6377 | GO | 6377 | GO |
| @@ -10969,7 +10969,7 @@ INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobi | @@ -10969,7 +10969,7 @@ INSERT INTO system_tenant (id, name, contact_user_id, contact_name, contact_mobi | ||
| 10969 | GO | 10969 | GO |
| 10970 | 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') | 10970 | 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') |
| 10971 | GO | 10971 | GO |
| 10972 | -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') | 10972 | +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') |
| 10973 | GO | 10973 | GO |
| 10974 | SET IDENTITY_INSERT system_tenant OFF | 10974 | SET IDENTITY_INSERT system_tenant OFF |
| 10975 | GO | 10975 | GO |
| @@ -11533,7 +11533,7 @@ SET IDENTITY_INSERT system_users ON | @@ -11533,7 +11533,7 @@ SET IDENTITY_INSERT system_users ON | ||
| 11533 | GO | 11533 | GO |
| 11534 | 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) | 11534 | 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) |
| 11535 | GO | 11535 | GO |
| 11536 | -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) | 11536 | +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) |
| 11537 | GO | 11537 | GO |
| 11538 | 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) | 11538 | 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) |
| 11539 | GO | 11539 | GO |
| @@ -11551,7 +11551,7 @@ INSERT INTO system_users (id, username, password, nickname, remark, dept_id, pos | @@ -11551,7 +11551,7 @@ INSERT INTO system_users (id, username, password, nickname, remark, dept_id, pos | ||
| 11551 | GO | 11551 | GO |
| 11552 | 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) | 11552 | 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) |
| 11553 | GO | 11553 | GO |
| 11554 | -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) | 11554 | +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) |
| 11555 | GO | 11555 | GO |
| 11556 | 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) | 11556 | 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) |
| 11557 | GO | 11557 | GO |
sql/tools/convertor.py
| 1 | # encoding=utf8 | 1 | # encoding=utf8 |
| 2 | -"""芋道系统数据库迁移工具 | 2 | +"""全域系统数据库迁移工具 |
| 3 | 3 | ||
| 4 | Author: dhb52 (https://gitee.com/dhb52) | 4 | Author: dhb52 (https://gitee.com/dhb52) |
| 5 | 5 | ||
| @@ -915,7 +915,7 @@ class OpengaussConvertor(KingbaseConvertor): | @@ -915,7 +915,7 @@ class OpengaussConvertor(KingbaseConvertor): | ||
| 915 | 915 | ||
| 916 | 916 | ||
| 917 | def main(): | 917 | def main(): |
| 918 | - parser = argparse.ArgumentParser(description="芋道系统数据库转换工具") | 918 | + parser = argparse.ArgumentParser(description="全域系统数据库转换工具") |
| 919 | parser.add_argument( | 919 | parser.add_argument( |
| 920 | "type", | 920 | "type", |
| 921 | type=str, | 921 | type=str, |
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 { | @@ -50,7 +50,7 @@ public class OperateLogCreateReqDTO { | ||
| 50 | private Long bizId; | 50 | private Long bizId; |
| 51 | /** | 51 | /** |
| 52 | * 操作内容,记录整个操作的明细 | 52 | * 操作内容,记录整个操作的明细 |
| 53 | - * 例如说,修改编号为 1 的用户信息,将性别从男改成女,将姓名从芋道改成源码。 | 53 | + * 例如说,修改编号为 1 的用户信息,将性别从男改成女,将姓名从全域改成源码。 |
| 54 | */ | 54 | */ |
| 55 | @NotEmpty(message = "操作内容不能为空") | 55 | @NotEmpty(message = "操作内容不能为空") |
| 56 | private String action; | 56 | private String action; |
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 { | @@ -61,7 +61,7 @@ public class LogRecordServiceImpl implements ILogRecordService { | ||
| 61 | reqDTO.setType(logRecord.getType()); // 大模块类型,例如:CRM 客户 | 61 | reqDTO.setType(logRecord.getType()); // 大模块类型,例如:CRM 客户 |
| 62 | reqDTO.setSubType(logRecord.getSubType());// 操作名称,例如:转移客户 | 62 | reqDTO.setSubType(logRecord.getSubType());// 操作名称,例如:转移客户 |
| 63 | reqDTO.setBizId(Long.parseLong(logRecord.getBizNo())); // 业务编号,例如:客户编号 | 63 | reqDTO.setBizId(Long.parseLong(logRecord.getBizNo())); // 业务编号,例如:客户编号 |
| 64 | - reqDTO.setAction(logRecord.getAction());// 操作内容,例如:修改编号为 1 的用户信息,将性别从男改成女,将姓名从芋道改成源码。 | 64 | + reqDTO.setAction(logRecord.getAction());// 操作内容,例如:修改编号为 1 的用户信息,将性别从男改成女,将姓名从全域改成源码。 |
| 65 | reqDTO.setExtra(logRecord.getExtra()); // 拓展字段,有些复杂的业务,需要记录一些字段 ( JSON 格式 ),例如说,记录订单编号,{ orderId: "1"} | 65 | reqDTO.setExtra(logRecord.getExtra()); // 拓展字段,有些复杂的业务,需要记录一些字段 ( JSON 格式 ),例如说,记录订单编号,{ orderId: "1"} |
| 66 | } | 66 | } |
| 67 | 67 | ||
| @@ -88,4 +88,4 @@ public class LogRecordServiceImpl implements ILogRecordService { | @@ -88,4 +88,4 @@ public class LogRecordServiceImpl implements ILogRecordService { | ||
| 88 | throw new UnsupportedOperationException("使用 OperateLogApi 进行操作日志的查询"); | 88 | throw new UnsupportedOperationException("使用 OperateLogApi 进行操作日志的查询"); |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | -} | ||
| 92 | \ No newline at end of file | 91 | \ No newline at end of file |
| 92 | +} |
urbanops-framework/urbanops-spring-boot-starter-security/《芋道 Spring Boot 安全框架 Spring Security 入门》.md
| 1 | -* 芋道 Spring Security 入门:<http://www.iocoder.cn/Spring-Boot/Spring-Security/?urbanops> | 1 | +* 全域 Spring Security 入门:<http://www.iocoder.cn/Spring-Boot/Spring-Security/?urbanops> |
| 2 | * Spring Security 基本概念:<http://www.iocoder.cn/Fight/Spring-Security-4-1-0-Basic-concept-description/?urbanops> | 2 | * Spring Security 基本概念:<http://www.iocoder.cn/Fight/Spring-Security-4-1-0-Basic-concept-description/?urbanops> |
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; | @@ -41,7 +41,7 @@ import org.springframework.context.annotation.Configuration; | ||
| 41 | import java.util.List; | 41 | import java.util.List; |
| 42 | 42 | ||
| 43 | /** | 43 | /** |
| 44 | - * 芋道 AI 自动配置 | 44 | + * 全域 AI 自动配置 |
| 45 | * | 45 | * |
| 46 | * @author fansili | 46 | * @author fansili |
| 47 | */ | 47 | */ |
| @@ -285,4 +285,4 @@ public class AiAutoConfiguration { | @@ -285,4 +285,4 @@ public class AiAutoConfiguration { | ||
| 285 | return List.of(ToolCallbacks.from(personService)); | 285 | return List.of(ToolCallbacks.from(personService)); |
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | -} | ||
| 289 | \ No newline at end of file | 288 | \ No newline at end of file |
| 289 | +} |
urbanops-module-ai/src/main/java/com/zteits/urbanops/module/ai/framework/ai/config/UrbanopsAiProperties.java
| @@ -4,7 +4,7 @@ import lombok.Data; | @@ -4,7 +4,7 @@ import lombok.Data; | ||
| 4 | import org.springframework.boot.context.properties.ConfigurationProperties; | 4 | import org.springframework.boot.context.properties.ConfigurationProperties; |
| 5 | 5 | ||
| 6 | /** | 6 | /** |
| 7 | - * 芋道 AI 配置类 | 7 | + * 全域 AI 配置类 |
| 8 | * | 8 | * |
| 9 | * @author fansili | 9 | * @author fansili |
| 10 | * @since 1.0 | 10 | * @since 1.0 |
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; | @@ -10,7 +10,7 @@ import lombok.ToString; | ||
| 10 | @Data | 10 | @Data |
| 11 | public class BpmFormPageReqVO extends PageParam { | 11 | public class BpmFormPageReqVO extends PageParam { |
| 12 | 12 | ||
| 13 | - @Schema(description = "表单名称", example = "芋道") | 13 | + @Schema(description = "表单名称", example = "全域") |
| 14 | private String name; | 14 | private String name; |
| 15 | 15 | ||
| 16 | } | 16 | } |
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 { | @@ -14,7 +14,7 @@ public class BpmFormRespVO { | ||
| 14 | @Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 14 | @Schema(description = "表单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 15 | private Long id; | 15 | private Long id; |
| 16 | 16 | ||
| 17 | - @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 17 | + @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 18 | @NotNull(message = "表单名称不能为空") | 18 | @NotNull(message = "表单名称不能为空") |
| 19 | private String name; | 19 | private String name; |
| 20 | 20 |
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 { | @@ -12,7 +12,7 @@ public class BpmFormSaveReqVO { | ||
| 12 | @Schema(description = "表单编号", example = "1024") | 12 | @Schema(description = "表单编号", example = "1024") |
| 13 | private Long id; | 13 | private Long id; |
| 14 | 14 | ||
| 15 | - @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 15 | + @Schema(description = "表单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 16 | @NotNull(message = "表单名称不能为空") | 16 | @NotNull(message = "表单名称不能为空") |
| 17 | private String name; | 17 | private String name; |
| 18 | 18 |
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 { | @@ -17,7 +17,7 @@ public class BpmUserGroupPageReqVO extends PageParam { | ||
| 17 | @Schema(description = "编号", example = "1024") | 17 | @Schema(description = "编号", example = "1024") |
| 18 | private Long id; | 18 | private Long id; |
| 19 | 19 | ||
| 20 | - @Schema(description = "组名", example = "芋道") | 20 | + @Schema(description = "组名", example = "全域") |
| 21 | private String name; | 21 | private String name; |
| 22 | 22 | ||
| 23 | @Schema(description = "状态", example = "1") | 23 | @Schema(description = "状态", example = "1") |
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 { | @@ -13,7 +13,7 @@ public class BpmUserGroupRespVO { | ||
| 13 | @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 13 | @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 14 | private Long id; | 14 | private Long id; |
| 15 | 15 | ||
| 16 | - @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 16 | + @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 17 | private String name; | 17 | private String name; |
| 18 | 18 | ||
| 19 | @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZIEITS") | 19 | @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "ZIEITS") |
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 { | @@ -12,7 +12,7 @@ public class BpmUserGroupSaveReqVO { | ||
| 12 | @Schema(description = "编号", example = "1024") | 12 | @Schema(description = "编号", example = "1024") |
| 13 | private Long id; | 13 | private Long id; |
| 14 | 14 | ||
| 15 | - @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 15 | + @Schema(description = "组名", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 16 | @NotNull(message = "组名不能为空") | 16 | @NotNull(message = "组名不能为空") |
| 17 | private String name; | 17 | private String name; |
| 18 | 18 |
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 { | @@ -20,7 +20,7 @@ public class BpmModelRespVO extends BpmModelMetaInfoVO { | ||
| 20 | @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "process_urbanops") | 20 | @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "process_urbanops") |
| 21 | private String key; | 21 | private String key; |
| 22 | 22 | ||
| 23 | - @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 23 | + @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 24 | private String name; | 24 | private String name; |
| 25 | 25 | ||
| 26 | @Schema(description = "流程图标", example = "https://www.iocoder.cn/urbanops.jpg") | 26 | @Schema(description = "流程图标", example = "https://www.iocoder.cn/urbanops.jpg") |
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 { | @@ -17,7 +17,7 @@ public class BpmModelSaveReqVO extends BpmModelMetaInfoVO { | ||
| 17 | @NotEmpty(message = "流程标识不能为空") | 17 | @NotEmpty(message = "流程标识不能为空") |
| 18 | private String key; | 18 | private String key; |
| 19 | 19 | ||
| 20 | - @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 20 | + @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 21 | @NotEmpty(message = "流程名称不能为空") | 21 | @NotEmpty(message = "流程名称不能为空") |
| 22 | private String name; | 22 | private String name; |
| 23 | 23 |
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 { | @@ -17,7 +17,7 @@ public class BpmProcessDefinitionRespVO extends BpmModelMetaInfoVO { | ||
| 17 | @Schema(description = "版本", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | 17 | @Schema(description = "版本", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") |
| 18 | private Integer version; | 18 | private Integer version; |
| 19 | 19 | ||
| 20 | - @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 20 | + @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 21 | private String name; | 21 | private String name; |
| 22 | 22 | ||
| 23 | @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "youdao") | 23 | @Schema(description = "流程标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "youdao") |
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 | @@ -13,7 +13,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE | ||
| 13 | @Data | 13 | @Data |
| 14 | public class BpmProcessInstanceCopyPageReqVO extends PageParam { | 14 | public class BpmProcessInstanceCopyPageReqVO extends PageParam { |
| 15 | 15 | ||
| 16 | - @Schema(description = "流程名称", example = "芋道") | 16 | + @Schema(description = "流程名称", example = "全域") |
| 17 | private String processInstanceName; | 17 | private String processInstanceName; |
| 18 | 18 | ||
| 19 | @Schema(description = "创建时间") | 19 | @Schema(description = "创建时间") |
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 | @@ -15,7 +15,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE | ||
| 15 | @Data | 15 | @Data |
| 16 | public class BpmProcessInstancePageReqVO extends PageParam { | 16 | public class BpmProcessInstancePageReqVO extends PageParam { |
| 17 | 17 | ||
| 18 | - @Schema(description = "流程名称", example = "芋道") | 18 | + @Schema(description = "流程名称", example = "全域") |
| 19 | private String name; | 19 | private String name; |
| 20 | 20 | ||
| 21 | @Schema(description = "流程定义的标识", example = "2048") | 21 | @Schema(description = "流程定义的标识", example = "2048") |
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 { | @@ -18,7 +18,7 @@ public class BpmProcessInstanceRespVO { | ||
| 18 | @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 18 | @Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 19 | private String id; | 19 | private String id; |
| 20 | 20 | ||
| 21 | - @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 21 | + @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 22 | private String name; | 22 | private String name; |
| 23 | 23 | ||
| 24 | @Schema(description = "流程摘要") | 24 | @Schema(description = "流程摘要") |
| @@ -71,7 +71,7 @@ public class BpmProcessInstanceRespVO { | @@ -71,7 +71,7 @@ public class BpmProcessInstanceRespVO { | ||
| 71 | @Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 71 | @Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 72 | private String id; | 72 | private String id; |
| 73 | 73 | ||
| 74 | - @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 74 | + @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 75 | private String name; | 75 | private String name; |
| 76 | 76 | ||
| 77 | @Schema(description = "任务分配人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2048") | 77 | @Schema(description = "任务分配人编号", requiredMode = Schema.RequiredMode.NOT_REQUIRED, example = "2048") |
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 { | @@ -28,7 +28,7 @@ public class BpmProcessPrintDataRespVO { | ||
| 28 | @Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 28 | @Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 29 | private String id; | 29 | private String id; |
| 30 | 30 | ||
| 31 | - @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 31 | + @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 32 | private String name; | 32 | private String name; |
| 33 | 33 | ||
| 34 | @Schema(description = "签名 URL", example = "https://www.iocoder.cn/sign.png") | 34 | @Schema(description = "签名 URL", example = "https://www.iocoder.cn/sign.png") |
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; | @@ -14,7 +14,7 @@ import java.time.LocalDateTime; | ||
| 14 | @Data | 14 | @Data |
| 15 | public class BpmTaskPageReqVO extends PageParam { | 15 | public class BpmTaskPageReqVO extends PageParam { |
| 16 | 16 | ||
| 17 | - @Schema(description = "流程任务名", example = "芋道") | 17 | + @Schema(description = "流程任务名", example = "全域") |
| 18 | private String name; | 18 | private String name; |
| 19 | 19 | ||
| 20 | @Schema(description = "流程分类", example = "1") | 20 | @Schema(description = "流程分类", example = "1") |
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 { | @@ -17,7 +17,7 @@ public class BpmTaskRespVO { | ||
| 17 | @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 17 | @Schema(description = "任务编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 18 | private String id; | 18 | private String id; |
| 19 | 19 | ||
| 20 | - @Schema(description = "任务名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 20 | + @Schema(description = "任务名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 21 | private String name; | 21 | private String name; |
| 22 | 22 | ||
| 23 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 23 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
| @@ -95,7 +95,7 @@ public class BpmTaskRespVO { | @@ -95,7 +95,7 @@ public class BpmTaskRespVO { | ||
| 95 | @Schema(description = "流程实例编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 95 | @Schema(description = "流程实例编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 96 | private String id; | 96 | private String id; |
| 97 | 97 | ||
| 98 | - @Schema(description = "流程实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 98 | + @Schema(description = "流程实例名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 99 | private String name; | 99 | private String name; |
| 100 | 100 | ||
| 101 | @Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED) | 101 | @Schema(description = "提交时间", requiredMode = Schema.RequiredMode.REQUIRED) |
urbanops-module-bpm/src/test/java/com/zteits/urbanops/module/bpm/service/definition/BpmFormServiceTest.java
| @@ -124,7 +124,7 @@ public class BpmFormServiceTest extends BaseDbUnitTest { | @@ -124,7 +124,7 @@ public class BpmFormServiceTest extends BaseDbUnitTest { | ||
| 124 | formMapper.insert(cloneIgnoreId(dbForm, o -> o.setName("源码"))); | 124 | formMapper.insert(cloneIgnoreId(dbForm, o -> o.setName("源码"))); |
| 125 | // 准备参数 | 125 | // 准备参数 |
| 126 | BpmFormPageReqVO reqVO = new BpmFormPageReqVO(); | 126 | BpmFormPageReqVO reqVO = new BpmFormPageReqVO(); |
| 127 | - reqVO.setName("芋道"); | 127 | + reqVO.setName("全域"); |
| 128 | 128 | ||
| 129 | // 调用 | 129 | // 调用 |
| 130 | PageResult<BpmFormDO> pageResult = formService.getFormPage(reqVO); | 130 | PageResult<BpmFormDO> pageResult = formService.getFormPage(reqVO); |
urbanops-module-bpm/src/test/java/com/zteits/urbanops/module/bpm/service/definition/BpmUserGroupServiceTest.java
| @@ -108,7 +108,7 @@ public class BpmUserGroupServiceTest extends BaseDbUnitTest { | @@ -108,7 +108,7 @@ public class BpmUserGroupServiceTest extends BaseDbUnitTest { | ||
| 108 | }); | 108 | }); |
| 109 | userGroupMapper.insert(dbUserGroup); | 109 | userGroupMapper.insert(dbUserGroup); |
| 110 | // 测试 name 不匹配 | 110 | // 测试 name 不匹配 |
| 111 | - userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setName("芋道"))); | 111 | + userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setName("全域"))); |
| 112 | // 测试 status 不匹配 | 112 | // 测试 status 不匹配 |
| 113 | userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus()))); | 113 | userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus()))); |
| 114 | // 测试 createTime 不匹配 | 114 | // 测试 createTime 不匹配 |
urbanops-module-bpm/src/test/resources/application-unit-test.yaml
| @@ -34,9 +34,9 @@ mybatis-plus: | @@ -34,9 +34,9 @@ mybatis-plus: | ||
| 34 | 34 | ||
| 35 | --- #################### 监控相关配置 #################### | 35 | --- #################### 监控相关配置 #################### |
| 36 | 36 | ||
| 37 | ---- #################### 芋道相关配置 #################### | 37 | +--- #################### 全域相关配置 #################### |
| 38 | 38 | ||
| 39 | -# 芋道配置项,设置当前项目所有自定义的配置 | 39 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 40 | urbanops: | 40 | urbanops: |
| 41 | info: | 41 | info: |
| 42 | base-package: com.zteits.urbanops.module | 42 | base-package: com.zteits.urbanops.module |
urbanops-module-crm/src/main/java/com/zteits/urbanops/module/crm/controller/admin/customer/CrmCustomerController.java
| @@ -249,7 +249,7 @@ public class CrmCustomerController { | @@ -249,7 +249,7 @@ public class CrmCustomerController { | ||
| 249 | public void importTemplate(HttpServletResponse response) throws IOException { | 249 | public void importTemplate(HttpServletResponse response) throws IOException { |
| 250 | // 手动创建导出 demo | 250 | // 手动创建导出 demo |
| 251 | List<CrmCustomerImportExcelVO> list = Arrays.asList( | 251 | List<CrmCustomerImportExcelVO> list = Arrays.asList( |
| 252 | - CrmCustomerImportExcelVO.builder().name("芋道").industryId(1).level(1).source(1) | 252 | + CrmCustomerImportExcelVO.builder().name("全域").industryId(1).level(1).source(1) |
| 253 | .mobile("15601691300").telephone("").qq("").wechat("").email("yunai@iocoder.cn") | 253 | .mobile("15601691300").telephone("").qq("").wechat("").email("yunai@iocoder.cn") |
| 254 | .areaId(null).detailAddress("").remark("").build(), | 254 | .areaId(null).detailAddress("").remark("").build(), |
| 255 | CrmCustomerImportExcelVO.builder().name("源码").industryId(1).level(1).source(1) | 255 | CrmCustomerImportExcelVO.builder().name("源码").industryId(1).level(1).source(1) |
urbanops-module-crm/src/test/resources/application-unit-test.yaml
| @@ -41,9 +41,9 @@ mybatis-plus: | @@ -41,9 +41,9 @@ mybatis-plus: | ||
| 41 | 41 | ||
| 42 | --- #################### 监控相关配置 #################### | 42 | --- #################### 监控相关配置 #################### |
| 43 | 43 | ||
| 44 | ---- #################### 芋道相关配置 #################### | 44 | +--- #################### 全域相关配置 #################### |
| 45 | 45 | ||
| 46 | -# 芋道配置项,设置当前项目所有自定义的配置 | 46 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 47 | urbanops: | 47 | urbanops: |
| 48 | info: | 48 | info: |
| 49 | base-package: com.zteits.urbanops | 49 | base-package: com.zteits.urbanops |
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 { | @@ -54,9 +54,9 @@ public class ErpFinancePaymentRespVO { | ||
| 54 | @Schema(description = "备注", example = "你猜") | 54 | @Schema(description = "备注", example = "你猜") |
| 55 | private String remark; | 55 | private String remark; |
| 56 | 56 | ||
| 57 | - @Schema(description = "创建人", example = "芋道") | 57 | + @Schema(description = "创建人", example = "全域") |
| 58 | private String creator; | 58 | private String creator; |
| 59 | - @Schema(description = "创建人名称", example = "芋道") | 59 | + @Schema(description = "创建人名称", example = "全域") |
| 60 | private String creatorName; | 60 | private String creatorName; |
| 61 | 61 | ||
| 62 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 62 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
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 { | @@ -54,9 +54,9 @@ public class ErpFinanceReceiptRespVO { | ||
| 54 | @Schema(description = "备注", example = "你猜") | 54 | @Schema(description = "备注", example = "你猜") |
| 55 | private String remark; | 55 | private String remark; |
| 56 | 56 | ||
| 57 | - @Schema(description = "创建人", example = "芋道") | 57 | + @Schema(description = "创建人", example = "全域") |
| 58 | private String creator; | 58 | private String creator; |
| 59 | - @Schema(description = "创建人名称", example = "芋道") | 59 | + @Schema(description = "创建人名称", example = "全域") |
| 60 | private String creatorName; | 60 | private String creatorName; |
| 61 | 61 | ||
| 62 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 62 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
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 { | @@ -29,7 +29,7 @@ public class ErpPurchaseInRespVO { | ||
| 29 | 29 | ||
| 30 | @Schema(description = "供应商编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") | 30 | @Schema(description = "供应商编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") |
| 31 | private Long supplierId; | 31 | private Long supplierId; |
| 32 | - @Schema(description = "供应商名称", example = "芋道") | 32 | + @Schema(description = "供应商名称", example = "全域") |
| 33 | @ExcelProperty("供应商名称") | 33 | @ExcelProperty("供应商名称") |
| 34 | private String supplierName; | 34 | private String supplierName; |
| 35 | 35 | ||
| @@ -78,9 +78,9 @@ public class ErpPurchaseInRespVO { | @@ -78,9 +78,9 @@ public class ErpPurchaseInRespVO { | ||
| 78 | @ExcelProperty("备注") | 78 | @ExcelProperty("备注") |
| 79 | private String remark; | 79 | private String remark; |
| 80 | 80 | ||
| 81 | - @Schema(description = "创建人", example = "芋道") | 81 | + @Schema(description = "创建人", example = "全域") |
| 82 | private String creator; | 82 | private String creator; |
| 83 | - @Schema(description = "创建人名称", example = "芋道") | 83 | + @Schema(description = "创建人名称", example = "全域") |
| 84 | private String creatorName; | 84 | private String creatorName; |
| 85 | 85 | ||
| 86 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 86 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
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 { | @@ -29,7 +29,7 @@ public class ErpPurchaseOrderRespVO { | ||
| 29 | 29 | ||
| 30 | @Schema(description = "供应商编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") | 30 | @Schema(description = "供应商编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") |
| 31 | private Long supplierId; | 31 | private Long supplierId; |
| 32 | - @Schema(description = "供应商名称", example = "芋道") | 32 | + @Schema(description = "供应商名称", example = "全域") |
| 33 | @ExcelProperty("供应商名称") | 33 | @ExcelProperty("供应商名称") |
| 34 | private String supplierName; | 34 | private String supplierName; |
| 35 | 35 | ||
| @@ -71,9 +71,9 @@ public class ErpPurchaseOrderRespVO { | @@ -71,9 +71,9 @@ public class ErpPurchaseOrderRespVO { | ||
| 71 | @ExcelProperty("备注") | 71 | @ExcelProperty("备注") |
| 72 | private String remark; | 72 | private String remark; |
| 73 | 73 | ||
| 74 | - @Schema(description = "创建人", example = "芋道") | 74 | + @Schema(description = "创建人", example = "全域") |
| 75 | private String creator; | 75 | private String creator; |
| 76 | - @Schema(description = "创建人名称", example = "芋道") | 76 | + @Schema(description = "创建人名称", example = "全域") |
| 77 | private String creatorName; | 77 | private String creatorName; |
| 78 | 78 | ||
| 79 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 79 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
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 { | @@ -29,7 +29,7 @@ public class ErpPurchaseReturnRespVO { | ||
| 29 | 29 | ||
| 30 | @Schema(description = "供应商编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") | 30 | @Schema(description = "供应商编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") |
| 31 | private Long supplierId; | 31 | private Long supplierId; |
| 32 | - @Schema(description = "供应商名称", example = "芋道") | 32 | + @Schema(description = "供应商名称", example = "全域") |
| 33 | @ExcelProperty("供应商名称") | 33 | @ExcelProperty("供应商名称") |
| 34 | private String supplierName; | 34 | private String supplierName; |
| 35 | 35 | ||
| @@ -78,9 +78,9 @@ public class ErpPurchaseReturnRespVO { | @@ -78,9 +78,9 @@ public class ErpPurchaseReturnRespVO { | ||
| 78 | @ExcelProperty("备注") | 78 | @ExcelProperty("备注") |
| 79 | private String remark; | 79 | private String remark; |
| 80 | 80 | ||
| 81 | - @Schema(description = "创建人", example = "芋道") | 81 | + @Schema(description = "创建人", example = "全域") |
| 82 | private String creator; | 82 | private String creator; |
| 83 | - @Schema(description = "创建人名称", example = "芋道") | 83 | + @Schema(description = "创建人名称", example = "全域") |
| 84 | private String creatorName; | 84 | private String creatorName; |
| 85 | 85 | ||
| 86 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 86 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
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 { | @@ -29,7 +29,7 @@ public class ErpSaleOrderRespVO { | ||
| 29 | 29 | ||
| 30 | @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") | 30 | @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") |
| 31 | private Long customerId; | 31 | private Long customerId; |
| 32 | - @Schema(description = "客户名称", example = "芋道") | 32 | + @Schema(description = "客户名称", example = "全域") |
| 33 | @ExcelProperty("客户名称") | 33 | @ExcelProperty("客户名称") |
| 34 | private String customerName; | 34 | private String customerName; |
| 35 | 35 | ||
| @@ -74,9 +74,9 @@ public class ErpSaleOrderRespVO { | @@ -74,9 +74,9 @@ public class ErpSaleOrderRespVO { | ||
| 74 | @ExcelProperty("备注") | 74 | @ExcelProperty("备注") |
| 75 | private String remark; | 75 | private String remark; |
| 76 | 76 | ||
| 77 | - @Schema(description = "创建人", example = "芋道") | 77 | + @Schema(description = "创建人", example = "全域") |
| 78 | private String creator; | 78 | private String creator; |
| 79 | - @Schema(description = "创建人名称", example = "芋道") | 79 | + @Schema(description = "创建人名称", example = "全域") |
| 80 | private String creatorName; | 80 | private String creatorName; |
| 81 | 81 | ||
| 82 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 82 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
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 { | @@ -29,7 +29,7 @@ public class ErpSaleOutRespVO { | ||
| 29 | 29 | ||
| 30 | @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") | 30 | @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") |
| 31 | private Long customerId; | 31 | private Long customerId; |
| 32 | - @Schema(description = "客户名称", example = "芋道") | 32 | + @Schema(description = "客户名称", example = "全域") |
| 33 | @ExcelProperty("客户名称") | 33 | @ExcelProperty("客户名称") |
| 34 | private String customerName; | 34 | private String customerName; |
| 35 | 35 | ||
| @@ -81,9 +81,9 @@ public class ErpSaleOutRespVO { | @@ -81,9 +81,9 @@ public class ErpSaleOutRespVO { | ||
| 81 | @ExcelProperty("备注") | 81 | @ExcelProperty("备注") |
| 82 | private String remark; | 82 | private String remark; |
| 83 | 83 | ||
| 84 | - @Schema(description = "创建人", example = "芋道") | 84 | + @Schema(description = "创建人", example = "全域") |
| 85 | private String creator; | 85 | private String creator; |
| 86 | - @Schema(description = "创建人名称", example = "芋道") | 86 | + @Schema(description = "创建人名称", example = "全域") |
| 87 | private String creatorName; | 87 | private String creatorName; |
| 88 | 88 | ||
| 89 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 89 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
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 { | @@ -29,7 +29,7 @@ public class ErpSaleReturnRespVO { | ||
| 29 | 29 | ||
| 30 | @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") | 30 | @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724") |
| 31 | private Long customerId; | 31 | private Long customerId; |
| 32 | - @Schema(description = "客户名称", example = "芋道") | 32 | + @Schema(description = "客户名称", example = "全域") |
| 33 | @ExcelProperty("客户名称") | 33 | @ExcelProperty("客户名称") |
| 34 | private String customerName; | 34 | private String customerName; |
| 35 | 35 | ||
| @@ -81,9 +81,9 @@ public class ErpSaleReturnRespVO { | @@ -81,9 +81,9 @@ public class ErpSaleReturnRespVO { | ||
| 81 | @ExcelProperty("备注") | 81 | @ExcelProperty("备注") |
| 82 | private String remark; | 82 | private String remark; |
| 83 | 83 | ||
| 84 | - @Schema(description = "创建人", example = "芋道") | 84 | + @Schema(description = "创建人", example = "全域") |
| 85 | private String creator; | 85 | private String creator; |
| 86 | - @Schema(description = "创建人名称", example = "芋道") | 86 | + @Schema(description = "创建人名称", example = "全域") |
| 87 | private String creatorName; | 87 | private String creatorName; |
| 88 | 88 | ||
| 89 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 89 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
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 { | @@ -51,9 +51,9 @@ public class ErpStockCheckRespVO { | ||
| 51 | @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") | 51 | @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") |
| 52 | private String fileUrl; | 52 | private String fileUrl; |
| 53 | 53 | ||
| 54 | - @Schema(description = "创建人", example = "芋道") | 54 | + @Schema(description = "创建人", example = "全域") |
| 55 | private String creator; | 55 | private String creator; |
| 56 | - @Schema(description = "创建人名称", example = "芋道") | 56 | + @Schema(description = "创建人名称", example = "全域") |
| 57 | private String creatorName; | 57 | private String creatorName; |
| 58 | 58 | ||
| 59 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 59 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
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 { | @@ -28,7 +28,7 @@ public class ErpStockInRespVO { | ||
| 28 | 28 | ||
| 29 | @Schema(description = "供应商编号", example = "3113") | 29 | @Schema(description = "供应商编号", example = "3113") |
| 30 | private Long supplierId; | 30 | private Long supplierId; |
| 31 | - @Schema(description = "供应商名称", example = "芋道") | 31 | + @Schema(description = "供应商名称", example = "全域") |
| 32 | @ExcelProperty("供应商名称") | 32 | @ExcelProperty("供应商名称") |
| 33 | private String supplierName; | 33 | private String supplierName; |
| 34 | 34 | ||
| @@ -56,9 +56,9 @@ public class ErpStockInRespVO { | @@ -56,9 +56,9 @@ public class ErpStockInRespVO { | ||
| 56 | @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") | 56 | @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") |
| 57 | private String fileUrl; | 57 | private String fileUrl; |
| 58 | 58 | ||
| 59 | - @Schema(description = "创建人", example = "芋道") | 59 | + @Schema(description = "创建人", example = "全域") |
| 60 | private String creator; | 60 | private String creator; |
| 61 | - @Schema(description = "创建人名称", example = "芋道") | 61 | + @Schema(description = "创建人名称", example = "全域") |
| 62 | private String creatorName; | 62 | private String creatorName; |
| 63 | 63 | ||
| 64 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 64 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
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 { | @@ -50,9 +50,9 @@ public class ErpStockMoveRespVO { | ||
| 50 | @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") | 50 | @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") |
| 51 | private String fileUrl; | 51 | private String fileUrl; |
| 52 | 52 | ||
| 53 | - @Schema(description = "创建人", example = "芋道") | 53 | + @Schema(description = "创建人", example = "全域") |
| 54 | private String creator; | 54 | private String creator; |
| 55 | - @Schema(description = "创建人名称", example = "芋道") | 55 | + @Schema(description = "创建人名称", example = "全域") |
| 56 | private String creatorName; | 56 | private String creatorName; |
| 57 | 57 | ||
| 58 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 58 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
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 { | @@ -28,7 +28,7 @@ public class ErpStockOutRespVO { | ||
| 28 | 28 | ||
| 29 | @Schema(description = "客户编号", example = "3113") | 29 | @Schema(description = "客户编号", example = "3113") |
| 30 | private Long customerId; | 30 | private Long customerId; |
| 31 | - @Schema(description = "客户名称", example = "芋道") | 31 | + @Schema(description = "客户名称", example = "全域") |
| 32 | @ExcelProperty("客户名称") | 32 | @ExcelProperty("客户名称") |
| 33 | private String customerName; | 33 | private String customerName; |
| 34 | 34 | ||
| @@ -56,9 +56,9 @@ public class ErpStockOutRespVO { | @@ -56,9 +56,9 @@ public class ErpStockOutRespVO { | ||
| 56 | @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") | 56 | @Schema(description = "附件 URL", example = "https://www.iocoder.cn/1.doc") |
| 57 | private String fileUrl; | 57 | private String fileUrl; |
| 58 | 58 | ||
| 59 | - @Schema(description = "创建人", example = "芋道") | 59 | + @Schema(description = "创建人", example = "全域") |
| 60 | private String creator; | 60 | private String creator; |
| 61 | - @Schema(description = "创建人名称", example = "芋道") | 61 | + @Schema(description = "创建人名称", example = "全域") |
| 62 | private String creatorName; | 62 | private String creatorName; |
| 63 | 63 | ||
| 64 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 64 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java
0 → 100644
| 1 | +package com.zteits.urbanops.module.garden.api.road; | ||
| 2 | + | ||
| 3 | +import com.zteits.urbanops.module.garden.api.road.dto.RoadReqDTO; | ||
| 4 | +import com.zteits.urbanops.module.garden.api.road.dto.RoadRespDTO; | ||
| 5 | + | ||
| 6 | +import java.util.List; | ||
| 7 | + | ||
| 8 | +/** | ||
| 9 | + * @author yanhuiqing | ||
| 10 | + * @version 1.0 | ||
| 11 | + * @description: 道路api 通过经纬度 系统编码获取道路信息 | ||
| 12 | + * @date 2025/12/9 22:12 | ||
| 13 | + */ | ||
| 14 | +public interface RoadApi { | ||
| 15 | + public List<RoadRespDTO> getRoadInfoBy(RoadReqDTO reqDTO); | ||
| 16 | +} |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java
0 → 100644
| 1 | +package com.zteits.urbanops.module.garden.api.road; | ||
| 2 | + | ||
| 3 | +import cn.hutool.json.JSONObject; | ||
| 4 | +import cn.hutool.json.JSONUtil; | ||
| 5 | +import com.alibaba.fastjson.JSON; | ||
| 6 | +import com.zteits.urbanops.framework.common.util.http.HttpUtils; | ||
| 7 | +import com.zteits.urbanops.module.garden.api.road.dto.RoadReqDTO; | ||
| 8 | +import com.zteits.urbanops.module.garden.api.road.dto.RoadRespDTO; | ||
| 9 | +import lombok.extern.slf4j.Slf4j; | ||
| 10 | +import org.springframework.beans.factory.annotation.Value; | ||
| 11 | +import org.springframework.stereotype.Service; | ||
| 12 | + | ||
| 13 | +import java.util.ArrayList; | ||
| 14 | +import java.util.HashMap; | ||
| 15 | +import java.util.List; | ||
| 16 | +import java.util.Map; | ||
| 17 | +import java.util.stream.Collectors; | ||
| 18 | + | ||
| 19 | +/** | ||
| 20 | + * @author yanhuiqing | ||
| 21 | + * @version 1.0 | ||
| 22 | + * @description: 道路api实现类 | ||
| 23 | + * @date 2025/12/9 22:18 | ||
| 24 | + */ | ||
| 25 | +@Slf4j | ||
| 26 | +@Service | ||
| 27 | +public class RoadApiImpl implements RoadApi{ | ||
| 28 | + | ||
| 29 | + @Value("${siot.roadUrl}") | ||
| 30 | + private String roadInfoUrl; | ||
| 31 | + | ||
| 32 | + @Override | ||
| 33 | + public List<RoadRespDTO> getRoadInfoBy(RoadReqDTO reqDTO) { | ||
| 34 | + Map<String, Object> param = new HashMap<>(); | ||
| 35 | + param.put("companyCode", reqDTO.getCompanyCode()); | ||
| 36 | + param.put("longitude", reqDTO.getLongitude()); | ||
| 37 | + param.put("latitude", reqDTO.getLatitude()); | ||
| 38 | + | ||
| 39 | + String responseBody = HttpUtils.post(roadInfoUrl, null, JSON.toJSONString(param)); | ||
| 40 | + log.info("获取道路信息接口,系统:{},经度:{},维度:{},返回结果:{}", reqDTO.getCompanyCode(), reqDTO.getLongitude(), reqDTO.getLatitude(), responseBody); | ||
| 41 | + JSONObject response = JSONUtil.parseObj(responseBody); | ||
| 42 | + if (response.getInt("code") != 200) { | ||
| 43 | + return new ArrayList<>(); | ||
| 44 | + } | ||
| 45 | + JSONObject data = response.getJSONObject("data"); | ||
| 46 | + if (data == null) { | ||
| 47 | + return new ArrayList<>(); | ||
| 48 | + } | ||
| 49 | + return data.getJSONArray("roadList").stream().map(item -> { | ||
| 50 | + JSONObject entries = JSONUtil.parseObj(item); | ||
| 51 | + RoadRespDTO roadInfo = new RoadRespDTO(); | ||
| 52 | + roadInfo.setRoadCode(entries.getStr("roadCode")); | ||
| 53 | + roadInfo.setRoadName(entries.getStr("roadName")); | ||
| 54 | + return roadInfo; | ||
| 55 | + }).collect(Collectors.toList()); | ||
| 56 | + } | ||
| 57 | +} |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadReqDTO.java
0 → 100644
| 1 | +package com.zteits.urbanops.module.garden.api.road.dto; | ||
| 2 | + | ||
| 3 | +import io.swagger.v3.oas.annotations.media.Schema; | ||
| 4 | +import jakarta.validation.constraints.NotNull; | ||
| 5 | +import lombok.Data; | ||
| 6 | + | ||
| 7 | +/** | ||
| 8 | + * @author yanhuiqing | ||
| 9 | + * @version 1.0 | ||
| 10 | + * @description: TODO | ||
| 11 | + * @date 2025/12/9 22:43 | ||
| 12 | + */ | ||
| 13 | +@Data | ||
| 14 | +public class RoadReqDTO { | ||
| 15 | + @NotNull | ||
| 16 | + @Schema(description = "系统编码", example = "sls") | ||
| 17 | + private String companyCode; | ||
| 18 | + @NotNull | ||
| 19 | + @Schema(description = "经度", example = "44.962685") | ||
| 20 | + private String longitude; | ||
| 21 | + @NotNull | ||
| 22 | + @Schema(description = "维度", example = "121.40476") | ||
| 23 | + private String latitude; | ||
| 24 | + | ||
| 25 | +} |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/dto/RoadRespDTO.java
0 → 100644
| 1 | +package com.zteits.urbanops.module.garden.api.road.dto; | ||
| 2 | + | ||
| 3 | +import lombok.Data; | ||
| 4 | + | ||
| 5 | +/** | ||
| 6 | + * @author yanhuiqing | ||
| 7 | + * @version 1.0 | ||
| 8 | + * @description: TODO | ||
| 9 | + * @date 2025/12/9 22:21 | ||
| 10 | + */ | ||
| 11 | +@Data | ||
| 12 | +public class RoadRespDTO { | ||
| 13 | + /** | ||
| 14 | + * 道路编码 | ||
| 15 | + */ | ||
| 16 | + private String roadCode; | ||
| 17 | + /** | ||
| 18 | + * 道路名称 | ||
| 19 | + */ | ||
| 20 | + private String roadName; | ||
| 21 | +} |
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; | @@ -8,6 +8,7 @@ import com.zteits.urbanops.framework.common.pojo.PageParam; | ||
| 8 | import com.zteits.urbanops.framework.common.pojo.PageResult; | 8 | import com.zteits.urbanops.framework.common.pojo.PageResult; |
| 9 | import com.zteits.urbanops.framework.common.util.object.BeanUtils; | 9 | import com.zteits.urbanops.framework.common.util.object.BeanUtils; |
| 10 | import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; | 10 | import com.zteits.urbanops.framework.excel.core.util.ExcelUtils; |
| 11 | +import com.zteits.urbanops.framework.translate.core.TranslateUtils; | ||
| 11 | import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksPageReqVO; | 12 | import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksPageReqVO; |
| 12 | import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksRespVO; | 13 | import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksRespVO; |
| 13 | import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksSaveReqVO; | 14 | import com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo.AssignTasksSaveReqVO; |
| @@ -84,6 +85,9 @@ public class AssignTasksController { | @@ -84,6 +85,9 @@ public class AssignTasksController { | ||
| 84 | @PreAuthorize("@ss.hasPermission('garden:assign-tasks:query')") | 85 | @PreAuthorize("@ss.hasPermission('garden:assign-tasks:query')") |
| 85 | public CommonResult<AssignTasksRespVO> getAssignTasks(@RequestParam("id") Long id) { | 86 | public CommonResult<AssignTasksRespVO> getAssignTasks(@RequestParam("id") Long id) { |
| 86 | AssignTasksDO assignTasks = assignTasksService.getAssignTasks(id); | 87 | AssignTasksDO assignTasks = assignTasksService.getAssignTasks(id); |
| 88 | + if (assignTasks == null) { | ||
| 89 | + return success(null); | ||
| 90 | + } | ||
| 87 | AssignTasksRespVO assignTasksRespVO = BeanUtils.toBean(assignTasks, AssignTasksRespVO.class); | 91 | AssignTasksRespVO assignTasksRespVO = BeanUtils.toBean(assignTasks, AssignTasksRespVO.class); |
| 88 | List<AssignTasksInfoDO> assignTaskInfoList = asignTasksInfoService.getAssignTasksInfos(assignTasks.getId()); | 92 | List<AssignTasksInfoDO> assignTaskInfoList = asignTasksInfoService.getAssignTasksInfos(assignTasks.getId()); |
| 89 | assignTasksRespVO.setAssignTaskInfoList(assignTaskInfoList); | 93 | assignTasksRespVO.setAssignTaskInfoList(assignTaskInfoList); |
| @@ -124,9 +128,9 @@ public class AssignTasksController { | @@ -124,9 +128,9 @@ public class AssignTasksController { | ||
| 124 | HttpServletResponse response) throws IOException { | 128 | HttpServletResponse response) throws IOException { |
| 125 | pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); | 129 | pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); |
| 126 | List<AssignTasksDO> list = assignTasksService.getAssignTasksPage(pageReqVO).getList(); | 130 | List<AssignTasksDO> list = assignTasksService.getAssignTasksPage(pageReqVO).getList(); |
| 127 | - // 导出 Excel | 131 | + List<AssignTasksRespVO> respVolist = BeanUtils.toBean(list, AssignTasksRespVO.class); |
| 128 | ExcelUtils.write(response, "派单任务主表(记录派单任务基本信息).xls", "数据", AssignTasksRespVO.class, | 132 | ExcelUtils.write(response, "派单任务主表(记录派单任务基本信息).xls", "数据", AssignTasksRespVO.class, |
| 129 | - BeanUtils.toBean(list, AssignTasksRespVO.class)); | 133 | + respVolist ); |
| 130 | } | 134 | } |
| 131 | 135 | ||
| 132 | @Operation(summary = "任务确认" ) | 136 | @Operation(summary = "任务确认" ) |
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 { | @@ -23,27 +23,14 @@ public class AssignTasksPageReqVO extends PageParam { | ||
| 23 | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | 23 | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| 24 | private LocalDateTime[] deadline; | 24 | private LocalDateTime[] deadline; |
| 25 | 25 | ||
| 26 | - @Schema(description = "派单模板文件路径(如:任务详情模板、填报表格等)") | ||
| 27 | - private String templateFile; | ||
| 28 | - | ||
| 29 | @Schema(description = "任务整体完成状态(0:未完成,1:已完成;所有关联单位均完成时自动更新为1)") | 26 | @Schema(description = "任务整体完成状态(0:未完成,1:已完成;所有关联单位均完成时自动更新为1)") |
| 30 | private Integer parentFinish; | 27 | private Integer parentFinish; |
| 31 | 28 | ||
| 32 | - @Schema(description = "整体完成时间(仅当parent_finish=1时有值)") | ||
| 33 | - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | ||
| 34 | - private LocalDateTime[] finishTime; | ||
| 35 | - | ||
| 36 | - @Schema(description = "任务备注(如:特殊要求、注意事项等)") | ||
| 37 | - private String note; | ||
| 38 | - | ||
| 39 | - @Schema(description = "创建人(关联用户ID,任务派发人)") | ||
| 40 | - private String creator; | ||
| 41 | - | ||
| 42 | @Schema(description = "任务创建时间(派单时间)") | 29 | @Schema(description = "任务创建时间(派单时间)") |
| 43 | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | 30 | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| 44 | private LocalDateTime[] createTime; | 31 | private LocalDateTime[] createTime; |
| 45 | 32 | ||
| 46 | - @Schema(description = "修改人(关联用户ID,最后修改人)") | ||
| 47 | - private String updater; | 33 | + private String deadlineBeginTime; |
| 34 | + private String deadlineEndTime; | ||
| 48 | 35 | ||
| 49 | } | 36 | } |
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; | @@ -3,6 +3,7 @@ package com.zteits.urbanops.module.garden.controller.admin.assigntasks.vo; | ||
| 3 | import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | 3 | import cn.idev.excel.annotation.ExcelIgnoreUnannotated; |
| 4 | import cn.idev.excel.annotation.ExcelProperty; | 4 | import cn.idev.excel.annotation.ExcelProperty; |
| 5 | import com.fasterxml.jackson.annotation.JsonFormat; | 5 | import com.fasterxml.jackson.annotation.JsonFormat; |
| 6 | +import com.fhs.core.trans.vo.VO; | ||
| 6 | import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO; | 7 | import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO; |
| 7 | import io.swagger.v3.oas.annotations.media.Schema; | 8 | import io.swagger.v3.oas.annotations.media.Schema; |
| 8 | import lombok.Data; | 9 | import lombok.Data; |
| @@ -18,54 +19,85 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE | @@ -18,54 +19,85 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE | ||
| 18 | public class AssignTasksRespVO { | 19 | public class AssignTasksRespVO { |
| 19 | 20 | ||
| 20 | @Schema(description = "自增ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3654") | 21 | @Schema(description = "自增ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3654") |
| 21 | - @ExcelProperty("自增ID") | ||
| 22 | private Long id; | 22 | private Long id; |
| 23 | 23 | ||
| 24 | @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") | 24 | @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") |
| 25 | @ExcelProperty("任务名称") | 25 | @ExcelProperty("任务名称") |
| 26 | private String taskName; | 26 | private String taskName; |
| 27 | 27 | ||
| 28 | - @Schema(description = "任务类型(关联数据字典,如:日常巡检、紧急维修等)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | ||
| 29 | - @ExcelProperty("任务类型(关联数据字典,如:日常巡检、紧急维修等)") | 28 | + @Schema(description = "任务类型(关联数据字典,1=日常任务,2=古树任务,3=屋顶绿化)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") |
| 30 | private String taskType; | 29 | private String taskType; |
| 30 | + @ExcelProperty(value = "任务类型") | ||
| 31 | + private String taskTypeName; | ||
| 32 | + | ||
| 33 | + @Schema(description = "任务整体完成状态(0:未完成,1:已完成;所有关联单位均完成时自动更新为1)", requiredMode = Schema.RequiredMode.REQUIRED) | ||
| 34 | + private Integer parentFinish; | ||
| 35 | + | ||
| 36 | + @ExcelProperty(value = "任务整体完成状态") | ||
| 37 | + private String parentFinishName; | ||
| 38 | + | ||
| 39 | + @Schema(description = "任务创建时间(派单时间)", requiredMode = Schema.RequiredMode.REQUIRED) | ||
| 40 | + @ExcelProperty("派达时间") | ||
| 41 | + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | ||
| 42 | + private Date createTime; | ||
| 31 | 43 | ||
| 32 | @Schema(description = "任务截止时间", requiredMode = Schema.RequiredMode.REQUIRED) | 44 | @Schema(description = "任务截止时间", requiredMode = Schema.RequiredMode.REQUIRED) |
| 33 | @ExcelProperty("任务截止时间") | 45 | @ExcelProperty("任务截止时间") |
| 34 | @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | 46 | @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| 35 | private Date deadline; | 47 | private Date deadline; |
| 36 | 48 | ||
| 49 | + @Schema(description = "任务备注(如:特殊要求、注意事项等)") | ||
| 50 | + @ExcelProperty("任务备注") | ||
| 51 | + private String note; | ||
| 52 | + | ||
| 37 | @Schema(description = "派单模板文件路径(如:任务详情模板、填报表格等)") | 53 | @Schema(description = "派单模板文件路径(如:任务详情模板、填报表格等)") |
| 38 | - @ExcelProperty("派单模板文件路径(如:任务详情模板、填报表格等)") | ||
| 39 | private String templateFile; | 54 | private String templateFile; |
| 40 | 55 | ||
| 41 | - @Schema(description = "任务整体完成状态(0:未完成,1:已完成;所有关联单位均完成时自动更新为1)", requiredMode = Schema.RequiredMode.REQUIRED) | ||
| 42 | - @ExcelProperty("任务整体完成状态(0:未完成,1:已完成;所有关联单位均完成时自动更新为1)") | ||
| 43 | - private Integer parentFinish; | ||
| 44 | - | ||
| 45 | @Schema(description = "整体完成时间(仅当parent_finish=1时有值)") | 56 | @Schema(description = "整体完成时间(仅当parent_finish=1时有值)") |
| 46 | - @ExcelProperty("整体完成时间(仅当parent_finish=1时有值)") | ||
| 47 | @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | 57 | @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| 48 | private Date finishTime; | 58 | private Date finishTime; |
| 49 | 59 | ||
| 50 | - @Schema(description = "任务备注(如:特殊要求、注意事项等)") | ||
| 51 | - @ExcelProperty("任务备注(如:特殊要求、注意事项等)") | ||
| 52 | - private String note; | ||
| 53 | - | ||
| 54 | @Schema(description = "创建人(关联用户ID,任务派发人)", requiredMode = Schema.RequiredMode.REQUIRED) | 60 | @Schema(description = "创建人(关联用户ID,任务派发人)", requiredMode = Schema.RequiredMode.REQUIRED) |
| 55 | - @ExcelProperty("创建人(关联用户ID,任务派发人)") | ||
| 56 | private String creator; | 61 | private String creator; |
| 57 | 62 | ||
| 58 | - @Schema(description = "任务创建时间(派单时间)", requiredMode = Schema.RequiredMode.REQUIRED) | ||
| 59 | - @ExcelProperty("任务创建时间(派单时间)") | ||
| 60 | - @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | ||
| 61 | - private Date createTime; | ||
| 62 | - | ||
| 63 | @Schema(description = "修改人(关联用户ID,最后修改人)") | 63 | @Schema(description = "修改人(关联用户ID,最后修改人)") |
| 64 | - @ExcelProperty("修改人(关联用户ID,最后修改人)") | ||
| 65 | private String updater; | 64 | private String updater; |
| 66 | 65 | ||
| 67 | private List<String> companyIds; | 66 | private List<String> companyIds; |
| 68 | private List<AssignTasksInfoDO> assignTaskInfoList; | 67 | private List<AssignTasksInfoDO> assignTaskInfoList; |
| 69 | 68 | ||
| 70 | - | 69 | + public void setParentFinish(Integer parentFinish) { |
| 70 | + this.parentFinish = parentFinish; | ||
| 71 | + // 手动固定值映射:0→未完成,1→已完成,其他→未知状态 | ||
| 72 | + switch (parentFinish) { | ||
| 73 | + case 0: | ||
| 74 | + this.parentFinishName = "未完成"; | ||
| 75 | + break; | ||
| 76 | + case 1: | ||
| 77 | + this.parentFinishName = "已完成"; | ||
| 78 | + break; | ||
| 79 | + default: // 包含null、2、3等非法值 | ||
| 80 | + this.parentFinishName = "未知状态"; | ||
| 81 | + break; | ||
| 82 | + } | ||
| 83 | + } | ||
| 84 | + | ||
| 85 | + public void setTaskType(String taskType) { | ||
| 86 | + this.taskType = taskType; | ||
| 87 | + //1=日常任务,2=古树任务,3=屋顶绿化 | ||
| 88 | + switch (taskType) { | ||
| 89 | + case "1": | ||
| 90 | + this.taskTypeName = "日常任务"; | ||
| 91 | + break; | ||
| 92 | + case "2": | ||
| 93 | + this.taskTypeName = "古树任务"; | ||
| 94 | + break; | ||
| 95 | + case "3": | ||
| 96 | + this.taskTypeName = "屋顶绿化"; | ||
| 97 | + break; | ||
| 98 | + default: | ||
| 99 | + this.taskTypeName = "未知"; | ||
| 100 | + break; | ||
| 101 | + } | ||
| 102 | + } | ||
| 71 | } | 103 | } |
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 | @@ -13,57 +13,19 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE | ||
| 13 | @Data | 13 | @Data |
| 14 | public class AssignTasksInfoPageReqVO extends PageParam { | 14 | public class AssignTasksInfoPageReqVO extends PageParam { |
| 15 | 15 | ||
| 16 | - @Schema(description = "关联派单任务主表ID(外键,关联td_assign_tasks.id)", example = "1875") | ||
| 17 | - private Long taskId; | ||
| 18 | 16 | ||
| 19 | @Schema(description = "单位ID(关联单位表主键)", example = "11926") | 17 | @Schema(description = "单位ID(关联单位表主键)", example = "11926") |
| 20 | private String companyId; | 18 | private String companyId; |
| 21 | 19 | ||
| 22 | - @Schema(description = "单位ID(关联单位表主键)", example = "张三") | ||
| 23 | - private String companyName; | ||
| 24 | - | ||
| 25 | @Schema(description = "填报人ID(单位指定的任务负责人)", example = "28216") | 20 | @Schema(description = "填报人ID(单位指定的任务负责人)", example = "28216") |
| 26 | private String writePersonId; | 21 | private String writePersonId; |
| 27 | 22 | ||
| 28 | - @Schema(description = "填报人姓名") | ||
| 29 | - private String writePerson; | ||
| 30 | - | ||
| 31 | - @Schema(description = "填报人手机号") | ||
| 32 | - private String writePersonPhone; | ||
| 33 | - | ||
| 34 | - @Schema(description = "填报时间(仅当finish=1时有值)") | ||
| 35 | - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | ||
| 36 | - private LocalDateTime[] writeTime; | ||
| 37 | - | ||
| 38 | @Schema(description = "单位任务完成状态(0:未完成,1:已完成)") | 23 | @Schema(description = "单位任务完成状态(0:未完成,1:已完成)") |
| 39 | private Integer finish; | 24 | private Integer finish; |
| 40 | 25 | ||
| 41 | @Schema(description = "是否超期(0:未超期,1:超期;NULL:未到截止时间)") | 26 | @Schema(description = "是否超期(0:未超期,1:超期;NULL:未到截止时间)") |
| 42 | private Integer isOverdue; | 27 | private Integer isOverdue; |
| 43 | 28 | ||
| 44 | - @Schema(description = "单位提交的任务文件路径(如:填报表格、现场照片等)") | ||
| 45 | - private String dataFile; | ||
| 46 | - | ||
| 47 | - @Schema(description = "催缴次数(未完成时的提醒次数)") | ||
| 48 | - private Integer rushNum; | ||
| 49 | - | ||
| 50 | - @Schema(description = "新任务标记(0:未读,1:已读)") | ||
| 51 | - private Integer newFlag; | ||
| 52 | - | ||
| 53 | - @Schema(description = "已读时间(仅当new_flag=1时有值)") | ||
| 54 | - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | ||
| 55 | - private LocalDateTime[] newFlagTime; | ||
| 56 | - | ||
| 57 | - @Schema(description = "驳回备注(当finish=2时,说明驳回原因)", example = "你说的对") | ||
| 58 | - private String rejectRemark; | ||
| 59 | - | ||
| 60 | - @Schema(description = "单位任务确认状态(已确认/未确认,单位接收任务后需确认)") | ||
| 61 | - private String confirm; | ||
| 62 | - | ||
| 63 | - @Schema(description = "确认时间(单位确认接收任务的时间)") | ||
| 64 | - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | ||
| 65 | - private LocalDateTime[] confirmTime; | ||
| 66 | - | ||
| 67 | @Schema(description = "创建人(关联用户ID,将任务派给该单位的操作人)") | 29 | @Schema(description = "创建人(关联用户ID,将任务派给该单位的操作人)") |
| 68 | private String creator; | 30 | private String creator; |
| 69 | 31 | ||
| @@ -71,16 +33,7 @@ public class AssignTasksInfoPageReqVO extends PageParam { | @@ -71,16 +33,7 @@ public class AssignTasksInfoPageReqVO extends PageParam { | ||
| 71 | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | 33 | @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| 72 | private LocalDateTime[] createTime; | 34 | private LocalDateTime[] createTime; |
| 73 | 35 | ||
| 74 | - @Schema(description = "修改人(关联用户ID,最后修改该记录的操作人)") | ||
| 75 | - private String updater; | ||
| 76 | - | ||
| 77 | - @Schema(description = "备注", example = "你猜") | ||
| 78 | - private String remark; | ||
| 79 | - | ||
| 80 | @Schema(description = "是否打回0:正常 1:打回") | 36 | @Schema(description = "是否打回0:正常 1:打回") |
| 81 | private Integer isReject; | 37 | private Integer isReject; |
| 82 | 38 | ||
| 83 | - @Schema(description = "0:正常1:停用", example = "1") | ||
| 84 | - private Integer status; | ||
| 85 | - | ||
| 86 | } | 39 | } |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/assigntasksinfo/vo/AssignTasksInfoRespVO.java
| 1 | package com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo; | 1 | package com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo; |
| 2 | 2 | ||
| 3 | +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; | ||
| 4 | +import cn.idev.excel.annotation.ExcelProperty; | ||
| 5 | +import com.fasterxml.jackson.annotation.JsonFormat; | ||
| 3 | import io.swagger.v3.oas.annotations.media.Schema; | 6 | import io.swagger.v3.oas.annotations.media.Schema; |
| 4 | -import lombok.*; | ||
| 5 | -import java.util.*; | ||
| 6 | -import org.springframework.format.annotation.DateTimeFormat; | 7 | +import lombok.Data; |
| 8 | + | ||
| 7 | import java.time.LocalDateTime; | 9 | import java.time.LocalDateTime; |
| 8 | -import cn.idev.excel.annotation.*; | 10 | +import java.util.Date; |
| 11 | + | ||
| 12 | +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | ||
| 9 | 13 | ||
| 10 | @Schema(description = "管理后台 - 派单任务-单位关联表(记录单位接收派单后的执行详情) Response VO") | 14 | @Schema(description = "管理后台 - 派单任务-单位关联表(记录单位接收派单后的执行详情) Response VO") |
| 11 | @Data | 15 | @Data |
| @@ -13,15 +17,27 @@ import cn.idev.excel.annotation.*; | @@ -13,15 +17,27 @@ import cn.idev.excel.annotation.*; | ||
| 13 | public class AssignTasksInfoRespVO { | 17 | public class AssignTasksInfoRespVO { |
| 14 | 18 | ||
| 15 | @Schema(description = "自增ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12148") | 19 | @Schema(description = "自增ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12148") |
| 16 | - @ExcelProperty("自增ID") | ||
| 17 | private Long id; | 20 | private Long id; |
| 18 | 21 | ||
| 19 | @Schema(description = "关联派单任务主表ID(外键,关联td_assign_tasks.id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1875") | 22 | @Schema(description = "关联派单任务主表ID(外键,关联td_assign_tasks.id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1875") |
| 20 | - @ExcelProperty("关联派单任务主表ID(外键,关联td_assign_tasks.id)") | 23 | + //@ExcelProperty("关联派单任务主表ID(外键,关联td_assign_tasks.id)") |
| 21 | private Long taskId; | 24 | private Long taskId; |
| 22 | 25 | ||
| 26 | + @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") | ||
| 27 | + @ExcelProperty("任务名称") | ||
| 28 | + private String taskName; | ||
| 29 | + | ||
| 30 | + @Schema(description = "任务类型(关联数据字典,1=日常任务,2=古树任务,3=屋顶绿化)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | ||
| 31 | + private String taskType; | ||
| 32 | + @ExcelProperty(value = "任务类型") | ||
| 33 | + private String taskTypeName; | ||
| 34 | + | ||
| 35 | + @Schema(description = "任务截止时间", requiredMode = Schema.RequiredMode.REQUIRED) | ||
| 36 | + @ExcelProperty("任务截止时间") | ||
| 37 | + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | ||
| 38 | + private Date deadline; | ||
| 39 | + | ||
| 23 | @Schema(description = "单位ID(关联单位表主键)", requiredMode = Schema.RequiredMode.REQUIRED, example = "11926") | 40 | @Schema(description = "单位ID(关联单位表主键)", requiredMode = Schema.RequiredMode.REQUIRED, example = "11926") |
| 24 | - @ExcelProperty("单位ID(关联单位表主键)") | ||
| 25 | private String companyId; | 41 | private String companyId; |
| 26 | 42 | ||
| 27 | @Schema(description = "单位ID(关联单位表主键)", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") | 43 | @Schema(description = "单位ID(关联单位表主键)", requiredMode = Schema.RequiredMode.REQUIRED, example = "张三") |
| @@ -29,7 +45,6 @@ public class AssignTasksInfoRespVO { | @@ -29,7 +45,6 @@ public class AssignTasksInfoRespVO { | ||
| 29 | private String companyName; | 45 | private String companyName; |
| 30 | 46 | ||
| 31 | @Schema(description = "填报人ID(单位指定的任务负责人)", example = "28216") | 47 | @Schema(description = "填报人ID(单位指定的任务负责人)", example = "28216") |
| 32 | - @ExcelProperty("填报人ID(单位指定的任务负责人)") | ||
| 33 | private String writePersonId; | 48 | private String writePersonId; |
| 34 | 49 | ||
| 35 | @Schema(description = "填报人姓名") | 50 | @Schema(description = "填报人姓名") |
| @@ -86,7 +101,8 @@ public class AssignTasksInfoRespVO { | @@ -86,7 +101,8 @@ public class AssignTasksInfoRespVO { | ||
| 86 | 101 | ||
| 87 | @Schema(description = "关联记录创建时间(派单给单位的时间)", requiredMode = Schema.RequiredMode.REQUIRED) | 102 | @Schema(description = "关联记录创建时间(派单给单位的时间)", requiredMode = Schema.RequiredMode.REQUIRED) |
| 88 | @ExcelProperty("关联记录创建时间(派单给单位的时间)") | 103 | @ExcelProperty("关联记录创建时间(派单给单位的时间)") |
| 89 | - private LocalDateTime createTime; | 104 | + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) |
| 105 | + private Date createTime; | ||
| 90 | 106 | ||
| 91 | @Schema(description = "修改人(关联用户ID,最后修改该记录的操作人)") | 107 | @Schema(description = "修改人(关联用户ID,最后修改该记录的操作人)") |
| 92 | @ExcelProperty("修改人(关联用户ID,最后修改该记录的操作人)") | 108 | @ExcelProperty("修改人(关联用户ID,最后修改该记录的操作人)") |
| @@ -104,4 +120,24 @@ public class AssignTasksInfoRespVO { | @@ -104,4 +120,24 @@ public class AssignTasksInfoRespVO { | ||
| 104 | @ExcelProperty("0:正常1:停用") | 120 | @ExcelProperty("0:正常1:停用") |
| 105 | private Integer status; | 121 | private Integer status; |
| 106 | 122 | ||
| 123 | + public void setTaskType(String taskType) { | ||
| 124 | + this.taskType = taskType; | ||
| 125 | + //1=日常任务,2=古树任务,3=屋顶绿化 | ||
| 126 | + switch (taskType) { | ||
| 127 | + case "1": | ||
| 128 | + this.taskTypeName = "日常任务"; | ||
| 129 | + break; | ||
| 130 | + case "2": | ||
| 131 | + this.taskTypeName = "古树任务"; | ||
| 132 | + break; | ||
| 133 | + case "3": | ||
| 134 | + this.taskTypeName = "屋顶绿化"; | ||
| 135 | + break; | ||
| 136 | + default: | ||
| 137 | + this.taskTypeName = "未知"; | ||
| 138 | + break; | ||
| 139 | + } | ||
| 140 | + } | ||
| 141 | + | ||
| 142 | + | ||
| 107 | } | 143 | } |
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 { | @@ -106,4 +106,16 @@ public class AssignTasksInfoDO extends BaseDO { | ||
| 106 | */ | 106 | */ |
| 107 | private Integer isReject; | 107 | private Integer isReject; |
| 108 | 108 | ||
| 109 | + /** | ||
| 110 | + * 任务名称 | ||
| 111 | + */ | ||
| 112 | + private String taskName; | ||
| 113 | + /** | ||
| 114 | + * 任务类型(关联数据字典,如:日常巡检、紧急维修等) | ||
| 115 | + */ | ||
| 116 | + private String taskType; | ||
| 117 | + /** | ||
| 118 | + * 任务截止时间 | ||
| 119 | + */ | ||
| 120 | + private LocalDateTime deadline; | ||
| 109 | } | 121 | } |
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<AssignTasksDO> { | @@ -22,13 +22,8 @@ public interface AssignTasksMapper extends BaseMapperX<AssignTasksDO> { | ||
| 22 | .likeIfPresent(AssignTasksDO::getTaskName, reqVO.getTaskName()) | 22 | .likeIfPresent(AssignTasksDO::getTaskName, reqVO.getTaskName()) |
| 23 | .eqIfPresent(AssignTasksDO::getTaskType, reqVO.getTaskType()) | 23 | .eqIfPresent(AssignTasksDO::getTaskType, reqVO.getTaskType()) |
| 24 | .eqIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline()) | 24 | .eqIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline()) |
| 25 | - .eqIfPresent(AssignTasksDO::getTemplateFile, reqVO.getTemplateFile()) | ||
| 26 | .eqIfPresent(AssignTasksDO::getParentFinish, reqVO.getParentFinish()) | 25 | .eqIfPresent(AssignTasksDO::getParentFinish, reqVO.getParentFinish()) |
| 27 | - .betweenIfPresent(AssignTasksDO::getFinishTime, reqVO.getFinishTime()) | ||
| 28 | - .eqIfPresent(AssignTasksDO::getNote, reqVO.getNote()) | ||
| 29 | - .eqIfPresent(AssignTasksDO::getCreator, reqVO.getCreator()) | ||
| 30 | .betweenIfPresent(AssignTasksDO::getCreateTime, reqVO.getCreateTime()) | 26 | .betweenIfPresent(AssignTasksDO::getCreateTime, reqVO.getCreateTime()) |
| 31 | - .eqIfPresent(AssignTasksDO::getUpdater, reqVO.getUpdater()) | ||
| 32 | .betweenIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline()) | 27 | .betweenIfPresent(AssignTasksDO::getDeadline, reqVO.getDeadline()) |
| 33 | .orderByDesc(AssignTasksDO::getId)); | 28 | .orderByDesc(AssignTasksDO::getId)); |
| 34 | } | 29 | } |
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<AssignTasksInfoDO> { | @@ -20,26 +20,11 @@ public interface AssignTasksInfoMapper extends BaseMapperX<AssignTasksInfoDO> { | ||
| 20 | 20 | ||
| 21 | default PageResult<AssignTasksInfoDO> selectPage(AssignTasksInfoPageReqVO reqVO) { | 21 | default PageResult<AssignTasksInfoDO> selectPage(AssignTasksInfoPageReqVO reqVO) { |
| 22 | return selectPage(reqVO, new LambdaQueryWrapperX<AssignTasksInfoDO>() | 22 | return selectPage(reqVO, new LambdaQueryWrapperX<AssignTasksInfoDO>() |
| 23 | - .eqIfPresent(AssignTasksInfoDO::getTaskId, reqVO.getTaskId()) | ||
| 24 | .eqIfPresent(AssignTasksInfoDO::getCompanyId, reqVO.getCompanyId()) | 23 | .eqIfPresent(AssignTasksInfoDO::getCompanyId, reqVO.getCompanyId()) |
| 25 | - .likeIfPresent(AssignTasksInfoDO::getCompanyName, reqVO.getCompanyName()) | ||
| 26 | .eqIfPresent(AssignTasksInfoDO::getWritePersonId, reqVO.getWritePersonId()) | 24 | .eqIfPresent(AssignTasksInfoDO::getWritePersonId, reqVO.getWritePersonId()) |
| 27 | - .eqIfPresent(AssignTasksInfoDO::getWritePerson, reqVO.getWritePerson()) | ||
| 28 | - .eqIfPresent(AssignTasksInfoDO::getWritePersonPhone, reqVO.getWritePersonPhone()) | ||
| 29 | - .betweenIfPresent(AssignTasksInfoDO::getWriteTime, reqVO.getWriteTime()) | ||
| 30 | .eqIfPresent(AssignTasksInfoDO::getFinish, reqVO.getFinish()) | 25 | .eqIfPresent(AssignTasksInfoDO::getFinish, reqVO.getFinish()) |
| 31 | .eqIfPresent(AssignTasksInfoDO::getIsOverdue, reqVO.getIsOverdue()) | 26 | .eqIfPresent(AssignTasksInfoDO::getIsOverdue, reqVO.getIsOverdue()) |
| 32 | - .eqIfPresent(AssignTasksInfoDO::getDataFile, reqVO.getDataFile()) | ||
| 33 | - .eqIfPresent(AssignTasksInfoDO::getRushNum, reqVO.getRushNum()) | ||
| 34 | - .eqIfPresent(AssignTasksInfoDO::getNewFlag, reqVO.getNewFlag()) | ||
| 35 | - .betweenIfPresent(AssignTasksInfoDO::getNewFlagTime, reqVO.getNewFlagTime()) | ||
| 36 | - .eqIfPresent(AssignTasksInfoDO::getRejectRemark, reqVO.getRejectRemark()) | ||
| 37 | - .eqIfPresent(AssignTasksInfoDO::getConfirm, reqVO.getConfirm()) | ||
| 38 | - .betweenIfPresent(AssignTasksInfoDO::getConfirmTime, reqVO.getConfirmTime()) | ||
| 39 | - .eqIfPresent(AssignTasksInfoDO::getCreator, reqVO.getCreator()) | ||
| 40 | .betweenIfPresent(AssignTasksInfoDO::getCreateTime, reqVO.getCreateTime()) | 27 | .betweenIfPresent(AssignTasksInfoDO::getCreateTime, reqVO.getCreateTime()) |
| 41 | - .eqIfPresent(AssignTasksInfoDO::getUpdater, reqVO.getUpdater()) | ||
| 42 | - .eqIfPresent(AssignTasksInfoDO::getRemark, reqVO.getRemark()) | ||
| 43 | .eqIfPresent(AssignTasksInfoDO::getIsReject, reqVO.getIsReject()) | 28 | .eqIfPresent(AssignTasksInfoDO::getIsReject, reqVO.getIsReject()) |
| 44 | .orderByDesc(AssignTasksInfoDO::getId)); | 29 | .orderByDesc(AssignTasksInfoDO::getId)); |
| 45 | } | 30 | } |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasks/AssignTasksServiceImpl.java
| @@ -28,8 +28,7 @@ import java.util.Objects; | @@ -28,8 +28,7 @@ import java.util.Objects; | ||
| 28 | import java.util.stream.Collectors; | 28 | import java.util.stream.Collectors; |
| 29 | 29 | ||
| 30 | import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; | 30 | import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception; |
| 31 | -import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDeptId; | ||
| 32 | -import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; | 31 | +import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.*; |
| 33 | import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.ASSIGN_TASKS_NOT_EXISTS; | 32 | import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.ASSIGN_TASKS_NOT_EXISTS; |
| 34 | import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.ASSIGN_TASKS_NOT_EXISTS_002; | 33 | import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.ASSIGN_TASKS_NOT_EXISTS_002; |
| 35 | 34 | ||
| @@ -65,7 +64,7 @@ public class AssignTasksServiceImpl implements AssignTasksService { | @@ -65,7 +64,7 @@ public class AssignTasksServiceImpl implements AssignTasksService { | ||
| 65 | AssignTasksDO assignTasks = BeanUtils.toBean(createReqVO, AssignTasksDO.class); | 64 | AssignTasksDO assignTasks = BeanUtils.toBean(createReqVO, AssignTasksDO.class); |
| 66 | assignTasksMapper.insert(assignTasks); | 65 | assignTasksMapper.insert(assignTasks); |
| 67 | //保存单位明细 | 66 | //保存单位明细 |
| 68 | - assignTasksInfoService.saveAssignTasksInfos(createReqVO.getCompanyIds(), assignTasks.getId()); | 67 | + assignTasksInfoService.saveAssignTasksInfos(createReqVO.getCompanyIds(), assignTasks); |
| 69 | //保存单位明细 | 68 | //保存单位明细 |
| 70 | 69 | ||
| 71 | // 返回 | 70 | // 返回 |
| @@ -111,7 +110,7 @@ public class AssignTasksServiceImpl implements AssignTasksService { | @@ -111,7 +110,7 @@ public class AssignTasksServiceImpl implements AssignTasksService { | ||
| 111 | .filter(Objects::nonNull) | 110 | .filter(Objects::nonNull) |
| 112 | .filter(id -> !existingCompanyIds.contains(id)) // 直接用列表 contains() | 111 | .filter(id -> !existingCompanyIds.contains(id)) // 直接用列表 contains() |
| 113 | .collect(Collectors.toList()); | 112 | .collect(Collectors.toList()); |
| 114 | - assignTasksInfoService.saveAssignTasksInfos(filteredCompanyIds, updateObj.getId()); | 113 | + assignTasksInfoService.saveAssignTasksInfos(filteredCompanyIds, updateObj); |
| 115 | } | 114 | } |
| 116 | 115 | ||
| 117 | @Override | 116 | @Override |
| @@ -150,8 +149,7 @@ public class AssignTasksServiceImpl implements AssignTasksService { | @@ -150,8 +149,7 @@ public class AssignTasksServiceImpl implements AssignTasksService { | ||
| 150 | @Override | 149 | @Override |
| 151 | public PageResult<AssignTasksDO> getAssignTasksPage(AssignTasksPageReqVO pageReqVO) { | 150 | public PageResult<AssignTasksDO> getAssignTasksPage(AssignTasksPageReqVO pageReqVO) { |
| 152 | //add by wq 派单任务只能总公司查询 | 151 | //add by wq 派单任务只能总公司查询 |
| 153 | - DeptRespDTO deptRespDTO = deptApi.getDept(getLoginUserDeptId()); | ||
| 154 | - if (deptRespDTO.getParentId() != 0) { | 152 | + if (getCompanyId() != 100) { |
| 155 | return null; | 153 | return null; |
| 156 | } | 154 | } |
| 157 | //add by wq 派单任务只能总公司查询 | 155 | //add by wq 派单任务只能总公司查询 |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java
| 1 | package com.zteits.urbanops.module.garden.service.assigntasksinfo; | 1 | package com.zteits.urbanops.module.garden.service.assigntasksinfo; |
| 2 | 2 | ||
| 3 | -import java.util.*; | ||
| 4 | -import jakarta.validation.*; | ||
| 5 | -import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.*; | ||
| 6 | -import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO; | ||
| 7 | import com.zteits.urbanops.framework.common.pojo.PageResult; | 3 | import com.zteits.urbanops.framework.common.pojo.PageResult; |
| 8 | -import com.zteits.urbanops.framework.common.pojo.PageParam; | 4 | +import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoPageReqVO; |
| 5 | +import com.zteits.urbanops.module.garden.controller.admin.assigntasksinfo.vo.AssignTasksInfoSaveReqVO; | ||
| 6 | +import com.zteits.urbanops.module.garden.dal.dataobject.assigntasks.AssignTasksDO; | ||
| 7 | +import com.zteits.urbanops.module.garden.dal.dataobject.assigntasksinfo.AssignTasksInfoDO; | ||
| 8 | +import jakarta.validation.Valid; | ||
| 9 | + | ||
| 10 | +import java.util.List; | ||
| 9 | 11 | ||
| 10 | /** | 12 | /** |
| 11 | * 派单任务-单位关联表(记录单位接收派单后的执行详情) Service 接口 | 13 | * 派单任务-单位关联表(记录单位接收派单后的执行详情) Service 接口 |
| @@ -64,10 +66,10 @@ public interface AssignTasksInfoService { | @@ -64,10 +66,10 @@ public interface AssignTasksInfoService { | ||
| 64 | * @Description 同步保存单位派单详情 | 66 | * @Description 同步保存单位派单详情 |
| 65 | * @Date 2025/11/16 17:07 | 67 | * @Date 2025/11/16 17:07 |
| 66 | * @Param companyIds | 68 | * @Param companyIds |
| 67 | - * @param taskId | 69 | + * @param assignTasks |
| 68 | * @Return java.lang.Long | 70 | * @Return java.lang.Long |
| 69 | */ | 71 | */ |
| 70 | - public void saveAssignTasksInfos(List<String> companyIds, Long taskId); | 72 | + public void saveAssignTasksInfos(List<String> companyIds, AssignTasksDO assignTasks); |
| 71 | 73 | ||
| 72 | /** | 74 | /** |
| 73 | * @Author wangqian | 75 | * @Author wangqian |
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java
| @@ -114,7 +114,7 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { | @@ -114,7 +114,7 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { | ||
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | @Override | 116 | @Override |
| 117 | - public void saveAssignTasksInfos(List<String> companyIds, Long taskId) { | 117 | + public void saveAssignTasksInfos(List<String> companyIds, AssignTasksDO assignTasks) { |
| 118 | // 获得用户基本信息 | 118 | // 获得用户基本信息 |
| 119 | if (companyIds != null && companyIds.size() > 0) { | 119 | if (companyIds != null && companyIds.size() > 0) { |
| 120 | //1、获取单位集合 | 120 | //1、获取单位集合 |
| @@ -129,13 +129,14 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { | @@ -129,13 +129,14 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { | ||
| 129 | (oldValue, newValue) -> newValue | 129 | (oldValue, newValue) -> newValue |
| 130 | )); | 130 | )); |
| 131 | for (String companyId : companyIds) { | 131 | for (String companyId : companyIds) { |
| 132 | - AssignTasksInfoSaveReqVO assignTaskInfo = new AssignTasksInfoSaveReqVO(); | 132 | + AssignTasksInfoDO assignTaskInfo = new AssignTasksInfoDO(); |
| 133 | assignTaskInfo.setCompanyId(companyId); | 133 | assignTaskInfo.setCompanyId(companyId); |
| 134 | assignTaskInfo.setCompanyName(companyIdToNameMap.get(Long.valueOf(companyId))); | 134 | assignTaskInfo.setCompanyName(companyIdToNameMap.get(Long.valueOf(companyId))); |
| 135 | - assignTaskInfo.setTaskId(taskId); | ||
| 136 | - AssignTasksInfoDO assignTasksInfo = BeanUtils.toBean(assignTaskInfo, AssignTasksInfoDO.class); | ||
| 137 | - | ||
| 138 | - assignTasksInfoMapper.insert(assignTasksInfo); | 135 | + assignTaskInfo.setTaskId(assignTasks.getId()); |
| 136 | + assignTaskInfo.setTaskName(assignTasks.getTaskName()); | ||
| 137 | + assignTaskInfo.setTaskType(assignTasks.getTaskType()); | ||
| 138 | + assignTaskInfo.setDeadline(assignTasks.getDeadline()); | ||
| 139 | + assignTasksInfoMapper.insert(assignTaskInfo); | ||
| 139 | } | 140 | } |
| 140 | } | 141 | } |
| 141 | } | 142 | } |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/flowpathidea/FlowpathIdeaDO.java
| @@ -10,7 +10,7 @@ import java.time.LocalDateTime; | @@ -10,7 +10,7 @@ import java.time.LocalDateTime; | ||
| 10 | /** | 10 | /** |
| 11 | * 流程审核意见 DO | 11 | * 流程审核意见 DO |
| 12 | * | 12 | * |
| 13 | - * @author 芋道源码 | 13 | + * @author 全域源码 |
| 14 | */ | 14 | */ |
| 15 | @TableName("global_flowpath_idea") | 15 | @TableName("global_flowpath_idea") |
| 16 | @KeySequence("global_flowpath_idea_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 | 16 | @KeySequence("global_flowpath_idea_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/problems/ProblemsDO.java
| @@ -13,7 +13,7 @@ import java.time.LocalDateTime; | @@ -13,7 +13,7 @@ import java.time.LocalDateTime; | ||
| 13 | /** | 13 | /** |
| 14 | * 事件表--问题单 DO | 14 | * 事件表--问题单 DO |
| 15 | * | 15 | * |
| 16 | - * @author 芋道源码 | 16 | + * @author 全域源码 |
| 17 | */ | 17 | */ |
| 18 | @TableName(value = "global_problems", autoResultMap = true) | 18 | @TableName(value = "global_problems", autoResultMap = true) |
| 19 | @KeySequence("global_problems_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 | 19 | @KeySequence("global_problems_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/roadinfo/RoadInfoDO.java
| @@ -9,7 +9,7 @@ import lombok.*; | @@ -9,7 +9,7 @@ import lombok.*; | ||
| 9 | /** | 9 | /** |
| 10 | * 道路信息对应关系 DO | 10 | * 道路信息对应关系 DO |
| 11 | * | 11 | * |
| 12 | - * @author 芋道源码 | 12 | + * @author 全域源码 |
| 13 | */ | 13 | */ |
| 14 | @TableName("global_master_road_info") | 14 | @TableName("global_master_road_info") |
| 15 | @KeySequence("global_master_road_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 | 15 | @KeySequence("global_master_road_info_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/dataobject/workorders/WorkOrdersDO.java
| @@ -11,7 +11,7 @@ import java.time.LocalDateTime; | @@ -11,7 +11,7 @@ import java.time.LocalDateTime; | ||
| 11 | /** | 11 | /** |
| 12 | * 工单 DO | 12 | * 工单 DO |
| 13 | * | 13 | * |
| 14 | - * @author 芋道源码 | 14 | + * @author 全域源码 |
| 15 | */ | 15 | */ |
| 16 | @TableName("global_work_orders") | 16 | @TableName("global_work_orders") |
| 17 | @KeySequence("global_work_orders_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 | 17 | @KeySequence("global_work_orders_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
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 | @@ -15,7 +15,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE | ||
| 15 | /** | 15 | /** |
| 16 | * 任务处理结果 DO | 16 | * 任务处理结果 DO |
| 17 | * | 17 | * |
| 18 | - * @author 芋道源码 | 18 | + * @author 全域源码 |
| 19 | */ | 19 | */ |
| 20 | @TableName(value = "global_work_orders_commit_detail",autoResultMap = true) | 20 | @TableName(value = "global_work_orders_commit_detail",autoResultMap = true) |
| 21 | @KeySequence("global_work_orders_commit_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 | 21 | @KeySequence("global_work_orders_commit_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/flowpathidea/FlowpathIdeaMapper.java
| @@ -12,7 +12,7 @@ import java.util.List; | @@ -12,7 +12,7 @@ import java.util.List; | ||
| 12 | /** | 12 | /** |
| 13 | * 流程审核意见 Mapper | 13 | * 流程审核意见 Mapper |
| 14 | * | 14 | * |
| 15 | - * @author 芋道源码 | 15 | + * @author 全域源码 |
| 16 | */ | 16 | */ |
| 17 | @Mapper | 17 | @Mapper |
| 18 | public interface FlowpathIdeaMapper extends BaseMapperX<FlowpathIdeaDO> { | 18 | public interface FlowpathIdeaMapper extends BaseMapperX<FlowpathIdeaDO> { |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/problems/ProblemsMapper.java
| @@ -15,7 +15,7 @@ import java.util.Map; | @@ -15,7 +15,7 @@ import java.util.Map; | ||
| 15 | /** | 15 | /** |
| 16 | * 事件表--问题单 Mapper | 16 | * 事件表--问题单 Mapper |
| 17 | * | 17 | * |
| 18 | - * @author 芋道源码 | 18 | + * @author 全域源码 |
| 19 | */ | 19 | */ |
| 20 | @Mapper | 20 | @Mapper |
| 21 | public interface ProblemsMapper extends BaseMapperX<ProblemsDO> { | 21 | public interface ProblemsMapper extends BaseMapperX<ProblemsDO> { |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/roadinfo/RoadInfoMapper.java
| @@ -14,7 +14,7 @@ import java.util.List; | @@ -14,7 +14,7 @@ import java.util.List; | ||
| 14 | /** | 14 | /** |
| 15 | * 道路信息对应关系 Mapper | 15 | * 道路信息对应关系 Mapper |
| 16 | * | 16 | * |
| 17 | - * @author 芋道源码 | 17 | + * @author 全域源码 |
| 18 | */ | 18 | */ |
| 19 | @Mapper | 19 | @Mapper |
| 20 | public interface RoadInfoMapper extends BaseMapperX<RoadInfoDO> { | 20 | public interface RoadInfoMapper extends BaseMapperX<RoadInfoDO> { |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/workorders/WorkOrdersMapper.java
| @@ -14,7 +14,7 @@ import java.util.Map; | @@ -14,7 +14,7 @@ import java.util.Map; | ||
| 14 | /** | 14 | /** |
| 15 | * 工单 Mapper | 15 | * 工单 Mapper |
| 16 | * | 16 | * |
| 17 | - * @author 芋道源码 | 17 | + * @author 全域源码 |
| 18 | */ | 18 | */ |
| 19 | @Mapper | 19 | @Mapper |
| 20 | public interface WorkOrdersMapper extends BaseMapperX<WorkOrdersDO> { | 20 | public interface WorkOrdersMapper extends BaseMapperX<WorkOrdersDO> { |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/dal/mapper/workorderscommitdetail/WorkOrdersCommitDetailMapper.java
| @@ -14,7 +14,7 @@ import java.util.List; | @@ -14,7 +14,7 @@ import java.util.List; | ||
| 14 | /** | 14 | /** |
| 15 | * 任务处理结果 Mapper | 15 | * 任务处理结果 Mapper |
| 16 | * | 16 | * |
| 17 | - * @author 芋道源码 | 17 | + * @author 全域源码 |
| 18 | */ | 18 | */ |
| 19 | @Mapper | 19 | @Mapper |
| 20 | public interface WorkOrdersCommitDetailMapper extends BaseMapperX<WorkOrdersCommitDetailDO> { | 20 | public interface WorkOrdersCommitDetailMapper extends BaseMapperX<WorkOrdersCommitDetailDO> { |
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; | @@ -3,7 +3,7 @@ package com.zteits.urbanops.module.gloabl.dal.redis; | ||
| 3 | /** | 3 | /** |
| 4 | * ERP Redis Key 枚举类 | 4 | * ERP Redis Key 枚举类 |
| 5 | * | 5 | * |
| 6 | - * @author 芋道源码 | 6 | + * @author 全域源码 |
| 7 | */ | 7 | */ |
| 8 | public interface RedisKeyConstants { | 8 | public interface RedisKeyConstants { |
| 9 | 9 |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/flowpathidea/FlowpathIdeaService.java
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 | @@ -27,7 +27,7 @@ import static com.zteits.urbanops.module.gloabl.enums.ErrorCodeConstants.FLOWPAT | ||
| 27 | /** | 27 | /** |
| 28 | * 流程审核意见 Service 实现类 | 28 | * 流程审核意见 Service 实现类 |
| 29 | * | 29 | * |
| 30 | - * @author 芋道源码 | 30 | + * @author 全域源码 |
| 31 | */ | 31 | */ |
| 32 | @Service | 32 | @Service |
| 33 | @Validated | 33 | @Validated |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/problems/ProblemsService.java
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 | @@ -48,7 +48,7 @@ import static com.zteits.urbanops.module.gloabl.enums.ErrorCodeConstants.PROBLEM | ||
| 48 | /** | 48 | /** |
| 49 | * 事件表--问题单 Service 实现类 | 49 | * 事件表--问题单 Service 实现类 |
| 50 | * | 50 | * |
| 51 | - * @author 芋道源码 | 51 | + * @author 全域源码 |
| 52 | */ | 52 | */ |
| 53 | @Service | 53 | @Service |
| 54 | @Validated | 54 | @Validated |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/roadinfo/RoadInfoService.java
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 | @@ -32,7 +32,7 @@ import static com.zteits.urbanops.module.gloabl.enums.ErrorCodeConstants.ROAD_IN | ||
| 32 | /** | 32 | /** |
| 33 | * 道路信息对应关系 Service 实现类 | 33 | * 道路信息对应关系 Service 实现类 |
| 34 | * | 34 | * |
| 35 | - * @author 芋道源码 | 35 | + * @author 全域源码 |
| 36 | */ | 36 | */ |
| 37 | @Service | 37 | @Service |
| 38 | @Validated | 38 | @Validated |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorders/WorkOrdersService.java
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 | @@ -61,7 +61,7 @@ import static com.zteits.urbanops.module.gloabl.enums.ErrorCodeConstants.WORK_OR | ||
| 61 | /** | 61 | /** |
| 62 | * 工单 Service 实现类 | 62 | * 工单 Service 实现类 |
| 63 | * | 63 | * |
| 64 | - * @author 芋道源码 | 64 | + * @author 全域源码 |
| 65 | */ | 65 | */ |
| 66 | @Service | 66 | @Service |
| 67 | @Validated | 67 | @Validated |
urbanops-module-gloabl/src/main/java/com/zteits/urbanops/module/gloabl/service/workorderscommitdetail/WorkOrdersCommitDetailService.java
| @@ -13,7 +13,7 @@ import java.util.List; | @@ -13,7 +13,7 @@ import java.util.List; | ||
| 13 | /** | 13 | /** |
| 14 | * 任务处理结果 Service 接口 | 14 | * 任务处理结果 Service 接口 |
| 15 | * | 15 | * |
| 16 | - * @author 芋道源码 | 16 | + * @author 全域源码 |
| 17 | */ | 17 | */ |
| 18 | public interface WorkOrdersCommitDetailService { | 18 | public interface WorkOrdersCommitDetailService { |
| 19 | 19 |
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 | @@ -30,7 +30,7 @@ import static com.zteits.urbanops.module.gloabl.enums.ErrorCodeConstants.WORK_OR | ||
| 30 | /** | 30 | /** |
| 31 | * 任务处理结果 Service 实现类 | 31 | * 任务处理结果 Service 实现类 |
| 32 | * | 32 | * |
| 33 | - * @author 芋道源码 | 33 | + * @author 全域源码 |
| 34 | */ | 34 | */ |
| 35 | @Service | 35 | @Service |
| 36 | @Validated | 36 | @Validated |
urbanops-module-infra/src/main/java/com/zteits/urbanops/module/infra/controller/admin/codegen/CodegenController.java
| @@ -51,7 +51,7 @@ public class CodegenController { | @@ -51,7 +51,7 @@ public class CodegenController { | ||
| 51 | @Parameters({ | 51 | @Parameters({ |
| 52 | @Parameter(name = "dataSourceConfigId", description = "数据源配置的编号", required = true, example = "1"), | 52 | @Parameter(name = "dataSourceConfigId", description = "数据源配置的编号", required = true, example = "1"), |
| 53 | @Parameter(name = "name", description = "表名,模糊匹配", example = "urbanops"), | 53 | @Parameter(name = "name", description = "表名,模糊匹配", example = "urbanops"), |
| 54 | - @Parameter(name = "comment", description = "描述,模糊匹配", example = "芋道") | 54 | + @Parameter(name = "comment", description = "描述,模糊匹配", example = "全域") |
| 55 | }) | 55 | }) |
| 56 | @PreAuthorize("@ss.hasPermission('infra:codegen:query')") | 56 | @PreAuthorize("@ss.hasPermission('infra:codegen:query')") |
| 57 | public CommonResult<List<DatabaseTableRespVO>> getDatabaseTableList( | 57 | public CommonResult<List<DatabaseTableRespVO>> getDatabaseTableList( |
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 { | @@ -16,7 +16,7 @@ public class CodegenTablePageReqVO extends PageParam { | ||
| 16 | @Schema(description = "表名称,模糊匹配", example = "urbanops") | 16 | @Schema(description = "表名称,模糊匹配", example = "urbanops") |
| 17 | private String tableName; | 17 | private String tableName; |
| 18 | 18 | ||
| 19 | - @Schema(description = "表描述,模糊匹配", example = "芋道") | 19 | + @Schema(description = "表描述,模糊匹配", example = "全域") |
| 20 | private String tableComment; | 20 | private String tableComment; |
| 21 | 21 | ||
| 22 | @Schema(description = "实体,模糊匹配", example = "Urbanops") | 22 | @Schema(description = "实体,模糊匹配", example = "Urbanops") |
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 { | @@ -18,7 +18,7 @@ public class CodegenTableRespVO { | ||
| 18 | @Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "urbanops") | 18 | @Schema(description = "表名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "urbanops") |
| 19 | private String tableName; | 19 | private String tableName; |
| 20 | 20 | ||
| 21 | - @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 21 | + @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 22 | private String tableComment; | 22 | private String tableComment; |
| 23 | 23 | ||
| 24 | @Schema(description = "备注", example = "我是备注") | 24 | @Schema(description = "备注", example = "我是备注") |
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 { | @@ -24,7 +24,7 @@ public class CodegenTableSaveReqVO { | ||
| 24 | @NotNull(message = "表名称不能为空") | 24 | @NotNull(message = "表名称不能为空") |
| 25 | private String tableName; | 25 | private String tableName; |
| 26 | 26 | ||
| 27 | - @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 27 | + @Schema(description = "表描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 28 | @NotNull(message = "表描述不能为空") | 28 | @NotNull(message = "表描述不能为空") |
| 29 | private String tableComment; | 29 | private String tableComment; |
| 30 | 30 |
urbanops-module-infra/src/test/java/com/zteits/urbanops/module/infra/service/file/FileConfigServiceImplTest.java
| @@ -191,7 +191,7 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest { | @@ -191,7 +191,7 @@ public class FileConfigServiceImplTest extends BaseDbUnitTest { | ||
| 191 | fileConfigMapper.insert(cloneIgnoreId(dbFileConfig, o -> o.setCreateTime(LocalDateTimeUtil.parse("2020-11-23", DatePattern.NORM_DATE_PATTERN)))); | 191 | fileConfigMapper.insert(cloneIgnoreId(dbFileConfig, o -> o.setCreateTime(LocalDateTimeUtil.parse("2020-11-23", DatePattern.NORM_DATE_PATTERN)))); |
| 192 | // 准备参数 | 192 | // 准备参数 |
| 193 | FileConfigPageReqVO reqVO = new FileConfigPageReqVO(); | 193 | FileConfigPageReqVO reqVO = new FileConfigPageReqVO(); |
| 194 | - reqVO.setName("芋道"); | 194 | + reqVO.setName("全域"); |
| 195 | reqVO.setStorage(FileStorageEnum.LOCAL.getStorage()); | 195 | reqVO.setStorage(FileStorageEnum.LOCAL.getStorage()); |
| 196 | reqVO.setCreateTime((new LocalDateTime[]{buildTime(2020, 1, 1), | 196 | reqVO.setCreateTime((new LocalDateTime[]{buildTime(2020, 1, 1), |
| 197 | buildTime(2020, 1, 24)})); | 197 | buildTime(2020, 1, 24)})); |
urbanops-module-infra/src/test/resources/application-unit-test.yaml
| @@ -42,9 +42,9 @@ mybatis-plus: | @@ -42,9 +42,9 @@ mybatis-plus: | ||
| 42 | 42 | ||
| 43 | --- #################### 监控相关配置 #################### | 43 | --- #################### 监控相关配置 #################### |
| 44 | 44 | ||
| 45 | ---- #################### 芋道相关配置 #################### | 45 | +--- #################### 全域相关配置 #################### |
| 46 | 46 | ||
| 47 | -# 芋道配置项,设置当前项目所有自定义的配置 | 47 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 48 | urbanops: | 48 | urbanops: |
| 49 | info: | 49 | info: |
| 50 | base-package: com.zteits.urbanops | 50 | base-package: com.zteits.urbanops |
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; | @@ -6,7 +6,7 @@ import org.springframework.stereotype.Component; | ||
| 6 | import java.time.Duration; | 6 | import java.time.Duration; |
| 7 | 7 | ||
| 8 | /** | 8 | /** |
| 9 | - * 芋道 IoT 全局配置类 | 9 | + * 全域 IoT 全局配置类 |
| 10 | * | 10 | * |
| 11 | * @author ZIEITS | 11 | * @author ZIEITS |
| 12 | */ | 12 | */ |
urbanops-module-iot/urbanops-module-iot-biz/src/test/resources/application-unit-test.yaml
| @@ -39,9 +39,9 @@ logging: | @@ -39,9 +39,9 @@ logging: | ||
| 39 | 39 | ||
| 40 | --- #################### 监控相关配置 #################### | 40 | --- #################### 监控相关配置 #################### |
| 41 | 41 | ||
| 42 | ---- #################### 芋道相关配置 #################### | 42 | +--- #################### 全域相关配置 #################### |
| 43 | 43 | ||
| 44 | -# 芋道配置项,设置当前项目所有自定义的配置 | 44 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 45 | urbanops: | 45 | urbanops: |
| 46 | info: | 46 | info: |
| 47 | base-package: com.zteits.urbanops | 47 | base-package: com.zteits.urbanops |
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 { | @@ -15,7 +15,7 @@ public class AppProductSpuDetailRespVO { | ||
| 15 | 15 | ||
| 16 | // ========== 基本信息 ========= | 16 | // ========== 基本信息 ========= |
| 17 | 17 | ||
| 18 | - @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 18 | + @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 19 | private String name; | 19 | private String name; |
| 20 | 20 | ||
| 21 | @Schema(description = "商品简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是一个快乐简介") | 21 | @Schema(description = "商品简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "我是一个快乐简介") |
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 { | @@ -12,7 +12,7 @@ public class AppProductSpuRespVO { | ||
| 12 | @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") | 12 | @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") |
| 13 | private Long id; | 13 | private Long id; |
| 14 | 14 | ||
| 15 | - @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 15 | + @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 16 | private String name; | 16 | private String name; |
| 17 | 17 | ||
| 18 | @Schema(description = "商品简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "清凉小短袖简介") | 18 | @Schema(description = "商品简介", requiredMode = Schema.RequiredMode.REQUIRED, example = "清凉小短袖简介") |
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 { | @@ -120,7 +120,7 @@ public class ProductBrandServiceImplTest extends BaseDbUnitTest { | ||
| 120 | brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCreateTime(buildTime(2022, 3, 1)))); | 120 | brandMapper.insert(cloneIgnoreId(dbBrand, o -> o.setCreateTime(buildTime(2022, 3, 1)))); |
| 121 | // 准备参数 | 121 | // 准备参数 |
| 122 | ProductBrandPageReqVO reqVO = new ProductBrandPageReqVO(); | 122 | ProductBrandPageReqVO reqVO = new ProductBrandPageReqVO(); |
| 123 | - reqVO.setName("芋道"); | 123 | + reqVO.setName("全域"); |
| 124 | reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); | 124 | reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); |
| 125 | reqVO.setCreateTime((new LocalDateTime[]{buildTime(2022, 1, 1), buildTime(2022, 2, 25)})); | 125 | reqVO.setCreateTime((new LocalDateTime[]{buildTime(2022, 1, 1), buildTime(2022, 2, 25)})); |
| 126 | 126 |
urbanops-module-mall/urbanops-module-product/src/test/resources/application-unit-test.yaml
| @@ -41,9 +41,9 @@ mybatis-plus: | @@ -41,9 +41,9 @@ mybatis-plus: | ||
| 41 | 41 | ||
| 42 | --- #################### 监控相关配置 #################### | 42 | --- #################### 监控相关配置 #################### |
| 43 | 43 | ||
| 44 | ---- #################### 芋道相关配置 #################### | 44 | +--- #################### 全域相关配置 #################### |
| 45 | 45 | ||
| 46 | -# 芋道配置项,设置当前项目所有自定义的配置 | 46 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 47 | urbanops: | 47 | urbanops: |
| 48 | info: | 48 | info: |
| 49 | base-package: com.zteits.urbanops | 49 | base-package: com.zteits.urbanops |
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 { | @@ -16,7 +16,7 @@ public class KeFuConversationRespVO { | ||
| 16 | private Long userId; | 16 | private Long userId; |
| 17 | @Schema(description = "会话所属用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://urbanops.com/images/avatar.jpg") | 17 | @Schema(description = "会话所属用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://urbanops.com/images/avatar.jpg") |
| 18 | private String userAvatar; | 18 | private String userAvatar; |
| 19 | - @Schema(description = "会话所属用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 19 | + @Schema(description = "会话所属用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 20 | private String userNickname; | 20 | private String userNickname; |
| 21 | 21 | ||
| 22 | @Schema(description = "最后聊天时间", requiredMode = Schema.RequiredMode.REQUIRED) | 22 | @Schema(description = "最后聊天时间", requiredMode = Schema.RequiredMode.REQUIRED) |
| @@ -43,4 +43,4 @@ public class KeFuConversationRespVO { | @@ -43,4 +43,4 @@ public class KeFuConversationRespVO { | ||
| 43 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) | 43 | @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) |
| 44 | private LocalDateTime createTime; | 44 | private LocalDateTime createTime; |
| 45 | 45 | ||
| 46 | -} | ||
| 47 | \ No newline at end of file | 46 | \ No newline at end of file |
| 47 | +} |
urbanops-module-mall/urbanops-module-promotion/src/test/resources/application-unit-test.yaml
| @@ -40,9 +40,9 @@ mybatis: | @@ -40,9 +40,9 @@ mybatis: | ||
| 40 | 40 | ||
| 41 | --- #################### 监控相关配置 #################### | 41 | --- #################### 监控相关配置 #################### |
| 42 | 42 | ||
| 43 | ---- #################### 芋道相关配置 #################### | 43 | +--- #################### 全域相关配置 #################### |
| 44 | 44 | ||
| 45 | -# 芋道配置项,设置当前项目所有自定义的配置 | 45 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 46 | urbanops: | 46 | urbanops: |
| 47 | info: | 47 | info: |
| 48 | base-package: com.zteits.urbanops.module | 48 | base-package: com.zteits.urbanops.module |
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 { | @@ -14,7 +14,7 @@ public class AppProductSpuBaseRespVO { | ||
| 14 | @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 14 | @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 15 | private Long id; | 15 | private Long id; |
| 16 | 16 | ||
| 17 | - @Schema(description = "商品 SPU 名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 17 | + @Schema(description = "商品 SPU 名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 18 | private String name; | 18 | private String name; |
| 19 | 19 | ||
| 20 | @Schema(description = "商品主图地址", example = "https://www.iocoder.cn/xx.png") | 20 | @Schema(description = "商品主图地址", example = "https://www.iocoder.cn/xx.png") |
urbanops-module-mall/urbanops-module-trade/src/test/resources/application-unit-test.yaml
| @@ -40,9 +40,9 @@ mybatis: | @@ -40,9 +40,9 @@ mybatis: | ||
| 40 | 40 | ||
| 41 | --- #################### 监控相关配置 #################### | 41 | --- #################### 监控相关配置 #################### |
| 42 | 42 | ||
| 43 | ---- #################### 芋道相关配置 #################### | 43 | +--- #################### 全域相关配置 #################### |
| 44 | 44 | ||
| 45 | -# 芋道配置项,设置当前项目所有自定义的配置 | 45 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 46 | urbanops: | 46 | urbanops: |
| 47 | info: | 47 | info: |
| 48 | base-package: com.zteits.urbanops.module | 48 | base-package: com.zteits.urbanops.module |
| @@ -57,4 +57,4 @@ urbanops: | @@ -57,4 +57,4 @@ urbanops: | ||
| 57 | kd100: | 57 | kd100: |
| 58 | customer: xxxxx | 58 | customer: xxxxx |
| 59 | key: xxxxx | 59 | key: xxxxx |
| 60 | - client: not_provide | ||
| 61 | \ No newline at end of file | 60 | \ No newline at end of file |
| 61 | + client: not_provide |
urbanops-module-member/src/test/resources/application-unit-test.yaml
| @@ -40,9 +40,9 @@ mybatis: | @@ -40,9 +40,9 @@ mybatis: | ||
| 40 | 40 | ||
| 41 | --- #################### 监控相关配置 #################### | 41 | --- #################### 监控相关配置 #################### |
| 42 | 42 | ||
| 43 | ---- #################### 芋道相关配置 #################### | 43 | +--- #################### 全域相关配置 #################### |
| 44 | 44 | ||
| 45 | -# 芋道配置项,设置当前项目所有自定义的配置 | 45 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 46 | urbanops: | 46 | urbanops: |
| 47 | info: | 47 | info: |
| 48 | base-package: com.zteits.urbanops.module | 48 | base-package: com.zteits.urbanops.module |
urbanops-module-mp/src/main/java/com/zteits/urbanops/module/mp/controller/admin/user/vo/MpUserRespVO.java
| @@ -26,7 +26,7 @@ public class MpUserRespVO { | @@ -26,7 +26,7 @@ public class MpUserRespVO { | ||
| 26 | @Schema(description = "取消关注时间") | 26 | @Schema(description = "取消关注时间") |
| 27 | private LocalDateTime unsubscribeTime; | 27 | private LocalDateTime unsubscribeTime; |
| 28 | 28 | ||
| 29 | - @Schema(description = "昵称", example = "芋道") | 29 | + @Schema(description = "昵称", example = "全域") |
| 30 | private String nickname; | 30 | private String nickname; |
| 31 | @Schema(description = "头像地址", example = "https://www.iocoder.cn/1.png") | 31 | @Schema(description = "头像地址", example = "https://www.iocoder.cn/1.png") |
| 32 | private String headImageUrl; | 32 | private String headImageUrl; |
urbanops-module-mp/src/main/java/com/zteits/urbanops/module/mp/controller/admin/user/vo/MpUserUpdateReqVO.java
| @@ -14,7 +14,7 @@ public class MpUserUpdateReqVO { | @@ -14,7 +14,7 @@ public class MpUserUpdateReqVO { | ||
| 14 | @NotNull(message = "编号不能为空") | 14 | @NotNull(message = "编号不能为空") |
| 15 | private Long id; | 15 | private Long id; |
| 16 | 16 | ||
| 17 | - @Schema(description = "昵称", example = "芋道") | 17 | + @Schema(description = "昵称", example = "全域") |
| 18 | private String nickname; | 18 | private String nickname; |
| 19 | 19 | ||
| 20 | @Schema(description = "备注", example = "你是一个芋头嘛") | 20 | @Schema(description = "备注", example = "你是一个芋头嘛") |
urbanops-module-pay/src/test/resources/application-unit-test.yaml
| @@ -40,9 +40,9 @@ mybatis: | @@ -40,9 +40,9 @@ mybatis: | ||
| 40 | 40 | ||
| 41 | --- #################### 监控相关配置 #################### | 41 | --- #################### 监控相关配置 #################### |
| 42 | 42 | ||
| 43 | ---- #################### 芋道相关配置 #################### | 43 | +--- #################### 全域相关配置 #################### |
| 44 | 44 | ||
| 45 | -# 芋道配置项,设置当前项目所有自定义的配置 | 45 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 46 | urbanops: | 46 | urbanops: |
| 47 | info: | 47 | info: |
| 48 | base-package: com.zteits.urbanops.module | 48 | base-package: com.zteits.urbanops.module |
urbanops-module-report/src/test/java/com/zteits/urbanops/module/report/service/goview/GoViewDataServiceImplTest.java
| @@ -40,7 +40,7 @@ public class GoViewDataServiceImplTest extends BaseDbUnitTest { | @@ -40,7 +40,7 @@ public class GoViewDataServiceImplTest extends BaseDbUnitTest { | ||
| 40 | // mock 数据明细 | 40 | // mock 数据明细 |
| 41 | when(sqlRowSet.next()).thenReturn(true).thenReturn(true).thenReturn(false); | 41 | when(sqlRowSet.next()).thenReturn(true).thenReturn(true).thenReturn(false); |
| 42 | when(sqlRowSet.getObject("id")).thenReturn(1L).thenReturn(2L); | 42 | when(sqlRowSet.getObject("id")).thenReturn(1L).thenReturn(2L); |
| 43 | - when(sqlRowSet.getObject("name")).thenReturn("ZIEITS").thenReturn("芋道"); | 43 | + when(sqlRowSet.getObject("name")).thenReturn("ZIEITS").thenReturn("全域"); |
| 44 | 44 | ||
| 45 | // 调用 | 45 | // 调用 |
| 46 | GoViewDataRespVO dataBySQL = goViewDataService.getDataBySQL(sql); | 46 | GoViewDataRespVO dataBySQL = goViewDataService.getDataBySQL(sql); |
| @@ -52,7 +52,7 @@ public class GoViewDataServiceImplTest extends BaseDbUnitTest { | @@ -52,7 +52,7 @@ public class GoViewDataServiceImplTest extends BaseDbUnitTest { | ||
| 52 | assertEquals("ZIEITS", dataBySQL.getSource().get(0).get("name")); | 52 | assertEquals("ZIEITS", dataBySQL.getSource().get(0).get("name")); |
| 53 | assertEquals(2, dataBySQL.getSource().get(1).size()); | 53 | assertEquals(2, dataBySQL.getSource().get(1).size()); |
| 54 | assertEquals(2L, dataBySQL.getSource().get(1).get("id")); | 54 | assertEquals(2L, dataBySQL.getSource().get(1).get("id")); |
| 55 | - assertEquals("芋道", dataBySQL.getSource().get(1).get("name")); | 55 | + assertEquals("全域", dataBySQL.getSource().get(1).get("name")); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | } | 58 | } |
urbanops-module-report/src/test/resources/application-unit-test.yaml
| @@ -40,9 +40,9 @@ mybatis: | @@ -40,9 +40,9 @@ mybatis: | ||
| 40 | 40 | ||
| 41 | --- #################### 监控相关配置 #################### | 41 | --- #################### 监控相关配置 #################### |
| 42 | 42 | ||
| 43 | ---- #################### 芋道相关配置 #################### | 43 | +--- #################### 全域相关配置 #################### |
| 44 | 44 | ||
| 45 | -# 芋道配置项,设置当前项目所有自定义的配置 | 45 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 46 | urbanops: | 46 | urbanops: |
| 47 | info: | 47 | info: |
| 48 | base-package: com.zteits.urbanops.module | 48 | base-package: com.zteits.urbanops.module |
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; | @@ -15,13 +15,13 @@ import java.util.List; | ||
| 15 | @Builder | 15 | @Builder |
| 16 | public class AuthMenuRespVO { | 16 | public class AuthMenuRespVO { |
| 17 | 17 | ||
| 18 | - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 18 | + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 19 | private Long id; | 19 | private Long id; |
| 20 | 20 | ||
| 21 | @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 21 | @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 22 | private Long parentId; | 22 | private Long parentId; |
| 23 | 23 | ||
| 24 | - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 24 | + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 25 | private String name; | 25 | private String name; |
| 26 | 26 | ||
| 27 | @Schema(description = "路由地址,仅菜单类型为菜单或者目录时,才需要传", example = "post") | 27 | @Schema(description = "路由地址,仅菜单类型为菜单或者目录时,才需要传", example = "post") |
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java
| @@ -69,13 +69,13 @@ public class AuthPermissionInfoRespVO { | @@ -69,13 +69,13 @@ public class AuthPermissionInfoRespVO { | ||
| 69 | @Builder | 69 | @Builder |
| 70 | public static class MenuVO { | 70 | public static class MenuVO { |
| 71 | 71 | ||
| 72 | - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 72 | + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 73 | private Long id; | 73 | private Long id; |
| 74 | 74 | ||
| 75 | @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 75 | @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 76 | private Long parentId; | 76 | private Long parentId; |
| 77 | 77 | ||
| 78 | - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 78 | + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 79 | private String name; | 79 | private String name; |
| 80 | 80 | ||
| 81 | @Schema(description = "路由地址,仅菜单类型为菜单或者目录时,才需要传", example = "post") | 81 | @Schema(description = "路由地址,仅菜单类型为菜单或者目录时,才需要传", example = "post") |
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; | @@ -7,7 +7,7 @@ import lombok.Data; | ||
| 7 | @Data | 7 | @Data |
| 8 | public class DeptListReqVO { | 8 | public class DeptListReqVO { |
| 9 | 9 | ||
| 10 | - @Schema(description = "部门名称,模糊匹配", example = "芋道") | 10 | + @Schema(description = "部门名称,模糊匹配", example = "全域") |
| 11 | private String name; | 11 | private String name; |
| 12 | 12 | ||
| 13 | @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1") | 13 | @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1") |
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 { | @@ -12,7 +12,7 @@ public class DeptRespVO { | ||
| 12 | @Schema(description = "部门编号", example = "1024") | 12 | @Schema(description = "部门编号", example = "1024") |
| 13 | private Long id; | 13 | private Long id; |
| 14 | 14 | ||
| 15 | - @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 15 | + @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 16 | private String name; | 16 | private String name; |
| 17 | 17 | ||
| 18 | @Schema(description = "父部门 ID", example = "1024") | 18 | @Schema(description = "父部门 ID", example = "1024") |
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 { | @@ -17,7 +17,7 @@ public class DeptSaveReqVO { | ||
| 17 | @Schema(description = "部门编号", example = "1024") | 17 | @Schema(description = "部门编号", example = "1024") |
| 18 | private Long id; | 18 | private Long id; |
| 19 | 19 | ||
| 20 | - @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 20 | + @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 21 | @NotBlank(message = "部门名称不能为空") | 21 | @NotBlank(message = "部门名称不能为空") |
| 22 | @Size(max = 30, message = "部门名称长度不能超过 30 个字符") | 22 | @Size(max = 30, message = "部门名称长度不能超过 30 个字符") |
| 23 | private String name; | 23 | private String name; |
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 { | @@ -14,7 +14,7 @@ public class DeptSimpleRespVO { | ||
| 14 | @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 14 | @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 15 | private Long id; | 15 | private Long id; |
| 16 | 16 | ||
| 17 | - @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 17 | + @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 18 | private String name; | 18 | private String name; |
| 19 | 19 | ||
| 20 | @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 20 | @Schema(description = "父部门 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
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 { | @@ -13,7 +13,7 @@ public class PostPageReqVO extends PageParam { | ||
| 13 | @Schema(description = "岗位编码,模糊匹配", example = "urbanops") | 13 | @Schema(description = "岗位编码,模糊匹配", example = "urbanops") |
| 14 | private String code; | 14 | private String code; |
| 15 | 15 | ||
| 16 | - @Schema(description = "岗位名称,模糊匹配", example = "芋道") | 16 | + @Schema(description = "岗位名称,模糊匹配", example = "全域") |
| 17 | private String name; | 17 | private String name; |
| 18 | 18 | ||
| 19 | @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1") | 19 | @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1") |
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; | @@ -14,7 +14,7 @@ import jakarta.validation.constraints.Size; | ||
| 14 | @EqualsAndHashCode(callSuper = true) | 14 | @EqualsAndHashCode(callSuper = true) |
| 15 | public class DictDataPageReqVO extends PageParam { | 15 | public class DictDataPageReqVO extends PageParam { |
| 16 | 16 | ||
| 17 | - @Schema(description = "字典标签", example = "芋道") | 17 | + @Schema(description = "字典标签", example = "全域") |
| 18 | @Size(max = 100, message = "字典标签长度不能超过100个字符") | 18 | @Size(max = 100, message = "字典标签长度不能超过100个字符") |
| 19 | private String label; | 19 | private String label; |
| 20 | 20 |
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 { | @@ -23,7 +23,7 @@ public class DictDataRespVO { | ||
| 23 | @ExcelProperty("字典排序") | 23 | @ExcelProperty("字典排序") |
| 24 | private Integer sort; | 24 | private Integer sort; |
| 25 | 25 | ||
| 26 | - @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 26 | + @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 27 | @ExcelProperty("字典标签") | 27 | @ExcelProperty("字典标签") |
| 28 | private String label; | 28 | private String label; |
| 29 | 29 |
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 { | @@ -20,7 +20,7 @@ public class DictDataSaveReqVO { | ||
| 20 | @NotNull(message = "显示顺序不能为空") | 20 | @NotNull(message = "显示顺序不能为空") |
| 21 | private Integer sort; | 21 | private Integer sort; |
| 22 | 22 | ||
| 23 | - @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 23 | + @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 24 | @NotBlank(message = "字典标签不能为空") | 24 | @NotBlank(message = "字典标签不能为空") |
| 25 | @Size(max = 100, message = "字典标签长度不能超过100个字符") | 25 | @Size(max = 100, message = "字典标签长度不能超过100个字符") |
| 26 | private String label; | 26 | private String label; |
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 | @@ -16,7 +16,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE | ||
| 16 | @EqualsAndHashCode(callSuper = true) | 16 | @EqualsAndHashCode(callSuper = true) |
| 17 | public class DictTypePageReqVO extends PageParam { | 17 | public class DictTypePageReqVO extends PageParam { |
| 18 | 18 | ||
| 19 | - @Schema(description = "字典类型名称,模糊匹配", example = "芋道") | 19 | + @Schema(description = "字典类型名称,模糊匹配", example = "全域") |
| 20 | private String name; | 20 | private String name; |
| 21 | 21 | ||
| 22 | @Schema(description = "字典类型,模糊匹配", example = "sys_common_sex") | 22 | @Schema(description = "字典类型,模糊匹配", example = "sys_common_sex") |
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 { | @@ -10,7 +10,7 @@ public class DictTypeSimpleRespVO { | ||
| 10 | @Schema(description = "字典类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 10 | @Schema(description = "字典类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 11 | private Long id; | 11 | private Long id; |
| 12 | 12 | ||
| 13 | - @Schema(description = "字典类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 13 | + @Schema(description = "字典类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 14 | private String name; | 14 | private String name; |
| 15 | 15 | ||
| 16 | @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "sys_common_sex") | 16 | @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "sys_common_sex") |
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 { | @@ -18,7 +18,7 @@ public class LoginLogPageReqVO extends PageParam { | ||
| 18 | @Schema(description = "用户 IP,模拟匹配", example = "127.0.0.1") | 18 | @Schema(description = "用户 IP,模拟匹配", example = "127.0.0.1") |
| 19 | private String userIp; | 19 | private String userIp; |
| 20 | 20 | ||
| 21 | - @Schema(description = "用户账号,模拟匹配", example = "芋道") | 21 | + @Schema(description = "用户账号,模拟匹配", example = "全域") |
| 22 | private String username; | 22 | private String username; |
| 23 | 23 | ||
| 24 | @Schema(description = "操作状态", example = "true") | 24 | @Schema(description = "操作状态", example = "true") |
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 | @@ -13,7 +13,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE | ||
| 13 | @Data | 13 | @Data |
| 14 | public class OperateLogPageReqVO extends PageParam { | 14 | public class OperateLogPageReqVO extends PageParam { |
| 15 | 15 | ||
| 16 | - @Schema(description = "用户编号", example = "芋道") | 16 | + @Schema(description = "用户编号", example = "全域") |
| 17 | private Long userId; | 17 | private Long userId; |
| 18 | 18 | ||
| 19 | @Schema(description = "操作模块业务编号", example = "1") | 19 | @Schema(description = "操作模块业务编号", example = "1") |
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 { | @@ -43,7 +43,7 @@ public class OperateLogRespVO implements VO { | ||
| 43 | @ExcelProperty("操作模块业务编号") | 43 | @ExcelProperty("操作模块业务编号") |
| 44 | private Long bizId; | 44 | private Long bizId; |
| 45 | 45 | ||
| 46 | - @Schema(description = "操作明细", example = "修改编号为 1 的用户信息,将性别从男改成女,将姓名从芋道改成源码。") | 46 | + @Schema(description = "操作明细", example = "修改编号为 1 的用户信息,将性别从男改成女,将姓名从全域改成源码。") |
| 47 | private String action; | 47 | private String action; |
| 48 | 48 | ||
| 49 | @Schema(description = "拓展字段", example = "{'orderId': 1}") | 49 | @Schema(description = "拓展字段", example = "{'orderId': 1}") |
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/notice/vo/NoticePageReqVO.java
| @@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode; | @@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode; | ||
| 10 | @EqualsAndHashCode(callSuper = true) | 10 | @EqualsAndHashCode(callSuper = true) |
| 11 | public class NoticePageReqVO extends PageParam { | 11 | public class NoticePageReqVO extends PageParam { |
| 12 | 12 | ||
| 13 | - @Schema(description = "通知公告名称,模糊匹配", example = "芋道") | 13 | + @Schema(description = "通知公告名称,模糊匹配", example = "全域") |
| 14 | private String title; | 14 | private String title; |
| 15 | 15 | ||
| 16 | @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1") | 16 | @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1") |
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 { | @@ -19,7 +19,7 @@ public class OAuth2UserInfoRespVO { | ||
| 19 | @Schema(description = "用户账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") | 19 | @Schema(description = "用户账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") |
| 20 | private String username; | 20 | private String username; |
| 21 | 21 | ||
| 22 | - @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 22 | + @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 23 | private String nickname; | 23 | private String nickname; |
| 24 | 24 | ||
| 25 | @Schema(description = "用户邮箱", example = "urbanops@iocoder.cn") | 25 | @Schema(description = "用户邮箱", example = "urbanops@iocoder.cn") |
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; | @@ -7,7 +7,7 @@ import lombok.Data; | ||
| 7 | @Data | 7 | @Data |
| 8 | public class MenuListReqVO { | 8 | public class MenuListReqVO { |
| 9 | 9 | ||
| 10 | - @Schema(description = "菜单名称,模糊匹配", example = "芋道") | 10 | + @Schema(description = "菜单名称,模糊匹配", example = "全域") |
| 11 | private String name; | 11 | private String name; |
| 12 | 12 | ||
| 13 | @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1") | 13 | @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1") |
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 { | @@ -15,7 +15,7 @@ public class MenuRespVO { | ||
| 15 | @Schema(description = "菜单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 15 | @Schema(description = "菜单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 16 | private Long id; | 16 | private Long id; |
| 17 | 17 | ||
| 18 | - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 18 | + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 19 | @NotBlank(message = "菜单名称不能为空") | 19 | @NotBlank(message = "菜单名称不能为空") |
| 20 | @Size(max = 50, message = "菜单名称长度不能超过50个字符") | 20 | @Size(max = 50, message = "菜单名称长度不能超过50个字符") |
| 21 | private String name; | 21 | private String name; |
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 { | @@ -14,7 +14,7 @@ public class MenuSaveVO { | ||
| 14 | @Schema(description = "菜单编号", example = "1024") | 14 | @Schema(description = "菜单编号", example = "1024") |
| 15 | private Long id; | 15 | private Long id; |
| 16 | 16 | ||
| 17 | - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 17 | + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 18 | @NotBlank(message = "菜单名称不能为空") | 18 | @NotBlank(message = "菜单名称不能为空") |
| 19 | @Size(max = 50, message = "菜单名称长度不能超过50个字符") | 19 | @Size(max = 50, message = "菜单名称长度不能超过50个字符") |
| 20 | private String name; | 20 | private String name; |
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 { | @@ -10,7 +10,7 @@ public class MenuSimpleRespVO { | ||
| 10 | @Schema(description = "菜单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 10 | @Schema(description = "菜单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 11 | private Long id; | 11 | private Long id; |
| 12 | 12 | ||
| 13 | - @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 13 | + @Schema(description = "菜单名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 14 | private String name; | 14 | private String name; |
| 15 | 15 | ||
| 16 | @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 16 | @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
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 | @@ -15,7 +15,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE | ||
| 15 | @EqualsAndHashCode(callSuper = true) | 15 | @EqualsAndHashCode(callSuper = true) |
| 16 | public class RolePageReqVO extends PageParam { | 16 | public class RolePageReqVO extends PageParam { |
| 17 | 17 | ||
| 18 | - @Schema(description = "角色名称,模糊匹配", example = "芋道") | 18 | + @Schema(description = "角色名称,模糊匹配", example = "全域") |
| 19 | private String name; | 19 | private String name; |
| 20 | 20 | ||
| 21 | @Schema(description = "角色标识,模糊匹配", example = "urbanops") | 21 | @Schema(description = "角色标识,模糊匹配", example = "urbanops") |
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 { | @@ -12,7 +12,7 @@ public class RoleSimpleRespVO { | ||
| 12 | @Schema(description = "角色编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 12 | @Schema(description = "角色编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 13 | private Long id; | 13 | private Long id; |
| 14 | 14 | ||
| 15 | - @Schema(description = "角色名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 15 | + @Schema(description = "角色名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 16 | private String name; | 16 | private String name; |
| 17 | 17 | ||
| 18 | } | 18 | } |
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/tenant/TenantController.http
| @@ -8,7 +8,7 @@ Authorization: Bearer {{token}} | @@ -8,7 +8,7 @@ Authorization: Bearer {{token}} | ||
| 8 | tenant-id: {{adminTenantId}} | 8 | tenant-id: {{adminTenantId}} |
| 9 | 9 | ||
| 10 | { | 10 | { |
| 11 | - "name": "芋道", | 11 | + "name": "全域", |
| 12 | "contactName": "芋艿", | 12 | "contactName": "芋艿", |
| 13 | "contactMobile": "15601691300", | 13 | "contactMobile": "15601691300", |
| 14 | "status": 0, | 14 | "status": 0, |
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 | @@ -17,7 +17,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE | ||
| 17 | @ToString(callSuper = true) | 17 | @ToString(callSuper = true) |
| 18 | public class TenantPageReqVO extends PageParam { | 18 | public class TenantPageReqVO extends PageParam { |
| 19 | 19 | ||
| 20 | - @Schema(description = "租户名", example = "芋道") | 20 | + @Schema(description = "租户名", example = "全域") |
| 21 | private String name; | 21 | private String name; |
| 22 | 22 | ||
| 23 | @Schema(description = "联系人", example = "芋艿") | 23 | @Schema(description = "联系人", example = "芋艿") |
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 { | @@ -20,7 +20,7 @@ public class TenantRespVO { | ||
| 20 | @ExcelProperty("租户编号") | 20 | @ExcelProperty("租户编号") |
| 21 | private Long id; | 21 | private Long id; |
| 22 | 22 | ||
| 23 | - @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 23 | + @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 24 | @ExcelProperty("租户名") | 24 | @ExcelProperty("租户名") |
| 25 | private String name; | 25 | private String name; |
| 26 | 26 |
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 { | @@ -20,7 +20,7 @@ public class TenantSaveReqVO { | ||
| 20 | @Schema(description = "租户编号", example = "1024") | 20 | @Schema(description = "租户编号", example = "1024") |
| 21 | private Long id; | 21 | private Long id; |
| 22 | 22 | ||
| 23 | - @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 23 | + @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 24 | @NotNull(message = "租户名不能为空") | 24 | @NotNull(message = "租户名不能为空") |
| 25 | private String name; | 25 | private String name; |
| 26 | 26 |
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/UserController.java
| @@ -172,7 +172,7 @@ public class UserController { | @@ -172,7 +172,7 @@ public class UserController { | ||
| 172 | // 手动创建导出 demo | 172 | // 手动创建导出 demo |
| 173 | List<UserImportExcelVO> list = Arrays.asList( | 173 | List<UserImportExcelVO> list = Arrays.asList( |
| 174 | UserImportExcelVO.builder().username("yunai").deptId(1L).email("yunai@iocoder.cn").mobile("15601691300") | 174 | UserImportExcelVO.builder().username("yunai").deptId(1L).email("yunai@iocoder.cn").mobile("15601691300") |
| 175 | - .nickname("芋道").status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(), | 175 | + .nickname("全域").status(CommonStatusEnum.ENABLE.getStatus()).sex(SexEnum.MALE.getSex()).build(), |
| 176 | UserImportExcelVO.builder().username("yuanma").deptId(2L).email("yuanma@iocoder.cn").mobile("15601701300") | 176 | UserImportExcelVO.builder().username("yuanma").deptId(2L).email("yuanma@iocoder.cn").mobile("15601701300") |
| 177 | .nickname("源码").status(CommonStatusEnum.DISABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build() | 177 | .nickname("源码").status(CommonStatusEnum.DISABLE.getStatus()).sex(SexEnum.FEMALE.getSex()).build() |
| 178 | ); | 178 | ); |
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 { | @@ -14,7 +14,7 @@ public class UserSimpleRespVO { | ||
| 14 | @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 14 | @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 15 | private Long id; | 15 | private Long id; |
| 16 | 16 | ||
| 17 | - @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 17 | + @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 18 | private String nickname; | 18 | private String nickname; |
| 19 | 19 | ||
| 20 | @Schema(description = "部门ID", example = "我是一个用户") | 20 | @Schema(description = "部门ID", example = "我是一个用户") |
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/dict/vo/AppDictDataRespVO.java
| @@ -14,7 +14,7 @@ public class AppDictDataRespVO { | @@ -14,7 +14,7 @@ public class AppDictDataRespVO { | ||
| 14 | @Schema(description = "字典数据编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 14 | @Schema(description = "字典数据编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 15 | private Long id; | 15 | private Long id; |
| 16 | 16 | ||
| 17 | - @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 17 | + @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 18 | private String label; | 18 | private String label; |
| 19 | 19 | ||
| 20 | @Schema(description = "字典值", requiredMode = Schema.RequiredMode.REQUIRED, example = "iocoder") | 20 | @Schema(description = "字典值", requiredMode = Schema.RequiredMode.REQUIRED, example = "iocoder") |
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/app/tenant/vo/AppTenantRespVO.java
| @@ -10,7 +10,7 @@ public class AppTenantRespVO { | @@ -10,7 +10,7 @@ public class AppTenantRespVO { | ||
| 10 | @Schema(description = "租户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") | 10 | @Schema(description = "租户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") |
| 11 | private Long id; | 11 | private Long id; |
| 12 | 12 | ||
| 13 | - @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") | 13 | + @Schema(description = "租户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "全域") |
| 14 | private String name; | 14 | private String name; |
| 15 | 15 | ||
| 16 | } | 16 | } |
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 { | @@ -55,7 +55,7 @@ public class OperateLogDO extends BaseDO { | ||
| 55 | /** | 55 | /** |
| 56 | * 日志内容,记录整个操作的明细 | 56 | * 日志内容,记录整个操作的明细 |
| 57 | * | 57 | * |
| 58 | - * 例如说,修改编号为 1 的用户信息,将性别从男改成女,将姓名从芋道改成源码。 | 58 | + * 例如说,修改编号为 1 的用户信息,将性别从男改成女,将姓名从全域改成源码。 |
| 59 | */ | 59 | */ |
| 60 | private String action; | 60 | private String action; |
| 61 | /** | 61 | /** |
urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/mail/MailTemplateServiceImplTest.java
| @@ -115,7 +115,7 @@ public class MailTemplateServiceImplTest extends BaseDbUnitTest { | @@ -115,7 +115,7 @@ public class MailTemplateServiceImplTest extends BaseDbUnitTest { | ||
| 115 | }); | 115 | }); |
| 116 | mailTemplateMapper.insert(dbMailTemplate); | 116 | mailTemplateMapper.insert(dbMailTemplate); |
| 117 | // 测试 name 不匹配 | 117 | // 测试 name 不匹配 |
| 118 | - mailTemplateMapper.insert(cloneIgnoreId(dbMailTemplate, o -> o.setName("芋道"))); | 118 | + mailTemplateMapper.insert(cloneIgnoreId(dbMailTemplate, o -> o.setName("全域"))); |
| 119 | // 测试 code 不匹配 | 119 | // 测试 code 不匹配 |
| 120 | mailTemplateMapper.insert(cloneIgnoreId(dbMailTemplate, o -> o.setCode("test_02"))); | 120 | mailTemplateMapper.insert(cloneIgnoreId(dbMailTemplate, o -> o.setCode("test_02"))); |
| 121 | // 测试 accountId 不匹配 | 121 | // 测试 accountId 不匹配 |
urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/sms/SmsChannelServiceTest.java
| @@ -171,7 +171,7 @@ public class SmsChannelServiceTest extends BaseDbUnitTest { | @@ -171,7 +171,7 @@ public class SmsChannelServiceTest extends BaseDbUnitTest { | ||
| 171 | smsChannelMapper.insert(cloneIgnoreId(dbSmsChannel, o -> o.setCreateTime(buildTime(2020, 11, 11)))); | 171 | smsChannelMapper.insert(cloneIgnoreId(dbSmsChannel, o -> o.setCreateTime(buildTime(2020, 11, 11)))); |
| 172 | // 准备参数 | 172 | // 准备参数 |
| 173 | SmsChannelPageReqVO reqVO = new SmsChannelPageReqVO(); | 173 | SmsChannelPageReqVO reqVO = new SmsChannelPageReqVO(); |
| 174 | - reqVO.setSignature("芋道"); | 174 | + reqVO.setSignature("全域"); |
| 175 | reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); | 175 | reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); |
| 176 | reqVO.setCreateTime(buildBetweenTime(2020, 12, 1, 2020, 12, 24)); | 176 | reqVO.setCreateTime(buildBetweenTime(2020, 12, 1, 2020, 12, 24)); |
| 177 | 177 |
urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/sms/SmsTemplateServiceImplTest.java
| @@ -231,7 +231,7 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest { | @@ -231,7 +231,7 @@ public class SmsTemplateServiceImplTest extends BaseDbUnitTest { | ||
| 231 | reqVO.setType(SmsTemplateTypeEnum.PROMOTION.getType()); | 231 | reqVO.setType(SmsTemplateTypeEnum.PROMOTION.getType()); |
| 232 | reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); | 232 | reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); |
| 233 | reqVO.setCode("tu"); | 233 | reqVO.setCode("tu"); |
| 234 | - reqVO.setContent("芋道"); | 234 | + reqVO.setContent("全域"); |
| 235 | reqVO.setApiTemplateId("yu"); | 235 | reqVO.setApiTemplateId("yu"); |
| 236 | reqVO.setChannelId(1L); | 236 | reqVO.setChannelId(1L); |
| 237 | reqVO.setCreateTime(buildBetweenTime(2021, 11, 1, 2021, 12, 1)); | 237 | reqVO.setCreateTime(buildBetweenTime(2021, 11, 1, 2021, 12, 1)); |
urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/tenant/TenantPackageServiceImplTest.java
| @@ -157,7 +157,7 @@ public class TenantPackageServiceImplTest extends BaseDbUnitTest { | @@ -157,7 +157,7 @@ public class TenantPackageServiceImplTest extends BaseDbUnitTest { | ||
| 157 | tenantPackageMapper.insert(cloneIgnoreId(dbTenantPackage, o -> o.setCreateTime(buildTime(2022, 11, 11)))); | 157 | tenantPackageMapper.insert(cloneIgnoreId(dbTenantPackage, o -> o.setCreateTime(buildTime(2022, 11, 11)))); |
| 158 | // 准备参数 | 158 | // 准备参数 |
| 159 | TenantPackagePageReqVO reqVO = new TenantPackagePageReqVO(); | 159 | TenantPackagePageReqVO reqVO = new TenantPackagePageReqVO(); |
| 160 | - reqVO.setName("芋道"); | 160 | + reqVO.setName("全域"); |
| 161 | reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); | 161 | reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); |
| 162 | reqVO.setRemark("源码"); | 162 | reqVO.setRemark("源码"); |
| 163 | reqVO.setCreateTime(buildBetweenTime(2022, 10, 9, 2022, 10, 11)); | 163 | reqVO.setCreateTime(buildBetweenTime(2022, 10, 9, 2022, 10, 11)); |
urbanops-module-system/src/test/java/com/zteits/urbanops/module/system/service/tenant/TenantServiceImplTest.java
| @@ -146,14 +146,14 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | @@ -146,14 +146,14 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | ||
| 146 | when(userService.createUser(argThat(user -> { | 146 | when(userService.createUser(argThat(user -> { |
| 147 | assertEquals("yunai", user.getUsername()); | 147 | assertEquals("yunai", user.getUsername()); |
| 148 | assertEquals("yuanma", user.getPassword()); | 148 | assertEquals("yuanma", user.getPassword()); |
| 149 | - assertEquals("芋道", user.getNickname()); | 149 | + assertEquals("全域", user.getNickname()); |
| 150 | assertEquals("15601691300", user.getMobile()); | 150 | assertEquals("15601691300", user.getMobile()); |
| 151 | return true; | 151 | return true; |
| 152 | }))).thenReturn(300L); | 152 | }))).thenReturn(300L); |
| 153 | 153 | ||
| 154 | // 准备参数 | 154 | // 准备参数 |
| 155 | TenantSaveReqVO reqVO = randomPojo(TenantSaveReqVO.class, o -> { | 155 | TenantSaveReqVO reqVO = randomPojo(TenantSaveReqVO.class, o -> { |
| 156 | - o.setContactName("芋道"); | 156 | + o.setContactName("全域"); |
| 157 | o.setContactMobile("15601691300"); | 157 | o.setContactMobile("15601691300"); |
| 158 | o.setPackageId(100L); | 158 | o.setPackageId(100L); |
| 159 | o.setStatus(randomCommonStatus()); | 159 | o.setStatus(randomCommonStatus()); |
| @@ -307,7 +307,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | @@ -307,7 +307,7 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | ||
| 307 | tenantMapper.insert(cloneIgnoreId(dbTenant, o -> o.setCreateTime(buildTime(2021, 12, 12)))); | 307 | tenantMapper.insert(cloneIgnoreId(dbTenant, o -> o.setCreateTime(buildTime(2021, 12, 12)))); |
| 308 | // 准备参数 | 308 | // 准备参数 |
| 309 | TenantPageReqVO reqVO = new TenantPageReqVO(); | 309 | TenantPageReqVO reqVO = new TenantPageReqVO(); |
| 310 | - reqVO.setName("芋道"); | 310 | + reqVO.setName("全域"); |
| 311 | reqVO.setContactName("艿"); | 311 | reqVO.setContactName("艿"); |
| 312 | reqVO.setContactMobile("1560"); | 312 | reqVO.setContactMobile("1560"); |
| 313 | reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); | 313 | reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus()); |
| @@ -324,11 +324,11 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | @@ -324,11 +324,11 @@ public class TenantServiceImplTest extends BaseDbUnitTest { | ||
| 324 | @Test | 324 | @Test |
| 325 | public void testGetTenantByName() { | 325 | public void testGetTenantByName() { |
| 326 | // mock 数据 | 326 | // mock 数据 |
| 327 | - TenantDO dbTenant = randomPojo(TenantDO.class, o -> o.setName("芋道")); | 327 | + TenantDO dbTenant = randomPojo(TenantDO.class, o -> o.setName("全域")); |
| 328 | tenantMapper.insert(dbTenant);// @Sql: 先插入出一条存在的数据 | 328 | tenantMapper.insert(dbTenant);// @Sql: 先插入出一条存在的数据 |
| 329 | 329 | ||
| 330 | // 调用 | 330 | // 调用 |
| 331 | - TenantDO result = tenantService.getTenantByName("芋道"); | 331 | + TenantDO result = tenantService.getTenantByName("全域"); |
| 332 | // 校验存在 | 332 | // 校验存在 |
| 333 | assertPojoEquals(result, dbTenant); | 333 | assertPojoEquals(result, dbTenant); |
| 334 | } | 334 | } |
urbanops-module-system/src/test/resources/application-unit-test.yaml
| @@ -40,9 +40,9 @@ mybatis: | @@ -40,9 +40,9 @@ mybatis: | ||
| 40 | 40 | ||
| 41 | --- #################### 监控相关配置 #################### | 41 | --- #################### 监控相关配置 #################### |
| 42 | 42 | ||
| 43 | ---- #################### 芋道相关配置 #################### | 43 | +--- #################### 全域相关配置 #################### |
| 44 | 44 | ||
| 45 | -# 芋道配置项,设置当前项目所有自定义的配置 | 45 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 46 | urbanops: | 46 | urbanops: |
| 47 | info: | 47 | info: |
| 48 | base-package: com.zteits.urbanops.module | 48 | base-package: com.zteits.urbanops.module |
urbanops-module-workorder/pom.xml
| @@ -131,7 +131,12 @@ | @@ -131,7 +131,12 @@ | ||
| 131 | <artifactId>urbanops-module-bpm</artifactId> | 131 | <artifactId>urbanops-module-bpm</artifactId> |
| 132 | <version>${revision}</version> | 132 | <version>${revision}</version> |
| 133 | </dependency> | 133 | </dependency> |
| 134 | - | 134 | + <dependency> |
| 135 | + <groupId>com.zteits.boot</groupId> | ||
| 136 | + <artifactId>urbanops-module-garden</artifactId> | ||
| 137 | + <version>${revision}</version> | ||
| 138 | + <scope>compile</scope> | ||
| 139 | + </dependency> | ||
| 135 | </dependencies> | 140 | </dependencies> |
| 136 | 141 | ||
| 137 | </project> | 142 | </project> |
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; | @@ -3,6 +3,9 @@ package com.zteits.urbanops.module.workorder.controller.app.garden; | ||
| 3 | import com.zteits.urbanops.framework.common.pojo.CommonResult; | 3 | import com.zteits.urbanops.framework.common.pojo.CommonResult; |
| 4 | import com.zteits.urbanops.framework.common.pojo.PageResult; | 4 | import com.zteits.urbanops.framework.common.pojo.PageResult; |
| 5 | import com.zteits.urbanops.framework.common.util.object.BeanUtils; | 5 | import com.zteits.urbanops.framework.common.util.object.BeanUtils; |
| 6 | +import com.zteits.urbanops.module.garden.api.road.RoadApi; | ||
| 7 | +import com.zteits.urbanops.module.garden.api.road.dto.RoadReqDTO; | ||
| 8 | +import com.zteits.urbanops.module.garden.api.road.dto.RoadRespDTO; | ||
| 6 | import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderPageReqVO; | 9 | import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderPageReqVO; |
| 7 | import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderRespVO; | 10 | import com.zteits.urbanops.module.workorder.controller.admin.garden.vo.BpmGardenWorkOrderRespVO; |
| 8 | import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderPageReqVO; | 11 | import com.zteits.urbanops.module.workorder.controller.app.garden.vo.AppGardenWorkOrderPageReqVO; |
| @@ -18,6 +21,8 @@ import jakarta.validation.Valid; | @@ -18,6 +21,8 @@ import jakarta.validation.Valid; | ||
| 18 | import org.springframework.security.access.prepost.PreAuthorize; | 21 | import org.springframework.security.access.prepost.PreAuthorize; |
| 19 | import org.springframework.web.bind.annotation.*; | 22 | import org.springframework.web.bind.annotation.*; |
| 20 | 23 | ||
| 24 | +import java.util.List; | ||
| 25 | + | ||
| 21 | import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; | 26 | import static com.zteits.urbanops.framework.common.pojo.CommonResult.success; |
| 22 | import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; | 27 | import static com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; |
| 23 | 28 | ||
| @@ -33,6 +38,8 @@ import static com.zteits.urbanops.framework.security.core.util.SecurityFramework | @@ -33,6 +38,8 @@ import static com.zteits.urbanops.framework.security.core.util.SecurityFramework | ||
| 33 | public class AppGardenWorkOrderController { | 38 | public class AppGardenWorkOrderController { |
| 34 | @Resource | 39 | @Resource |
| 35 | private BpmGardenService gardenService; | 40 | private BpmGardenService gardenService; |
| 41 | + @Resource | ||
| 42 | + private RoadApi roadApi; | ||
| 36 | 43 | ||
| 37 | @PostMapping("/create") | 44 | @PostMapping("/create") |
| 38 | //@PreAuthorize("@ss.hasPermission('bpm:garden-workorder:create')") | 45 | //@PreAuthorize("@ss.hasPermission('bpm:garden-workorder:create')") |
| @@ -65,4 +72,11 @@ public class AppGardenWorkOrderController { | @@ -65,4 +72,11 @@ public class AppGardenWorkOrderController { | ||
| 65 | return success(BeanUtils.toBean(pageResult, AppGardenWorkOrderRespVO.class)); | 72 | return success(BeanUtils.toBean(pageResult, AppGardenWorkOrderRespVO.class)); |
| 66 | } | 73 | } |
| 67 | 74 | ||
| 75 | + @GetMapping("/listRoadInfo") | ||
| 76 | + //@PreAuthorize("@ss.hasPermission('bpm:garden-workorder:query')") | ||
| 77 | + @Operation(summary = "app-获取道路信息") | ||
| 78 | + public List<RoadRespDTO> getRoadInfoBy(@Valid RoadReqDTO reqDTO) { | ||
| 79 | + return roadApi.getRoadInfoBy(reqDTO); | ||
| 80 | + } | ||
| 81 | + | ||
| 68 | } | 82 | } |
urbanops-server/src/main/resources/application-dev.yaml
| @@ -177,9 +177,9 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta | @@ -177,9 +177,9 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta | ||
| 177 | key-prefix: wa # Redis Key 的前缀 | 177 | key-prefix: wa # Redis Key 的前缀 |
| 178 | http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 | 178 | http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 |
| 179 | 179 | ||
| 180 | ---- #################### 芋道相关配置 #################### | 180 | +--- #################### 全域相关配置 #################### |
| 181 | 181 | ||
| 182 | -# 芋道配置项,设置当前项目所有自定义的配置 | 182 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 183 | urbanops: | 183 | urbanops: |
| 184 | pay: | 184 | pay: |
| 185 | order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址 | 185 | order-notify-url: http://yunai.natapp1.cc/admin-api/pay/notify/order # 支付渠道的【支付】回调地址 |
urbanops-server/src/main/resources/application-local.yaml
| @@ -219,9 +219,9 @@ wx: | @@ -219,9 +219,9 @@ wx: | ||
| 219 | key-prefix: wa # Redis Key 的前缀 | 219 | key-prefix: wa # Redis Key 的前缀 |
| 220 | http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 | 220 | http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 |
| 221 | 221 | ||
| 222 | ---- #################### 芋道相关配置 #################### | 222 | +--- #################### 全域相关配置 #################### |
| 223 | 223 | ||
| 224 | -# 芋道配置项,设置当前项目所有自定义的配置 | 224 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 225 | urbanops: | 225 | urbanops: |
| 226 | captcha: | 226 | captcha: |
| 227 | enable: false # 本地环境,暂时关闭图片验证码,方便登录等接口的测试; | 227 | enable: false # 本地环境,暂时关闭图片验证码,方便登录等接口的测试; |
| @@ -265,4 +265,4 @@ justauth: | @@ -265,4 +265,4 @@ justauth: | ||
| 265 | cache: | 265 | cache: |
| 266 | type: REDIS | 266 | type: REDIS |
| 267 | prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE:: | 267 | prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE:: |
| 268 | - timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟 | ||
| 269 | \ No newline at end of file | 268 | \ No newline at end of file |
| 269 | + timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟 |
urbanops-server/src/main/resources/application-prod.yaml
| @@ -207,9 +207,9 @@ wx: | @@ -207,9 +207,9 @@ wx: | ||
| 207 | key-prefix: wa # Redis Key 的前缀 | 207 | key-prefix: wa # Redis Key 的前缀 |
| 208 | http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 | 208 | http-client-type: HttpClient # 采用 HttpClient 请求微信公众号平台 |
| 209 | 209 | ||
| 210 | ---- #################### 芋道相关配置 #################### | 210 | +--- #################### 全域相关配置 #################### |
| 211 | 211 | ||
| 212 | -# 芋道配置项,设置当前项目所有自定义的配置 | 212 | +# 全域配置项,设置当前项目所有自定义的配置 |
| 213 | global: | 213 | global: |
| 214 | captcha: | 214 | captcha: |
| 215 | enable: true # 本地环境,暂时关闭图片验证码,方便登录等接口的测试; | 215 | enable: true # 本地环境,暂时关闭图片验证码,方便登录等接口的测试; |
urbanops-server/src/main/resources/application.yaml
| @@ -254,7 +254,7 @@ urbanops: | @@ -254,7 +254,7 @@ urbanops: | ||
| 254 | enable: true | 254 | enable: true |
| 255 | api-key: sk-40500e52840f4d24b956d0b1d80d9abe | 255 | api-key: sk-40500e52840f4d24b956d0b1d80d9abe |
| 256 | 256 | ||
| 257 | ---- #################### 芋道相关配置 #################### | 257 | +--- #################### 全域相关配置 #################### |
| 258 | 258 | ||
| 259 | urbanops: | 259 | urbanops: |
| 260 | info: | 260 | info: |
| @@ -292,7 +292,7 @@ urbanops: | @@ -292,7 +292,7 @@ urbanops: | ||
| 292 | topic: ${spring.application.name}-websocket # 消息发送的 Kafka Topic | 292 | topic: ${spring.application.name}-websocket # 消息发送的 Kafka Topic |
| 293 | consumer-group: ${spring.application.name}-websocket-consumer # 消息发送的 Kafka Consumer Group | 293 | consumer-group: ${spring.application.name}-websocket-consumer # 消息发送的 Kafka Consumer Group |
| 294 | swagger: | 294 | swagger: |
| 295 | - title: 芋道快速开发平台 | 295 | + title: 全域快速开发平台 |
| 296 | description: 提供管理后台、用户 App 的所有功能 | 296 | description: 提供管理后台、用户 App 的所有功能 |
| 297 | version: ${urbanops.info.version} | 297 | version: ${urbanops.info.version} |
| 298 | url: ${urbanops.web.admin-ui.url} | 298 | url: ${urbanops.web.admin-ui.url} |