BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 99338182b206a7d699dfb766500a3efb5c0174c8

Authored by 芋道源码
Committed by Gitee
2 parents 1b3051da a5ec334e

!323 fix: 逻辑删除唯一索引冲突的问题 

Merge pull request !323 from 与或非/issues/I61D4E
Inline Side-by-side
Showing 7 changed files with 201 additions and 96 deletions
sql/mysql/ruoyi-vue-pro.sql
  View file @9933818
@@ -1335,19 +1335,20 @@ COMMIT; @@ -1335,19 +1335,20 @@ COMMIT;
1335 -- Table structure for system_dict_type 1335 -- Table structure for system_dict_type
1336 -- ---------------------------- 1336 -- ----------------------------
1337 DROP TABLE IF EXISTS `system_dict_type`; 1337 DROP TABLE IF EXISTS `system_dict_type`;
1338 -CREATE TABLE `system_dict_type` (  
1339 - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '字典主键',  
1340 - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '字典名称',  
1341 - `type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '字典类型',  
1342 - `status` tinyint NOT NULL DEFAULT 0 COMMENT '状态（0正常 1停用）',  
1343 - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注',  
1344 - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',  
1345 - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',  
1346 - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',  
1347 - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',  
1348 - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',  
1349 - PRIMARY KEY (`id`) USING BTREE,  
1350 - UNIQUE INDEX `dict_type`(`type` ASC) USING BTREE 1338 +CREATE TABLE `system_dict_type`(
  1339 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '字典主键',
  1340 + `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '字典名称',
  1341 + `type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '字典类型',
  1342 + `status` tinyint NOT NULL DEFAULT 0 COMMENT '状态（0正常 1停用）',
  1343 + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注',
  1344 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  1345 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  1346 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  1347 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  1348 + `deleted_time` datetime DEFAULT NULL COMMENT '删除时间',
  1349 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  1350 + PRIMARY KEY (`id`) USING BTREE,
  1351 + UNIQUE INDEX `dict_type`(`type` ASC,`deleted_time` ASC) USING BTREE
1351 ) ENGINE = InnoDB AUTO_INCREMENT = 149 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表'; 1352 ) ENGINE = InnoDB AUTO_INCREMENT = 149 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表';
1352 1353
1353 -- ---------------------------- 1354 -- ----------------------------
sql/oracle/ruoyi-vue-pro.sql
  View file @9933818
@@ -2474,17 +2474,18 @@ COMMIT; @@ -2474,17 +2474,18 @@ COMMIT;
2474 -- Table structure for SYSTEM_DICT_TYPE 2474 -- Table structure for SYSTEM_DICT_TYPE
2475 -- ---------------------------- 2475 -- ----------------------------
2476 DROP TABLE "SYSTEM_DICT_TYPE"; 2476 DROP TABLE "SYSTEM_DICT_TYPE";
2477 -CREATE TABLE "SYSTEM_DICT_TYPE" (  
2478 - "ID" NUMBER(20,0) NOT NULL,  
2479 - "NAME" NVARCHAR2(100),  
2480 - "TYPE" NVARCHAR2(100),  
2481 - "STATUS" NUMBER(4,0) NOT NULL,  
2482 - "REMARK" NVARCHAR2(500),  
2483 - "CREATOR" NVARCHAR2(64),  
2484 - "CREATE_TIME" DATE NOT NULL,  
2485 - "UPDATER" NVARCHAR2(64),  
2486 - "UPDATE_TIME" DATE NOT NULL,  
2487 - "DELETED" NUMBER(1,0) DEFAULT 0 NOT NULL 2477 +CREATE TABLE "SYSTEM_DICT_TYPE"(
  2478 + "ID" NUMBER(20,0) NOT NULL,
  2479 + "NAME" NVARCHAR2(100),
  2480 + "TYPE" NVARCHAR2(100),
  2481 + "STATUS" NUMBER(4,0) NOT NULL,
  2482 + "REMARK" NVARCHAR2(500),
  2483 + "CREATOR" NVARCHAR2(64),
  2484 + "CREATE_TIME" DATE NOT NULL,
  2485 + "UPDATER" NVARCHAR2(64),
  2486 + "UPDATE_TIME" DATE NOT NULL,
  2487 + "DELETED_TIME" DATE,
  2488 + "DELETED" NUMBER(1,0) DEFAULT 0 NOT NULL
2488 ) 2489 )
2489 LOGGING 2490 LOGGING
2490 NOCOMPRESS 2491 NOCOMPRESS
@@ -2503,25 +2504,54 @@ PARALLEL 1 @@ -2503,25 +2504,54 @@ PARALLEL 1
2503 NOCACHE 2504 NOCACHE
2504 DISABLE ROW MOVEMENT 2505 DISABLE ROW MOVEMENT
2505 ; 2506 ;
2506 -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."ID" IS '字典主键';  
2507 -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."NAME" IS '字典名称';  
2508 -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."TYPE" IS '字典类型';  
2509 -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."STATUS" IS '状态（0正常 1停用）';  
2510 -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."REMARK" IS '备注';  
2511 -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."CREATOR" IS '创建者';  
2512 -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."CREATE_TIME" IS '创建时间';  
2513 -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."UPDATER" IS '更新者';  
2514 -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."UPDATE_TIME" IS '更新时间';  
2515 -COMMENT ON COLUMN "SYSTEM_DICT_TYPE"."DELETED" IS '是否删除';  
2516 -COMMENT ON TABLE "SYSTEM_DICT_TYPE" IS '字典类型表'; 2507 +COMMENT
  2508 +ON COLUMN "SYSTEM_DICT_TYPE"."ID" IS '字典主键';
  2509 +COMMENT
  2510 +ON COLUMN "SYSTEM_DICT_TYPE"."NAME" IS '字典名称';
  2511 +COMMENT
  2512 +ON COLUMN "SYSTEM_DICT_TYPE"."TYPE" IS '字典类型';
  2513 +COMMENT
  2514 +ON COLUMN "SYSTEM_DICT_TYPE"."STATUS" IS '状态（0正常 1停用）';
  2515 +COMMENT
  2516 +ON COLUMN "SYSTEM_DICT_TYPE"."REMARK" IS '备注';
  2517 +COMMENT
  2518 +ON COLUMN "SYSTEM_DICT_TYPE"."CREATOR" IS '创建者';
  2519 +COMMENT
  2520 +ON COLUMN "SYSTEM_DICT_TYPE"."CREATE_TIME" IS '创建时间';
  2521 +COMMENT
  2522 +ON COLUMN "SYSTEM_DICT_TYPE"."UPDATER" IS '更新者';
  2523 +COMMENT
  2524 +ON COLUMN "SYSTEM_DICT_TYPE"."UPDATE_TIME" IS '更新时间';
  2525 +COMMENT
  2526 +ON COLUMN "SYSTEM_DICT_TYPE"."DELETED_TIME" IS '删除时间';
  2527 +COMMENT
  2528 +ON COLUMN "SYSTEM_DICT_TYPE"."DELETED" IS '是否删除';
  2529 +COMMENT
  2530 +ON TABLE "SYSTEM_DICT_TYPE" IS '字典类型表';
2517 2531
2518 -- ---------------------------- 2532 -- ----------------------------
2519 -- Records of SYSTEM_DICT_TYPE 2533 -- Records of SYSTEM_DICT_TYPE
2520 -- ---------------------------- 2534 -- ----------------------------
2521 -INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('1', '用户性别', 'system_user_sex', '0', NULL, 'admin', TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-05-01 12:55:56', 'SYYYY-MM-DD HH24:MI:SS'), '0');  
2522 -INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('6', '参数类型', 'infra_config_type', '0', NULL, 'admin', TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-02-01 16:36:54', 'SYYYY-MM-DD HH24:MI:SS'), '0');  
2523 -INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('7', '通知类型', 'system_notice_type', '0', NULL, 'admin', TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-02-01 16:35:26', 'SYYYY-MM-DD HH24:MI:SS'), '0');  
2524 -INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('9', '操作类型', 'system_operate_type', '0', NULL, 'admin', TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), '1', TO_DATE('2022-02-16 09:32:21', 'SYYYY-MM-DD HH24:MI:SS'), '0'); 2535 +INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER",
  2536 + "UPDATE_TIME", "DELETED")
  2537 +VALUES ('1', '用户性别', 'system_user_sex', '0', NULL, 'admin',
  2538 + TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), '1',
  2539 + TO_DATE('2022-05-01 12:55:56', 'SYYYY-MM-DD HH24:MI:SS'), '0');
  2540 +INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER",
  2541 + "UPDATE_TIME", "DELETED")
  2542 +VALUES ('6', '参数类型', 'infra_config_type', '0', NULL, 'admin',
  2543 + TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), NULL,
  2544 + TO_DATE('2022-02-01 16:36:54', 'SYYYY-MM-DD HH24:MI:SS'), '0');
  2545 +INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER",
  2546 + "UPDATE_TIME", "DELETED")
  2547 +VALUES ('7', '通知类型', 'system_notice_type', '0', NULL, 'admin',
  2548 + TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), NULL,
  2549 + TO_DATE('2022-02-01 16:35:26', 'SYYYY-MM-DD HH24:MI:SS'), '0');
  2550 +INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER",
  2551 + "UPDATE_TIME", "DELETED")
  2552 +VALUES ('9', '操作类型', 'system_operate_type', '0', NULL, 'admin',
  2553 + TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), '1',
  2554 + TO_DATE('2022-02-16 09:32:21', 'SYYYY-MM-DD HH24:MI:SS'), '0');
2525 INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('10', '系统状态', 'common_status', '0', NULL, 'admin', TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-02-01 16:21:28', 'SYYYY-MM-DD HH24:MI:SS'), '0'); 2555 INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('10', '系统状态', 'common_status', '0', NULL, 'admin', TO_DATE('2021-01-05 17:03:48', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-02-01 16:21:28', 'SYYYY-MM-DD HH24:MI:SS'), '0');
2526 INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('11', 'Boolean 是否类型', 'infra_boolean_string', '0', 'boolean 转是否', NULL, TO_DATE('2021-01-19 03:20:08', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-02-01 16:37:10', 'SYYYY-MM-DD HH24:MI:SS'), '0'); 2556 INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('11', 'Boolean 是否类型', 'infra_boolean_string', '0', 'boolean 转是否', NULL, TO_DATE('2021-01-19 03:20:08', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-02-01 16:37:10', 'SYYYY-MM-DD HH24:MI:SS'), '0');
2527 INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('104', '登陆结果', 'system_login_result', '0', '登陆结果', NULL, TO_DATE('2021-01-18 06:17:11', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-02-01 16:36:00', 'SYYYY-MM-DD HH24:MI:SS'), '0'); 2557 INSERT INTO "SYSTEM_DICT_TYPE" ("ID", "NAME", "TYPE", "STATUS", "REMARK", "CREATOR", "CREATE_TIME", "UPDATER", "UPDATE_TIME", "DELETED") VALUES ('104', '登陆结果', 'system_login_result', '0', '登陆结果', NULL, TO_DATE('2021-01-18 06:17:11', 'SYYYY-MM-DD HH24:MI:SS'), NULL, TO_DATE('2022-02-01 16:36:00', 'SYYYY-MM-DD HH24:MI:SS'), '0');
sql/postgresql/ruoyi-vue-pro.sql
  View file @9933818
@@ -2357,38 +2357,58 @@ COMMIT; @@ -2357,38 +2357,58 @@ COMMIT;
2357 -- Table structure for system_dict_type 2357 -- Table structure for system_dict_type
2358 -- ---------------------------- 2358 -- ----------------------------
2359 DROP TABLE IF EXISTS "system_dict_type"; 2359 DROP TABLE IF EXISTS "system_dict_type";
2360 -CREATE TABLE "system_dict_type" (  
2361 - "id" int8 NOT NULL,  
2362 - "name" varchar(100) COLLATE "pg_catalog"."default" NOT NULL,  
2363 - "type" varchar(100) COLLATE "pg_catalog"."default" NOT NULL,  
2364 - "status" int2 NOT NULL,  
2365 - "remark" varchar(500) COLLATE "pg_catalog"."default",  
2366 - "creator" varchar(64) COLLATE "pg_catalog"."default",  
2367 - "create_time" timestamp(6) NOT NULL,  
2368 - "updater" varchar(64) COLLATE "pg_catalog"."default",  
2369 - "update_time" timestamp(6) NOT NULL,  
2370 - "deleted" int2 NOT NULL DEFAULT 0 2360 +CREATE TABLE "system_dict_type"(
  2361 + "id" int8 NOT NULL,
  2362 + "name" varchar(100) COLLATE "pg_catalog"."default" NOT NULL,
  2363 + "type" varchar(100) COLLATE "pg_catalog"."default" NOT NULL,
  2364 + "status" int2 NOT NULL,
  2365 + "remark" varchar(500) COLLATE "pg_catalog"."default",
  2366 + "creator" varchar(64) COLLATE "pg_catalog"."default",
  2367 + "create_time" timestamp(6) NOT NULL,
  2368 + "updater" varchar(64) COLLATE "pg_catalog"."default",
  2369 + "update_time" timestamp(6) NOT NULL,
  2370 + "deleted_time" timestamp(6),
  2371 + "deleted" int2 NOT NULL DEFAULT 0
2371 ) 2372 )
2372 ; 2373 ;
2373 -COMMENT ON COLUMN "system_dict_type"."id" IS '字典主键';  
2374 -COMMENT ON COLUMN "system_dict_type"."name" IS '字典名称';  
2375 -COMMENT ON COLUMN "system_dict_type"."type" IS '字典类型';  
2376 -COMMENT ON COLUMN "system_dict_type"."status" IS '状态（0正常 1停用）';  
2377 -COMMENT ON COLUMN "system_dict_type"."remark" IS '备注';  
2378 -COMMENT ON COLUMN "system_dict_type"."creator" IS '创建者';  
2379 -COMMENT ON COLUMN "system_dict_type"."create_time" IS '创建时间';  
2380 -COMMENT ON COLUMN "system_dict_type"."updater" IS '更新者';  
2381 -COMMENT ON COLUMN "system_dict_type"."update_time" IS '更新时间';  
2382 -COMMENT ON COLUMN "system_dict_type"."deleted" IS '是否删除';  
2383 -COMMENT ON TABLE "system_dict_type" IS '字典类型表'; 2374 +COMMENT
  2375 +ON COLUMN "system_dict_type"."id" IS '字典主键';
  2376 +COMMENT
  2377 +ON COLUMN "system_dict_type"."name" IS '字典名称';
  2378 +COMMENT
  2379 +ON COLUMN "system_dict_type"."type" IS '字典类型';
  2380 +COMMENT
  2381 +ON COLUMN "system_dict_type"."status" IS '状态（0正常 1停用）';
  2382 +COMMENT
  2383 +ON COLUMN "system_dict_type"."remark" IS '备注';
  2384 +COMMENT
  2385 +ON COLUMN "system_dict_type"."creator" IS '创建者';
  2386 +COMMENT
  2387 +ON COLUMN "system_dict_type"."create_time" IS '创建时间';
  2388 +COMMENT
  2389 +ON COLUMN "system_dict_type"."updater" IS '更新者';
  2390 +COMMENT
  2391 +ON COLUMN "system_dict_type"."update_time" IS '更新时间';
  2392 +COMMENT
  2393 +ON COLUMN "system_dict_type"."deleted_time" IS '删除时间';
  2394 +COMMENT
  2395 +ON COLUMN "system_dict_type"."deleted" IS '是否删除';
  2396 +COMMENT
  2397 +ON TABLE "system_dict_type" IS '字典类型表';
2384 2398
2385 -- ---------------------------- 2399 -- ----------------------------
2386 -- Records of system_dict_type 2400 -- Records of system_dict_type
2387 -- ---------------------------- 2401 -- ----------------------------
2388 BEGIN; 2402 BEGIN;
2389 -INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (1, '用户性别', 'system_user_sex', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:30:31', 0);  
2390 -INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (6, '参数类型', 'infra_config_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:36:54', 0);  
2391 -INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (7, '通知类型', 'system_notice_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:35:26', 0); 2403 +INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater",
  2404 + "update_time", "deleted")
  2405 +VALUES (1, '用户性别', 'system_user_sex', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:30:31', 0);
  2406 +INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater",
  2407 + "update_time", "deleted")
  2408 +VALUES (6, '参数类型', 'infra_config_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:36:54', 0);
  2409 +INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater",
  2410 + "update_time", "deleted")
  2411 +VALUES (7, '通知类型', 'system_notice_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:35:26', 0);
2392 INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (9, '操作类型', 'system_operate_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '1', '2022-02-16 09:32:21', 0); 2412 INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (9, '操作类型', 'system_operate_type', 0, NULL, 'admin', '2021-01-05 17:03:48', '1', '2022-02-16 09:32:21', 0);
2393 INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (10, '系统状态', 'common_status', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:21:28', 0); 2413 INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (10, '系统状态', 'common_status', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:21:28', 0);
2394 INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (11, 'Boolean 是否类型', 'infra_boolean_string', 0, 'boolean 转是否', '', '2021-01-19 03:20:08', '', '2022-02-01 16:37:10', 0); 2414 INSERT INTO "system_dict_type" ("id", "name", "type", "status", "remark", "creator", "create_time", "updater", "update_time", "deleted") VALUES (11, 'Boolean 是否类型', 'infra_boolean_string', 0, 'boolean 转是否', '', '2021-01-19 03:20:08', '', '2022-02-01 16:37:10', 0);
sql/sqlserver/ruoyi-vue-pro.sql
  View file @9933818
@@ -5813,18 +5813,51 @@ IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[sy @@ -5813,18 +5813,51 @@ IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[sy
5813 DROP TABLE [dbo].[system_dict_type] 5813 DROP TABLE [dbo].[system_dict_type]
5814 GO 5814 GO
5815 5815
5816 -CREATE TABLE [dbo].[system_dict_type] (  
5817 - [id] bigint IDENTITY(1,1) NOT NULL,  
5818 - [name] nvarchar(100) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,  
5819 - [type] nvarchar(100) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,  
5820 - [status] tinyint NOT NULL,  
5821 - [remark] nvarchar(500) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,  
5822 - [creator] nvarchar(64) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,  
5823 - [create_time] datetime2(7) NOT NULL,  
5824 - [updater] nvarchar(64) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,  
5825 - [update_time] datetime2(7) NOT NULL,  
5826 - [deleted] bit DEFAULT 0 NOT NULL  
5827 -) 5816 +CREATE TABLE [dbo].[system_dict_type]
  5817 +(
  5818 + [
  5819 + id]
  5820 + bigint
  5821 + IDENTITY
  5822 +(
  5823 + 1,
  5824 + 1
  5825 +) NOT NULL,
  5826 + [name] nvarchar
  5827 +(
  5828 + 100
  5829 +) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
  5830 + [type] nvarchar
  5831 +(
  5832 + 100
  5833 +) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
  5834 + [status] tinyint NOT NULL,
  5835 + [remark] nvarchar
  5836 +(
  5837 + 500
  5838 +) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
  5839 + [creator] nvarchar
  5840 +(
  5841 + 64
  5842 +) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
  5843 + [create_time] datetime2
  5844 +(
  5845 + 7
  5846 +) NOT NULL,
  5847 + [updater] nvarchar
  5848 +(
  5849 + 64
  5850 +) COLLATE SQL_Latin1_General_CP1_CI_AS NULL,
  5851 + [update_time] datetime2
  5852 +(
  5853 + 7
  5854 +) NOT NULL,
  5855 + [deleted_time] datetime2
  5856 +(
  5857 + 7
  5858 +),
  5859 + [deleted] bit DEFAULT 0 NOT NULL
  5860 + )
5828 GO 5861 GO
5829 5862
5830 ALTER TABLE [dbo].[system_dict_type] SET (LOCK_ESCALATION = TABLE) 5863 ALTER TABLE [dbo].[system_dict_type] SET (LOCK_ESCALATION = TABLE)
@@ -5882,26 +5915,29 @@ GO @@ -5882,26 +5915,29 @@ GO
5882 EXEC sp_addextendedproperty 5915 EXEC sp_addextendedproperty
5883 'MS_Description', N'更新者', 5916 'MS_Description', N'更新者',
5884 'SCHEMA', N'dbo', 5917 'SCHEMA', N'dbo',
5885 -'TABLE', N'system_dict_type',  
5886 -'COLUMN', N'updater'  
5887 -GO  
5888 -  
5889 -EXEC sp_addextendedproperty  
5890 -'MS_Description', N'更新时间',  
5891 -'SCHEMA', N'dbo',  
5892 -'TABLE', N'system_dict_type',  
5893 -'COLUMN', N'update_time'  
5894 -GO  
5895 -  
5896 -EXEC sp_addextendedproperty  
5897 -'MS_Description', N'是否删除',  
5898 -'SCHEMA', N'dbo',  
5899 -'TABLE', N'system_dict_type',  
5900 -'COLUMN', N'deleted'  
5901 -GO  
5902 -  
5903 -EXEC sp_addextendedproperty  
5904 -'MS_Description', N'字典类型表', 5918 + 'TABLE', N'system_dict_type',
  5919 + 'COLUMN', N'updater'
  5920 + GO
  5921 + EXEC sp_addextendedproperty
  5922 + 'MS_Description', N'更新时间',
  5923 + 'SCHEMA', N'dbo',
  5924 + 'TABLE', N'system_dict_type',
  5925 + 'COLUMN', N'update_time'
  5926 + GO
  5927 + EXEC sp_addextendedproperty
  5928 + 'MS_Description', N'删除时间',
  5929 + 'SCHEMA', N'dbo',
  5930 + 'TABLE', N'system_dict_type',
  5931 + 'COLUMN', N'deleted_time'
  5932 + GO
  5933 + EXEC sp_addextendedproperty
  5934 + 'MS_Description', N'是否删除',
  5935 + 'SCHEMA', N'dbo',
  5936 + 'TABLE', N'system_dict_type',
  5937 + 'COLUMN', N'deleted'
  5938 + GO
  5939 + EXEC sp_addextendedproperty
  5940 + 'MS_Description', N'字典类型表',
5905 'SCHEMA', N'dbo', 5941 'SCHEMA', N'dbo',
5906 'TABLE', N'system_dict_type' 5942 'TABLE', N'system_dict_type'
5907 GO 5943 GO
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dict/DictTypeDO.java
  View file @9933818
@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId; @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
8 import com.baomidou.mybatisplus.annotation.TableName; 8 import com.baomidou.mybatisplus.annotation.TableName;
9 import lombok.*; 9 import lombok.*;
10 10
  11 +import java.time.LocalDateTime;
  12 +
11 /** 13 /**
12 * 字典类型表 14 * 字典类型表
13 * 15 *
@@ -47,4 +49,9 @@ public class DictTypeDO extends BaseDO { @@ -47,4 +49,9 @@ public class DictTypeDO extends BaseDO {
47 */ 49 */
48 private String remark; 50 private String remark;
49 51
  52 + /**
  53 + * 删除时间
  54 + */
  55 + private LocalDateTime deletedTime;
  56 +
50 } 57 }
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictTypeMapper.java
  View file @9933818
@@ -7,8 +7,12 @@ import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeExpo @@ -7,8 +7,12 @@ import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypeExpo
7 import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypePageReqVO; 7 import cn.iocoder.yudao.module.system.controller.admin.dict.vo.type.DictTypePageReqVO;
8 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO; 8 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
9 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO; 9 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO;
  10 +import org.apache.ibatis.annotations.Delete;
10 import org.apache.ibatis.annotations.Mapper; 11 import org.apache.ibatis.annotations.Mapper;
  12 +import org.apache.ibatis.annotations.Param;
  13 +import org.apache.ibatis.annotations.Update;
11 14
  15 +import java.time.LocalDateTime;
12 import java.util.List; 16 import java.util.List;
13 17
14 @Mapper 18 @Mapper
@@ -39,4 +43,10 @@ public interface DictTypeMapper extends BaseMapperX<DictTypeDO> { @@ -39,4 +43,10 @@ public interface DictTypeMapper extends BaseMapperX<DictTypeDO> {
39 return selectOne(DictTypeDO::getName, name); 43 return selectOne(DictTypeDO::getName, name);
40 } 44 }
41 45
  46 + @Update("UPDATE system_dict_type SET DELETED = 1,DELETED_TIME=#{deletedTime} WHERE id = #{id}")
  47 + int deleteById(@Param("id") Long id, @Param("deletedTime") LocalDateTime deletedTime);
  48 +
  49 + default int deleteById(Long id) {
  50 + return deleteById(id, LocalDateTime.now());
  51 + }
42 } 52 }
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImpl.java
  View file @9933818
@@ -13,6 +13,7 @@ import com.google.common.annotations.VisibleForTesting; @@ -13,6 +13,7 @@ import com.google.common.annotations.VisibleForTesting;
13 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
14 14
15 import javax.annotation.Resource; 15 import javax.annotation.Resource;
  16 +import java.time.LocalDateTime;
16 import java.util.List; 17 import java.util.List;
17 18
18 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 19 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;