diff --git a/sql/mysql8/youlai_boot.sql b/sql/mysql8/youlai_boot.sql
index f9ab7a55..b711510a 100644
--- a/sql/mysql8/youlai_boot.sql
+++ b/sql/mysql8/youlai_boot.sql
@@ -18,7 +18,8 @@ use youlai_boot;
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
-
+  -- 开启事务
+START TRANSACTION;
 
 -- ----------------------------
 -- Table structure for sys_config
@@ -57,7 +58,7 @@ CREATE TABLE `sys_dept`  (
                              `is_deleted` tinyint NOT NULL DEFAULT 0 COMMENT '逻辑删除标识(1-已删除 0-未删除)',
                              PRIMARY KEY (`id`) USING BTREE,
                              UNIQUE INDEX `uk_code`(`code` ASC) USING BTREE COMMENT '部门编号唯一索引'
-) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '部门表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '部门表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of sys_dept
@@ -81,39 +82,48 @@ CREATE TABLE `sys_dict`  (
                              `is_deleted` tinyint NULL DEFAULT 0 COMMENT '是否删除(1-删除，0-未删除)',
                              PRIMARY KEY (`id`) USING BTREE,
                              UNIQUE INDEX `uk_code`(`code` ASC) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 89 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典类型表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典类型表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of sys_dict
 -- ----------------------------
-INSERT INTO `sys_dict` VALUES (1, '性别', 'gender', 1, NULL, '2019-12-06 19:03:32', '2024-06-22 21:14:47', 0);
-INSERT INTO `sys_dict` VALUES (2,'通知类型','notice_type',1,NULL,'2024-09-01 17:23:48','2024-09-01 17:23:54',0);
+INSERT INTO `sys_dict` VALUES (1, '性别', 'gender', 1, NULL, now(), now(), 0);
+INSERT INTO `sys_dict` VALUES (2,'通知类型','notice_type',1,NULL,now(),now(),0);
+INSERT INTO `sys_dict` VALUES (3, '通知级别', 'notice_level', 1, NULL, now(), now(), 0);
+
 
 -- ----------------------------
 -- Table structure for sys_dict_item
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_dict_item`;
-CREATE TABLE `sys_dict_item`  (
-                                  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
-                                  `dict_id` bigint NULL DEFAULT NULL COMMENT '字典ID',
-                                  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典项名称',
-                                  `value` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '字典项值',
-                                  `status` tinyint NULL DEFAULT 0 COMMENT '状态（1-正常，0-禁用）',
-                                  `sort` int NULL DEFAULT 0 COMMENT '排序',
-                                  `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注',
-                                  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-                                  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-                                  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 70 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '字典数据表' ROW_FORMAT = DYNAMIC;
+CREATE TABLE `sys_dict_item` (
+                                 `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+                                 `dict_code` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '字典编码',
+                                 `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '字典项名称',
+                                 `value` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '字典项值',
+                                 `status` tinyint DEFAULT '0' COMMENT '状态（1-正常，0-禁用）',
+                                 `sort` int DEFAULT '0' COMMENT '排序',
+                                 `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '备注',
+                                 `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+                                 `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+                                 PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='字典数据表';
 
 -- ----------------------------
 -- Records of sys_dict_item
 -- ----------------------------
-INSERT INTO `sys_dict_item` VALUES (1, 1, '男', '1', 1, 1, NULL, '2019-05-05 13:07:52', '2022-06-12 23:20:39');
-INSERT INTO `sys_dict_item` VALUES (2, 1, '女', '2', 1, 2, NULL, '2019-04-19 11:33:00', '2019-07-02 14:23:05');
-INSERT INTO `sys_dict_item` VALUES (3, 1, '保密', '0', 1, 3, NULL, '2020-10-17 08:09:31', '2020-10-17 08:09:31');
-INSERT INTO `sys_dict_item` VALUES (4, 2,'系统通知','1',1, 1, NULL,'2020-10-17 08:09:31', '2020-10-17 08:09:31');
-INSERT INTO `sys_dict_item` VALUES (5, 2,'通知消息','2',1, 2, NULL,'2020-10-17 08:09:31', '2020-10-17 08:09:31');
+INSERT INTO `sys_dict_item` VALUES (1, 'gender', '男', '1', 1, 1, NULL, now(), now());
+INSERT INTO `sys_dict_item` VALUES (2, 'gender',  '女', '2', 1, 2, NULL, now(), now());
+INSERT INTO `sys_dict_item` VALUES (3,  'gender', '保密', '0', 1, 3, NULL, now(), now());
+INSERT INTO `sys_dict_item` VALUES (4,  'notice_type', '系统升级', '1', 1, 1, '', now(), now());
+INSERT INTO `sys_dict_item` VALUES (5,  'notice_type', '系统维护', '2', 1, 2, '', now(), now());
+INSERT INTO `sys_dict_item` VALUES (6,  'notice_type', '安全警告', '3', 1, 3, '', now(), now());
+INSERT INTO `sys_dict_item` VALUES (7,  'notice_type', '假期通知', '4', 1, 4, '', now(), now());
+INSERT INTO `sys_dict_item` VALUES (8,  'notice_type', '公司新闻', '5', 1, 5, '', now(), now());
+INSERT INTO `sys_dict_item` VALUES (9,  'notice_type', '其他', '99', 1, 99, '', now(), now());
+INSERT INTO `sys_dict_item` VALUES (10,  'notice_level', 'L', '低', 1, 1, '', now(), now());
+INSERT INTO `sys_dict_item` VALUES (11,  'notice_level', 'M', '中', 1, 2, '', now(), now());
+INSERT INTO `sys_dict_item` VALUES (12,  'notice_level', 'H', '高', 1, 3, '', now(), now());
 
 -- ----------------------------
 -- Table structure for sys_log
@@ -161,7 +171,7 @@ CREATE TABLE `sys_menu`  (
                              `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
                              `params` json NULL COMMENT '路由参数',
                              PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 117 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单管理' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单管理' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of sys_menu
@@ -228,14 +238,12 @@ INSERT INTO `sys_menu` VALUES (123,120,'0,1,120','修改系统配置',4,NULL,'',
 INSERT INTO `sys_menu` VALUES (124,120,'0,1,120','删除系统配置',4,NULL,'',NULL,'sys:config:delete',0,1,1,4,'',NULL,'2024-07-30 16:31:07','2024-07-30 16:31:07',NULL);
 INSERT INTO `sys_menu` VALUES (125,120,'0,1,120','刷新系统配置',4,NULL,'',NULL,'sys:config:refresh',0,1,1,5,'',NULL,'2024-07-30 16:31:25','2024-07-30 16:31:25',NULL);
 INSERT INTO `sys_menu` VALUES (126,1,'0,1','通知公告',1,'Notice','notice','system/notice/index',NULL,NULL,NULL,1,9,'',NULL,'2024-08-24 13:39:03','2024-08-24 13:39:03',NULL);
-INSERT INTO `sys_menu` VALUES (127,126,'0,1,132','查询',4,NULL,'',NULL,'sys:notice:query',NULL,NULL,1,1,'',NULL,'2024-08-24 13:39:03','2024-08-24 13:39:03',NULL);
-INSERT INTO `sys_menu` VALUES (128,126,'0,1,133','新增',4,NULL,'',NULL,'sys:notice:add',NULL,NULL,1,2,'',NULL,'2024-08-24 13:39:03','2024-08-24 13:39:03',NULL);
-INSERT INTO `sys_menu` VALUES (129,126,'0,1,134','编辑',4,NULL,'',NULL,'sys:notice:edit',NULL,NULL,1,3,'',NULL,'2024-08-24 13:39:03','2024-08-24 13:39:03',NULL);
-INSERT INTO `sys_menu` VALUES (130,126,'0,1,135','删除',4,NULL,'',NULL,'sys:notice:delete',NULL,NULL,1,4,'',NULL,'2024-08-24 13:39:03','2024-08-24 13:39:03',NULL);
-INSERT INTO `sys_menu` VALUES (131,0,'0','消息中心',2,NULL,'/notice','Layout',NULL,1,1,1,13,'el-icon-Message',NULL,'2024-08-31 21:16:06','2024-08-31 21:16:41',NULL);
-INSERT INTO `sys_menu` VALUES (132,131,'0,136','我的消息',1,'MyNotice','notice','notice/index',NULL,0,1,1,1,'',NULL,'2024-08-31 21:17:36','2024-09-12 11:28:42',NULL);
-INSERT INTO `sys_menu` VALUES (133,132,'0,1,131','发布',4,NULL,'',NULL,'sys:notice:publish',0,1,1,5,'',NULL,'2024-09-01 23:53:52','2024-09-01 23:53:52',NULL);
-INSERT INTO `sys_menu` VALUES (134,132,'0,1,131','撤回',4,NULL,'',NULL,'sys:notice:revoke',0,1,1,6,'',NULL,'2024-09-01 23:54:16','2024-09-01 23:54:16',NULL);
+INSERT INTO `sys_menu` VALUES (127,126,'0,1,126','查询',4,NULL,'',NULL,'sys:notice:query',NULL,NULL,1,1,'',NULL,'2024-08-24 13:39:03','2024-08-24 13:39:03',NULL);
+INSERT INTO `sys_menu` VALUES (128,126,'0,1,126','新增',4,NULL,'',NULL,'sys:notice:add',NULL,NULL,1,2,'',NULL,'2024-08-24 13:39:03','2024-08-24 13:39:03',NULL);
+INSERT INTO `sys_menu` VALUES (129,126,'0,1,126','编辑',4,NULL,'',NULL,'sys:notice:edit',NULL,NULL,1,3,'',NULL,'2024-08-24 13:39:03','2024-08-24 13:39:03',NULL);
+INSERT INTO `sys_menu` VALUES (130,126,'0,1,126','删除',4,NULL,'',NULL,'sys:notice:delete',NULL,NULL,1,4,'',NULL,'2024-08-24 13:39:03','2024-08-24 13:39:03',NULL);
+INSERT INTO `sys_menu` VALUES (133,126,'0,1,126','发布',4,NULL,'',NULL,'sys:notice:publish',0,1,1,5,'',NULL,'2024-09-01 23:53:52','2024-09-01 23:53:52',NULL);
+INSERT INTO `sys_menu` VALUES (134,126,'0,1,126','撤回',4,NULL,'',NULL,'sys:notice:revoke',0,1,1,6,'',NULL,'2024-09-01 23:54:16','2024-09-01 23:54:16',NULL);
 
 -- ----------------------------
 -- Table structure for sys_message
@@ -274,7 +282,7 @@ CREATE TABLE `sys_role`  (
                              PRIMARY KEY (`id`) USING BTREE,
                              UNIQUE INDEX `uk_name`(`name` ASC) USING BTREE COMMENT '角色名称唯一索引',
                              UNIQUE INDEX `uk_code`(`code` ASC) USING BTREE COMMENT '角色编码唯一索引'
-) ENGINE = InnoDB AUTO_INCREMENT = 128 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of sys_role
@@ -400,14 +408,14 @@ CREATE TABLE `sys_user`  (
                              `is_deleted` tinyint(1) NULL DEFAULT 0 COMMENT '逻辑删除标识(0-未删除 1-已删除)',
                              PRIMARY KEY (`id`) USING BTREE,
                              UNIQUE INDEX `login_name`(`username` ASC) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 288 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息表' ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES (1, 'root', '有来技术', 0, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', NULL, 'https://oss.youlai.tech/youlai-boot/2023/05/16/811270ef31f548af9cffc026dfc3777b.gif', '17621590365', 1, 'youlaitech@163.com', NULL, NULL, NULL, NULL, 0);
-INSERT INTO `sys_user` VALUES (2, 'admin', '系统管理员', 1, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', 1, 'https://oss.youlai.tech/youlai-boot/2023/05/16/811270ef31f548af9cffc026dfc3777b.gif', '17621210366', 1, '', '2019-10-10 13:41:22', NULL, '2022-07-31 12:39:30', NULL, 0);
-INSERT INTO `sys_user` VALUES (3, 'websocket', '测试小用户', 1, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', 3, 'https://oss.youlai.tech/youlai-boot/2023/05/16/811270ef31f548af9cffc026dfc3777b.gif', '17621210366', 1, 'youlaitech@163.com', '2021-06-05 01:31:29', NULL, '2021-06-05 01:31:29', NULL, 0);
+INSERT INTO `sys_user` VALUES (1, 'root', '有来技术', 0, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', NULL, 'https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif', '18866668888', 1, 'youlaitech@163.com', NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_user` VALUES (2, 'admin', '系统管理员', 1, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', 1, 'https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif', '18866668887', 1, '', '2019-10-10 13:41:22', NULL, '2022-07-31 12:39:30', NULL, 0);
+INSERT INTO `sys_user` VALUES (3, 'websocket', '测试小用户', 1, '$2a$10$xVWsNOhHrCxh5UbpCE7/HuJ.PAOKcYAqRxD2CO2nVnJS.IAXkr5aq', 3, 'https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif', '18866668886', 1, 'youlaitech@163.com', '2021-06-05 01:31:29', NULL, '2021-06-05 01:31:29', NULL, 0);
 
 -- ----------------------------
 -- Table structure for sys_user_role
@@ -499,33 +507,39 @@ CREATE TABLE `gen_field_config` (
                                     KEY `config_id` (`config_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='代码生成字段配置表';
 
-CREATE TABLE `sys_notice` (
-                              `id` BIGINT NOT NULL AUTO_INCREMENT,
-                              `title` VARCHAR(50) DEFAULT NULL COMMENT '通知标题',
-                              `content` TEXT COMMENT '通知内容',
-                              `notice_type` INT NOT NULL COMMENT '通知类型',
-                              `release_by` BIGINT DEFAULT NULL COMMENT '发布人',
-                              `priority` TINYINT NOT NULL COMMENT '优先级(0-低 1-中 2-高)',
-                              `tar_type` TINYINT NOT NULL COMMENT '目标类型(0-全体 1-指定)',
-                              `tar_ids` TEXT COMMENT '目标人id',
-                              `release_status` TINYINT NOT NULL COMMENT '发布状态(0-未发布 1已发布 2已撤回)',
-                              `release_time` DATETIME DEFAULT NULL COMMENT '发布时间',
-                              `recall_time` DATETIME DEFAULT NULL COMMENT '撤回时间',
-                              `create_by` BIGINT NOT NULL COMMENT '创建人ID',
-                              `create_time` DATETIME NOT NULL COMMENT '创建时间',
-                              `update_by` BIGINT DEFAULT NULL COMMENT '更新人ID',
-                              `update_time` DATETIME DEFAULT NULL COMMENT '更新时间',
-                              `is_deleted` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '逻辑删除标识(0-未删除 1-已删除)',
-                              PRIMARY KEY (`id`) USING BTREE
-) ENGINE=INNODB COMMENT='通知公告';
+CREATE TABLE `sys_user_notice` (
+                                   `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
+                                   `notice_id` bigint NOT NULL COMMENT '公共通知id',
+                                   `user_id` bigint NOT NULL COMMENT '用户id',
+                                   `is_read` bigint NOT NULL DEFAULT '0' COMMENT '读取状态（0未读；1已读）',
+                                   `read_time` datetime DEFAULT NULL COMMENT '阅读时间',
+                                   `create_time` datetime NOT NULL COMMENT '创建时间',
+                                   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+                                   `is_deleted` tinyint NOT NULL DEFAULT '0' COMMENT '逻辑删除(1-已删除；0-未删除)',
+                                   PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='用户通知公告表';
 
-CREATE TABLE `sys_notice_status` (
-                                     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT 'id',
-                                     `notice_id` BIGINT NOT NULL COMMENT '公共通知id',
-                                     `user_id` INT NOT NULL COMMENT '用户id',
-                                     `read_status` BIGINT DEFAULT NULL COMMENT '读取状态，0未读，1已读取',
-                                     `read_time` DATETIME DEFAULT NULL COMMENT '用户阅读时间',
-                                     PRIMARY KEY (`id`) USING BTREE
-) ENGINE=INNODB COMMENT='用户公告状态表';
+CREATE TABLE `sys_notice` (
+                              `id` bigint NOT NULL AUTO_INCREMENT,
+                              `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '通知标题',
+                              `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '通知内容',
+                              `type` tinyint NOT NULL COMMENT '通知类型（字典code：notice_type）',
+                              `level` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '通知等级（字典code：notice_level）',
+                              `target_type` tinyint NOT NULL COMMENT '目标类型（1: 全体, 2: 指定）',
+                              `target_user_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '目标人ID集合（多个使用英文逗号,分割）',
+                              `publisher_id` bigint DEFAULT NULL COMMENT '发布人ID',
+                              `publish_status` tinyint NOT NULL DEFAULT '0' COMMENT '发布状态（0: 未发布, 1: 已发布, -1: 已撤回）',
+                              `publish_time` datetime DEFAULT NULL COMMENT '发布时间',
+                              `revoke_time` datetime DEFAULT NULL COMMENT '撤回时间',
+                              `create_by` bigint NOT NULL COMMENT '创建人ID',
+                              `create_time` datetime NOT NULL COMMENT '创建时间',
+                              `update_by` bigint DEFAULT NULL COMMENT '更新人ID',
+                              `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+                              `is_deleted` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除（0: 未删除, 1: 已删除）',
+                              PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='通知公告表';
 
 SET FOREIGN_KEY_CHECKS = 1;
+
+ -- 提交事务
+COMMIT;
\ No newline at end of file
diff --git a/src/main/java/com/youlai/boot/system/controller/DictController.java b/src/main/java/com/youlai/boot/system/controller/DictController.java
index 71d2e6c0..c2225c2d 100644
--- a/src/main/java/com/youlai/boot/system/controller/DictController.java
+++ b/src/main/java/com/youlai/boot/system/controller/DictController.java
@@ -52,15 +52,6 @@ public class DictController {
         return Result.success(list);
     }
 
-    @Operation(summary = "字典数据项列表")
-    @GetMapping("/{code}/options")
-    public Result<List<Option<Long>>> getDictOptions(
-            @Parameter(description = "字典编码") @PathVariable String code
-    ) {
-        List<Option<Long>> options = dictService.listDictItemsByCode(code);
-        return Result.success(options);
-    }
-
     @Operation(summary = "字典表单")
     @GetMapping("/{id}/form")
     public Result<DictForm> getDictForm(
@@ -101,4 +92,9 @@ public class DictController {
     }
 
 
+
+
+
+
+
 }
diff --git a/src/main/java/com/youlai/boot/system/controller/DictDataController.java b/src/main/java/com/youlai/boot/system/controller/DictDataController.java
new file mode 100644
index 00000000..a2673069
--- /dev/null
+++ b/src/main/java/com/youlai/boot/system/controller/DictDataController.java
@@ -0,0 +1,96 @@
+package com.youlai.boot.system.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.youlai.boot.common.annotation.Log;
+import com.youlai.boot.common.annotation.RepeatSubmit;
+import com.youlai.boot.common.enums.LogModuleEnum;
+import com.youlai.boot.common.model.Option;
+import com.youlai.boot.common.result.PageResult;
+import com.youlai.boot.common.result.Result;
+import com.youlai.boot.system.model.form.DictDataForm;
+import com.youlai.boot.system.model.query.DictPageQuery;
+import com.youlai.boot.system.model.vo.DictDataPageVO;
+import com.youlai.boot.system.service.DictDataService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 字典控制层
+ *
+ * @author Ray
+ * @since 2.9.0
+ */
+@Tag(name = "07.字典数据接口")
+@RestController
+@RequestMapping("/api/v1/dict-data")
+@RequiredArgsConstructor
+public class DictDataController {
+
+    private final DictDataService dictDataService;
+
+    @Operation(summary = "字典数据分页列表")
+    @GetMapping("/page")
+    @Log( value = "字典数据分页列表",module = LogModuleEnum.DICT)
+    public PageResult<DictDataPageVO> getDictDataPage(
+            DictPageQuery queryParams
+    ) {
+        Page<DictDataPageVO> result = dictDataService.getDictDataPage(queryParams);
+        return PageResult.success(result);
+    }
+
+    @Operation(summary = "字典数据表单内")
+    @GetMapping("/{id}/form")
+    public Result<DictDataForm> getDictDataForm(
+            @Parameter(description = "字典数据ID") @PathVariable Long id
+    ) {
+        DictDataForm formData = dictDataService.getDictDataForm(id);
+        return Result.success(formData);
+    }
+
+    @Operation(summary = "新增字典数据")
+    @PostMapping
+    @PreAuthorize("@ss.hasPerm('sys:dict:add')")
+    @RepeatSubmit
+    public Result<Void> saveDictData(@Valid @RequestBody DictDataForm formData) {
+        boolean result = dictDataService.saveDictData(formData);
+        return Result.judge(result);
+    }
+
+    @Operation(summary = "修改字典数据")
+    @PutMapping("/{id}")
+    @PreAuthorize("@ss.hasPerm('sys:dict:edit')")
+    public Result<?> updateDictData(
+            @PathVariable Long id,
+            @RequestBody DictDataForm formData
+    ) {
+        boolean status = dictDataService.updateDictData(formData);
+        return Result.judge(status);
+    }
+
+    @Operation(summary = "删除字典数据")
+    @DeleteMapping("/{ids}")
+    @PreAuthorize("@ss.hasPerm('sys:dict:delete')")
+    public Result<Void> deleteDictionaries(
+            @Parameter(description = "字典ID，多个以英文逗号(,)拼接") @PathVariable String ids
+    ) {
+        dictDataService.deleteDictDataByIds(ids);
+        return Result.success();
+    }
+
+    @Operation(summary = "字典数据列表")
+    @GetMapping("/{dictCode}/options")
+    public Result<List<Option>> getDictDataList(
+            @Parameter(description = "字典编码") @PathVariable String dictCode
+    ) {
+        List<Option> options = dictDataService.getDictDataList(dictCode);
+        return Result.success(options);
+    }
+
+}
diff --git a/src/main/java/com/youlai/boot/system/controller/NoticeController.java b/src/main/java/com/youlai/boot/system/controller/NoticeController.java
index ea1677af..29e74751 100644
--- a/src/main/java/com/youlai/boot/system/controller/NoticeController.java
+++ b/src/main/java/com/youlai/boot/system/controller/NoticeController.java
@@ -8,7 +8,6 @@ import com.youlai.boot.system.model.query.NoticePageQuery;
 import com.youlai.boot.system.model.vo.NoticeDetailVO;
 import com.youlai.boot.system.model.vo.NoticePageVO;
 import com.youlai.boot.system.model.vo.UserNoticePageVO;
-import com.youlai.boot.system.model.vo.UserUnreadNoticeVO;
 import com.youlai.boot.system.service.NoticeService;
 import com.youlai.boot.system.service.UserNoticeService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -20,7 +19,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 
 /**
  * 通知公告前端控制层
@@ -114,13 +112,6 @@ public class NoticeController {
         return Result.judge(result);
     }
 
-    @Operation(summary = "获取未读的通知公告")
-    @GetMapping("/unread")
-    public Result<List<UserUnreadNoticeVO>> listUnreadNotices() {
-        List<UserUnreadNoticeVO> list = userNoticeService.listUnreadNotices();
-        return Result.success(list);
-    }
-
     @Operation(summary = "全部已读")
     @PutMapping("/read-all")
     public Result<Void> readAll() {
diff --git a/src/main/java/com/youlai/boot/system/converter/DictDataConverter.java b/src/main/java/com/youlai/boot/system/converter/DictDataConverter.java
new file mode 100644
index 00000000..b469f624
--- /dev/null
+++ b/src/main/java/com/youlai/boot/system/converter/DictDataConverter.java
@@ -0,0 +1,30 @@
+package com.youlai.boot.system.converter;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.youlai.boot.system.model.entity.DictData;
+import com.youlai.boot.system.model.form.DictDataForm;
+import com.youlai.boot.system.model.vo.DictPageVO;
+import com.youlai.boot.common.model.Option;
+import com.youlai.boot.system.model.form.DictForm;
+import org.mapstruct.Mapper;
+
+import java.util.List;
+
+/**
+ * 字典项 对象转换器
+ *
+ * @author Ray
+ * @since 2022/6/8
+ */
+@Mapper(componentModel = "spring")
+public interface DictDataConverter {
+
+    Page<DictPageVO> toPageVo(Page<DictData> page);
+
+    DictDataForm toForm(DictData entity);
+
+    DictData toEntity(DictDataForm formFata);
+
+    Option<Long> toOption(DictData dictData);
+    List<Option<Long>> toOption(List<DictData> dictData);
+}
diff --git a/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java b/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java
deleted file mode 100644
index ea49d58b..00000000
--- a/src/main/java/com/youlai/boot/system/converter/DictItemConverter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.youlai.boot.system.converter;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.boot.system.model.entity.DictItem;
-import com.youlai.boot.system.model.vo.DictPageVO;
-import com.youlai.boot.common.model.Option;
-import com.youlai.boot.system.model.form.DictForm;
-import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
-import org.mapstruct.Mappings;
-
-import java.util.List;
-
-/**
- * 字典项 对象转换器
- *
- * @author Ray
- * @since 2022/6/8
- */
-@Mapper(componentModel = "spring")
-public interface DictItemConverter {
-
-    Page<DictPageVO> toPageVo(Page<DictItem> page);
-
-    DictForm toForm(DictItem entity);
-
-    DictItem toEntity(DictForm.DictItem dictItems);
-    List<DictItem> toEntity(List<DictForm.DictItem> dictItems);
-
-    DictForm.DictItem toDictItem(DictItem entity);
-    List<DictForm.DictItem> toDictItem(List<DictItem> entities);
-
-    @Mappings({
-            @Mapping(target = "value", source = "value"),
-            @Mapping(target = "label", source = "name")
-    })
-    Option<Long> toOption(DictItem dictItem);
-    List<Option<Long>> toOption(List<DictItem> dictItems);
-}
diff --git a/src/main/java/com/youlai/boot/system/mapper/DictDataMapper.java b/src/main/java/com/youlai/boot/system/mapper/DictDataMapper.java
new file mode 100644
index 00000000..09c5cb91
--- /dev/null
+++ b/src/main/java/com/youlai/boot/system/mapper/DictDataMapper.java
@@ -0,0 +1,24 @@
+package com.youlai.boot.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.youlai.boot.system.model.entity.DictData;
+import com.youlai.boot.system.model.query.DictPageQuery;
+import com.youlai.boot.system.model.vo.DictDataPageVO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 字典数据映射层
+ *
+ * @author Ray Hao
+ * @since 2.9.0
+ */
+@Mapper
+public interface DictDataMapper extends BaseMapper<DictData> {
+
+    Page<DictDataPageVO> getDictDataPage(Page<DictDataPageVO> page, DictPageQuery queryParams);
+}
+
+
+
+
diff --git a/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java b/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java
deleted file mode 100644
index 7f6a137c..00000000
--- a/src/main/java/com/youlai/boot/system/mapper/DictItemMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.youlai.boot.system.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.youlai.boot.system.model.entity.DictItem;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 字典项 访问层
- *
- * @author Ray Hao
- * @since 2.9.0
- */
-@Mapper
-public interface DictItemMapper extends BaseMapper<DictItem> {
-
-}
-
-
-
-
diff --git a/src/main/java/com/youlai/boot/system/mapper/UserNoticeMapper.java b/src/main/java/com/youlai/boot/system/mapper/UserNoticeMapper.java
index db03a887..e874cd3e 100644
--- a/src/main/java/com/youlai/boot/system/mapper/UserNoticeMapper.java
+++ b/src/main/java/com/youlai/boot/system/mapper/UserNoticeMapper.java
@@ -7,7 +7,6 @@ import com.youlai.boot.system.model.entity.UserNotice;
 import com.youlai.boot.system.model.query.NoticePageQuery;
 import com.youlai.boot.system.model.vo.NoticePageVO;
 import com.youlai.boot.system.model.vo.UserNoticePageVO;
-import com.youlai.boot.system.model.vo.UserUnreadNoticeVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,14 +20,6 @@ import java.util.List;
  */
 @Mapper
 public interface UserNoticeMapper extends BaseMapper<UserNotice> {
-
-    /**
-     * 获取未读的通知公告
-     * @param userId 用户ID
-     * @return 公告列表
-     */
-    List<UserUnreadNoticeVO> listUnreadNotices(Long userId);
-
     /**
      * 分页获取我的通知公告
      * @param page 分页对象
diff --git a/src/main/java/com/youlai/boot/system/model/entity/Dict.java b/src/main/java/com/youlai/boot/system/model/entity/Dict.java
index 6604f801..7172d266 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Dict.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Dict.java
@@ -17,17 +17,18 @@ import lombok.EqualsAndHashCode;
 public class Dict extends BaseEntity {
 
     /**
-     * 类型名称
-     */
-    private String name;
-
-    /**
-     * 类型编码
+     * 字典编码
      */
     private String code;
 
     /**
-     * 状态(0:正常;1:禁用)
+     * 字典名称
+     */
+    private String name;
+
+
+    /**
+     * 状态（1：启用, 0：停用）
      */
     private Integer status;
 
diff --git a/src/main/java/com/youlai/boot/system/model/entity/DictItem.java b/src/main/java/com/youlai/boot/system/model/entity/DictData.java
similarity index 77%
rename from src/main/java/com/youlai/boot/system/model/entity/DictItem.java
rename to src/main/java/com/youlai/boot/system/model/entity/DictData.java
index 0750a3c8..ec3d5552 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/DictItem.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/DictData.java
@@ -6,17 +6,18 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.youlai.boot.common.base.BaseEntity;
 import lombok.Data;
 
 /**
- * 字典项实体
+ * 字典数据表
  *
  * @author haoxr
  * @since 2022/12/17
  */
-@TableName("sys_dict_item")
+@TableName("sys_dict_data")
 @Data
-public class DictItem implements Serializable {
+public class DictData extends BaseEntity {
     /**
      * 主键
      */
@@ -24,14 +25,14 @@ public class DictItem implements Serializable {
     private Long id;
 
     /**
-     * 字典类ID
+     * 字典编码
      */
-    private Long dictId;
+    private String dictCode;
 
     /**
      * 字典项名称
      */
-    private String name;
+    private String label;
 
     /**
      * 字典项值
diff --git a/src/main/java/com/youlai/boot/system/model/form/DictDataForm.java b/src/main/java/com/youlai/boot/system/model/form/DictDataForm.java
new file mode 100644
index 00000000..b06bef29
--- /dev/null
+++ b/src/main/java/com/youlai/boot/system/model/form/DictDataForm.java
@@ -0,0 +1,37 @@
+package com.youlai.boot.system.model.form;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.validator.constraints.Range;
+
+import java.util.List;
+
+/**
+ * 字典数据表单对象
+ *
+ * @author Ray Hao
+ * @since 2.9.0
+ */
+@Schema(description = "字典数据表单")
+@Data
+public class DictDataForm {
+
+    @Schema(description = "字典ID")
+    private Long id;
+
+    @Schema(description = "字典值")
+    private String value;
+
+    @Schema(description = "字典标签")
+    private String label;
+
+    @Schema(description = "排序")
+    private Integer sort;
+
+    @Schema(description = "状态（1-启用，0-禁用）")
+    private Integer status;
+
+}
diff --git a/src/main/java/com/youlai/boot/system/model/form/DictForm.java b/src/main/java/com/youlai/boot/system/model/form/DictForm.java
index a7d614bd..1011392e 100644
--- a/src/main/java/com/youlai/boot/system/model/form/DictForm.java
+++ b/src/main/java/com/youlai/boot/system/model/form/DictForm.java
@@ -23,39 +23,14 @@ public class DictForm {
     private Long id;
 
     @Schema(description = "字典名称",example = "性别")
-    private String name;
+    private String dictName;
 
     @Schema(description = "字典编码", example ="gender")
-    private String code;
+    private String dictCode;
 
     @Schema(description = "字典状态（1-启用，0-禁用）", example = "1")
     @Range(min = 0, max = 1, message = "字典状态不正确")
     private Integer status;
 
-    @Schema(description = "字典数据项列表",example = "[{\"id\":1,\"name\":\"男\",\"value\":\"1\",\"sort\":1,\"status\":1},{\"id\":2,\"name\":\"女\",\"value\":\"2\",\"sort\":2,\"status\":1}]")
-    private List<DictItem> dictItems;
-
-    @Schema(description = "字典数据项")
-    @Getter
-    @Setter
-    public static class DictItem {
-
-        @Schema(description = "字典ID")
-        private Long id;
-
-        @Schema(description = "字典名称")
-        private String name;
-
-        @Schema(description = "字典值")
-        private String value;
-
-        @Schema(description = "排序")
-        private Integer sort;
-
-        @Schema(description = "状态（1-启用，0-禁用）")
-        private Integer status;
-
-    }
-
 
 }
diff --git a/src/main/java/com/youlai/boot/system/model/query/DictDataPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/DictDataPageQuery.java
new file mode 100644
index 00000000..762e8d82
--- /dev/null
+++ b/src/main/java/com/youlai/boot/system/model/query/DictDataPageQuery.java
@@ -0,0 +1,20 @@
+package com.youlai.boot.system.model.query;
+
+
+import com.youlai.boot.common.base.BasePageQuery;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Schema(description ="字典数据分页查询对象")
+public class DictDataPageQuery extends BasePageQuery {
+
+    @Schema(description="关键字(字典数据标签/值)")
+    private String keywords;
+
+    @Schema(description="字典编码")
+    private String dictCode;
+
+}
diff --git a/src/main/java/com/youlai/boot/system/model/query/DictPageQuery.java b/src/main/java/com/youlai/boot/system/model/query/DictPageQuery.java
index 3e4696b4..91b464d5 100644
--- a/src/main/java/com/youlai/boot/system/model/query/DictPageQuery.java
+++ b/src/main/java/com/youlai/boot/system/model/query/DictPageQuery.java
@@ -11,9 +11,10 @@ import lombok.EqualsAndHashCode;
 @Schema(description ="字典数据项分页查询对象")
 public class DictPageQuery extends BasePageQuery {
 
-    @Schema(description="关键字(字典项名称)")
+    @Schema(description="关键字(字典名称)")
     private String keywords;
 
     @Schema(description="字典编码")
     private String typeCode;
+
 }
diff --git a/src/main/java/com/youlai/boot/system/model/vo/DictDataPageVO.java b/src/main/java/com/youlai/boot/system/model/vo/DictDataPageVO.java
new file mode 100644
index 00000000..2425d08f
--- /dev/null
+++ b/src/main/java/com/youlai/boot/system/model/vo/DictDataPageVO.java
@@ -0,0 +1,38 @@
+package com.youlai.boot.system.model.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+ * 字典数据项分页VO
+ *
+ * @author Ray
+ * @since 0.0.1
+ */
+@Schema(description = "字典数据分页对象")
+@Getter
+@Setter
+public class DictDataPageVO {
+
+    @Schema(description = "字典数据ID")
+    private Long id;
+
+    @Schema(description = "字典编码")
+    private String dictCode;
+
+    @Schema(description = "字典数据值")
+    private String value;
+
+    @Schema(description = "字典数据标签")
+    private String label;
+
+    @Schema(description = "排序")
+    private Integer sort;
+
+    @Schema(description = "状态（1:启用，0:禁用）")
+    private Integer status;
+
+}
diff --git a/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java b/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java
index 80d43fe4..2c03f389 100644
--- a/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java
+++ b/src/main/java/com/youlai/boot/system/model/vo/DictPageVO.java
@@ -23,37 +23,12 @@ public class DictPageVO {
     private Long id;
 
     @Schema(description = "字典名称")
-    private String name;
+    private String dictName;
 
     @Schema(description = "字典编码")
-    private String code;
+    private String dictCode;
 
     @Schema(description = "字典状态（1-启用，0-禁用）")
     private Integer status;
 
-    @Schema(description = "字典项列表")
-    private List<DictItem> dictItems;
-
-    @Schema(description = "字典")
-    @Getter
-    @Setter
-    public static class DictItem {
-
-        @Schema(description = "字典项ID")
-        private Long id;
-
-        @Schema(description = "字典项名称")
-        private String name;
-
-        @Schema(description = "字典项值")
-        private String value;
-
-        @Schema(description = "排序")
-        private Integer sort;
-
-        @Schema(description = "状态（1-启用，0-禁用）")
-        private Integer status;
-
-    }
-
 }
diff --git a/src/main/java/com/youlai/boot/system/model/vo/UserNoticePageVO.java b/src/main/java/com/youlai/boot/system/model/vo/UserNoticePageVO.java
index 186da5a4..8fd5722b 100644
--- a/src/main/java/com/youlai/boot/system/model/vo/UserNoticePageVO.java
+++ b/src/main/java/com/youlai/boot/system/model/vo/UserNoticePageVO.java
@@ -22,6 +22,9 @@ public class UserNoticePageVO {
     @Schema(description = "通知标题")
     private String title;
 
+    @Schema(description = "通知等级")
+    private String level;
+
     @Schema(description = "通知类型")
     private String typeLabel;
 
@@ -32,7 +35,7 @@ public class UserNoticePageVO {
     private String levelLabel;
 
     @Schema(description = "发布时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime publishTime;
 
     @Schema(description = "是否已读")
diff --git a/src/main/java/com/youlai/boot/system/model/vo/UserUnreadNoticeVO.java b/src/main/java/com/youlai/boot/system/model/vo/UserUnreadNoticeVO.java
deleted file mode 100644
index 2f676f16..00000000
--- a/src/main/java/com/youlai/boot/system/model/vo/UserUnreadNoticeVO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.youlai.boot.system.model.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * 用户公告VO
- *
- * @author Theo
- * @since 2024-08-28 16:56
- */
-@Data
-@Schema(description = "用户公告VO")
-public class UserUnreadNoticeVO {
-
-    @Schema(description = "通知ID")
-    private Long id;
-
-    @Schema(description = "通知标题")
-    private String title;
-
-}
diff --git a/src/main/java/com/youlai/boot/system/service/DictDataService.java b/src/main/java/com/youlai/boot/system/service/DictDataService.java
new file mode 100644
index 00000000..630dfe9b
--- /dev/null
+++ b/src/main/java/com/youlai/boot/system/service/DictDataService.java
@@ -0,0 +1,68 @@
+package com.youlai.boot.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.youlai.boot.common.model.Option;
+import com.youlai.boot.system.model.entity.DictData;
+import com.youlai.boot.system.model.form.DictDataForm;
+import com.youlai.boot.system.model.form.DictForm;
+import com.youlai.boot.system.model.query.DictPageQuery;
+import com.youlai.boot.system.model.vo.DictDataPageVO;
+
+import java.util.List;
+
+/**
+ * 字典数据接口
+ *
+ * @author Ray Hao
+ * @since 2023/3/4
+ */
+public interface DictDataService extends IService<DictData> {
+
+    /**
+     * 字典数据分页列表
+     *
+     * @param queryParams
+     * @return
+     */
+    Page<DictDataPageVO> getDictDataPage(DictPageQuery queryParams);
+
+    /**
+     * 获取字典数据表单
+     *
+     * @param id 字典数据ID
+     * @return
+     */
+    DictDataForm getDictDataForm(Long id);
+
+    /**
+     * 保存字典数据
+     *
+     * @param formData
+     * @return
+     */
+    boolean saveDictData(DictDataForm formData);
+
+    /**
+     * 更新字典数据
+     *
+     * @param formData 字典数据表单
+     * @return
+     */
+    boolean updateDictData(DictDataForm formData);
+
+    /**
+     * 删除字典数据
+     *
+     * @param ids 字典数据ID,多个逗号分隔
+     */
+    void deleteDictDataByIds(String ids);
+
+    /**
+     * 获取字典数据列表
+     *
+     * @param dictCode 字典编码
+     * @return
+     */
+    List<Option<String>> getDictDataList(String dictCode);
+}
diff --git a/src/main/java/com/youlai/boot/system/service/DictItemService.java b/src/main/java/com/youlai/boot/system/service/DictItemService.java
deleted file mode 100644
index f3114d68..00000000
--- a/src/main/java/com/youlai/boot/system/service/DictItemService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.youlai.boot.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.youlai.boot.system.model.entity.DictItem;
-
-/**
- * 字典项 接口
- *
- * @author Ray Hao
- * @since 2023/3/4
- */
-public interface DictItemService extends IService<DictItem> {
-
-}
diff --git a/src/main/java/com/youlai/boot/system/service/UserNoticeService.java b/src/main/java/com/youlai/boot/system/service/UserNoticeService.java
index cfeb5df7..ddf31c11 100644
--- a/src/main/java/com/youlai/boot/system/service/UserNoticeService.java
+++ b/src/main/java/com/youlai/boot/system/service/UserNoticeService.java
@@ -7,7 +7,6 @@ import com.youlai.boot.system.model.entity.UserNotice;
 import com.youlai.boot.system.model.query.NoticePageQuery;
 import com.youlai.boot.system.model.vo.UserNoticePageVO;
 import com.youlai.boot.system.model.vo.NoticePageVO;
-import com.youlai.boot.system.model.vo.UserUnreadNoticeVO;
 
 import java.util.List;
 
@@ -19,12 +18,6 @@ import java.util.List;
  */
 public interface UserNoticeService extends IService<UserNotice> {
 
-    /**
-     * 获取未读的通知公告
-     * @return 公告列表
-     */
-    List<UserUnreadNoticeVO> listUnreadNotices();
-
     /**
      * 全部标记为已读
      *
diff --git a/src/main/java/com/youlai/boot/system/service/impl/DictDataServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictDataServiceImpl.java
new file mode 100644
index 00000000..379f99a7
--- /dev/null
+++ b/src/main/java/com/youlai/boot/system/service/impl/DictDataServiceImpl.java
@@ -0,0 +1,112 @@
+package com.youlai.boot.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.youlai.boot.common.model.Option;
+import com.youlai.boot.system.converter.DictDataConverter;
+import com.youlai.boot.system.mapper.DictDataMapper;
+import com.youlai.boot.system.model.entity.DictData;
+import com.youlai.boot.system.model.form.DictDataForm;
+import com.youlai.boot.system.model.query.DictPageQuery;
+import com.youlai.boot.system.model.vo.DictDataPageVO;
+import com.youlai.boot.system.service.DictDataService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 字典数据实现类
+ *
+ * @author haoxr
+ * @since 2022/10/12
+ */
+@Service
+@RequiredArgsConstructor
+public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> implements DictDataService {
+
+    private final DictDataConverter dictDataConverter;
+
+    /**
+     * 获取字典数据分页列表
+     *
+     * @param queryParams
+     * @return
+     */
+    @Override
+    public Page<DictDataPageVO> getDictDataPage(DictPageQuery queryParams) {
+        int pageNum = queryParams.getPageNum();
+        int pageSize = queryParams.getPageSize();
+        Page<DictDataPageVO> page = new Page<>(pageNum, pageSize);
+
+        return this.baseMapper.getDictDataPage(page, queryParams);
+    }
+
+    /**
+     * 获取字典数据表单
+     *
+     * @param id 字典数据ID
+     * @return
+     */
+    @Override
+    public DictDataForm getDictDataForm(Long id) {
+        DictData entity = this.getById(id);
+        return dictDataConverter.toForm(entity);
+    }
+
+    /**
+     * 保存字典数据
+     *
+     * @param formData
+     * @return
+     */
+    @Override
+    public boolean saveDictData(DictDataForm formData) {
+        DictData entity = dictDataConverter.toEntity(formData);
+        return this.save(entity);
+    }
+
+    /**
+     * 更新字典数据
+     *
+     * @param formData 字典数据表单
+     * @return
+     */
+    @Override
+    public boolean updateDictData(DictDataForm formData) {
+        DictData entity = dictDataConverter.toEntity(formData);
+        return this.updateById(entity);
+    }
+
+    /**
+     * 删除字典数据
+     *
+     * @param ids 字典数据ID集合
+     */
+    @Override
+    public void deleteDictDataByIds(String ids) {
+        List<Long> idList = Arrays.stream(ids.split(",")).map(Long::parseLong).toList();
+        this.removeByIds(idList);
+    }
+
+    /**
+     * 获取字典数据列表
+     *
+     * @param dictCode 字典编码
+     * @return
+     */
+    @Override
+    public List<Option<String>> getDictDataList(String dictCode) {
+        return this.list(new LambdaQueryWrapper<DictData>()
+                        .eq(DictData::getDictCode, dictCode)
+                        .eq(DictData::getStatus, 1)
+                ).stream().map(item -> new Option<>(item.getValue(), item.getLabel()))
+                .toList();
+    }
+}
+
+
+
+
diff --git a/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java
deleted file mode 100644
index f5b73f84..00000000
--- a/src/main/java/com/youlai/boot/system/service/impl/DictItemServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.youlai.boot.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.youlai.boot.system.mapper.DictItemMapper;
-import com.youlai.boot.system.model.entity.DictItem;
-import com.youlai.boot.system.service.DictItemService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
-/**
- * 数据字典 服务实现类
- *
- * @author haoxr
- * @since 2022/10/12
- */
-@Service
-@RequiredArgsConstructor
-public class DictItemServiceImpl extends ServiceImpl<DictItemMapper, DictItem> implements DictItemService {
-
-}
-
-
-
-
diff --git a/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java
index 8e3489a7..544598de 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/DictServiceImpl.java
@@ -6,16 +6,17 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.youlai.boot.common.exception.BusinessException;
 import com.youlai.boot.system.converter.DictConverter;
-import com.youlai.boot.system.converter.DictItemConverter;
+import com.youlai.boot.system.converter.DictDataConverter;
 import com.youlai.boot.system.mapper.DictMapper;
 import com.youlai.boot.system.model.entity.Dict;
-import com.youlai.boot.system.model.entity.DictItem;
+import com.youlai.boot.system.model.entity.DictData;
 import com.youlai.boot.system.model.form.DictForm;
 import com.youlai.boot.system.model.query.DictPageQuery;
 import com.youlai.boot.system.model.vo.DictPageVO;
 import com.youlai.boot.common.model.Option;
-import com.youlai.boot.system.service.DictItemService;
+import com.youlai.boot.system.service.DictDataService;
 import com.youlai.boot.system.service.DictService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -34,9 +35,9 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements DictService {
 
-    private final DictItemService dictItemService;
+    private final DictDataService dictDataService;
     private final DictConverter dictConverter;
-    private final DictItemConverter dictItemConverter;
+    private final DictDataConverter dictDataConverter;
 
     /**
      * 字典分页列表
@@ -64,20 +65,14 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
         Dict entity = dictConverter.toEntity(dictForm);
 
         // 校验 code 是否唯一
+        String dictCode = entity.getCode();
+
         long count = this.count(new LambdaQueryWrapper<Dict>()
-                .eq(Dict::getCode, entity.getCode())
+                .eq(Dict::getCode, dictCode)
         );
         Assert.isTrue(count == 0, "字典编码已存在");
 
-        boolean result = this.save(entity);
-        // 保存字典项
-        if (result) {
-            List<DictForm.DictItem> dictFormDictItems = dictForm.getDictItems();
-            List<DictItem> dictItems = dictItemConverter.toEntity(dictFormDictItems);
-            dictItems.forEach(dictItem -> dictItem.setDictId(entity.getId()));
-            dictItemService.saveBatch(dictItems);
-        }
-        return result;
+        return this.save(entity);
     }
 
 
@@ -90,17 +85,10 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
     public DictForm getDictForm(Long id) {
         // 获取字典
         Dict entity = this.getById(id);
-        Assert.isTrue(entity != null, "字典不存在");
-        DictForm dictForm = dictConverter.toForm(entity);
-
-        // 获取字典项集合
-        List<DictItem> dictItems = dictItemService.list(new LambdaQueryWrapper<DictItem>()
-                .eq(DictItem::getDictId, id)
-        );
-        // 转换数据项
-        List<DictForm.DictItem> dictItemList = dictItemConverter.toDictItem(dictItems);
-        dictForm.setDictItems(dictItemList);
-        return dictForm;
+        if(entity==null){
+            throw new BusinessException("字典不存在");
+        }
+        return dictConverter.toForm(entity);
     }
 
     /**
@@ -115,57 +103,16 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
         Dict entity = dictConverter.toEntity(dictForm);
 
         // 校验 code 是否唯一
+        String dictCode = entity.getCode();
         long count = this.count(new LambdaQueryWrapper<Dict>()
-                .eq(Dict::getCode, entity.getCode())
+                .eq(Dict::getCode, dictCode)
                 .ne(Dict::getId, id)
         );
-        Assert.isTrue(count == 0, "字典编码已存在");
-
-        boolean result = this.updateById(entity);
-
-        if (result) {
-            // 更新字典项
-            List<DictForm.DictItem> dictFormDictItems = dictForm.getDictItems();
-            List<DictItem> dictItems = dictItemConverter.toEntity(dictFormDictItems);
-
-            // 获取当前数据库中的字典项
-            List<DictItem> currentDictItemEntities = dictItemService.list(new LambdaQueryWrapper<DictItem>()
-                    .eq(DictItem::getDictId, id)
-            );
-
-            // 获取当前数据库中存在的字典项ID集合
-            Set<Long> currentDictItemIds = currentDictItemEntities.stream()
-                    .map(DictItem::getId)
-                    .collect(Collectors.toSet());
-
-            // 获取新提交的字典项ID集合
-            Set<Long> newAttrIds = dictItems.stream()
-                    .map(DictItem::getId)
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toSet());
-
-            // 需要删除的字典项ID集合（存在于数据库但不在新提交的字典项中）
-            Set<Long> idsToDelete = new HashSet<>(currentDictItemIds);
-            idsToDelete.removeAll(newAttrIds);
-
-            // 删除不在新提交字典项中的旧字典项
-            if (!idsToDelete.isEmpty()) {
-                dictItemService.removeByIds(idsToDelete);
-            }
-
-            // 更新或新增字典项
-            for (DictItem dictItem : dictItems) {
-                if (dictItem.getId() != null && currentDictItemIds.contains(dictItem.getId())) {
-                    // 更新现有字典项
-                    dictItemService.updateById(dictItem);
-                } else {
-                    // 新增字典项
-                    dictItem.setDictId(id);
-                    dictItemService.save(dictItem);
-                }
-            }
+        if(count>0){
+            throw new BusinessException("字典编码已存在");
         }
-        return result;
+
+        return this.updateById(entity);
     }
 
     /**
@@ -183,13 +130,17 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
                 .toList();
 
         for (String id : idList) {
-            boolean result = this.removeById(id);
-            if (result) {
+            Dict dict = this.getById(id);
+            if (dict != null) {
+                boolean removeResult = this.removeById(id);
                 // 删除字典下的字典项
-                dictItemService.remove(
-                        new LambdaQueryWrapper<DictItem>()
-                                .eq(DictItem::getDictId, id)
-                );
+                if (removeResult) {
+                    dictDataService.remove(
+                            new LambdaQueryWrapper<DictData>()
+                                    .eq(DictData::getDictCode, dict.getCode())
+                    );
+                }
+
             }
         }
     }
@@ -213,13 +164,13 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, Dict> implements Di
         }
 
         // 获取字典项
-        List<DictItem> dictItems = dictItemService.list(
-                new LambdaQueryWrapper<DictItem>()
-                        .eq(DictItem::getDictId, dict.getId())
+        List<DictData> dictData = dictDataService.list(
+                new LambdaQueryWrapper<DictData>()
+                        .eq(DictData::getDictCode, dict.getCode())
         );
 
         // 转换为 Option
-        return dictItemConverter.toOption(dictItems);
+        return dictDataConverter.toOption(dictData);
     }
 
     /**
diff --git a/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java
index 1abc214b..f44489ba 100644
--- a/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java
+++ b/src/main/java/com/youlai/boot/system/service/impl/UserNoticeServiceImpl.java
@@ -10,7 +10,6 @@ import com.youlai.boot.system.model.entity.UserNotice;
 import com.youlai.boot.system.model.query.NoticePageQuery;
 import com.youlai.boot.system.model.vo.NoticePageVO;
 import com.youlai.boot.system.model.vo.UserNoticePageVO;
-import com.youlai.boot.system.model.vo.UserUnreadNoticeVO;
 import com.youlai.boot.system.service.UserNoticeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -29,18 +28,6 @@ public class UserNoticeServiceImpl extends ServiceImpl<UserNoticeMapper, UserNot
 
     private final UserNoticeMapper userNoticeMapper;
 
-    /**
-     * 获取未读的通知公告
-     *
-     * @return 公告列表
-     */
-    @Override
-    public List<UserUnreadNoticeVO> listUnreadNotices() {
-        //获取当前登录用户
-        Long userId = SecurityUtils.getUserId();
-        return userNoticeMapper.listUnreadNotices(userId);
-    }
-
     /**
      * 全部标记为已读
      *
diff --git a/src/main/resources/mapper/system/DictDataMapper.xml b/src/main/resources/mapper/system/DictDataMapper.xml
new file mode 100644
index 00000000..d69d66e9
--- /dev/null
+++ b/src/main/resources/mapper/system/DictDataMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.youlai.boot.system.mapper.DictDataMapper">
+
+    <!-- 根据字典编码获取字典列表 -->
+    <select id="getDictItemsByCode" resultType="com.youlai.boot.system.model.vo.DictPageVO$DictItem">
+        SELECT
+            id,
+            `name`,
+            value,
+            sort,
+            status
+        FROM
+            sys_dict_item
+        <where>
+            dict_code = #{dictCode}
+        </where>
+        ORDER BY
+            sort ASC
+    </select>
+
+    <!-- 获取字典数据分页列表 -->
+    <select id="getDictDataPage" resultType="com.youlai.boot.system.model.vo.DictDataPageVO">
+        SELECT
+            id,
+            dict_code,
+            value,
+            label,
+            sort,
+            status
+        FROM
+            sys_dict_data
+        <where>
+            <if test="queryParams.keywords!=null and queryParams.keywords.trim() neq ''">
+               AND (
+                value LIKE CONCAT('%', #{queryParams.keywords} ,'%')
+                OR
+                label LIKE CONCAT('%', #{queryParams.keywords} ,'%')
+                )
+            </if>
+            <if test="queryParams.dictCode!=null and queryParams.dictCode.trim() neq ''">
+                AND dict_code = #{queryParams.dictCode}
+            </if>
+        </where>
+
+
+
+    </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/system/DictItemMapper.xml b/src/main/resources/mapper/system/DictItemMapper.xml
deleted file mode 100644
index 8edb50ca..00000000
--- a/src/main/resources/mapper/system/DictItemMapper.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.youlai.boot.system.mapper.DictItemMapper">
-
-    <!-- 根据字典编码获取字典列表 -->
-    <select id="listDictItemsByDictId" resultType="com.youlai.boot.system.model.vo.DictPageVO$DictItem">
-        SELECT
-            id,
-            `name`,
-            value,
-            sort,
-            status
-        FROM
-            sys_dict_item
-        <where>
-            dict_id = #{dictId}
-        </where>
-        ORDER BY
-            sort ASC
-    </select>
-
-</mapper>
diff --git a/src/main/resources/mapper/system/DictMapper.xml b/src/main/resources/mapper/system/DictMapper.xml
index 7634045f..e35ab193 100644
--- a/src/main/resources/mapper/system/DictMapper.xml
+++ b/src/main/resources/mapper/system/DictMapper.xml
@@ -6,9 +6,9 @@
 
     <!-- 字典映射 -->
     <resultMap id="DictMap" type="com.youlai.boot.system.model.vo.DictPageVO">
-        <collection property="dictItems"
-                    column="{dictId=id}"
-                    select="com.youlai.boot.system.mapper.DictItemMapper.listDictItemsByDictId">
+        <collection property="dictData"
+                    column="{dictCode=code}"
+                    select="com.youlai.boot.system.mapper.DictDataMapper.getDictItemsByCode">
         </collection>
     </resultMap>
     <!-- 字典分页列表 -->
diff --git a/src/main/resources/mapper/system/UserNoticeMapper.xml b/src/main/resources/mapper/system/UserNoticeMapper.xml
index 41cb86c7..e759882c 100644
--- a/src/main/resources/mapper/system/UserNoticeMapper.xml
+++ b/src/main/resources/mapper/system/UserNoticeMapper.xml
@@ -2,20 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.youlai.boot.system.mapper.UserNoticeMapper">
 
-    <!-- 获取用户未读通知列表 -->
-    <select id="listUnreadNotices" resultType="com.youlai.boot.system.model.vo.UserUnreadNoticeVO">
-        SELECT
-            t2.id,
-            t2.title
-        FROM
-            sys_user_notice t1
-                INNER JOIN sys_notice t2 ON t2.id = t1.notice_id AND t2.publish_status = 1 AND t2.is_deleted = 0
-        WHERE
-            t1.user_id = #{userId} AND t1.is_read = 0 AND t1.is_deleted = 0
-        ORDER BY
-            t2.publish_time DESC
-    </select>
-
     <!-- 获取我的通知分页列表 -->
     <select id="getMyNoticePage" resultType="com.youlai.boot.system.model.vo.UserNoticePageVO">
         SELECT
@@ -25,19 +11,20 @@
             t3.nickname publisherName,
             t5.name levelLabel,
             t2.publish_time,
-            t1.is_read
+            t1.is_read,
+            t2.level
         FROM
             sys_user_notice t1
-                INNER JOIN sys_notice ON t2.notice_id = t1.id AND t2.publish_status = 1
+                INNER JOIN sys_notice t2 ON  t1.notice_id = t2.id AND t2.publish_status = 1
                 LEFT JOIN sys_user t3 ON t2.publisher_id = t3.id
                 LEFT JOIN sys_dict_item t4 ON t2.type = t4.value AND t4.dict_code = 'notice_type'
                 LEFT JOIN sys_dict_item t5 ON t2.level = t5.value AND t5.dict_code = 'notice_level'
         WHERE
-            t1.user_id = #{queryParams.userId}
+            t1.user_id = #{queryParams.userId} AND t1.is_deleted = 0 AND t2.is_deleted = 0
         <if test="queryParams.title != null and queryParams.title != ''">
             AND t2.title LIKE CONCAT('%',#{queryParams.title},'%')
         </if>
         ORDER BY
-            t2.release_time DESC
+            t2.publish_time DESC
     </select>
 </mapper>