Update the dict plugin table structure (#817)

wu-clan · web-flow · commit 3efca8af372d · 2025-09-15T09:04:30.000+08:00
* Update the dict plugin table structure

* Update dict sql

* FIx the dict plugin sql
diff --git a/backend/plugin/dict/api/v1/sys/dict_data.py b/backend/plugin/dict/api/v1/sys/dict_data.py
@@ -35,6 +35,14 @@ async def get_dict_data(
     return response_base.success(data=data)
 
 
+@router.get('/type-codes/{code}', summary='获取字典数据列表', dependencies=[DependsJwtAuth])
+async def get_dict_data_by_type_code(
+    code: Annotated[str, Path(description='字典类型编码')],
+) -> ResponseSchemaModel[list[GetDictDataDetail]]:
+    data = await dict_data_service.get_by_type_code(code=code)
+    return response_base.success(data=data)
+
+
 @router.get(
     '',
     summary='分页获取所有字典数据',
diff --git a/backend/plugin/dict/api/v1/sys/dict_type.py b/backend/plugin/dict/api/v1/sys/dict_type.py
@@ -47,9 +47,8 @@ async def get_dict_types_paged(
     db: CurrentSession,
     name: Annotated[str | None, Query(description='字典类型名称')] = None,
     code: Annotated[str | None, Query(description='字典类型编码')] = None,
-    status: Annotated[int | None, Query(description='状态')] = None,
 ) -> ResponseSchemaModel[PageData[GetDictTypeDetail]]:
-    dict_type_select = await dict_type_service.get_select(name=name, code=code, status=status)
+    dict_type_select = await dict_type_service.get_select(name=name, code=code)
     page_data = await paging_data(db, dict_type_select)
     return response_base.success(data=page_data)
 
diff --git a/backend/plugin/dict/crud/crud_dict_data.py b/backend/plugin/dict/crud/crud_dict_data.py
@@ -23,6 +23,18 @@ async def get(self, db: AsyncSession, pk: int) -> DictData | None:
         """
         return await self.select_model(db, pk, load_strategies={'type': 'noload'})
 
+    async def get_by_type_code(self, db: AsyncSession, type_code: str) -> Sequence[DictData]:
+        """
+        通过字典类型编码获取字典数据
+
+        :param db: 数据库会话
+        :param type_code: 字典类型编码
+        :return:
+        """
+        return await self.select_models_order(
+            db, sort_columns='sort', sort_orders='desc', type_code=type_code, load_strategies={'type': 'noload'}
+        )
+
     async def get_all(self, db: AsyncSession) -> Sequence[DictData]:
         """
         获取所有字典数据
diff --git a/backend/plugin/dict/crud/crud_dict_type.py b/backend/plugin/dict/crud/crud_dict_type.py
@@ -32,13 +32,12 @@ async def get_all(self, db: AsyncSession) -> Sequence[DictType]:
         """
         return await self.select_models(db, load_strategies={'datas': 'noload'})
 
-    async def get_list(self, *, name: str | None, code: str | None, status: int | None) -> Select:
+    async def get_list(self, *, name: str | None, code: str | None) -> Select:
         """
         获取字典类型列表
 
         :param name: 字典类型名称
         :param code: 字典类型编码
-        :param status: 字典状态
         :return:
         """
         filters = {}
@@ -47,8 +46,6 @@ async def get_list(self, *, name: str | None, code: str | None, status: int | No
             filters['name__like'] = f'%{name}%'
         if code is not None:
             filters['code__like'] = f'%{code}%'
-        if status is not None:
-            filters['status'] = status
 
         return await self.select_order('id', 'desc', load_strategies={'datas': 'noload'}, **filters)
 
diff --git a/backend/plugin/dict/model/dict_data.py b/backend/plugin/dict/model/dict_data.py
@@ -24,6 +24,7 @@ class DictData(Base):
     type_code: Mapped[str] = mapped_column(String(32), comment='对应的字典类型编码')
     label: Mapped[str] = mapped_column(String(32), comment='字典标签')
     value: Mapped[str] = mapped_column(String(32), comment='字典值')
+    color: Mapped[str | None] = mapped_column(String(32), default=None, comment='标签颜色')
     sort: Mapped[int] = mapped_column(default=0, comment='排序')
     status: Mapped[int] = mapped_column(default=1, comment='状态（0停用 1正常）')
     remark: Mapped[str | None] = mapped_column(
diff --git a/backend/plugin/dict/model/dict_type.py b/backend/plugin/dict/model/dict_type.py
@@ -23,7 +23,6 @@ class DictType(Base):
     id: Mapped[id_key] = mapped_column(init=False)
     name: Mapped[str] = mapped_column(String(32), comment='字典类型名称')
     code: Mapped[str] = mapped_column(String(32), unique=True, comment='字典类型编码')
-    status: Mapped[int] = mapped_column(default=1, comment='状态（0停用 1正常）')
     remark: Mapped[str | None] = mapped_column(
         LONGTEXT().with_variant(TEXT, 'postgresql'), default=None, comment='备注'
     )
diff --git a/backend/plugin/dict/plugin.toml b/backend/plugin/dict/plugin.toml
@@ -1,6 +1,6 @@
 [plugin]
 summary = '数据字典'
-version = '0.0.5'
+version = '0.0.6'
 description = '通常用于约束前端工程数据展示'
 author = 'wu-clan'
 
diff --git a/backend/plugin/dict/schema/dict_data.py b/backend/plugin/dict/schema/dict_data.py
@@ -14,6 +14,7 @@ class DictDataSchemaBase(SchemaBase):
     type_id: int = Field(description='字典类型 ID')
     label: str = Field(description='字典标签')
     value: str = Field(description='字典值')
+    color: str | None = Field(None, description='标签颜色')
     sort: int = Field(description='排序')
     status: StatusType = Field(description='状态')
     remark: str | None = Field(None, description='备注')
diff --git a/backend/plugin/dict/schema/dict_type.py b/backend/plugin/dict/schema/dict_type.py
@@ -4,7 +4,6 @@
 
 from pydantic import ConfigDict, Field
 
-from backend.common.enums import StatusType
 from backend.common.schema import SchemaBase
 
 
@@ -13,7 +12,6 @@ class DictTypeSchemaBase(SchemaBase):
 
     name: str = Field(description='字典名称')
     code: str = Field(description='字典编码')
-    status: StatusType = Field(description='状态')
     remark: str | None = Field(None, description='备注')
 
 
diff --git a/backend/plugin/dict/service/dict_data_service.py b/backend/plugin/dict/service/dict_data_service.py
@@ -29,6 +29,20 @@ async def get(*, pk: int) -> DictData:
                 raise errors.NotFoundError(msg='字典数据不存在')
             return dict_data
 
+    @staticmethod
+    async def get_by_type_code(*, code: str) -> Sequence[DictData]:
+        """
+        获取字典数据详情
+
+        :param code: 字典类型编码
+        :return:
+        """
+        async with async_db_session() as db:
+            dict_datas = await dict_data_dao.get_by_type_code(db, code)
+            if not dict_datas:
+                raise errors.NotFoundError(msg='字典数据不存在')
+            return dict_datas
+
     @staticmethod
     async def get_all() -> Sequence[DictData]:
         async with async_db_session() as db:
diff --git a/backend/plugin/dict/service/dict_type_service.py b/backend/plugin/dict/service/dict_type_service.py
@@ -35,16 +35,15 @@ async def get_all() -> Sequence[DictType]:
             return dict_datas
 
     @staticmethod
-    async def get_select(*, name: str | None, code: str | None, status: int | None) -> Select:
+    async def get_select(*, name: str | None, code: str | None) -> Select:
         """
         获取字典类型列表查询条件
 
         :param name: 字典类型名称
         :param code: 字典类型编码
-        :param status: 状态
         :return:
         """
-        return await dict_type_dao.get_list(name=name, code=code, status=status)
+        return await dict_type_dao.get_list(name=name, code=code)
 
     @staticmethod
     async def create(*, obj: CreateDictTypeParam) -> None:
diff --git a/backend/plugin/dict/sql/mysql/init.sql b/backend/plugin/dict/sql/mysql/init.sql
@@ -1,41 +1,53 @@
-insert into sys_dict_type (id, name, code, status, remark, created_time, updated_time)
+insert into sys_dict_type (id, name, code, remark, created_time, updated_time)
 values
-(1, '通用状态', 'sys_status', 1, '系统通用状态：启用/停用', now(), null),
-(2, '菜单类型', 'sys_menu_type', 1, '系统菜单类型', now(), null),
-(3, '登录日志状态', 'sys_login_status', 1, '用户登录日志状态', now(), null),
-(4, '数据规则运算符', 'sys_data_rule_operator', 1, '数据权限规则运算符', now(), null),
-(5, '数据规则表达式', 'sys_data_rule_expression', 1, '数据权限规则表达式', now(), null),
-(6, '前端参数配置', 'sys_frontend_config', 1, '前端参数配置类型', now(), null),
-(7, '过滤数据权限', 'sys_data_permission', 1, '数据权限过滤类型', now(), null),
-(8, '菜单显示', 'sys_menu_display', 1, '菜单是否显示', now(), null),
-(9, '菜单缓存', 'sys_menu_cache', 1, '菜单是否缓存', now(), null);
+(1, '通用状态', 'sys_status', '系统通用状态：1/0', now(), null),
+(2, '通用开关', 'sys_choose', '系统通用开关：true/false', now(), null),
+(3, '菜单类型', 'sys_menu_type', '系统菜单类型', now(), null),
+(4, '登录状态', 'sys_login_status', '用户登录状态', now(), null),
+(5, '数据规则运算符', 'sys_data_rule_operator', '数据权限规则运算符', now(), null),
+(6, '数据规则表达式', 'sys_data_rule_expression', '数据权限规则表达式', now(), null),
+(7, '前端参数配置', 'sys_frontend_config', '前端参数配置类型', now(), null),
+(8, '任务策略类型', 'task_strategy_type', '定时任务策略类型', now(), null),
+(9, '任务周期类型', 'task_period_type', '定时任务周期类型', now(), null),
+(10, '通知公告', 'notice', '通知类型', now(), null),
+(11, '在线状态', 'user_online_status', '用户在线状态', now(), null),
+(12, '插件类型', 'sys_plugin_type', '插件类型', now(), null);
 
-insert into sys_dict_data (id, type_code, label, value, sort, status, remark, type_id, created_time, updated_time)
+insert into sys_dict_data (id, type_code, label, value, color, sort, status, remark, type_id, created_time, updated_time)
 values
-(1, 'sys_status', '停用', '0', 1, 1, '系统停用状态', 1, now(), null),
-(2, 'sys_status', '正常', '1', 2, 1, '系统正常状态', 1, now(), null),
-(3, 'sys_menu_type', '目录', '0', 1, 1, '菜单目录类型', 2, now(), null),
-(4, 'sys_menu_type', '菜单', '1', 2, 1, '普通菜单类型', 2, now(), null),
-(5, 'sys_menu_type', '按钮', '2', 3, 1, '按钮权限类型', 2, now(), null),
-(6, 'sys_menu_type', '内嵌', '3', 4, 1, '内嵌页面类型', 2, now(), null),
-(7, 'sys_menu_type', '外链', '4', 5, 1, '外部链接类型', 2, now(), null),
-(8, 'sys_login_status', '失败', '0', 1, 1, '登录失败状态', 3, now(), null),
-(9, 'sys_login_status', '成功', '1', 2, 1, '登录成功状态', 3, now(), null),
-(10, 'sys_data_rule_operator', 'AND', '0', 1, 1, '逻辑与运算符', 4, now(), null),
-(11, 'sys_data_rule_operator', 'OR', '1', 2, 1, '逻辑或运算符', 4, now(), null),
-(12, 'sys_data_rule_expression', '等于(==)', '0', 1, 1, '等于比较表达式', 5, now(), null),
-(13, 'sys_data_rule_expression', '不等于(!=)', '1', 2, 1, '不等于比较表达式', 5, now(), null),
-(14, 'sys_data_rule_expression', '大于(>)', '2', 3, 1, '大于比较表达式', 5, now(), null),
-(15, 'sys_data_rule_expression', '大于等于(>=)', '3', 4, 1, '大于等于比较表达式', 5, now(), null),
-(16, 'sys_data_rule_expression', '小于(<)', '4', 5, 1, '小于比较表达式', 5, now(), null),
-(17, 'sys_data_rule_expression', '小于等于(<=)', '5', 6, 1, '小于等于比较表达式', 5, now(), null),
-(18, 'sys_data_rule_expression', '包含(in)', '6', 7, 1, '包含表达式', 5, now(), null),
-(19, 'sys_data_rule_expression', '不包含(not in)', '7', 8, 1, '不包含表达式', 5, now(), null),
-(20, 'sys_frontend_config', '否', '0', 1, 1, '不是前端参数配置', 6, now(), null),
-(21, 'sys_frontend_config', '是', '1', 2, 1, '是前端参数配置', 6, now(), null),
-(22, 'sys_data_permission', '否', '0', 1, 1, '不进行数据权限过滤', 7, now(), null),
-(23, 'sys_data_permission', '是', '1', 2, 1, '进行数据权限过滤', 7, now(), null),
-(24, 'sys_menu_display', '隐藏', '0', 1, 1, '菜单隐藏', 8, now(), null),
-(25, 'sys_menu_display', '显示', '1', 2, 1, '菜单显示', 8, now(), null),
-(26, 'sys_menu_cache', '不缓存', '0', 1, 1, '菜单不缓存', 9, now(), null),
-(27, 'sys_menu_cache', '缓存', '1', 2, 1, '菜单缓存', 9, now(), null);
+(1, 'sys_status', '停用', '0', 'red', 1, 1, '停用状态', 1, now(), null),
+(2, 'sys_status', '正常', '1', 'green', 2, 1, '正常状态', 1, now(), null),
+(3, 'sys_choose', '关闭', 'false', 'error', 1, 1, '关闭状态', 2, now(), null),
+(4, 'sys_choose', '开启', 'true', 'success', 2, 1, '开启状态', 2, now(), null),
+(5, 'sys_menu_type', '目录', '0', 'orange', 1, 1, '菜单目录', 3, now(), null),
+(6, 'sys_menu_type', '菜单', '1', 'default', 2, 1, '普通菜单', 3, now(), null),
+(7, 'sys_menu_type', '按钮', '2', 'processing', 3, 1, '菜单按钮', 3, now(), null),
+(8, 'sys_menu_type', '内嵌', '3', 'cyan', 4, 1, '内嵌页面', 3, now(), null),
+(9, 'sys_menu_type', '外链', '4', 'purple', 5, 1, '外部链接', 3, now(), null),
+(10, 'sys_login_status', '失败', '0', 'error', 1, 1, '登录失败状态', 4, now(), null),
+(11, 'sys_login_status', '成功', '1', 'success', 2, 1, '登录成功状态', 4, now(), null),
+(12, 'sys_data_rule_operator', 'AND', '0', 'green', 1, 1, '逻辑 AND 运算符', 5, now(), null),
+(13, 'sys_data_rule_operator', 'OR', '1', 'gold', 2, 1, '逻辑 OR 运算符', 5, now(), null),
+(14, 'sys_data_rule_expression', '等于(==)', '0', 'success', 1, 1, '等于比较表达式', 6, now(), null),
+(15, 'sys_data_rule_expression', '不等于(!=)', '1', 'error', 2, 1, '不等于比较表达式', 6, now(), null),
+(16, 'sys_data_rule_expression', '大于(>)', '2', 'magenta', 3, 1, '大于比较表达式', 6, now(), null),
+(17, 'sys_data_rule_expression', '大于等于(>=)', '3', 'volcano', 4, 1, '大于等于比较表达式', 6, now(), null),
+(18, 'sys_data_rule_expression', '小于(<)', '4', 'gold', 5, 1, '小于比较表达式', 6, now(), null),
+(19, 'sys_data_rule_expression', '小于等于(<=)', '5', 'orange', 6, 1, '小于等于比较表达式', 6, now(), null),
+(20, 'sys_data_rule_expression', '包含(in)', '6', 'purple', 7, 1, '包含表达式', 6, now(), null),
+(21, 'sys_data_rule_expression', '不包含(not in)', '7', 'error', 8, 1, '不包含表达式', 6, now(), null),
+(22, 'sys_frontend_config', '否', '0', 'red', 1, 1, '不是前端参数配置', 7, now(), null),
+(23, 'sys_frontend_config', '是', '1', 'green', 2, 1, '是前端参数配置', 7, now(), null),
+(24, 'task_strategy_type', 'Interval（间隔）', '0', 'cyan', 1, 1, '时间间隔策略', 8, now(), null),
+(25, 'task_strategy_type', 'Crontab（计划）', '1', 'purple', 2, 1, '时间表达式策略', 8, now(), null),
+(26, 'task_period_type', '天', 'days', 'processing', 1, 1, '定时任务周期类型-天', 9, now(), null),
+(27, 'task_period_type', '小时', 'hours', 'magenta', 2, 1, '定时任务周期类型-小时', 9, now(), null),
+(28, 'task_period_type', '分钟', 'minutes', 'volcano', 3, 1, '定时任务周期类型-分钟', 9, now(), null),
+(29, 'task_period_type', '秒', 'seconds', 'gold', 4, 1, '定时任务周期类型-秒', 9, now(), null),
+(30, 'task_period_type', '微妙', 'microseconds', 'warning', 5, 1, '定时任务周期类型-微妙', 9, now(), null),
+(31, 'notice', '通知', '0', 'magenta', 1, 1, '通知类型', 10, now(), null),
+(32, 'notice', '公告', '1', 'purple', 2, 1, '公告类型', 10, now(), null),
+(33, 'user_online_status', '离线', '0', 'warning', 1, 1, '用户离线状态', 11, now(), null),
+(34, 'user_online_status', '在线', '1', 'success', 2, 1, '用户在线状态', 11, now(), null),
+(35, 'sys_plugin_type', '压缩包', '0', 'gold', 1, 1, '插件类型-压缩包', 12, now(), null),
+(36, 'sys_plugin_type', 'GIT', '1', 'processing', 2, 1, '插件类型-GIT', 12, now(), null);
diff --git a/backend/plugin/dict/sql/mysql/init_snowflake.sql b/backend/plugin/dict/sql/mysql/init_snowflake.sql
diff --git a/backend/plugin/dict/sql/postgresql/init.sql b/backend/plugin/dict/sql/postgresql/init.sql
diff --git a/backend/plugin/dict/sql/postgresql/init_snowflake.sql b/backend/plugin/dict/sql/postgresql/init_snowflake.sql

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ class DictType(Base):`
`23`	`23`	`id: Mapped[id_key] = mapped_column(init=False)`
`24`	`24`	`name: Mapped[str] = mapped_column(String(32), comment='字典类型名称')`
`25`	`25`	`code: Mapped[str] = mapped_column(String(32), unique=True, comment='字典类型编码')`
`26`		`- status: Mapped[int] = mapped_column(default=1, comment='状态（0停用 1正常）')`
`27`	`26`	`remark: Mapped[str \| None] = mapped_column(`
`28`	`27`	`LONGTEXT().with_variant(TEXT, 'postgresql'), default=None, comment='备注'`
`29`	`28`	`)`