diff --git a/vue-fastapi-backend/module_admin/controller/datastd_controller.py b/vue-fastapi-backend/module_admin/controller/datastd_controller.py index 0596011..d690b50 100644 --- a/vue-fastapi-backend/module_admin/controller/datastd_controller.py +++ b/vue-fastapi-backend/module_admin/controller/datastd_controller.py @@ -87,8 +87,8 @@ async def add_std_code( add_std_code.create_by = current_user.user.user_name add_std_code.create_time = datetime.now() - add_std_code.update_by = current_user.user.user_name - add_std_code.update_time = datetime.now() + add_std_code.upd_prsn = current_user.user.user_name + add_std_code.upd_time = datetime.now() add_std_code_result = await DataStdService.add_std_code_services(request, query_db, add_std_code) logger.info(add_std_code_result.message) return ResponseUtil.success(msg=add_std_code_result.message) @@ -102,8 +102,8 @@ async def edit_std_code( query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user), ): - edit_std_code.update_by = current_user.user.user_name - edit_std_code.update_time = datetime.now() + edit_std_code.upd_prsn = current_user.user.user_name + edit_std_code.upd_time = datetime.now() edit_std_code_result = await DataStdService.edit_std_code_services(request, query_db, edit_std_code) logger.info(edit_std_code_result.message) return ResponseUtil.success(msg=edit_std_code_result.message) @@ -145,9 +145,9 @@ async def add_std_code_with_items( # 设置标准代码的创建和更新时间 code.create_by = current_user.user.user_name code.create_time = datetime.now() - code.update_by = current_user.user.user_name - code.update_time = datetime.now() - code.sys_name='公司级' if 'company'==code.code_type else code.sys_name + code.upd_prsn = current_user.user.user_name + code.upd_time = datetime.now() + code.src_sys='公司级' if 'company'==code.cd_type else code.src_sys # 传递给服务层，处理标准代码和代码项的添加 result = await DataStdService.add_std_code_with_items_services(request, query_db, code, code_item_list) @@ -181,9 +181,9 @@ async def edit_std_code_with_items( current_user: CurrentUserModel = Depends(LoginService.get_current_user), ): # 设置标准代码的创建和更新时间 - code.sys_name='公司级' if 'company'==code.code_type else code.sys_name - code.update_by = current_user.user.user_name - code.update_time = datetime.now() + code.src_sys='公司级' if 'company'==code.cd_type else code.src_sys + code.upd_prsn = current_user.user.user_name + code.upd_time = datetime.now() # 传递给服务层，处理标准代码和代码项的添加 result = await DataStdService.edit_std_code_with_items_services(request, query_db, code, code_item_list) @@ -258,8 +258,8 @@ async def add_std_dict( add_std_dict.create_by = current_user.user.user_name add_std_dict.create_time = datetime.now() - add_std_dict.update_by = current_user.user.user_name - add_std_dict.update_time = datetime.now() + add_std_dict.upd_prsn = current_user.user.user_name + add_std_dict.upd_time = datetime.now() add_std_dict_result = await DataStdService.add_std_dict_services(request, query_db, add_std_dict) logger.info(add_std_dict_result.message) return ResponseUtil.success(msg=add_std_dict_result.message) @@ -273,8 +273,8 @@ async def edit_std_dict( query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user), ): - edit_std_dict.update_by = current_user.user.user_name - edit_std_dict.update_time = datetime.now() + edit_std_dict.upd_prsn = current_user.user.user_name + edit_std_dict.upd_time = datetime.now() edit_std_dict_result = await DataStdService.edit_std_dict_services(request, query_db, edit_std_dict) logger.info(edit_std_dict_result.message) return ResponseUtil.success(msg=edit_std_dict_result.message) @@ -310,8 +310,8 @@ async def add_std_dict_appr( ): add_std_dict.create_by = current_user.user.user_name add_std_dict.create_time = datetime.now() - add_std_dict.update_by = current_user.user.user_name - add_std_dict.update_time = datetime.now() + add_std_dict.upd_prsn = current_user.user.user_name + add_std_dict.upd_time = datetime.now() add_std_dict_result = await DataStdService.add_std_dict_appr(query_db, add_std_dict) logger.info(add_std_dict_result.message) return ResponseUtil.success(msg=add_std_dict_result.message) @@ -323,8 +323,8 @@ async def edit_std_dict_appr( query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user), ): - edit_std_dict.update_by = current_user.user.user_name - edit_std_dict.update_time = datetime.now() + edit_std_dict.upd_prsn = current_user.user.user_name + edit_std_dict.upd_time = datetime.now() edit_std_dict_result = await DataStdService.edit_std_dict_appr(query_db, edit_std_dict) logger.info(edit_std_dict_result.message) return ResponseUtil.success(msg=edit_std_dict_result.message) @@ -574,8 +574,8 @@ async def add_std_main( ): add_std_main.create_by = current_user.user.user_name add_std_main.create_time = datetime.now() - add_std_main.update_by = current_user.user.user_name - add_std_main.update_time = datetime.now() + add_std_main.upd_prsn = current_user.user.user_name + add_std_main.upd_time = datetime.now() add_std_main_result = await DataStdService.add_std_main(query_db, add_std_main) logger.info(add_std_main_result.message) return ResponseUtil.success(msg=add_std_main_result.message) @@ -590,8 +590,8 @@ async def add_std_main_appr( ): add_std_main.create_by = current_user.user.user_name add_std_main.create_time = datetime.now() - add_std_main.update_by = current_user.user.user_name - add_std_main.update_time = datetime.now() + add_std_main.upd_prsn = current_user.user.user_name + add_std_main.upd_time = datetime.now() add_std_main_result = await DataStdService.add_std_main_appr(query_db, add_std_main) logger.info(add_std_main_result.message) return ResponseUtil.success(msg=add_std_main_result.message) @@ -605,8 +605,8 @@ async def edit_std_main( query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user), ): - edit_std_main.update_by = current_user.user.user_name - edit_std_main.update_time = datetime.now() + edit_std_main.upd_prsn = current_user.user.user_name + edit_std_main.upd_time = datetime.now() edit_std_main_result = await DataStdService.edit_std_main(query_db, edit_std_main) logger.info(edit_std_main_result.message) return ResponseUtil.success(msg=edit_std_main_result.message) @@ -618,8 +618,8 @@ async def edit_std_main_appr( query_db: AsyncSession = Depends(get_db), current_user: CurrentUserModel = Depends(LoginService.get_current_user), ): - edit_std_main.update_by = current_user.user.user_name - edit_std_main.update_time = datetime.now() + edit_std_main.upd_prsn = current_user.user.user_name + edit_std_main.upd_time = datetime.now() edit_std_main_result = await DataStdService.edit_std_main_appr(query_db, edit_std_main) logger.info(edit_std_main_result.message) return ResponseUtil.success(msg=edit_std_main_result.message) @@ -651,7 +651,7 @@ async def change_std_main_onum( edit_std_main: DataStdMainModel, query_db: AsyncSession = Depends(get_db), ): - delete_std_main_result = await DataStdService.change_std_main_onum(query_db, edit_std_main.id,edit_std_main.sys_id) + delete_std_main_result = await DataStdService.change_std_main_onum(query_db, edit_std_main.onum,edit_std_main.belt_data_std_content) logger.info(delete_std_main_result.message) return ResponseUtil.success(msg=delete_std_main_result.message) # 标准代码映射图谱 diff --git a/vue-fastapi-backend/module_admin/dao/datastd_dao.py b/vue-fastapi-backend/module_admin/dao/datastd_dao.py index c340b2e..42642bf 100644 --- a/vue-fastapi-backend/module_admin/dao/datastd_dao.py +++ b/vue-fastapi-backend/module_admin/dao/datastd_dao.py @@ -25,49 +25,68 @@ class DataStdDao: filters.append(DataStdCodeAppr.flowId == flowId) query = select(DataStdCodeAppr).where(*filters).order_by(desc(DataStdCodeAppr.create_time)) return await PageUtil.paginate(db, query, 0, 0, False) + @classmethod async def get_std_code_list(cls, db: AsyncSession, query_object: DataStdCodeModel, is_page: bool = False): - """ - 获取 DataStdCode 的列表信息，支持模糊查询和分页 - :param db: ORM对象 - :param query_object: 查询参数对象 - :param is_page: 是否开启分页 - :return: 列表信息 - """ - # 构建查询条件 - filters = [] - if query_object.code_name: - filters.append(DataStdCode.code_name.like(f"%{query_object.code_name}%")) - if query_object.code_num: - filters.append( or_( - DataStdCode.code_name.like(f"%{query_object.code_num}%"), - DataStdCode.code_num.like(f"%{query_object.code_num}%") - )) - if query_object.code_status: - filters.append(DataStdCode.code_status==query_object.code_status) - if query_object.sys_id: - filters.append(DataStdCode.sys_id==query_object.sys_id) - if query_object.code_type: - filters.append(DataStdCode.code_type==query_object.code_type) - - if query_object.class_id: - filters.append(DataStdCode.class_id==query_object.class_id) - if query_object.class_id=='codeItem' and not query_object.parent_id: - filters.append(1==2) - if query_object.parent_id: - filters.append(DataStdCode.parent_id==query_object.parent_id) - # 构建查询语句 - query = ( - select(DataStdCode) - .where(*filters) - .order_by(desc(DataStdCode.create_time)) # 按创建时间降序排序 - ) + """ + 查询 DataStdCode 列表，带出 code_map_cn 字段（通过 code_map_id 关联同表获取 cd_val_cn_mean） + :param db: ORM 会话对象 + :param query_object: 查询条件对象 + :param is_page: 是否分页 + :return: 列表结果（分页或不分页） + """ + # 构建别名 + c1 = aliased(DataStdCode) # 当前记录 + c2 = aliased(DataStdCode) # 关联 code_map_id + + # 构建过滤条件 + filters = [] + if query_object.cd_val_cn_mean: + filters.append(c1.cd_val_cn_mean.like(f"%{query_object.cd_val_cn_mean}%")) + if query_object.cd_no: + filters.append(or_( + c1.cd_val_cn_mean.like(f"%{query_object.cd_no}%"), + c1.cd_no.like(f"%{query_object.cd_no}%") + )) + if query_object.cd_val_stat: + filters.append(c1.cd_val_stat == query_object.cd_val_stat) + if query_object.src_sys: + filters.append(c1.src_sys == query_object.src_sys) + if query_object.cd_type: + filters.append(c1.cd_type == query_object.cd_type) + if query_object.class_id: + filters.append(c1.class_id == query_object.class_id) + if query_object.class_id == 'codeItem' and not query_object.parent_id: + filters.append(1 == 2) + if query_object.parent_id: + filters.append(c1.parent_id == query_object.parent_id) + + # 构建查询 + query = ( + select( + c1.onum, # 当前 code 数据的 Id + c1.cd_no, # 当前代码编号 + c1.cd_val_cn_mean, # 当前代码值 + c1.cd_type, # 当前代码类型 + c1.cd_val_stat, # 当前代码状态 + c1.src_sys, # 当前归属系统 + c1.class_id, # 当前代码类别 + c1.parent_id, # 当前代码父 id + c1.code_map_id, # 当前代码映射 Id + c2.cd_val_cn_mean.label("code_map_cn") # 映射名称 + ) + .select_from(c1) + .outerjoin(c2, c1.code_map_id == c2.onum) + .where(*filters) + .order_by(desc(c1.create_time)) + ) + + # 分页处理 + result = await PageUtil.paginate( + db, query, query_object.page_num, query_object.page_size, is_page + ) + return result - # 分页处理 - col_list = await PageUtil.paginate( - db, query, query_object.page_num, query_object.page_size, is_page - ) - return col_list @classmethod async def get_appr_std_code_list(cls, db: AsyncSession, query_object: DataStdCodeApprModel, is_page: bool = False): """ @@ -79,19 +98,19 @@ class DataStdDao: """ # 构建查询条件 filters = [] - if query_object.code_name: - filters.append(DataStdCodeAppr.code_name.like(f"%{query_object.code_name}%")) - if query_object.code_num: + if query_object.cd_val_cn_mean: + filters.append(DataStdCodeAppr.cd_val_cn_mean.like(f"%{query_object.cd_val_cn_mean}%")) + if query_object.cd_no: filters.append( or_( - DataStdCodeAppr.code_name.like(f"%{query_object.code_num}%"), - DataStdCodeAppr.code_num.like(f"%{query_object.code_num}%") + DataStdCodeAppr.cd_val_cn_mean.like(f"%{query_object.cd_no}%"), + DataStdCodeAppr.cd_no.like(f"%{query_object.cd_no}%") )) - if query_object.code_status: - filters.append(DataStdCodeAppr.code_status==query_object.code_status) - if query_object.sys_id: - filters.append(DataStdCodeAppr.sys_id==query_object.sys_id) - if query_object.code_type: - filters.append(DataStdCodeAppr.code_type==query_object.code_type) + if query_object.cd_val_stat: + filters.append(DataStdCodeAppr.cd_val_stat==query_object.cd_val_stat) + if query_object.src_sys: + filters.append(DataStdCodeAppr.src_sys==query_object.src_sys) + if query_object.cd_type: + filters.append(DataStdCodeAppr.cd_type==query_object.cd_type) if query_object.class_id: filters.append(DataStdCodeAppr.class_id==query_object.class_id) @@ -119,7 +138,7 @@ class DataStdDao: DataStdCodeAppr.oldInstId == Id, DataStdCodeAppr.approStatus == "succeed" ) - .order_by(DataStdCodeAppr.update_time.desc()) + .order_by(DataStdCodeAppr.upd_time.desc()) .limit(1) ) return result.scalar_one_or_none() @@ -133,7 +152,7 @@ class DataStdDao: c3 = aliased(DataStdCode) # 别名 c3 表示映射的代码 c4 = aliased(DataStdCode) # 别名 c4 表示映射父级代码 if query_object.parent_id: - if query_object.code_type =='sys': + if query_object.cd_type =='sys': filters.append(c1.parent_id == query_object.parent_id) else: filters.append(c3.parent_id == query_object.parent_id) @@ -143,21 +162,21 @@ class DataStdDao: # 3. 构建基础查询，使用连接和别名 query = ( select( - c2.sys_id.label("target_sys_id"), # 父级系统编号 - c2.sys_name.label("target_sys_name"), # 父级系统名称 - c2.code_num.label("target_code_num"), # 父级代码编号 - c2.code_name.label("target_code_name"), # 父级代码名称 - c1.code_num.label("target_code_num_item"), # 当前 codeItem 的编号 - c1.code_name.label("target_code_name_item"), # 当前 codeItem 的名称 - c4.code_num.label("resource_code_num"), # 映射的父级代码编号 - c4.code_name.label("resource_code_name"), # 映射的父级代码名称 - c3.code_num.label("resource_code_num_item"), # 映射的父级代码编号 - c3.code_name.label("resource_code_name_item") # 映射的父级代码名称 + c2.src_sys.label("target_sys_id"), # 父级系统编号 + c2.src_sys.label("target_sys_name"), # 父级系统名称 + c2.cd_no.label("target_code_num"), # 父级代码编号 + c2.cd_val_cn_mean.label("target_code_name"), # 父级代码名称 + c1.cd_no.label("target_code_num_item"), # 当前 codeItem 的编号 + c1.cd_val_cn_mean.label("target_code_name_item"), # 当前 codeItem 的名称 + c4.cd_no.label("resource_code_num"), # 映射的父级代码编号 + c4.cd_val_cn_mean.label("resource_code_name"), # 映射的父级代码名称 + c3.cd_no.label("resource_code_num_item"), # 映射的父级代码编号 + c3.cd_val_cn_mean.label("resource_code_name_item") # 映射的父级代码名称 ) .select_from(c1) # 从 c1 开始查询 - .join(c2, c1.parent_id == c2.id, isouter=True) # 连接 c2 - .join(c3, c1.code_map_id == c3.id, isouter=True) # 连接 c3 - .join(c4, c3.parent_id == c4.id, isouter=True) # 连接 c4 + .join(c2, c1.parent_id == c2.onum, isouter=True) # 连接 c2 + .join(c3, c1.code_map_id == c3.onum, isouter=True) # 连接 c3 + .join(c4, c3.parent_id == c4.onum, isouter=True) # 连接 c4 .where(*filters) # 使用所有过滤条件 .order_by(desc(c1.create_time)) # 按照创建时间降序排列 ) @@ -172,11 +191,11 @@ class DataStdDao: await db.execute( select(DataStdCode) .where( - DataStdCode.code_name == query_object.code_name if query_object.code_name else True, - DataStdCode.id == query_object.id if query_object.id else True, - DataStdCode.code_status == query_object.code_status if query_object.code_status else True, - DataStdCode.sys_id == query_object.sys_id if query_object.sys_id else True, - DataStdCode.code_type == query_object.code_type if query_object.code_type else True, + DataStdCode.cd_val_cn_mean == query_object.cd_val_cn_mean if query_object.cd_val_cn_mean else True, + DataStdCode.onum == query_object.onum if query_object.onum else True, + DataStdCode.cd_val_stat == query_object.cd_val_stat if query_object.cd_val_stat else True, + DataStdCode.src_sys == query_object.src_sys if query_object.src_sys else True, + DataStdCode.cd_type == query_object.cd_type if query_object.cd_type else True, DataStdCode.code_map_id == query_object.code_map_id if query_object.code_map_id else True, DataStdCode.parent_id == query_object.parent_id if query_object.parent_id else True, DataStdCode.class_id == query_object.class_id if query_object.class_id else True @@ -190,11 +209,11 @@ class DataStdDao: await db.execute( select(DataStdCode) .where( - DataStdCode.code_name == query_object.code_name if query_object.code_name else True, - DataStdCode.code_num == query_object.code_num if query_object.code_num else True, - DataStdCode.code_status == query_object.code_status if query_object.code_status else True, - DataStdCode.sys_id == query_object.sys_id if query_object.sys_id else True, - DataStdCode.code_type == query_object.code_type if query_object.code_type else True, + DataStdCode.cd_val_cn_mean == query_object.cd_val_cn_mean if query_object.cd_val_cn_mean else True, + DataStdCode.cd_no == query_object.cd_no if query_object.cd_no else True, + DataStdCode.cd_val_stat == query_object.cd_val_stat if query_object.cd_val_stat else True, + DataStdCode.src_sys == query_object.src_sys if query_object.src_sys else True, + DataStdCode.cd_type == query_object.cd_type if query_object.cd_type else True, DataStdCode.parent_id == query_object.parent_id if query_object.parent_id else True, DataStdCode.class_id == query_object.class_id if query_object.class_id else True ) @@ -206,7 +225,7 @@ class DataStdDao: col = ( await db.execute( select(DataStdCode) - .where(DataStdCode.id == Id) + .where(DataStdCode.onum == Id) ) ).scalars().first() return col @@ -215,7 +234,7 @@ class DataStdDao: col = ( await db.execute( select(DataStdCodeAppr) - .where(DataStdCodeAppr.id == Id) + .where(DataStdCodeAppr.onum == Id) ) ).scalars().first() return col @@ -240,7 +259,7 @@ class DataStdDao: @classmethod async def delete_std_code(cls, db: AsyncSession, Id: str): - await db.execute(delete(DataStdCode).where(DataStdCode.id == Id)) + await db.execute(delete(DataStdCode).where(DataStdCode.onum == Id)) @classmethod async def update_std_code_appr(cls, db: AsyncSession, update_data: DataStdCodeApprModel): @@ -254,17 +273,17 @@ class DataStdDao: await db.flush() @classmethod - async def check_code_num_exists(cls, query_db: AsyncSession, code_num: str) -> bool: + async def check_code_num_exists(cls, query_db: AsyncSession, cd_no: str) -> bool: """ 检查标准代码或代码项的code_num是否已经存在 """ # 查询标准代码表中是否存在相同的code_num - result = await query_db.execute(select(DataStdCodeModel).filter(DataStdCodeModel.code_num == code_num)) + result = await query_db.execute(select(DataStdCodeModel).filter(DataStdCodeModel.cd_no == cd_no)) existing_code = result.scalar_one_or_none() # 如果不存在，则检查代码项表中是否存在相同的code_num if not existing_code: - result = await query_db.execute(select(DataStdCode).filter(DataStdCodeModel.code_num == code_num)) + result = await query_db.execute(select(DataStdCode).filter(DataStdCodeModel.cd_no == cd_no)) existing_code_item = result.scalar_one_or_none() return existing_code_item is not None @@ -281,51 +300,50 @@ class DataStdDao: """ # 构建查询条件 filters = [] - if query_object.dict_name: - filters.append(DataStdDict.dict_name.like(f"%{query_object.dict_name}%")) - if query_object.dict_code: - filters.append(DataStdDict.dict_code.like(f"%{query_object.dict_code}%")) - if query_object.dict_level: - filters.append(DataStdDict.dict_level == query_object.dict_level) - if query_object.sys_id: - filters.append(DataStdDict.sys_id == query_object.sys_id) - if query_object.dict_type: - filters.append(DataStdDict.dict_type == query_object.dict_type) - if query_object.dict_status: - filters.append(DataStdDict.dict_status == query_object.dict_status) - c1 = aliased(SysDept) # 技术部门 - c2 = aliased(SysDept) # 业务部门 + if query_object.data_dict_cn_name: + filters.append(DataStdDict.data_dict_cn_name.like(f"%{query_object.data_dict_cn_name}%")) + if query_object.data_dict_eng_name: + filters.append(DataStdDict.data_dict_eng_name.like(f"%{query_object.data_dict_eng_name}%")) + if query_object.data_dict_vest: + filters.append(DataStdDict.data_dict_vest == query_object.data_dict_vest) + if query_object.src_sys: + filters.append(DataStdDict.src_sys == query_object.src_sys) + if query_object.data_dict_data_type: + filters.append(DataStdDict.data_dict_data_type == query_object.data_dict_data_type) + if query_object.data_dict_stat: + filters.append(DataStdDict.data_dict_stat == query_object.data_dict_stat) + c1 = aliased(DataStdDict) # 技术部门 # 构建查询语句 query = ( - select(DataStdDict.id, + select(DataStdDict.onum, DataStdDict.create_by, DataStdDict.create_time, - DataStdDict.update_by, - DataStdDict.update_time, - DataStdDict.dict_num, - DataStdDict.dict_code, - DataStdDict.dict_name, - DataStdDict.dict_level, - DataStdDict.dict_type, - DataStdDict.sys_name, - DataStdDict.sys_id, - DataStdDict.dict_menu, - DataStdDict.data_type, - DataStdDict.std_code, - DataStdDict.std_name, - DataStdDict.dict_status, - DataStdDict.buss_dept_id, - DataStdDict.tech_dept_id, - DataStdDict.buss_user, - DataStdDict.tech_user, - c1.dept_name.label("tech_dept_name"), - c2.dept_name.label("buss_dept_name")).select_from(DataStdDict) - .join(c1,c1.dept_id ==DataStdDict.tech_dept_id, isouter=True) - .join(c2,c2.dept_id ==DataStdDict.buss_dept_id, isouter=True) + DataStdDict.upd_prsn, + DataStdDict.upd_time, + DataStdDict.data_dict_no, + DataStdDict.data_dict_eng_name, + DataStdDict.data_dict_cn_name, + DataStdDict.data_dict_vest, + DataStdDict.data_dict_data_type, + DataStdDict.src_sys, + DataStdDict.src_sys, + DataStdDict.data_dict_busi_mean, + DataStdDict.data_dict_data_type, + DataStdDict.data_std_no, + DataStdDict.data_dict_stat, + DataStdMain.data_std_it_ownership_dept.label("data_std_it_ownership_dept") , + DataStdMain.data_std_busi_ownership_dept.label("data_std_busi_ownership_dept") , + DataStdMain.data_std_it_ownership_prsn.label("data_std_it_ownership_prsn") , + DataStdMain.data_std_busi_ownership_prsn.label("data_std_busi_ownership_prsn") + + ) + .outerjoin( # 使用left outer join确保即使没有关联code也能返回主表数据 + DataStdDict, + DataStdMain.data_std_no == DataStdDict.data_std_no + ) .where(*filters) .order_by(desc(DataStdDict.create_time)) # 按创建时间降序排序 ) - # 分页处理 col_list = await PageUtil.paginate( db, query, query_object.page_num, query_object.page_size, is_page @@ -343,12 +361,12 @@ class DataStdDao: @classmethod async def delete_std_dict(cls, db: AsyncSession, Id: str): - await db.execute(delete(DataStdDict).where(DataStdDict.id == Id)) + await db.execute(delete(DataStdDict).where(DataStdDict.onum == Id)) @classmethod async def get_std_dict_list_all(cls, db: AsyncSession, query_object: DataStdDict): filters = [] - if query_object.std_code: - filters.append(DataStdDict.std_code.like(f"%{query_object.std_code}%")) + if query_object.data_std_no: + filters.append(DataStdDict.data_std_no.like(f"%{query_object.data_std_no}%")) query = select(DataStdDict).where(*filters).order_by(desc(DataStdDict.create_time)) return await PageUtil.paginate(db, query, 0, 0, False) @classmethod @@ -362,7 +380,7 @@ class DataStdDao: col = ( await db.execute( select(DataStdDict) - .where(DataStdDict.id == Id) + .where(DataStdDict.onum == Id) ) ).scalars().first() return col @@ -372,12 +390,12 @@ class DataStdDao: await db.execute( select(DataStdDict) .where( - DataStdDict.dict_name == query_object.dict_name if query_object.dict_name else True, - DataStdDict.dict_num == query_object.dict_num if query_object.dict_num else True, - DataStdDict.dict_status == query_object.dict_status if query_object.dict_status else True, - DataStdDict.std_code == query_object.std_code if query_object.std_code else True, - DataStdDict.sys_id == query_object.sys_id if query_object.sys_id else True, - DataStdDict.dict_type == query_object.dict_type if query_object.dict_type else True, + DataStdDict.data_dict_cn_name == query_object.data_dict_cn_name if query_object.data_dict_cn_name else True, + DataStdDict.data_dict_no == query_object.data_dict_no if query_object.data_dict_no else True, + DataStdDict.data_dict_stat == query_object.data_dict_stat if query_object.data_dict_stat else True, + DataStdDict.data_std_no == query_object.data_std_no if query_object.data_std_no else True, + DataStdDict.src_sys == query_object.src_sys if query_object.src_sys else True, + DataStdDict.data_dict_data_type == query_object.data_dict_data_type if query_object.data_dict_data_type else True, ) ) ).scalars().first() @@ -756,38 +774,104 @@ class DataStdDao: @classmethod async def get_std_main_list(cls, db: AsyncSession, query_object: DataStdMainModel, is_page: bool = False): filters = [] - if query_object.std_name: - filters.append(DataStdMain.std_name.like(f"%{query_object.std_name}%")) - if query_object.std_code: - filters.append(DataStdMain.std_code.like(f"%{query_object.std_code}%")) - if query_object.sys_id: - filters.append(DataStdMain.sys_id == query_object.sys_id) - if query_object.std_type: - filters.append(DataStdMain.std_type == query_object.std_type) + if query_object.data_std_cn_name: + filters.append(DataStdMain.data_std_cn_name.like(f"%{query_object.data_std_cn_name}%")) + if query_object.data_std_no: + filters.append(DataStdMain.data_std_no.like(f"%{query_object.data_std_no}%")) + if query_object.src_sys: + filters.append(DataStdMain.src_sys == query_object.src_sys) + if query_object.data_std_type: + filters.append(DataStdMain.data_std_type == query_object.data_std_type) if query_object.std_status: filters.append(DataStdMain.std_status == query_object.std_status) - if query_object.content_onum: - filters.append(DataStdMain.content_onum == query_object.content_onum) + if query_object.belt_data_std_content: + filters.append(DataStdMain.belt_data_std_content == query_object.belt_data_std_content) - query = select(DataStdMain).where(*filters).order_by(desc(DataStdMain.create_time)) + query = ( + select( + DataStdMain.onum, + DataStdMain.create_by, + DataStdMain.create_time, + DataStdMain.upd_prsn, + DataStdMain.upd_time, + DataStdMain.data_std_no, + DataStdMain.data_std_eng_name, + DataStdMain.data_std_cn_name, + DataStdMain.data_std_type, + DataStdMain.securityLevel, + DataStdMain.src_sys, + DataStdMain.data_std_vest, + DataStdMain.data_std_busi_defn, + DataStdMain.cd_id, + DataStdMain.std_status, + DataStdMain.data_std_busi_ownership_dept, + DataStdMain.data_std_it_ownership_dept, + DataStdMain.data_std_busi_ownership_prsn, + DataStdMain.data_std_it_ownership_prsn, + DataStdMain.belt_data_std_content, + DataStdMain.data_std_src, + DataStdMain.data_clas, + DataStdMain.typical_fld, + DataStdCode.cd_no.label("cd_no") # 关联查询的cd_no + ) + .outerjoin( # 使用left outer join确保即使没有关联code也能返回主表数据 + DataStdCode, + DataStdMain.cd_id == DataStdCode.onum + ) + .where(*filters) + .order_by(desc(DataStdMain.create_time)) + ) return await PageUtil.paginate(db, query, query_object.page_num, query_object.page_size, is_page) @classmethod async def get_std_main_list_all(cls, db: AsyncSession, query_object: DataStdMainModel): filters = [] - if query_object.std_name: - filters.append(DataStdMain.std_name.like(f"%{query_object.std_name}%")) - if query_object.std_code: - filters.append(DataStdMain.std_code.like(f"%{query_object.std_code}%")) - if query_object.sys_id: - filters.append(DataStdMain.sys_id == query_object.sys_id) - if query_object.code_id: - filters.append(DataStdMain.code_id == query_object.code_id) - if query_object.std_type: - filters.append(DataStdMain.std_type == query_object.std_type) + if query_object.data_std_cn_name: + filters.append(DataStdMain.data_std_cn_name.like(f"%{query_object.data_std_cn_name}%")) + if query_object.data_std_no: + filters.append(DataStdMain.data_std_no.like(f"%{query_object.data_std_no}%")) + if query_object.src_sys: + filters.append(DataStdMain.src_sys == query_object.src_sys) + if query_object.cd_id: + filters.append(DataStdMain.cd_id == query_object.cd_id) + if query_object.data_std_type: + filters.append(DataStdMain.data_std_type == query_object.data_std_type) if query_object.std_status: filters.append(DataStdMain.std_status == query_object.std_status) - query = select(DataStdMain).where(*filters).order_by(desc(DataStdMain.create_time)) + query = ( + select( + DataStdMain.onum, + DataStdMain.create_by, + DataStdMain.create_time, + DataStdMain.upd_prsn, + DataStdMain.upd_time, + DataStdMain.data_std_no, + DataStdMain.data_std_eng_name, + DataStdMain.data_std_cn_name, + DataStdMain.data_std_type, + DataStdMain.securityLevel, + DataStdMain.src_sys, + DataStdMain.data_std_vest, + DataStdMain.data_std_busi_defn, + DataStdMain.cd_id, + DataStdMain.std_status, + DataStdMain.data_std_busi_ownership_dept, + DataStdMain.data_std_it_ownership_dept, + DataStdMain.data_std_busi_ownership_prsn, + DataStdMain.data_std_it_ownership_prsn, + DataStdMain.belt_data_std_content, + DataStdMain.data_std_src, + DataStdMain.data_clas, + DataStdMain.typical_fld, + DataStdCode.cd_no.label("cd_no") # 关联查询的cd_no + ) + .outerjoin( # 使用left outer join确保即使没有关联code也能返回主表数据 + DataStdCode, + DataStdMain.cd_id == DataStdCode.onum + ) + .where(*filters) + .order_by(desc(DataStdMain.create_time)) + ) return await PageUtil.paginate(db, query, 0, 0, False) @classmethod async def add_std_main(cls, db: AsyncSession, model: DataStdMainModel): @@ -809,10 +893,10 @@ class DataStdDao: return col @classmethod async def delete_std_main(cls, db: AsyncSession, Id: str): - await db.execute(delete(DataStdMain).where(DataStdMain.id == Id)) + await db.execute(delete(DataStdMain).where(DataStdMain.onum == Id)) @classmethod async def delete_std_dict_appr(cls, db: AsyncSession, Id: str): - await db.execute(delete(DataStdDictAppr).where(DataStdDictAppr.id == Id)) + await db.execute(delete(DataStdDictAppr).where(DataStdDictAppr.onum == Id)) @classmethod async def update_std_main(cls, db: AsyncSession, update_data: DataStdMainModel): @@ -827,19 +911,19 @@ class DataStdDao: @classmethod async def get_std_main_by_id(cls, db: AsyncSession, Id: str): - col = await db.execute(select(DataStdMain).where(DataStdMain.id == Id)) + col = await db.execute(select(DataStdMain).where(DataStdMain.onum == Id)) return col.scalars().first() @classmethod async def get_data_main_by_info(cls, db: AsyncSession, query_object: DataStdMainModel): col = await db.execute( select(DataStdMain).where( - DataStdMain.std_name == query_object.std_name if query_object.std_name else True, - DataStdMain.std_code == query_object.std_code if query_object.std_code else True, - DataStdMain.std_num == query_object.std_num if query_object.std_num else True, - DataStdMain.sys_id == query_object.sys_id if query_object.sys_id else True, - DataStdMain.std_type == query_object.std_type if query_object.std_type else True, - DataStdMain.code_id == query_object.code_id if query_object.code_id else True, + DataStdMain.data_std_cn_name == query_object.data_std_cn_name if query_object.data_std_cn_name else True, + DataStdMain.data_std_no == query_object.data_std_no if query_object.data_std_no else True, + DataStdMain.data_std_no == query_object.data_std_no if query_object.data_std_no else True, + DataStdMain.src_sys == query_object.src_sys if query_object.src_sys else True, + DataStdMain.data_std_type == query_object.data_std_type if query_object.data_std_type else True, + DataStdMain.cd_id == query_object.cd_id if query_object.cd_id else True, DataStdMain.std_status == query_object.std_status if query_object.std_status else True ) ) @@ -848,18 +932,18 @@ class DataStdDao: async def get_std_main_appr_list_all(cls, db: AsyncSession, query_object: DataStdMainApprModel): filters = [] - if query_object.std_name: - filters.append(DataStdMainAppr.std_name.like(f"%{query_object.std_name}%")) - if query_object.std_code: - filters.append(DataStdMainAppr.std_code.like(f"%{query_object.std_code}%")) - if query_object.sys_id: - filters.append(DataStdMainAppr.sys_id == query_object.sys_id) - if query_object.code_id: - filters.append(DataStdMainAppr.code_id == query_object.code_id) + if query_object.data_std_cn_name: + filters.append(DataStdMainAppr.data_std_cn_name.like(f"%{query_object.data_std_cn_name}%")) + if query_object.data_std_no: + filters.append(DataStdMainAppr.data_std_no.like(f"%{query_object.data_std_no}%")) + if query_object.src_sys: + filters.append(DataStdMainAppr.src_sys == query_object.src_sys) + if query_object.cd_id: + filters.append(DataStdMainAppr.cd_id == query_object.cd_id) if query_object.flowId: filters.append(DataStdMainAppr.flowId == query_object.flowId) - if query_object.std_type: - filters.append(DataStdMainAppr.std_type == query_object.std_type) + if query_object.data_std_type: + filters.append(DataStdMainAppr.data_std_type == query_object.data_std_type) if query_object.std_status: filters.append(DataStdMainAppr.std_status == query_object.std_status) query = select(DataStdMainAppr).where(*filters).order_by(desc(DataStdMainAppr.create_time)) @@ -880,11 +964,11 @@ class DataStdDao: @classmethod async def get_std_main_appr_by_id(cls, db: AsyncSession, Id: str): - col = await db.execute(select(DataStdMainAppr).where(DataStdMainAppr.id == Id)) + col = await db.execute(select(DataStdMainAppr).where(DataStdMainAppr.onum == Id)) return col.scalars().first() @classmethod async def get_std_dict_appr_by_id(cls, db: AsyncSession, Id: str): - col = await db.execute(select(DataStdDictAppr).where(DataStdDictAppr.id == Id)) + col = await db.execute(select(DataStdDictAppr).where(DataStdDictAppr.onum == Id)) return col.scalars().first() @classmethod async def get_last_std_main_appr_by_id(cls,db: AsyncSession, Id: str ): @@ -894,7 +978,7 @@ class DataStdDao: DataStdMainAppr.oldInstId == Id, DataStdMainAppr.approStatus == "succeed" ) - .order_by(DataStdMainAppr.update_time.desc()) + .order_by(DataStdMainAppr.upd_time.desc()) .limit(1) ) return result.scalar_one_or_none() @@ -906,7 +990,7 @@ class DataStdDao: DataStdDictAppr.oldInstId == Id, DataStdDictAppr.approStatus == "succeed" ) - .order_by(DataStdDictAppr.update_time.desc()) + .order_by(DataStdDictAppr.upd_time.desc()) .limit(1) ) return result.scalar_one_or_none() diff --git a/vue-fastapi-backend/module_admin/entity/do/datastd_do.py b/vue-fastapi-backend/module_admin/entity/do/datastd_do.py index ce28b0d..45579a6 100644 --- a/vue-fastapi-backend/module_admin/entity/do/datastd_do.py +++ b/vue-fastapi-backend/module_admin/entity/do/datastd_do.py @@ -8,46 +8,41 @@ class DataStdCode(Base): """ 标准代码表 (Standard Code Table) """ - __tablename__ = 't_datastd_code' + __tablename__ = 't_data_cd_val' - id = Column(String(50), primary_key=True, comment='标准代码Id') + onum = Column(String(50), primary_key=True, comment='标准代码Id') create_by = Column(String(20), default='', comment='创建者') create_time = Column(DateTime, nullable=True, default=None, comment='创建时间') - update_by = Column(String(20), default='', comment='更新者') - update_time = Column(DateTime, nullable=True, default=None, comment='更新时间') - code_num = Column(String(50), default=None, comment='标准代码编号') - code_name = Column(String(200), default=None, comment='标准代码值') - code_type = Column(String(10), default=None, comment='标准代码类型（sys：系统级 company：公司级）') - code_status = Column(String(1), default=None, comment='代码状态（0：有效 1：无效）') - sys_name = Column(String(50), default=None, comment='归属系统') - sys_id = Column(Integer, default=None, comment='归属系统Id') + upd_prsn = Column(String(20), default='', comment='更新者') + upd_time = Column(DateTime, nullable=True, default=None, comment='更新时间') + cd_no = Column(String(50), default=None, comment='标准代码编号') + cd_val_cn_mean = Column(String(200), default=None, comment='标准代码值') + cd_type = Column(String(10), default=None, comment='标准代码类型（sys：系统级 company：公司级）') + cd_val_stat = Column(String(1), default=None, comment='代码状态（0：有效 1：无效）') + src_sys = Column(String(50), default=None, comment='归属系统') class_id = Column(String(10), default=None, comment='代码类型（code：代码 codeItem：代码项）') parent_id = Column(String(50), default=None, comment='父id') code_map_id = Column(String(50), default=None,comment='标准代码Id') - code_map_num = Column(String(50), default=None, comment='标准代码编号') - code_map_name = Column(String(200), default=None, comment='标准代码值') + class DataStdCodeAppr(Base): """ 标准代码表 (Standard Code Table) """ - __tablename__ = 't_datastd_code_appr' + __tablename__ = 't_data_cd_val_appr' - id = Column(String(50), primary_key=True, comment='标准代码Id') + onum = Column(String(50), primary_key=True, comment='标准代码Id') create_by = Column(String(20), default='', comment='创建者') create_time = Column(DateTime, nullable=True, default=None, comment='创建时间') - update_by = Column(String(20), default='', comment='更新者') - update_time = Column(DateTime, nullable=True, default=None, comment='更新时间') - code_num = Column(String(50), default=None, comment='标准代码编号') - code_name = Column(String(200), default=None, comment='标准代码值') - code_type = Column(String(10), default=None, comment='标准代码类型（sys：系统级 company：公司级）') - code_status = Column(String(1), default=None, comment='代码状态（0：有效 1：无效）') - sys_name = Column(String(50), default=None, comment='归属系统') - sys_id = Column(Integer, default=None, comment='归属系统Id') + upd_prsn = Column(String(20), default='', comment='更新者') + upd_time = Column(DateTime, nullable=True, default=None, comment='更新时间') + cd_no = Column(String(50), default=None, comment='标准代码编号') + cd_val_cn_mean = Column(String(200), default=None, comment='标准代码值') + cd_type = Column(String(10), default=None, comment='标准代码类型（sys：系统级 company：公司级）') + cd_val_stat = Column(String(1), default=None, comment='代码状态（0：有效 1：无效）') + src_sys = Column(String(50), default=None, comment='归属系统') class_id = Column(String(10), default=None, comment='代码类型（code：代码 codeItem：代码项）') parent_id = Column(String(50), default=None, comment='父id') code_map_id = Column(String(50), default=None,comment='标准代码Id') - code_map_num = Column(String(50), default=None, comment='标准代码编号') - code_map_name = Column(String(200), default=None, comment='标准代码值') changeType = Column(String(10), default=None, comment='变更类型') flowId = Column(String(50), default=None, comment='审批Id') oldInstId = Column(String(50), default=None, comment='原始正式id') @@ -58,56 +53,47 @@ class DataStdDict(Base): """ 标准字典表 (Standard Code Table) """ - __tablename__ = 't_datastd_dict' # 表名为 t_datastd_dict + __tablename__ = 't_data_dict' # 表名为 t_datastd_dict - id = Column(String(50), primary_key=True, comment='标准代码Id') + onum = Column(String(50), primary_key=True, comment='标准代码Id') create_by = Column(String(20), default='', comment='创建者') create_time = Column(DateTime, nullable=True, default=None, comment='创建时间') - update_by = Column(String(20), default='', comment='更新者') - update_time = Column(DateTime, nullable=True, default=None, comment='更新时间') - dict_num = Column(String(50), default=None, comment='字典编号') - dict_code = Column(String(50), default=None, comment='字典英文名') - dict_name = Column(String(200), default=None, comment='字典中文名') - dict_level = Column(String(10), default=None, comment='字典归属（sys：系统级 company：公司级）') - dict_type = Column(String(1), default=None, comment='字典类型（0：基础数据 1：指标数据）') - sys_name = Column(String(50), default=None, comment='归属系统') - sys_id = Column(Integer, default=None, comment='归属系统Id') - dict_menu = Column(String(200), default=None, comment='字典业务定义') - data_type = Column(String(20), default=None, comment='数据类型') - std_code = Column(String(50), default=None, comment='数据标准编号') - std_name = Column(String(50), default=None, comment='数据标准名称') - dict_status = Column(String(1), default=None, comment='字典状态（1：有效 0：无效）') - buss_dept_id = Column(BigInteger, default=None, comment='业务认责部门') - tech_dept_id = Column(BigInteger, default=None, comment='技术认责部门') - buss_user = Column(String(20), default=None, comment='业务认责人员') - tech_user = Column(String(20), default=None, comment='技术认责人员') + upd_prsn = Column(String(20), default='', comment='更新者') + upd_time = Column(DateTime, nullable=True, default=None, comment='更新时间') + data_dict_no = Column(String(50), default=None, comment='字典编号') + data_dict_eng_name = Column(String(50), default=None, comment='字典英文名') + data_dict_cn_name = Column(String(200), default=None, comment='字典中文名') + data_dict_vest = Column(String(10), default=None, comment='字典归属（sys：系统级 company：公司级）') + data_dict_type = Column(String(1), default=None, comment='字典类型（0：基础数据 1：指标数据）') + src_sys = Column(Integer, default=None, comment='归属系统') + data_dict_busi_mean = Column(String(200), default=None, comment='字典业务定义') + data_dict_data_type = Column(String(20), default=None, comment='数据类型') + data_std_no = Column(String(50), default=None, comment='数据标准编号') + src_sys_tab_fld_name = Column(String(1000), default=None, comment='来源系统表字段名') + data_dict_stat = Column(String(1), default=None, comment='字典状态（1：有效 0：无效）') + class DataStdDictAppr(Base): """ 标准字典审批表 (Standard Code Table) """ - __tablename__ = 't_datastd_dict_appr' # 表名为 t_datastd_dict + __tablename__ = 't_data_dict_appr' # 表名为 t_datastd_dict - id = Column(String(50), primary_key=True, comment='标准代码Id') + onum = Column(String(50), primary_key=True, comment='标准代码Id') create_by = Column(String(20), default='', comment='创建者') create_time = Column(DateTime, nullable=True, default=None, comment='创建时间') - update_by = Column(String(20), default='', comment='更新者') - update_time = Column(DateTime, nullable=True, default=None, comment='更新时间') - dict_num = Column(String(50), default=None, comment='字典编号') - dict_code = Column(String(50), default=None, comment='字典英文名') - dict_name = Column(String(200), default=None, comment='字典中文名') - dict_level = Column(String(10), default=None, comment='字典归属（sys：系统级 company：公司级）') - dict_type = Column(String(1), default=None, comment='字典类型（0：基础数据 1：指标数据）') - sys_name = Column(String(50), default=None, comment='归属系统') - sys_id = Column(Integer, default=None, comment='归属系统Id') - dict_menu = Column(String(200), default=None, comment='字典业务定义') - data_type = Column(String(20), default=None, comment='数据类型') - std_code = Column(String(50), default=None, comment='数据标准编号') - std_name = Column(String(50), default=None, comment='数据标准名称') - dict_status = Column(String(1), default=None, comment='字典状态（1：有效 0：无效）') - buss_dept_id = Column(BigInteger, default=None, comment='业务认责部门') - tech_dept_id = Column(BigInteger, default=None, comment='技术认责部门') - buss_user = Column(String(20), default=None, comment='业务认责人员') - tech_user = Column(String(20), default=None, comment='技术认责人员') + upd_prsn = Column(String(20), default='', comment='更新者') + upd_time = Column(DateTime, nullable=True, default=None, comment='更新时间') + data_dict_no = Column(String(50), default=None, comment='字典编号') + data_dict_eng_name = Column(String(50), default=None, comment='字典英文名') + data_dict_cn_name = Column(String(200), default=None, comment='字典中文名') + data_dict_vest = Column(String(10), default=None, comment='字典归属（sys：系统级 company：公司级）') + data_dict_type = Column(String(1), default=None, comment='字典类型（0：基础数据 1：指标数据）') + src_sys = Column(String(50), default=None, comment='归属系统') + data_dict_busi_mean = Column(String(200), default=None, comment='字典业务定义') + data_std_no = Column(String(50), default=None, comment='数据标准编号') + data_dict_stat = Column(String(1), default=None, comment='字典状态（1：有效 0：无效）') + data_dict_data_type = Column(String(20), default=None, comment='数据类型') + src_sys_tab_fld_name = Column(String(1000), default=None, comment='来源系统表字段名') changeType = Column(String(10), default=None, comment='变更类型') flowId = Column(String(50), default=None, comment='审批Id') oldInstId = Column(String(50), default=None, comment='原始正式id') @@ -147,64 +133,62 @@ class DataStdMain(Base): """ 数据标准表 """ - __tablename__ = 't_datastd_main' + __tablename__ = 't_data_std' - id = Column(String(50), primary_key=True, comment='标准代码Id') + onum = Column(String(50), primary_key=True, comment='标准代码Id') create_by = Column(String(20), default='', comment='创建者') create_time = Column(DateTime, nullable=True, default=None, comment='创建时间') - update_by = Column(String(20), default='', comment='更新者') - update_time = Column(DateTime, nullable=True, default=None, comment='更新时间') - std_num = Column(String(50), default=None, comment='标准编号') - std_code = Column(String(50), default=None, comment='标准英文名') - std_name = Column(String(200), default=None, comment='标准中文名') - std_type = Column(String(1), default=None, comment='标准类型（0：基础数据 1：指标数据）') + upd_prsn = Column(String(20), default='', comment='更新者') + upd_time = Column(DateTime, nullable=True, default=None, comment='更新时间') + data_std_no = Column(String(50), default=None, comment='标准编号') + data_std_eng_name = Column(String(50), default=None, comment='标准英文名') + data_std_cn_name = Column(String(200), default=None, comment='标准中文名') + data_std_type = Column(String(1), default=None, comment='标准类型（0：基础数据 1：指标数据）') securityLevel = Column(String(1), default=None, comment='安全等级') - sourceSystem = Column(String(50), default=None, comment='来源系统') - sys_name = Column(String(50), default=None, comment='归属系统') - sys_id = Column(Integer, default=None, comment='归属系统Id') - std_menu = Column(String(200), default=None, comment='标准业务定义') - code_num = Column(String(50), default=None, comment='代码编号') - code_id = Column(String(50), default=None, comment='代码id') + src_sys = Column(String(50), default=None, comment='来源系统') + data_std_vest = Column(String(50), default=None, comment='数据标准归属(公司级、系统级)') + data_std_busi_defn = Column(String(200), default=None, comment='标准业务定义') + cd_id = Column(String(50), default=None, comment='代码id') std_status = Column(String(1), default=None, comment='标准状态（1：有效 0：无效）') - buss_dept_id = Column(BigInteger, default=None, comment='业务认责部门') - tech_dept_id = Column(BigInteger, default=None, comment='技术认责部门') - buss_user = Column(String(20), default=None, comment='业务认责人员') - tech_user = Column(String(20), default=None, comment='技术认责人员') - content_onum = Column(Integer, default=None, comment='分类') - std_src = Column(String(20), default=None, comment='标准来源') + data_std_busi_ownership_dept = Column(String(100), default=None, comment='业务认责部门') + data_std_it_ownership_dept = Column(String(100), default=None, comment='技术认责部门') + data_std_busi_ownership_prsn = Column(String(100), default=None, comment='业务认责人员') + data_std_it_ownership_prsn = Column(String(100), default=None, comment='技术认责人员') + belt_data_std_content = Column(Integer, default=None, comment='分类') + data_std_src = Column(String(20), default=None, comment='标准来源') data_clas = Column(String(20), default=None, comment='数据类别') + typical_fld = Column(String(500), default=None, comment='典型字段') class DataStdMainAppr(Base): """ 数据标准表 """ - __tablename__ = 't_datastd_main_appr' + __tablename__ = 't_data_std_appr' - id = Column(String(50), primary_key=True, comment='标准代码Id') + onum = Column(String(50), primary_key=True, comment='标准代码Id') create_by = Column(String(20), default='', comment='创建者') create_time = Column(DateTime, nullable=True, default=None, comment='创建时间') - update_by = Column(String(20), default='', comment='更新者') - update_time = Column(DateTime, nullable=True, default=None, comment='更新时间') - std_num = Column(String(50), default=None, comment='标准编号') - std_code = Column(String(50), default=None, comment='标准英文名') - std_name = Column(String(200), default=None, comment='标准中文名') - std_type = Column(String(1), default=None, comment='标准类型（0：基础数据 1：指标数据）') + upd_prsn = Column(String(20), default='', comment='更新者') + upd_time = Column(DateTime, nullable=True, default=None, comment='更新时间') + data_std_no = Column(String(50), default=None, comment='标准编号') + data_std_eng_name = Column(String(50), default=None, comment='标准英文名') + data_std_cn_name = Column(String(200), default=None, comment='标准中文名') + data_std_type = Column(String(1), default=None, comment='标准类型（0：基础数据 1：指标数据）') securityLevel = Column(String(1), default=None, comment='安全等级') - sourceSystem = Column(String(50), default=None, comment='来源系统') - sys_name = Column(String(50), default=None, comment='归属系统') - sys_id = Column(Integer, default=None, comment='归属系统Id') - std_menu = Column(String(200), default=None, comment='标准业务定义') - code_num = Column(String(50), default=None, comment='代码编号') - code_id = Column(String(50), default=None, comment='代码id') + src_sys = Column(Integer, default=None, comment='来源系统') + data_std_vest = Column(String(50), default=None, comment='数据标准归属(公司级、系统级)') + data_std_busi_defn = Column(String(200), default=None, comment='标准业务定义') + cd_id = Column(String(50), default=None, comment='代码id') std_status = Column(String(1), default=None, comment='标准状态（1：有效 0：无效）') - buss_dept_id = Column(BigInteger, default=None, comment='业务认责部门') - tech_dept_id = Column(BigInteger, default=None, comment='技术认责部门') - buss_user = Column(String(20), default=None, comment='业务认责人员') - tech_user = Column(String(20), default=None, comment='技术认责人员') - content_onum = Column(Integer, default=None, comment='分类') - std_src = Column(String(20), default=None, comment='标准来源') - data_clas = Column(String(20), default=None, comment='数据类别') + data_std_busi_ownership_dept = Column(String(100), default=None, comment='业务认责部门') + data_std_it_ownership_dept = Column(String(100), default=None, comment='技术认责部门') + data_std_busi_ownership_prsn = Column(String(100), default=None, comment='业务认责人员') + data_std_it_ownership_prsn = Column(String(100), default=None, comment='技术认责人员') + belt_data_std_content = Column(Integer, default=None, comment='分类') + data_std_src = Column(String(20), default=None, comment='标准来源') + data_clas = Column(String(20), default=None, comment='数据类别') + typical_fld = Column(String(500), default=None, comment='典型字段') changeType = Column(String(10), default=None, comment='变更类型') flowId = Column(String(50), default=None, comment='审批Id') oldInstId = Column(String(50), default=None, comment='原始正式id') diff --git a/vue-fastapi-backend/module_admin/entity/vo/datastd_vo.py b/vue-fastapi-backend/module_admin/entity/vo/datastd_vo.py index 7bdc602..f0a4312 100644 --- a/vue-fastapi-backend/module_admin/entity/vo/datastd_vo.py +++ b/vue-fastapi-backend/module_admin/entity/vo/datastd_vo.py @@ -18,22 +18,20 @@ class DataStdCodeModel(BaseModel): """ model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) - id: Optional[str] = Field(default=None, description='标准代码主键') - code_num: Optional[str] = Field(default=None, description='标准代码编号') - code_name: Optional[str] = Field(default=None, description='标准代码名称') - code_type: Optional[str] = Field(default=None, description='标准代码类型') - code_status: Optional[str] = Field(default=None, description='标准代码状态') - sys_name: Optional[str] = Field(default=None, description='系统名称') - sys_id: Optional[int] = Field(default=None, description='系统ID') + onum: Optional[str] = Field(default=None, description='序号') + cd_no: Optional[str] = Field(default=None, description='标准代码编号') + cd_val_cn_mean: Optional[str] = Field(default=None, description='标准代码名称') + cd_type: Optional[str] = Field(default=None, description='标准代码类型') + cd_val_stat: Optional[str] = Field(default=None, description='标准代码状态') + src_sys: Optional[int] = Field(default=None, description='系统ID') parent_id: Optional[str] = Field(default=None, description='父级ID') class_id: Optional[str] = Field(default=None, description='类目ID') create_by: Optional[str] = Field(default=None, description='创建者') create_time: Optional[datetime] = Field(default=None, description='创建时间') - update_by: Optional[str] = Field(default=None, description='更新者') - update_time: Optional[datetime] = Field(default=None, description='更新时间') + upd_prsn: Optional[str] = Field(default=None, description='更新者') + upd_time: Optional[datetime] = Field(default=None, description='更新时间') code_map_id: Optional[str] = Field(default=None, description='标准代码主键(映射)') - code_map_num: Optional[str] = Field(default=None, description='标准代码编号(映射)') - code_map_name: Optional[str] = Field(default=None, description='标准代码名称(映射)') + class DataStdCodeApprModel(DataStdCodeModel): changeType: Optional[str] = Field(default=None, description='变更类型') @@ -64,27 +62,23 @@ class DataStdDictModel(BaseModel): """ model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) - id: Optional[str] = Field(default=None, description='标准字典主键') + onum: Optional[str] = Field(default=None, description='标准字典主键') create_by: Optional[str] = Field(default='', description='创建者') create_time: Optional[datetime] = Field(default=None, description='创建时间') - update_by: Optional[str] = Field(default='', description='更新者') - update_time: Optional[datetime] = Field(default=None, description='更新时间') - dict_num: Optional[str] = Field(default=None, description='字典编号') - dict_code: Optional[str] = Field(default=None, description='字典英文名') - dict_name: Optional[str] = Field(default=None, description='字典中文名') - dict_level: Optional[str] = Field(default=None, description='字典归属（sys：系统级 company：公司级）') - dict_type: Optional[str] = Field(default=None, description='字典类型（0：基础数据 1：指标数据）') - sys_name: Optional[str] = Field(default=None, description='归属系统') - sys_id: Optional[int] = Field(default=None, description='归属系统Id') - dict_menu: Optional[str] = Field(default=None, description='字典业务定义') - data_type: Optional[str] = Field(default=None, description='数据类型') - std_code: Optional[str] = Field(default=None, description='数据标准编号') - std_name: Optional[str] = Field(default=None, description='数据标准名称') - dict_status: Optional[str] = Field(default=None, description='字典状态（1：有效 0：无效）') - buss_dept_id: Optional[int] = Field(default=None, description='业务认责部门') - tech_dept_id: Optional[int] = Field(default=None, description='技术认责部门') - buss_user: Optional[str] = Field(default=None, description='业务认责人员') - tech_user: Optional[str] = Field(default=None, description='技术认责人员') + upd_prsn: Optional[str] = Field(default='', description='更新者') + upd_time: Optional[datetime] = Field(default=None, description='更新时间') + data_dict_no: Optional[str] = Field(default=None, description='字典编号') + data_dict_eng_name: Optional[str] = Field(default=None, description='字典英文名') + data_dict_cn_name: Optional[str] = Field(default=None, description='字典中文名') + data_dict_vest: Optional[str] = Field(default=None, description='字典归属（sys：系统级 company：公司级）') + data_dict_type: Optional[str] = Field(default=None, description='字典类型（0：基础数据 1：指标数据）') + src_sys: Optional[int] = Field(default=None, description='归属系统') + data_dict_busi_mean: Optional[str] = Field(default=None, description='字典业务定义') + data_dict_data_type: Optional[str] = Field(default=None, description='数据类型') + src_sys_tab_fld_name: Optional[str] = Field(default=None, description='来源系统表字段名') + data_std_no: Optional[str] = Field(default=None, description='数据标准编号') + data_dict_stat: Optional[str] = Field(default=None, description='字典状态（1：有效 0：无效）') + @as_query class DataStdDictPageQueryModel(DataStdDictModel): """ @@ -104,30 +98,28 @@ class DataStdMainModel(BaseModel): """ model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) - id: Optional[str] = Field(default=None, description='标准代码Id') + onum: Optional[str] = Field(default=None, description='标准代码Id') create_by: Optional[str] = Field(default='', description='创建者') create_time: Optional[datetime] = Field(default=None, description='创建时间') - update_by: Optional[str] = Field(default='', description='更新者') - update_time: Optional[datetime] = Field(default=None, description='更新时间') - std_num: Optional[str] = Field(default=None, description='标准编号') - std_code: Optional[str] = Field(default=None, description='标准英文名') - std_name: Optional[str] = Field(default=None, description='标准中文名') - std_type: Optional[str] = Field(default=None, description='标准类型（0：基础数据 1：指标数据）') + upd_prsn: Optional[str] = Field(default='', description='更新者') + upd_time: Optional[datetime] = Field(default=None, description='更新时间') + data_std_no: Optional[str] = Field(default=None, description='标准编号') + data_std_eng_name: Optional[str] = Field(default=None, description='标准英文名') + data_std_cn_name: Optional[str] = Field(default=None, description='标准中文名') + data_std_type: Optional[str] = Field(default=None, description='标准类型（0：基础数据 1：指标数据）') securityLevel: Optional[str] = Field(default=None, description='安全等级') - sourceSystem: Optional[str] = Field(default=None, description='来源系统') - sys_name: Optional[str] = Field(default=None, description='归属系统') - sys_id: Optional[int] = Field(default=None, description='归属系统Id') - std_menu: Optional[str] = Field(default=None, description='标准业务定义') - code_num: Optional[str] = Field(default=None, description='代码编号') - code_id: Optional[str] = Field(default=None, description='代码id') + src_sys: Optional[int] = Field(default=None, description='归属系统') + data_std_busi_defn: Optional[str] = Field(default=None, description='标准业务定义') + cd_id: Optional[str] = Field(default=None, description='代码id') std_status: Optional[str] = Field(default=None, description='标准状态（1：有效 0：无效）') - buss_dept_id: Optional[int] = Field(default=None, description='业务认责部门') - tech_dept_id: Optional[int] = Field(default=None, description='技术认责部门') - buss_user: Optional[str] = Field(default=None, description='业务认责人员') - tech_user: Optional[str] = Field(default=None, description='技术认责人员') - content_onum: Optional[int] = Field(default=None, description='分类') - std_src: Optional[str] = Field(default=None, description='标准来源') + data_std_busi_ownership_dept: Optional[str] = Field(default=None, description='业务认责部门') + data_std_it_ownership_dept: Optional[str] = Field(default=None, description='技术认责部门') + data_std_busi_ownership_prsn: Optional[str] = Field(default=None, description='业务认责人员') + data_std_it_ownership_prsn: Optional[str] = Field(default=None, description='技术认责人员') + belt_data_std_content: Optional[int] = Field(default=None, description='分类') + data_std_src: Optional[str] = Field(default=None, description='标准来源') data_clas: Optional[str] = Field(default=None, description='数据类别') + typical_fld: Optional[str] = Field(default=None, description='典型字段') @as_query class DataStdMainPageQueryModel(DataStdMainModel): """ diff --git a/vue-fastapi-backend/module_admin/service/approval_service.py b/vue-fastapi-backend/module_admin/service/approval_service.py index 59439f9..c43fae9 100644 --- a/vue-fastapi-backend/module_admin/service/approval_service.py +++ b/vue-fastapi-backend/module_admin/service/approval_service.py @@ -151,7 +151,7 @@ class ApprovalService: elif change_type == "edit": # 使用 oldInstId 作为主键 main_model = DataStdMainModel(**appr_model.model_dump(exclude_unset=True, by_alias=True)) - main_model.id = appr_model.oldInstId + main_model.onum = appr_model.oldInstId await DataStdDao.update_std_main(result_db, main_model) elif change_type == "delete": @@ -184,7 +184,7 @@ class ApprovalService: # 使用 oldInstId 作为主键 main_model = DataStdDictModel(**appr_model.model_dump(exclude_unset=True, by_alias=True)) - main_model.id = appr_model.oldInstId + main_model.onum = appr_model.oldInstId await DataStdDao.update_std_dict(result_db, main_model.model_dump(exclude_unset=True)) elif change_type == "delete": @@ -216,7 +216,7 @@ class ApprovalService: # 使用 oldInstId 作为主键 main_model = DataStdCodeModel(**appr_model.model_dump(exclude_unset=True, by_alias=True)) - main_model.id = appr_model.oldInstId + main_model.onum = appr_model.oldInstId await DataStdDao.update_std_code(result_db, main_model.model_dump(exclude_unset=True)) elif change_type == "delete": diff --git a/vue-fastapi-backend/module_admin/service/datastd_service.py b/vue-fastapi-backend/module_admin/service/datastd_service.py index 09db8ef..538a15b 100644 --- a/vue-fastapi-backend/module_admin/service/datastd_service.py +++ b/vue-fastapi-backend/module_admin/service/datastd_service.py @@ -40,7 +40,7 @@ class DataStdService: # col_list_result = await DataStdDao.get_appr_std_code_list(query_db, query_object, is_page) - # # for 循环col_list_result.rows 如果changeType是update的 去查他的compareId 用oldItem= get_std_code_appr_by_id（compareId ） 获取原始数据 比较 code_num code_name code_map_id （code_map_id都为空的情况应该判断一致） 如果三个属性都一致的 判定一致 移除这个col_list_result，不一致的把改属性改为 item.code_num=oldItem.code_num-->item.code_num + # # for 循环col_list_result.rows 如果changeType是update的 去查他的compareId 用oldItem= get_std_code_appr_by_id（compareId ） 获取原始数据 比较 cd_no cd_val_cn_mean code_map_id （code_map_id都为空的情况应该判断一致） 如果三个属性都一致的 判定一致 移除这个col_list_result，不一致的把改属性改为 item.cd_no=oldItem.cd_no-->item.cd_no # return col_list_result @classmethod async def get_appr_std_code_list_services( @@ -54,8 +54,8 @@ class DataStdService: old_item = await DataStdDao.get_std_code_appr_by_id(query_db, item.get("compareId")) # 判断三个字段是否一致（空值也算一致） - is_code_num_same = item.get("codeNum") == old_item.code_num - is_code_name_same = item.get("codeName") == old_item.code_name + is_code_num_same = item.get("cdNo") == old_item.cd_no + is_code_name_same = item.get("cdValCnMean") == old_item.cd_val_cn_mean is_code_map_id_same = ( (not item.get("codeMapId") and not old_item.code_map_id) or (item.get("codeMapId") == old_item.code_map_id) @@ -66,9 +66,9 @@ class DataStdService: else: # 拼接变更格式：旧值 ==> 新值 if not is_code_num_same: - item["codeNum"] = f"{old_item.code_num or ''} ==> {item.get('codeNum', '')}" + item["cdNo"] = f"{old_item.cd_no or ''} ==> {item.get('cdNo', '')}" if not is_code_name_same: - item["codeName"] = f"{old_item.code_name or ''} ==> {item.get('codeName', '')}" + item["cdValCnMean"] = f"{old_item.cd_val_cn_mean or ''} ==> {item.get('cdValCnMean', '')}" if not is_code_map_id_same: old_val = old_item.code_map_id or "" new_val = item.get("codeMapId") or "" @@ -127,7 +127,7 @@ class DataStdService: try: # 创建新的 page_object 实例，避免修改原始对象 new_page_object = DataStdCodeModel(**page_object.model_dump(by_alias=True)) - new_page_object.code_status="9" + new_page_object.cd_val_stat="9" # 调用 DAO 方法插入数据 await DataStdDao.add_std_code(query_db, new_page_object) return CrudResponseModel(is_success=True, message='新增标准代码成功') @@ -155,19 +155,37 @@ class DataStdService: @classmethod async def code_appr_detail_services(cls, query_db: AsyncSession, col: str): """ - 获取参数配置详细信息service - + 获取参数配置详细信息 service + :param query_db: orm对象 - :param config_id: 参数配置id - :return: 参数配置id对应的信息 + :param col: 参数配置 id + :return: 参数配置 id 对应的信息，标记变更字段 """ config = await DataStdDao.get_std_code_appr_by_id(query_db, col) - if config: - result = DataStdCodeApprModel(**CamelCaseUtil.transform_result(config)) - else: - result = DataStdCodeApprModel(**dict()) + if not config: + return DataStdCodeApprModel(**dict()) + + old_config = await DataStdDao.get_std_code_appr_by_id(query_db, config.compareId) + + # 将 ORM 对象转为 dict 并驼峰命名 + current = CamelCaseUtil.transform_result(config) + result_data = current.copy() + + if old_config: + old = CamelCaseUtil.transform_result(old_config) + + def diff(field): + old_val = str(old.get(field, '') or '') + new_val = str(current.get(field, '') or '') + return f"{old_val} ==> {new_val}" if old_val != new_val else new_val + + # 比较指定字段 + result_data["cdNo"] = diff("cdNo") + result_data["cdValCnMean"] = diff("cdValCnMean") + result_data["srcSys"] = diff("srcSys") + + return result_data - return result @classmethod async def edit_std_code_services(cls, request: Request, query_db: AsyncSession, page_object: DataStdCodeModel): """ @@ -179,7 +197,7 @@ class DataStdService: :return: 编辑列配置校验结果 """ edit_col = page_object.model_dump(exclude_unset=True) - col_info = await cls.get_std_code_by_id_services(query_db, page_object.id) + col_info = await cls.get_std_code_by_id_services(query_db, page_object.onum) if col_info: try: @@ -189,7 +207,7 @@ class DataStdService: await query_db.rollback() raise e else: - raise ServiceException(message=f'标准代码{page_object.id}不存在') + raise ServiceException(message=f'标准代码{page_object.onum}不存在') @classmethod async def delete_std_code_with_items_appr( @@ -208,8 +226,8 @@ class DataStdService: raise ServiceException(message="请提供有效的标准代码ID列表") for std_id in id_list: - std_code = await DataStdDao.get_std_code_by_id(query_db, std_id) - if not std_code: + data_std_no = await DataStdDao.get_std_code_by_id(query_db, std_id) + if not data_std_no: raise ServiceException(message=f"ID 为 {std_id} 的标准代码不存在，无法提交删除审批") @@ -217,19 +235,19 @@ class DataStdService: last_appr= await DataStdDao.get_last_std_code_appr_by_id(query_db,std_id) # 标准代码审批记录 - std_code_appr = DataStdCodeApprModel(**CamelCaseUtil.transform_result(std_code)) + std_code_appr = DataStdCodeApprModel(**CamelCaseUtil.transform_result(data_std_no)) std_code_appr.changeType = "delete" - std_code_appr.compareId = last_appr.id - std_code_appr.oldInstId = std_code.id + std_code_appr.compareId = last_appr.onum + std_code_appr.oldInstId = data_std_no.onum std_code_appr.approStatus = "waiting" - std_code_appr.code_status = "9" + std_code_appr.cd_val_stat = "9" std_code_appr.flowId = flow_id - std_code_appr.id=str(uuid.uuid4()) + std_code_appr.onum=str(uuid.uuid4()) std_code_appr.create_by = current_user.user.user_name std_code_appr.create_time = datetime.now() await DataStdDao.add_std_code_appr(query_db, std_code_appr) queryCodeItem = DataStdCodePageQueryModel() - queryCodeItem.parent_id=std_code.id + queryCodeItem.parent_id=data_std_no.onum queryCodeItem.class_id="codeItem" queryCodeItem.page_size=100 queryCodeItem.page_num=1 @@ -238,13 +256,13 @@ class DataStdService: appr_item=DataStdCodeApprModel(**code_item) last_appr_item= await DataStdDao.get_last_std_code_appr_by_id(query_db,std_id) appr_item.changeType = "delete" - appr_item.parent_id = std_code_appr.id - appr_item.compareId = last_appr_item.id - appr_item.oldInstId = appr_item.id + appr_item.parent_id = std_code_appr.onum + appr_item.compareId = last_appr_item.onum + appr_item.oldInstId = appr_item.onum appr_item.approStatus = "waiting" - appr_item.code_status = "9" + appr_item.cd_val_stat = "9" appr_item.flowId = flow_id - appr_item.id=str(uuid.uuid4()) + appr_item.onum=str(uuid.uuid4()) appr_item.create_by = current_user.user.user_name appr_item.create_time = datetime.now() await DataStdDao.add_std_code_appr(query_db, appr_item) @@ -297,26 +315,26 @@ class DataStdService: try: # 先校验标准代码是否唯一 if not await cls.check_code_unique_services(query_db, code): - raise ServiceException(message=f'新增代码{code.code_name}失败，{code.code_num}代码已存在') + raise ServiceException(message=f'新增代码{code.cd_val_cn_mean}失败，{code.cd_no}代码已存在') else: # 保存标准代码 - code.id=str(uuid.uuid4()) + code.onum=str(uuid.uuid4()) await cls.add_std_code_services(request, query_db, code) # 为每个代码项设置parent_id，并进行校验 for code_item in code_item_list: # 校验同一个父级下，code是否已存在 - code_item.parent_id = code.id + code_item.parent_id = code.onum if not await cls.check_code_unique_services(query_db, code_item): - raise ServiceException(message=f"父级代码{code.code_num}下的代码项{code_item.code_num}已存在") + raise ServiceException(message=f"父级代码{code.cd_no}下的代码项{code_item.cd_no}已存在") # 将parent_id设为code的ID - code_item.id=str(uuid.uuid4()) + code_item.onum=str(uuid.uuid4()) code_item.create_by=code.create_by code_item.create_time=code.create_time - code_item.update_by=code.update_by - code_item.update_time=code.update_time + code_item.upd_prsn=code.upd_prsn + code_item.upd_time=code.upd_time await cls.add_std_code_services(request, query_db, code_item) # 提交事务 @@ -335,23 +353,22 @@ class DataStdService: current_user: CurrentUserModel ): # 设置标准代码的创建和更新时间 - code.id = str(uuid.uuid4()) # 新生成 ID + code.onum = str(uuid.uuid4()) # 新生成 ID code.create_by = current_user.user.user_name code.create_time = datetime.now() - code.update_by = current_user.user.user_name - code.update_time = datetime.now() - code.sys_name = '公司级' if 'company' == code.code_type else code.sys_name + code.upd_prsn = current_user.user.user_name + code.upd_time = datetime.now() # 校验标准代码是否已存在于正式表中 if not await cls.check_code_unique_services(query_db, code): - raise ServiceException(message=f'标准代码{code.code_num}已经存在于正式表中，无法新增') + raise ServiceException(message=f'标准代码{code.cd_no}已经存在于正式表中，无法新增') # 先创建标准代码的审批记录 appr_model = DataStdCodeApprModel(**code.model_dump(exclude_unset=True, by_alias=True)) appr_model.changeType = "add" - appr_model.compareId = code.id - appr_model.oldInstId = code.id - appr_model.code_status="9" + appr_model.compareId = code.onum + appr_model.oldInstId = code.onum + appr_model.cd_val_stat="9" appr_model.approStatus = "waiting" appr_model.flowId = str(uuid.uuid4()) # 新生成 Flow ID @@ -359,23 +376,23 @@ class DataStdService: await DataStdDao.add_std_code_appr(query_db, appr_model) # 同时处理代码项的添加 for item in code_item_list: - item.id = str(uuid.uuid4()) # 新生成 ID + item.onum = str(uuid.uuid4()) # 新生成 ID item.create_by = current_user.user.user_name item.create_time = datetime.now() - item.update_by = current_user.user.user_name - item.update_time = datetime.now() - item.sys_name = '公司级' if 'company' == item.code_type else item.sys_name - item.parent_id = appr_model.id # 设置父级 ID + item.upd_prsn = current_user.user.user_name + item.upd_time = datetime.now() + item.src_sys = '公司级' if 'company' == item.cd_type else item.src_sys + item.parent_id = appr_model.onum # 设置父级 ID # 校验代码项是否已存在于正式表中 if not await cls.check_code_unique_services(query_db, item): - raise ServiceException(message=f'代码项{item.code_num}已经存在于正式表中，无法新增') + raise ServiceException(message=f'代码项{item.cd_no}已经存在于正式表中，无法新增') # 同样需要创建审批记录 item_appr_model = DataStdCodeApprModel(**item.model_dump(exclude_unset=True, by_alias=True)) item_appr_model.changeType = "add" - item_appr_model.compareId = item.id - item_appr_model.oldInstId = item.id + item_appr_model.compareId = item.onum + item_appr_model.oldInstId = item.onum item_appr_model.approStatus = "waiting" item_appr_model.flowId = appr_model.flowId # 使用相同的 Flow ID @@ -397,34 +414,34 @@ class DataStdService: try: # 校验标准代码是否存在并且唯一 if not await cls.check_code_unique_services(query_db, code): - raise ServiceException(message=f'修改代码{code.code_name}失败，{code.code_num}代码不存在或已存在') + raise ServiceException(message=f'修改代码{code.cd_val_cn_mean}失败，{code.cd_no}代码不存在或已存在') # 更新标准代码 await cls.edit_std_code_services(request, query_db, code) # 为每个代码项设置parent_id，并进行校验 for code_item in code_item_list: - code_item.parent_id = code.id - if code_item.id : + code_item.parent_id = code.onum + if code_item.onum : # 校验同一个父级下，code_num是否已存在 if not await cls.check_code_unique_services(query_db, code_item): - raise ServiceException(message=f"父级代码{code.code_num}下的代码项{code_item.code_num}已存在") + raise ServiceException(message=f"父级代码{code.cd_no}下的代码项{code_item.cd_no}已存在") # 更新代码项的相关信息 - code_item.update_time = code.update_time - code_item.update_by = code.update_by + code_item.upd_time = code.upd_time + code_item.upd_prsn = code.upd_prsn await cls.edit_std_code_services(request, query_db, code_item) # 执行更新操作 else: # 如果code_item的id不为0，表示是修改操作 # 校验同一个父级下，code_num是否已存在 if not await cls.check_code_unique_services(query_db, code_item): - raise ServiceException(message=f"父级代码{code.code_num}下的代码项{code_item.code_num}已存在") + raise ServiceException(message=f"父级代码{code.cd_no}下的代码项{code_item.cd_no}已存在") # 生成新的UUID，并新增代码项 - code_item.id = str(uuid.uuid4()) # 新生成的UUID - code_item.create_time = code.update_time + code_item.onum = str(uuid.uuid4()) # 新生成的UUID + code_item.create_time = code.upd_time code_item.create_by = code.create_by - code_item.update_time = code.update_time - code_item.update_by = code.update_by + code_item.upd_time = code.upd_time + code_item.upd_prsn = code.upd_prsn await cls.add_std_code_services(request, query_db, code_item) # 执行新增操作 # 提交事务 await query_db.commit() @@ -444,92 +461,93 @@ class DataStdService: ): """ 修改标准代码及其代码项的审批流程（修改审批）。 - code_item.id 存在为修改，若为空则为新增。 + code_item.onum 存在为修改，若为空则为新增。 """ # 更新时间及人 code.create_by = current_user.user.user_name code.create_time = datetime.now() - code.sys_name = '公司级' if 'company' == code.code_type else code.sys_name # 校验标准代码是否存在并且唯一 if not await cls.check_code_unique_services(query_db, code): - raise ServiceException(message=f'标准代码{code.code_num}不存在或已存在，无法提交修改审批') + raise ServiceException(message=f'标准代码{code.cd_no}不存在或已存在，无法提交修改审批') # 创建标准代码的审批记录（changeType 为 update） appr_model = DataStdCodeApprModel(**code.model_dump(exclude_unset=True, by_alias=True)) - last_appr= await DataStdDao.get_last_std_code_appr_by_id(query_db,code.id) + last_appr= await DataStdDao.get_last_std_code_appr_by_id(query_db,code.onum) appr_model.changeType = "update" - appr_model.compareId = last_appr.id # 对比对象为正式表的 ID - appr_model.oldInstId = code.id - appr_model.code_status = "9" + appr_model.compareId = last_appr.onum # 对比对象为正式表的 ID + appr_model.oldInstId = code.onum + appr_model.cd_val_stat = "9" appr_model.approStatus = "waiting" appr_model.flowId = str(uuid.uuid4()) # flowId 共用 - appr_model.id = str(uuid.uuid4()) # flowId 共用 + appr_model.onum = str(uuid.uuid4()) # flowId 共用 await DataStdDao.add_std_code_appr(query_db, appr_model) # query_object. query_object = DataStdCodePageQueryModel( ) - query_object.parent_id=code.id + query_object.parent_id=code.onum query_object.class_id="codeItem" query_object.page_size=100 query_object.page_num=1 code_item_list_old = await DataStdDao.get_std_code_list(query_db, query_object, False) - new_ids = {item.id for item in code_item_list if item.id} + new_ids = {item.onum for item in code_item_list if item.onum} # 同步处理代码项 for item in code_item_list: - item.parent_id = code.id - item.update_by = current_user.user.user_name - item.update_time = datetime.now() - item.sys_name = '公司级' if 'company' == item.code_type else item.sys_name + item.parent_id = code.onum + item.upd_prsn = current_user.user.user_name + item.upd_time = datetime.now() + item.create_by = current_user.user.user_name + item.create_time = datetime.now() + item.src_sys = '公司级' if 'company' == item.cd_type else item.src_sys - if item.id: # 修改项 + if item.onum: # 修改项 if not await cls.check_code_unique_services(query_db, item): - raise ServiceException(message=f'父级代码{code.code_num}下代码项{item.code_num}重复，无法提交修改审批') + raise ServiceException(message=f'父级代码{code.cd_no}下代码项{item.cd_no}重复，无法提交修改审批') item_appr_model = DataStdCodeApprModel(**item.model_dump(exclude_unset=True, by_alias=True)) - last_item_appr= await DataStdDao.get_last_std_code_appr_by_id(query_db,item_appr_model.id) + last_item_appr= await DataStdDao.get_last_std_code_appr_by_id(query_db,item_appr_model.onum) item_appr_model.changeType = "update" - item_appr_model.compareId = last_item_appr.id - item_appr_model.parent_id = appr_model.id - item_appr_model.oldInstId = item.id + item_appr_model.compareId = last_item_appr.onum + item_appr_model.parent_id = appr_model.onum + item_appr_model.oldInstId = item.onum item_appr_model.approStatus = "waiting" item_appr_model.flowId = appr_model.flowId - item_appr_model.id = str(uuid.uuid4()) # flowId 共用 + item_appr_model.onum = str(uuid.uuid4()) # flowId 共用 await DataStdDao.add_std_code_appr(query_db, item_appr_model) else: # 新增项 - item.id = str(uuid.uuid4()) + item.onum = str(uuid.uuid4()) item.create_by = current_user.user.user_name item.create_time = datetime.now() if not await cls.check_code_unique_services(query_db, item): - raise ServiceException(message=f'父级代码{code.code_num}下代码项{item.code_num}重复，无法提交新增审批') + raise ServiceException(message=f'父级代码{code.cd_no}下代码项{item.cd_no}重复，无法提交新增审批') item_appr_model = DataStdCodeApprModel(**item.model_dump(exclude_unset=True, by_alias=True)) item_appr_model.changeType = "add" - item_appr_model.compareId = item.id - item_appr_model.oldInstId = item.id + item_appr_model.compareId = item.onum + item_appr_model.oldInstId = item.onum item_appr_model.approStatus = "waiting" item_appr_model.flowId = appr_model.flowId - item_appr_model.parent_id = appr_model.id + item_appr_model.parent_id = appr_model.onum await DataStdDao.add_std_code_appr(query_db, item_appr_model) for old_item in code_item_list_old: - if old_item["id"] not in new_ids: + if old_item["onum"] not in new_ids: # 创建“删除”审批记录 delete_appr_model = DataStdCodeApprModel(**old_item) delete_appr_model.changeType = "delete" - last_appr= await DataStdDao.get_last_std_code_appr_by_id(query_db,old_item["id"]) - delete_appr_model.compareId = last_appr.id - delete_appr_model.oldInstId = old_item["id"] + last_appr= await DataStdDao.get_last_std_code_appr_by_id(query_db,old_item["onum"]) + delete_appr_model.compareId = last_appr.onum + delete_appr_model.oldInstId = old_item["onum"] delete_appr_model.approStatus = "waiting" delete_appr_model.flowId = appr_model.flowId - delete_appr_model.id = str(uuid.uuid4()) - delete_appr_model.parent_id = appr_model.id + delete_appr_model.onum = str(uuid.uuid4()) + delete_appr_model.parent_id = appr_model.onum delete_appr_model.create_by = current_user.user.user_name delete_appr_model.create_time = datetime.now() @@ -539,7 +557,7 @@ class DataStdService: apply_model = ApplyModel() apply_model.businessType = "dataStdCode" apply_model.businessId = appr_model.flowId - apply_model.applicant = appr_model.update_by + apply_model.applicant = appr_model.upd_prsn await ApprovalService.apply_services(query_db, apply_model, 'dataStdCode') return CrudResponseModel(is_success=True, message='提交修改标准代码审批成功!') @@ -553,15 +571,15 @@ class DataStdService: :param page_object: 字典类型对象 :return: 校验结果 """ - id = -1 if page_object.id is None else page_object.id + id = -1 if page_object.onum is None else page_object.onum codemodel=DataStdCodeModel() - codemodel.code_num=page_object.code_num + codemodel.cd_no=page_object.cd_no codemodel.class_id=page_object.class_id codemodel.parent_id=page_object.parent_id - codemodel.code_type=page_object.code_type - dict_type = await DataStdDao.get_data_code_by_info(query_db, codemodel + codemodel.cd_type=page_object.cd_type + data_dict_data_type = await DataStdDao.get_data_code_by_info(query_db, codemodel ) - if dict_type and dict_type.id != id: + if data_dict_data_type and data_dict_data_type.onum != id: return CommonConstant.NOT_UNIQUE return CommonConstant.UNIQUE # ----------------------------------------------------------------数据字典---------------------------------------------------------------------------------------------------- @@ -611,11 +629,11 @@ class DataStdService: """ try: if not await cls.check_dict_unique_services(query_db, page_object): - raise ServiceException(message=f"数据字典{page_object.dict_num}已存在") + raise ServiceException(message=f"数据字典{page_object.data_dict_no}已存在") # 创建新的 page_object 实例，避免修改原始对象 new_page_object = DataStdDictModel(**page_object.model_dump(by_alias=True)) - new_page_object.dict_status="9" - new_page_object.id=str(uuid.uuid4()) + new_page_object.data_dict_stat="9" + new_page_object.onum=str(uuid.uuid4()) # 调用 DAO 方法插入数据 await DataStdDao.add_std_dict(query_db, new_page_object) return CrudResponseModel(is_success=True, message='新增数据字典成功') @@ -651,9 +669,9 @@ class DataStdService: :return: 编辑列配置校验结果 """ if not await cls.check_dict_unique_services(query_db, page_object): - raise ServiceException(message=f"数据字典编号：{page_object.dict_num}已存在") + raise ServiceException(message=f"数据字典编号：{page_object.data_dict_no}已存在") edit_col = page_object.model_dump(exclude_unset=True) - col_info = await cls.get_std_dict_by_id_services(query_db, page_object.id) + col_info = await cls.get_std_dict_by_id_services(query_db, page_object.onum) if col_info: try: await DataStdDao.update_std_dict(query_db, edit_col) @@ -662,7 +680,7 @@ class DataStdService: await query_db.rollback() raise e else: - raise ServiceException(message=f'数据字典{page_object.id}不存在') + raise ServiceException(message=f'数据字典{page_object.onum}不存在') @classmethod @@ -700,13 +718,13 @@ class DataStdService: :param page_object: 字典类型对象 :return: 校验结果 """ - id ='-1' if page_object.id is None else page_object.id + id ='-1' if page_object.onum is None else page_object.onum codemodel=DataStdDictModel() - codemodel.dict_num=page_object.dict_num + codemodel.data_dict_no=page_object.data_dict_no - dict_type = await DataStdDao.get_data_dict_by_info(query_db, codemodel + data_dict_data_type = await DataStdDao.get_data_dict_by_info(query_db, codemodel ) - if dict_type and dict_type.id != id: + if data_dict_data_type and data_dict_data_type.onum != id: return CommonConstant.NOT_UNIQUE return CommonConstant.UNIQUE # ----------------------------------------------------------------数据标准分类---------------------------------------------------------------------------------------------------- @@ -732,7 +750,7 @@ class DataStdService: nodes = {} # 存储所有处理后的节点 # 处理每个组，生成节点 - for content_onum, items in grouped.items(): + for belt_data_std_content, items in grouped.items(): first_item = items[0] is_leaf = first_item['leafNodeFlag'] == 1 rela_onum = first_item['relaOnum'] is not None @@ -751,12 +769,12 @@ class DataStdService: 'children': [] } - nodes[content_onum] = common_fields + nodes[belt_data_std_content] = common_fields # 构建父子关系 root = None - for content_onum, node in nodes.items(): + for belt_data_std_content, node in nodes.items(): supr = node['suprContentOnum'] if supr is None: root = node @@ -766,7 +784,7 @@ class DataStdService: parent['children'].append(node) # 对每个父节点的children进行排序，将'临时的节点'放到最后 - for content_onum, node in nodes.items(): + for belt_data_std_content, node in nodes.items(): if 'children' in node: # 排序时，'临时的节点'会被放到最后 node['children'] = sorted( @@ -782,16 +800,16 @@ class DataStdService: return catalog_list_result @classmethod - async def get_catalog_detail_services(cls, query_db: AsyncSession, content_onum: int): + async def get_catalog_detail_services(cls, query_db: AsyncSession, belt_data_std_content: int): """ 获取数据目录详细信息service :param query_db: orm对象 - :param content_onum: 数据目录ID + :param belt_data_std_content: 数据目录ID :return: 数据目录详细信息对象 """ - catalog_detail_result = await DataStdDao.get_catalog_by_id(query_db, content_onum) + catalog_detail_result = await DataStdDao.get_catalog_by_id(query_db, belt_data_std_content) return catalog_detail_result @@ -918,12 +936,12 @@ class DataStdService: if request.content_onums: content_onum_list = request.content_onums.split(',') try: - for content_onum in content_onum_list: - catalog = await cls.get_catalog_detail_services(query_db, int(content_onum)) + for belt_data_std_content in content_onum_list: + catalog = await cls.get_catalog_detail_services(query_db, int(belt_data_std_content)) if not catalog: - raise ServiceException(message=f'目录ID {content_onum} 不存在') - await DataStdDao.delete_catalog_dao(query_db, DeleteDataCatalogModel(content_onums=content_onum)) - # await DataStdDao.delete_ast_book_mark_rela_by_content_onum(query_db, int(content_onum), user_id) + raise ServiceException(message=f'目录ID {belt_data_std_content} 不存在') + await DataStdDao.delete_catalog_dao(query_db, DeleteDataCatalogModel(content_onums=belt_data_std_content)) + # await DataStdDao.delete_ast_book_mark_rela_by_content_onum(query_db, int(belt_data_std_content), user_id) await query_db.commit() return CrudResponseModel(is_success=True, message='删除成功') except Exception as e: @@ -949,16 +967,16 @@ class DataStdService: sys_groups = {} for item in rows: - sys_name, eng_name, cn_name, ast_no = item + src_sys, eng_name, cn_name, ast_no = item # 创建或获取系统分组 - if sys_name not in sys_groups: - sys_groups[sys_name] = { - "dataAssetSysName": sys_name, + if src_sys not in sys_groups: + sys_groups[src_sys] = { + "dataAssetSysName": src_sys, "children": [] } # 添加子节点 - sys_groups[sys_name]["children"].append({ + sys_groups[src_sys]["children"].append({ "dataAssetCatalogNo": eng_name, "dataAssetCatalogName": cn_name, "dataAssetCatalogAstno": ast_no @@ -1070,11 +1088,11 @@ class DataStdService: """ 校验标准编号是否唯一 """ - id = '-1' if model.id is None else model.id + id = '-1' if model.onum is None else model.onum check_model = DataStdMainModel() - check_model.std_num=model.std_num + check_model.data_std_no=model.data_std_no existing = await DataStdDao.get_data_main_by_info(query_db, check_model) - return CommonConstant.NOT_UNIQUE if existing and existing.id != id else CommonConstant.UNIQUE + return CommonConstant.NOT_UNIQUE if existing and existing.onum != id else CommonConstant.UNIQUE @classmethod async def get_std_main_list(cls, query_db: AsyncSession, query_object: DataStdMainModel, is_page: bool = False): @@ -1162,10 +1180,10 @@ class DataStdService: @classmethod async def add_std_main(cls, query_db: AsyncSession, model: DataStdMainModel): if not await cls.check_std_num_unique(query_db, model): - raise ServiceException(message=f"标准编号 {model.std_num} 已存在") - model.id=str(uuid.uuid4()) + raise ServiceException(message=f"标准编号 {model.data_std_no} 已存在") + model.onum=str(uuid.uuid4()) model.std_status="9" - model.content_onum=2 + model.belt_data_std_content=2 await DataStdDao.add_std_main(query_db, model) return CrudResponseModel(is_success=True, message='新增标准成功') @@ -1173,25 +1191,25 @@ class DataStdService: @classmethod async def edit_std_main(cls, query_db: AsyncSession, model: DataStdMainModel): if not await cls.check_std_num_unique(query_db, model): - raise ServiceException(message=f"标准编号 {model.std_num} 已存在") - existing = await cls.get_std_main_by_id(query_db, model.id) + raise ServiceException(message=f"标准编号 {model.data_std_no} 已存在") + existing = await cls.get_std_main_by_id(query_db, model.onum) if existing: await DataStdDao.update_std_main(query_db, model.model_dump(exclude_unset=True)) return CrudResponseModel(is_success=True, message='编辑标准成功') else: - raise ServiceException(message=f'标准 {model.id} 不存在') + raise ServiceException(message=f'标准 {model.onum} 不存在') @classmethod async def add_std_main_appr(cls, query_db: AsyncSession, model: DataStdMainModel): if not await cls.check_std_num_unique(query_db, model): - raise ServiceException(message=f"标准编号 {model.std_num} 已存在") - model.id=str(uuid.uuid4()) + raise ServiceException(message=f"标准编号 {model.data_std_no} 已存在") + model.onum=str(uuid.uuid4()) model.std_status="9" - model.content_onum=2 + model.belt_data_std_content=2 # 将 DataStdMainModel 转换为 DataStdMainApprModel，保留字段原始名 apprModel = DataStdMainApprModel(**model.model_dump(exclude_unset=True, by_alias=True)) apprModel.changeType="add" - apprModel.compareId=model.id - apprModel.oldInstId=model.id + apprModel.compareId=model.onum + apprModel.oldInstId=model.onum apprModel.approStatus="waiting" apprModel.flowId=str(uuid.uuid4()) await DataStdDao.add_std_main_appr(query_db, apprModel) @@ -1204,14 +1222,14 @@ class DataStdService: @classmethod async def add_std_dict_appr(cls, query_db: AsyncSession, model: DataStdDictModel): if not await cls.check_dict_unique_services(query_db, model): - raise ServiceException(message=f"字典编号 {model.dict_num} 已存在") - model.id=str(uuid.uuid4()) - model.dict_status="9" + raise ServiceException(message=f"字典编号 {model.data_dict_no} 已存在") + model.onum=str(uuid.uuid4()) + model.data_dict_stat="9" # 将 DataStdMainModel 转换为 DataStdMainApprModel，保留字段原始名 apprModel = DataStdDictApprModel(**model.model_dump(exclude_unset=True, by_alias=True)) apprModel.changeType="add" - apprModel.compareId=model.id - apprModel.oldInstId=model.id + apprModel.compareId=model.onum + apprModel.oldInstId=model.onum apprModel.approStatus="waiting" apprModel.flowId=str(uuid.uuid4()) await DataStdDao.add_std_dict_appr(query_db, apprModel) @@ -1224,19 +1242,19 @@ class DataStdService: @classmethod async def edit_std_main_appr(cls, query_db: AsyncSession, model: DataStdMainModel): if not await cls.check_std_num_unique(query_db, model): - raise ServiceException(message=f"标准编号 {model.std_num} 已存在") + raise ServiceException(message=f"标准编号 {model.data_std_no} 已存在") model.std_status="9" # 将 DataStdMainModel 转换为 DataStdMainApprModel，保留字段原始名 - watingList=await DataStdDao.check_std_main_waiting(model.id, query_db) + watingList=await DataStdDao.check_std_main_waiting(model.onum, query_db) if len(watingList)>0 : # 如果 watingList 存在，意味着标准正在审批中 raise ServiceException(message="标准正在审批中，请等待审批完成") - lastAppr =await DataStdDao.get_last_std_main_appr_by_id(query_db,model.id) + lastAppr =await DataStdDao.get_last_std_main_appr_by_id(query_db,model.onum) apprModel = DataStdMainApprModel(**model.model_dump(exclude_unset=True, by_alias=True)) apprModel.changeType="edit" - apprModel.id=str(uuid.uuid4()) - apprModel.oldInstId=model.id - apprModel.compareId=lastAppr.id + apprModel.onum=str(uuid.uuid4()) + apprModel.oldInstId=model.onum + apprModel.compareId=lastAppr.onum apprModel.approStatus="waiting" apprModel.flowId=str(uuid.uuid4()) await DataStdDao.add_std_main_appr(query_db, apprModel) @@ -1250,17 +1268,17 @@ class DataStdService: async def edit_std_dict_appr(cls, query_db: AsyncSession, model: DataStdDictModel): if not await cls.check_dict_unique_services(query_db, model): raise ServiceException(message=f"字典编号 {model.c} 已存在") - model.dict_status="9" + model.data_dict_stat="9" - watingList=await DataStdDao.check_std_dict_waiting(model.id, query_db) + watingList=await DataStdDao.check_std_dict_waiting(model.onum, query_db) if len(watingList)>0 : # 如果 watingList 存在，意味着标准正在审批中 raise ServiceException(message="标准正在审批中，请等待审批完成") - lastAppr =await DataStdDao.get_last_std_dict_appr_by_id(query_db,model.id) + lastAppr =await DataStdDao.get_last_std_dict_appr_by_id(query_db,model.onum) apprModel = DataStdDictApprModel(**model.model_dump(exclude_unset=True, by_alias=True)) apprModel.changeType="edit" - apprModel.id=str(uuid.uuid4()) - apprModel.oldInstId=model.id - apprModel.compareId=lastAppr.id + apprModel.onum=str(uuid.uuid4()) + apprModel.oldInstId=model.onum + apprModel.compareId=lastAppr.onum apprModel.approStatus="waiting" apprModel.flowId=str(uuid.uuid4()) await DataStdDao.add_std_dict_appr(query_db, apprModel) @@ -1278,13 +1296,13 @@ class DataStdService: for col_id in col_id_list: col_info = await cls.get_std_main_by_id(query_db, col_id) if col_info: - watingList=await DataStdDao.check_std_main_waiting(col_info.id,query_db ) + watingList=await DataStdDao.check_std_main_waiting(col_info.onum,query_db ) if len(watingList)>0 : # 如果 watingList 存在，意味着标准正在审批中 raise ServiceException(message="标准正在审批中，请等待审批完成") apprModel = DataStdMainApprModel(**col_info.model_dump(exclude_unset=True, by_alias=True)) apprModel.changeType="delete" - apprModel.id=str(uuid.uuid4()) - apprModel.oldInstId=col_info.id + apprModel.onum=str(uuid.uuid4()) + apprModel.oldInstId=col_info.onum apprModel.approStatus="waiting" apprModel.flowId=str(uuid.uuid4()) await DataStdDao.add_std_main_appr(query_db, apprModel) @@ -1308,13 +1326,13 @@ class DataStdService: for col_id in col_id_list: col_info = await cls.get_std_dict_by_id_services(query_db, col_id) if col_info: - watingList=await DataStdDao.check_std_dict_waiting(col_info.id,query_db ) + watingList=await DataStdDao.check_std_dict_waiting(col_info.onum,query_db ) if len(watingList)>0 : # 如果 watingList 存在，意味着标准正在审批中 raise ServiceException(message="标准正在审批中，请等待审批完成") apprModel = DataStdDictApprModel(**col_info.model_dump(exclude_unset=True, by_alias=True)) apprModel.changeType="delete" - apprModel.id=str(uuid.uuid4()) - apprModel.oldInstId=col_info.id + apprModel.onum=str(uuid.uuid4()) + apprModel.oldInstId=col_info.onum apprModel.approStatus="waiting" apprModel.flowId=str(uuid.uuid4()) await DataStdDao.add_std_dict_appr(query_db, apprModel) @@ -1348,15 +1366,15 @@ class DataStdService: else: raise ServiceException(message='传入标准ID为空') @classmethod - async def change_std_main_onum(cls, query_db: AsyncSession, ids: str,onum:int): + async def change_std_main_onum(cls, query_db: AsyncSession, ids: str,belt_data_std_content:int): if ids: col_id_list = ids.split(',') try: for col_id in col_id_list: col_info = await cls.get_std_main_by_id(query_db, col_id) if col_info: - col_info.content_onum=onum - await DataStdDao.update_std_main(query_db,col_info.model_dump(exclude_unset=True) ) + col_info.belt_data_std_content=belt_data_std_content + await DataStdDao.update_std_main(query_db,col_info ) await query_db.commit() return CrudResponseModel(is_success=True, message='修改标准分类成功') except Exception as e: @@ -1370,9 +1388,9 @@ class DataStdService: async def get_code_std_map_list_services(cls, query_db: AsyncSession, id: str): # 查询 A 表（t_datastd_main） check_model = DataStdMainModel() - check_model.code_id = id + check_model.cd_id = id main_list = await DataStdDao.get_std_main_list_all(query_db, check_model) - stdCode=await DataStdDao.get_std_code_by_id(query_db, id) + dataStdNo=await DataStdDao.get_std_code_by_id(query_db, id) if not main_list: return {"tableData": [], "children": []} # 如果 A 表没有数据，返回空结构 @@ -1381,43 +1399,43 @@ class DataStdService: children = [] # 存储图谱数据 for main in main_list: - # 查询 B 表（t_datastd_dict），通过 A 表的 id 匹配 std_code + # 查询 B 表（t_datastd_dict），通过 A 表的 id 匹配 data_std_no dict_model = DataStdDictModel() - dict_model.std_code = main.get('id') # 使用 get() 方法访问字段 + dict_model.data_std_no = main.get('id') # 使用 get() 方法访问字段 dict_list = await DataStdDao.get_std_dict_list_all(query_db, dict_model) # 组织表格数据 if dict_list: for dict_item in dict_list: table_data.append({ - "codeNum": stdCode.code_num, # 使用 get() 方法访问字段 - "codeName": stdCode.code_name, # 使用 get() 方法访问字段 - "stdNum": main.get('stdNum'), # 使用 get() 方法访问字段 - "stdName": main.get('stdName'), # 使用 get() 方法访问字段 - "stdCode": main.get('stdCode'), # 使用 get() 方法访问字段 - "dictNum": dict_item.get('dictNum'), # 使用 get() 方法访问字段 - "dictName": dict_item.get('dictName'), # 使用 get() 方法访问字段 - "dictCode": dict_item.get('dictCode'), # 使用 get() 方法访问字段 + "cdNo": dataStdNo.cd_no, # 使用 get() 方法访问字段 + "cdValCnMean": dataStdNo.cd_val_cn_mean, # 使用 get() 方法访问字段 + "dataStdNo": main.get('dataStdNo'), # 使用 get() 方法访问字段 + "dataStdCnName": main.get('dataStdCnName'), # 使用 get() 方法访问字段 + "dataStdNo": main.get('dataStdNo'), # 使用 get() 方法访问字段 + "dataDictNo": dict_item.get('dataDictNo'), # 使用 get() 方法访问字段 + "dataDictCnName": dict_item.get('dataDictCnName'), # 使用 get() 方法访问字段 + "dataDictEngName": dict_item.get('dataDictEngName'), # 使用 get() 方法访问字段 }) else : table_data.append({ - "codeNum": stdCode.code_num, # 使用 get() 方法访问字段 - "codeName": stdCode.code_name, # 使用 get() 方法访问字段 - "stdNum": main.get('stdNum'), # 使用 get() 方法访问字段 - "stdName": main.get('stdName'), # 使用 get() 方法访问字段 - "stdCode": main.get('stdCode'), # 使用 get() 方法访问字段 - "dictNum": "", # 使用 get() 方法访问字段 - "dictName":"", # 使用 get() 方法访问字段 - "dictCode": "", # 使用 get() 方法访问字段 + "cdNo": dataStdNo.cd_no, # 使用 get() 方法访问字段 + "cdValCnMean": dataStdNo.cd_val_cn_mean, # 使用 get() 方法访问字段 + "dataStdNo": main.get('dataStdNo'), # 使用 get() 方法访问字段 + "dataStdCnName": main.get('dataStdCnName'), # 使用 get() 方法访问字段 + "dataStdNo": main.get('dataStdNo'), # 使用 get() 方法访问字段 + "dataDictNo": "", # 使用 get() 方法访问字段 + "dataDictCnName":"", # 使用 get() 方法访问字段 + "dataDictEngName": "", # 使用 get() 方法访问字段 }) # 组织图谱数据（A 表作为父节点） node = { "id": f"node_{main.get('id')}", # 使用 get() 方法访问字段 - "name": main.get('stdName'), # 使用 get() 方法访问字段 - "label": main.get('stdCode'), # 使用 get() 方法访问字段 + "name": main.get('dataStdCnName'), # 使用 get() 方法访问字段 + "label": main.get('dataStdNo'), # 使用 get() 方法访问字段 "rate": 1.0, "status": "B", - "currency": main.get('stdNum'), # 使用 get() 方法访问字段 + "currency": main.get('dataStdNo'), # 使用 get() 方法访问字段 "variableValue": "标准", "variableUp": True, "children": [], @@ -1427,11 +1445,11 @@ class DataStdService: for dict_item in dict_list: node["children"].append({ "id": f"dict_{dict_item.get('id')}", # 使用 get() 方法访问字段 - "name": dict_item.get('dictName'), # 使用 get() 方法访问字段 - "label": dict_item.get('dictCode'), # 使用 get() 方法访问字段 + "name": dict_item.get('dataDictCnName'), # 使用 get() 方法访问字段 + "label": dict_item.get('dataDictEngName'), # 使用 get() 方法访问字段 "rate": 1.0, "status": "R", - "currency": dict_item.get('dictNum'), # 使用 get() 方法访问字段 + "currency": dict_item.get('dataDictNo'), # 使用 get() 方法访问字段 "variableValue": "词典", "variableUp": True, }) @@ -1445,16 +1463,16 @@ class DataStdService: @classmethod async def get_code_map_list(cls, query_db: AsyncSession, id: str): check_model = DataStdCodeModel() - stdCode=await DataStdDao.get_std_code_by_id(query_db, id) - code_type="公司级" - if stdCode.code_type=='sys': - if stdCode.code_map_id: - check_model.id=stdCode.code_map_id + dataStdNo=await DataStdDao.get_std_code_by_id(query_db, id) + cd_type="公司级" + if dataStdNo.cd_type=='sys': + if dataStdNo.code_map_id: + check_model.onum=dataStdNo.code_map_id else: - check_model.id="no" + check_model.onum="no" else: check_model.code_map_id = id - code_type="系统级" + cd_type="系统级" main_list = await DataStdDao.get_data_code_list_by_info(query_db, check_model) @@ -1467,13 +1485,13 @@ class DataStdService: for main in main_list: # 组织图谱数据（A 表作为父节点） node = { - "id": f"node_{main.id}", # 使用 get() 方法访问字段 - "name": main.code_name, # 使用 get() 方法访问字段 - "label": main.code_num, # 使用 get() 方法访问字段 + "id": f"node_{main.onum}", # 使用 get() 方法访问字段 + "name": main.cd_val_cn_mean, # 使用 get() 方法访问字段 + "label": main.cd_no, # 使用 get() 方法访问字段 "rate": 1.0, "status": "B", - # "currency": main.get('stdNum'), # 使用 get() 方法访问字段 - "variableValue": code_type, + # "currency": main.get('dataStdNo'), # 使用 get() 方法访问字段 + "variableValue": cd_type, "variableUp": True, "children": [], } diff --git a/vue-fastapi-backend/sql/ruoyi-fastapi-pg.sql b/vue-fastapi-backend/sql/ruoyi-fastapi-pg.sql index 79b7767..a13efd7 100644 --- a/vue-fastapi-backend/sql/ruoyi-fastapi-pg.sql +++ b/vue-fastapi-backend/sql/ruoyi-fastapi-pg.sql @@ -553,7 +553,7 @@ comment on table sys_oper_log is '操作日志记录'; drop table if exists sys_dict_type; create table sys_dict_type ( dict_id bigserial not null, - dict_name varchar(100) default '', + data_dict_cn_name varchar(100) default '', dict_type varchar(100) unique default '', status char(1) default '0', create_by varchar(64) default '', @@ -565,7 +565,7 @@ create table sys_dict_type ( ); alter sequence sys_dict_type_dict_id_seq restart 100; comment on column sys_dict_type.dict_id is '字典主键'; -comment on column sys_dict_type.dict_name is '字典名称'; +comment on column sys_dict_type.data_dict_cn_name is '字典名称'; comment on column sys_dict_type.dict_type is '字典类型'; comment on column sys_dict_type.status is '状态（0正常 1停用）'; comment on column sys_dict_type.create_by is '创建者'; @@ -595,7 +595,7 @@ insert into sys_dict_type values(11, '系统状态', 'sys_common_status', '0 -- ---------------------------- drop table if exists sys_dict_data; create table sys_dict_data ( - dict_code bigserial not null, + data_dict_eng_name bigserial not null, dict_sort int4 default 0, dict_label varchar(100) default '', dict_value varchar(100) default '', @@ -609,10 +609,10 @@ create table sys_dict_data ( update_by varchar(64) default '', update_time timestamp(0), remark varchar(500) default null, - primary key (dict_code) + primary key (data_dict_eng_name) ); alter sequence sys_dict_data_dict_code_seq restart 100; -comment on column sys_dict_data.dict_code is '字典编码'; +comment on column sys_dict_data.data_dict_eng_name is '字典编码'; comment on column sys_dict_data.dict_sort is '字典排序'; comment on column sys_dict_data.dict_label is '字典标签'; comment on column sys_dict_data.dict_value is '字典键值'; diff --git a/vue-fastapi-backend/sql/ruoyi-fastapi.sql b/vue-fastapi-backend/sql/ruoyi-fastapi.sql index ef5a8de..ebe619f 100644 --- a/vue-fastapi-backend/sql/ruoyi-fastapi.sql +++ b/vue-fastapi-backend/sql/ruoyi-fastapi.sql @@ -448,7 +448,7 @@ drop table if exists sys_dict_type; create table sys_dict_type ( dict_id bigint(20) not null auto_increment comment '字典主键', - dict_name varchar(100) default '' comment '字典名称', + data_dict_cn_name varchar(100) default '' comment '字典名称', dict_type varchar(100) default '' comment '字典类型', status char(1) default '0' comment '状态（0正常 1停用）', create_by varchar(64) default '' comment '创建者', @@ -479,7 +479,7 @@ insert into sys_dict_type values(11, '系统状态', 'sys_common_status', '0 drop table if exists sys_dict_data; create table sys_dict_data ( - dict_code bigint(20) not null auto_increment comment '字典编码', + data_dict_eng_name bigint(20) not null auto_increment comment '字典编码', dict_sort int(4) default 0 comment '字典排序', dict_label varchar(100) default '' comment '字典标签', dict_value varchar(100) default '' comment '字典键值', @@ -493,7 +493,7 @@ create table sys_dict_data update_by varchar(64) default '' comment '更新者', update_time datetime comment '更新时间', remark varchar(500) default null comment '备注', - primary key (dict_code) + primary key (data_dict_eng_name) ) engine=innodb auto_increment=100 comment = '字典数据表'; insert into sys_dict_data values(1, 1, '男', '0', 'sys_user_sex', '', '', 'Y', '0', 'admin', sysdate(), '', null, '性别男'); diff --git a/vue-fastapi-backend/sql/syq20250204版本更新（数据安全模块）.sql b/vue-fastapi-backend/sql/syq20250204版本更新（数据安全模块）.sql index 39cb444..9454d11 100644 --- a/vue-fastapi-backend/sql/syq20250204版本更新（数据安全模块）.sql +++ b/vue-fastapi-backend/sql/syq20250204版本更新（数据安全模块）.sql @@ -47,17 +47,17 @@ CREATE TABLE `meta_security_row` ( SET FOREIGN_KEY_CHECKS = 1; --数据词典 -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (110, 0, '不可见', '0', 'metasecurity_ctr', NULL, 'danger', 'N', '0', 'admin', '2025-01-26 00:07:29', 'admin', '2025-02-03 13:40:02', NULL); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (111, 0, '可见', '1', 'metasecurity_ctr', NULL, 'primary', 'N', '0', 'admin', '2025-01-26 00:07:52', 'admin', '2025-02-03 13:40:23', NULL); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (112, 1, '用户', '0', 'metasecurity_obj', NULL, 'primary', 'N', '0', 'admin', '2025-01-26 00:48:48', 'admin', '2025-01-26 00:48:48', NULL); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (113, 1, '角色', '1', 'metasecurity_obj', NULL, 'warning', 'N', '0', 'admin', '2025-01-26 00:49:08', 'admin', '2025-01-26 00:49:08', NULL); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (114, 0, '固定值', '0', 'metasecurity_type', NULL, 'default', 'N', '0', 'admin', '2025-01-26 00:53:04', 'admin', '2025-01-26 00:53:04', NULL); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (115, 0, '表和字段', '1', 'metasecurity_type', NULL, 'default', 'N', '0', 'admin', '2025-01-26 00:53:12', 'admin', '2025-02-03 14:27:24', NULL); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (116, 0, '程序', '2', 'metasecurity_type', NULL, 'default', 'N', '0', 'admin', '2025-01-26 00:53:26', 'admin', '2025-02-03 14:27:32', NULL); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (117, 3, '应用', '2', 'metasecurity_obj', NULL, 'danger', 'N', '0', 'admin', '2025-02-03 14:25:37', 'admin', '2025-02-03 14:25:37', NULL); -INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (105, '控制方向', 'metasecurity_ctr', '0', 'admin', '2025-01-26 00:07:04', 'admin', '2025-01-26 01:19:54', NULL); -INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (106, '对象类型', 'metasecurity_obj', '0', 'admin', '2025-01-26 00:48:20', 'admin', '2025-01-26 00:48:20', NULL); -INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (107, '控制类型', 'metasecurity_type', '0', 'admin', '2025-01-26 00:52:24', 'admin', '2025-01-26 00:52:24', NULL); +INSERT INTO `sys_dict_data` (`data_dict_eng_name`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (110, 0, '不可见', '0', 'metasecurity_ctr', NULL, 'danger', 'N', '0', 'admin', '2025-01-26 00:07:29', 'admin', '2025-02-03 13:40:02', NULL); +INSERT INTO `sys_dict_data` (`data_dict_eng_name`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (111, 0, '可见', '1', 'metasecurity_ctr', NULL, 'primary', 'N', '0', 'admin', '2025-01-26 00:07:52', 'admin', '2025-02-03 13:40:23', NULL); +INSERT INTO `sys_dict_data` (`data_dict_eng_name`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (112, 1, '用户', '0', 'metasecurity_obj', NULL, 'primary', 'N', '0', 'admin', '2025-01-26 00:48:48', 'admin', '2025-01-26 00:48:48', NULL); +INSERT INTO `sys_dict_data` (`data_dict_eng_name`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (113, 1, '角色', '1', 'metasecurity_obj', NULL, 'warning', 'N', '0', 'admin', '2025-01-26 00:49:08', 'admin', '2025-01-26 00:49:08', NULL); +INSERT INTO `sys_dict_data` (`data_dict_eng_name`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (114, 0, '固定值', '0', 'metasecurity_type', NULL, 'default', 'N', '0', 'admin', '2025-01-26 00:53:04', 'admin', '2025-01-26 00:53:04', NULL); +INSERT INTO `sys_dict_data` (`data_dict_eng_name`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (115, 0, '表和字段', '1', 'metasecurity_type', NULL, 'default', 'N', '0', 'admin', '2025-01-26 00:53:12', 'admin', '2025-02-03 14:27:24', NULL); +INSERT INTO `sys_dict_data` (`data_dict_eng_name`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (116, 0, '程序', '2', 'metasecurity_type', NULL, 'default', 'N', '0', 'admin', '2025-01-26 00:53:26', 'admin', '2025-02-03 14:27:32', NULL); +INSERT INTO `sys_dict_data` (`data_dict_eng_name`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (117, 3, '应用', '2', 'metasecurity_obj', NULL, 'danger', 'N', '0', 'admin', '2025-02-03 14:25:37', 'admin', '2025-02-03 14:25:37', NULL); +INSERT INTO `sys_dict_type` (`dict_id`, `data_dict_cn_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (105, '控制方向', 'metasecurity_ctr', '0', 'admin', '2025-01-26 00:07:04', 'admin', '2025-01-26 01:19:54', NULL); +INSERT INTO `sys_dict_type` (`dict_id`, `data_dict_cn_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (106, '对象类型', 'metasecurity_obj', '0', 'admin', '2025-01-26 00:48:20', 'admin', '2025-01-26 00:48:20', NULL); +INSERT INTO `sys_dict_type` (`dict_id`, `data_dict_cn_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (107, '控制类型', 'metasecurity_type', '0', 'admin', '2025-01-26 00:52:24', 'admin', '2025-01-26 00:52:24', NULL); --页面按钮 INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `route_name`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2020, '删除', 2014, 4, '', '', '', '', 1, 0, 'F', '0', '0', 'meta:metaSecurityCol:remove', '#', 'admin', '2025-01-15 22:26:08', '', NULL, ''); INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `route_name`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2019, '修改', 2014, 3, '', '', '', '', 1, 0, 'F', '0', '0', 'meta:metaSecurityCol:edit', '#', 'admin', '2025-01-15 22:26:08', '', NULL, ''); diff --git a/vue-fastapi-frontend/src/api/datastd/std.js b/vue-fastapi-frontend/src/api/datastd/std.js index bdfe73d..8e41dfd 100644 --- a/vue-fastapi-frontend/src/api/datastd/std.js +++ b/vue-fastapi-frontend/src/api/datastd/std.js @@ -20,7 +20,7 @@ export function listStdCodeCompany() { return request({ url: '/default-api/datastd/stdcode/code/list', method: 'get', - params: {classId:'code',codeType:"company"} + params: {classId:'code',cdType:"company"} }) } export function listStdCodemap(query) { diff --git a/vue-fastapi-frontend/src/main.js b/vue-fastapi-frontend/src/main.js index dec9f04..cdbe97c 100644 --- a/vue-fastapi-frontend/src/main.js +++ b/vue-fastapi-frontend/src/main.js @@ -13,6 +13,7 @@ import App from './App' import store from './store' import router from './router' import directive from './directive' // directive +import useUserStore from '@/store/modules/user' // 注册指令 import plugins from './plugins' // plugins @@ -81,5 +82,6 @@ app.use(ElementPlus, { // 支持 large、default、small size: Cookies.get('size') || 'default' }) - +const userStore = useUserStore() +userStore.getdsSysList() app.mount('#app') diff --git a/vue-fastapi-frontend/src/store/modules/user.js b/vue-fastapi-frontend/src/store/modules/user.js index d3e91c1..5cc618c 100644 --- a/vue-fastapi-frontend/src/store/modules/user.js +++ b/vue-fastapi-frontend/src/store/modules/user.js @@ -4,6 +4,7 @@ import { isHttp, isEmpty } from "@/utils/validate" import defAva from '@/assets/images/profile.jpg' import md5 from 'js-md5' import cache from "@/plugins/cache.js"; +import { datasourcetree } from "@/api/meta/metatask"; const useUserStore = defineStore( @@ -15,6 +16,7 @@ const useUserStore = defineStore( name: '', avatar: '', roles: [], + dsSysList:[], permissions: [] }), actions: { @@ -34,6 +36,20 @@ const useUserStore = defineStore( }) }) }, + getdsSysList(){ + return new Promise((resolve, reject) => { + datasourcetree() + .then(res => { + this.dsSysList = res.rows || [] // 确保为空时不报错 + + resolve(res) + }) + .catch(error => { + this.dsSysList = [] // 请求失败也清空列表，避免残留 + reject(error) + }) + }) + }, // 获取用户信息 getInfo() { return new Promise((resolve, reject) => { @@ -58,6 +74,7 @@ const useUserStore = defineStore( }) }) }, + // 退出系统 logOut() { return new Promise((resolve, reject) => { diff --git a/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue b/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue index 5d48a94..f993c7f 100644 --- a/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue +++ b/vue-fastapi-frontend/src/views/datastd/main/components/AddEditForm.vue @@ -1,35 +1,81 @@