zgty/zt-dsc
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 调整 e 办 scheme 接口返回

Browse Source 
(cherry picked from commit 0215d22c93)
This commit is contained in:
chenbowen
2025-08-29 09:21:14 +08:00
committed by chenbowen
parent 689f9acf87
commit 1f135db00a
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sync/vo/org/OrgUpdateRequestVO.java
View File

@@ -32,6 +32,4 @@ public class OrgUpdateRequestVO extends DeptDO {
private Integer status; private Integer status;
@Schema(description = "机构类型", required = true, example = "28=单位、26=部门") @Schema(description = "机构类型", required = true, example = "28=单位、26=部门")
private Integer deptType; private Integer deptType;
@Schema(description = "机构 是否集团")
private Boolean isGroup;
} }

14
yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/sync/SchemaSyncServiceImpl.java
View File

@@ -1,10 +1,10 @@
package cn.iocoder.yudao.module.system.service.sync; package cn.iocoder.yudao.module.system.service.sync;
import cn.iocoder.yudao.module.system.controller.admin.sync.vo.org.OrgUpdateRequestVO;
import cn.iocoder.yudao.module.system.controller.admin.sync.vo.schema.SchemaAttributeVO; import cn.iocoder.yudao.module.system.controller.admin.sync.vo.schema.SchemaAttributeVO;
import cn.iocoder.yudao.module.system.controller.admin.sync.vo.schema.SchemaRequestVO; import cn.iocoder.yudao.module.system.controller.admin.sync.vo.schema.SchemaRequestVO;
import cn.iocoder.yudao.module.system.controller.admin.sync.vo.schema.SchemaResponseVO; import cn.iocoder.yudao.module.system.controller.admin.sync.vo.schema.SchemaResponseVO;
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; import cn.iocoder.yudao.module.system.controller.admin.sync.vo.user.UserUpdateRequestVO;
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -23,8 +23,8 @@ public class SchemaSyncServiceImpl implements SchemaSyncService {
public SchemaResponseVO getSchema(SchemaRequestVO requestVO) { public SchemaResponseVO getSchema(SchemaRequestVO requestVO) {
SchemaResponseVO resp = new SchemaResponseVO(); SchemaResponseVO resp = new SchemaResponseVO();
resp.setBimRequestId(requestVO.getBimRequestId()); resp.setBimRequestId(requestVO.getBimRequestId());
resp.setAccount(buildSchemaAttributes(AdminUserDO.class)); resp.setAccount(buildSchemaAttributes(UserUpdateRequestVO.class));
resp.setOrganization(buildSchemaAttributes(DeptDO.class)); resp.setOrganization(buildSchemaAttributes(OrgUpdateRequestVO.class));
return resp; return resp;
} }
@@ -36,7 +36,11 @@ public class SchemaSyncServiceImpl implements SchemaSyncService {
// 使用 Spring ReflectionUtils 遍历字段 // 使用 Spring ReflectionUtils 遍历字段
// 遍历类及其父类字段，过滤静态、常量、以及不返回的字段 // 遍历类及其父类字段，过滤静态、常量、以及不返回的字段
// 优化排除逻辑：支持批量、可扩展、忽略大小写和前缀 // 优化排除逻辑：支持批量、可扩展、忽略大小写和前缀
final String[] excludeFields = {"companyDeptInfos", "postIds", "tenantId", "createTime", "updateTime", "creator", "updater", "companyIds", "avatar"}; final String[] excludeFields = {"companyDeptInfos", "postIds", "tenantId", "createTime", "updateTime", "creator", "updater", "deleted",
"companyIds", "avatar",
"isCompany", "isGroup",
"bimRemoteUser", "bimRemotePwd", "bimRequestId", "bimUid", "bimOrgId",
};
final String[] excludePrefixes = {"internal", "_"}; final String[] excludePrefixes = {"internal", "_"};
ReflectionUtils.doWithFields(clazz, field -> { ReflectionUtils.doWithFields(clazz, field -> {
field.setAccessible(true); field.setAccessible(true);