From fca5b84da48775a26562ea42ec2412e6a4ed3608 Mon Sep 17 00:00:00 2001 From: songyuanlun Date: Tue, 24 Dec 2024 18:38:45 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3282):=20=E5=B2=97=E4=BD=8D=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infra/dao/orgjob/entity/OrgJob.java | 15 ++++++------ .../entity/OrgJobGroupRelationHistory.java | 2 +- .../OrgJobGroupFoundationService.java | 2 +- .../OrgJobGroupRelationFoundationService.java | 2 +- .../OrgJobGroupFoundationServiceImpl.java | 2 +- ...JobGroupRelationFoundationServiceImpl.java | 2 +- .../orgjob/service/OrgJobBizService.java | 23 ------------------- .../service/impl/OrgJobServiceImpl.java | 8 +++---- 8 files changed, 17 insertions(+), 39 deletions(-) delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/OrgJobBizService.java diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJob.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJob.java index b3ff94e..8483775 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJob.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJob.java @@ -1,11 +1,11 @@ package cn.axzo.orgmanax.infra.dao.orgjob.entity; -import cn.axzo.foundation.dao.support.mysql.type.BaseListTypeHandler; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -23,7 +23,7 @@ import lombok.experimental.SuperBuilder; * @author makejava * @since 2024-12-13 13:59:04 */ -@TableName(value = "org_job") +@TableName(value = "org_job", autoResultMap = true) @Data @Accessors(chain = true) @NoArgsConstructor @@ -102,20 +102,21 @@ public class OrgJob implements Serializable { private Integer identityType; /** - * 默认角色id列表 todo + * 默认角色id列表 */ - @TableField(typeHandler = LongListTypeHandler.class) + @TableField(value = "def_role_ids", typeHandler = FastjsonTypeHandler.class) private List defRoleIds; /** * 待排除的角色id列表 */ - @TableField(typeHandler = LongListTypeHandler.class) + @TableField(value = "exclude_role_ids", typeHandler = FastjsonTypeHandler.class) private List excludeRoleIds; /** * 扩展字段 */ + @TableField(value = "record_ext", typeHandler = FastjsonTypeHandler.class) private JSONObject recordExt; /** @@ -138,7 +139,7 @@ public class OrgJob implements Serializable { */ private Long isDelete; - public static class LongListTypeHandler extends BaseListTypeHandler { - } +// public static class LongListTypeHandler extends BaseListTypeHandler { +// } } diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobGroupRelationHistory.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobGroupRelationHistory.java index 73f5c1f..6c527fd 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobGroupRelationHistory.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJobGroupRelationHistory.java @@ -58,7 +58,7 @@ public class OrgJobGroupRelationHistory { /** * 岗位编码列表 */ - @TableField(typeHandler = FastjsonTypeHandler.class) + @TableField(value = "job_codes", typeHandler = FastjsonTypeHandler.class) private List jobCodes; /** * 变更人的自然人id diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/OrgJobGroupFoundationService.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/OrgJobGroupFoundationService.java index 2c5faaa..7cb6eb2 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/OrgJobGroupFoundationService.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/OrgJobGroupFoundationService.java @@ -22,6 +22,6 @@ public interface OrgJobGroupFoundationService { /** * 查询岗位分组 */ - List whileQuery(OrgJobGroupPageParam param); + List pageAll(OrgJobGroupPageParam param); } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/OrgJobGroupRelationFoundationService.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/OrgJobGroupRelationFoundationService.java index 4cc7727..b503bf8 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/OrgJobGroupRelationFoundationService.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/OrgJobGroupRelationFoundationService.java @@ -22,5 +22,5 @@ public interface OrgJobGroupRelationFoundationService { /** * 查询岗位分组 */ - List whileQuery(OrgJobGroupRelationPageParam param); + List pageAll(OrgJobGroupRelationPageParam param); } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupFoundationServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupFoundationServiceImpl.java index 1c3f29b..cc12fe3 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupFoundationServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupFoundationServiceImpl.java @@ -38,7 +38,7 @@ public class OrgJobGroupFoundationServiceImpl implements OrgJobGroupFoundationSe } @Override - public List whileQuery(OrgJobGroupPageParam param) { + public List pageAll(OrgJobGroupPageParam param) { List jobGroups = new ArrayList<>(); PageResp jobGroupPage; int pageNumber = 0; diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupRelationFoundationServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupRelationFoundationServiceImpl.java index 9697a5b..5bfcbc5 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupRelationFoundationServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupRelationFoundationServiceImpl.java @@ -38,7 +38,7 @@ public class OrgJobGroupRelationFoundationServiceImpl implements OrgJobGroupRela } @Override - public List whileQuery(OrgJobGroupRelationPageParam param) { + public List pageAll(OrgJobGroupRelationPageParam param) { List jobGroupRelations = new ArrayList<>(); PageResp jobGroupPage; int pageNumber = 0; diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/OrgJobBizService.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/OrgJobBizService.java deleted file mode 100644 index a426151..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/OrgJobBizService.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.axzo.orgmanax.server.orgjob.service; - - -public interface OrgJobBizService { - -// List groupAndJobTree(); - -// List page(OrgJobListReq req); - -// void createJob(OrgJobCreateReq req); -// -// void deleteJob(Long jobId, Long operatorId); -// -// void editJob(JobEditReq req); -// -// void setRoles(JobRoleSetReq req); -// -// void move(MoveJobReq req); -// -// OrgJobDTO getById(Long jobId, Boolean needJobGroup); -// -// OrgJobRes queryDefaultOrgJob(Long topNodeId); -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/impl/OrgJobServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/impl/OrgJobServiceImpl.java index 650771f..94ddc56 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/impl/OrgJobServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/impl/OrgJobServiceImpl.java @@ -229,7 +229,7 @@ public class OrgJobServiceImpl implements OrgJobService { OrgJobGroupRelationPageParam relationPageParam = OrgJobGroupRelationPageParam.builder() .jobCodes(orgJobs.stream().map(OrgJobDTO::getCode).collect(Collectors.toSet())) .build(); - Map relationGroup = orgJobGroupRelationService.whileQuery(relationPageParam) + Map relationGroup = orgJobGroupRelationService.pageAll(relationPageParam) .stream() .collect(Collectors.toMap(OrgJobGroupRelationDTO::getJobCode, OrgJobGroupRelationDTO::getGroupCode, (oldVal, newVal) -> oldVal)); @@ -240,7 +240,7 @@ public class OrgJobServiceImpl implements OrgJobService { // 查询岗位分组列表 Set groupCodes = Sets.newHashSet(relationGroup.values()); OrgJobGroupPageParam groupListParam = OrgJobGroupPageParam.builder().groupCodes(groupCodes).build(); - Map groupMap = orgJobGroupService.whileQuery(groupListParam).stream() + Map groupMap = orgJobGroupService.pageAll(groupListParam).stream() .collect(Collectors.toMap(OrgJobGroupDTO::getCode, Function.identity(), (oldVal, newVal) -> oldVal)); if (CollUtil.isEmpty(groupMap)) { log.info("buildOrgGroup4OrgJob orgJobGroup without any group."); @@ -288,7 +288,7 @@ public class OrgJobServiceImpl implements OrgJobService { } private Set resolveJobCodesByGroup(OrgJobGroupPageParam groupListParam) { - List groups = orgJobGroupService.whileQuery(groupListParam); + List groups = orgJobGroupService.pageAll(groupListParam); if (CollUtil.isEmpty(groups)) { log.info("resolveJobCodesByGroup there is not any job group. param:{}", JSONUtil.toJsonStr(groupListParam)); return Collections.emptySet(); @@ -297,7 +297,7 @@ public class OrgJobServiceImpl implements OrgJobService { OrgJobGroupRelationPageParam relationListParam = OrgJobGroupRelationPageParam.builder() .groupCodes(groupCodes) .build(); - List relations = orgJobGroupRelationService.whileQuery(relationListParam); + List relations = orgJobGroupRelationService.pageAll(relationListParam); if (CollUtil.isEmpty(relations)) { log.info("resolveJobCodesByGroup there is not any job and group relation. param:{}", JSONUtil.toJsonStr(relationListParam));