From 22bb8b4929c7fc3748033e63425fa86944c8b432 Mon Sep 17 00:00:00 2001 From: SondonYong Date: Mon, 10 Nov 2025 16:19:31 +0800 Subject: [PATCH] =?UTF-8?q?dev:=E7=89=B9=E7=A7=8D/=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=E4=BF=AE=E6=94=B9(=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E6=88=90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/UserQualificationInfoController.java | 9 ------- .../command/UserQualificationInfoAddExe.java | 19 ++++----------- .../UserQualificationInfoUpdateExe.java | 24 +++++-------------- .../query/UserQualificationInfoQueryExe.java | 13 ---------- .../info/dto/UserQualificationInfoAddCmd.java | 3 +-- .../dto/UserQualificationInfoPageQry.java | 6 ++--- .../dto/UserQualificationInfoRemoveCmd.java | 3 +-- .../dto/UserQualificationInfoUpdateCmd.java | 6 ++--- .../domain/model/UserQualificationInfoE.java | 10 ++++++++ .../UserQualificationInfoRepository.java | 6 +++++ .../repository/UserRepository.java | 2 ++ .../UserQualificationInfoRepositoryImpl.java | 21 ++++++++++++++++ .../repository/impl/UserRepositoryImpl.java | 20 ++++++++++++++++ 13 files changed, 76 insertions(+), 66 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java index b42dcda..b1975e8 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserQualificationInfoController.java @@ -90,15 +90,6 @@ public class UserQualificationInfoController { @ApiOperation("删除多个") @PutMapping("/removeBatch") public Response removeBatch(@Validated @RequestBody UserQualificationInfoRemoveCmd cmd) { - // 数据类型转换 - if(cmd.getIdsString() != null && cmd.getIdsString().length > 0){ - cmd.setIds(Arrays.stream(cmd.getIdsString()) - .filter(Objects::nonNull) // 过滤掉null - .filter(str -> !str.trim().isEmpty()) // 过滤掉空字符串 - .map(Long::valueOf) - .toArray(Long[]::new)); - } - userQualificationInfoService.removeBatch(cmd.getIds()); return SingleResponse.buildSuccess(); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoAddExe.java index 9928808..579d10d 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoAddExe.java @@ -1,5 +1,6 @@ package com.zcloud.basic.info.command; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jjb.saas.framework.auth.utils.AuthContext; import com.zcloud.basic.info.domain.gateway.UserQualificationInfoGateway; @@ -30,21 +31,11 @@ public class UserQualificationInfoAddExe { @Transactional(rollbackFor = Exception.class) public boolean execute(UserQualificationInfoAddCmd cmd) { - - if(StringUtils.isNotEmpty(cmd.getUserIdString())){ - cmd.setUserId(Long.valueOf(cmd.getUserIdString())); - } - - // 证书编号验重 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("certificate_no", cmd.getCertificateNo()); - queryWrapper.eq("delete_enum", "FALSE"); - List list = userQualificationInfoRepository.list(queryWrapper); - if(list != null && list.size() > 0){ - throw new BizException("该证书编号重复"); - } - UserQualificationInfoE userQualificationInfoE = new UserQualificationInfoE(); + // 证书编号验重 + List list = userQualificationInfoRepository.listByCertificateNo(cmd.getCertificateNo()); + userQualificationInfoE.checkNull(BeanUtil.copyToList(list, UserQualificationInfoE.class)); + BeanUtils.copyProperties(cmd, userQualificationInfoE); boolean res = false; try { diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoUpdateExe.java index b587191..e69ae9c 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoUpdateExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserQualificationInfoUpdateExe.java @@ -1,5 +1,6 @@ package com.zcloud.basic.info.command; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.cola.exception.BizException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zcloud.basic.info.domain.gateway.UserQualificationInfoGateway; @@ -28,27 +29,14 @@ public class UserQualificationInfoUpdateExe { private final UserQualificationInfoRepository userQualificationInfoRepository; @Transactional(rollbackFor = Exception.class) - public void execute(UserQualificationInfoUpdateCmd userQualificationInfoUpdateCmd) { - - if(StringUtils.isNotEmpty(userQualificationInfoUpdateCmd.getIdString())){ - userQualificationInfoUpdateCmd.setId(Long.valueOf(userQualificationInfoUpdateCmd.getIdString())); - } - if(StringUtils.isNotEmpty(userQualificationInfoUpdateCmd.getUserIdString())){ - userQualificationInfoUpdateCmd.setUserId(Long.valueOf(userQualificationInfoUpdateCmd.getUserIdString())); - } + public void execute(UserQualificationInfoUpdateCmd cmd) { + UserQualificationInfoE userQualificationInfoE = new UserQualificationInfoE(); // 证书编号验重 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.ne("id", userQualificationInfoUpdateCmd.getId()); - queryWrapper.eq("certificate_no", userQualificationInfoUpdateCmd.getCertificateNo()); - queryWrapper.eq("delete_enum", "FALSE"); - List list = userQualificationInfoRepository.list(queryWrapper); - if(list != null && list.size() > 0){ - throw new BizException("该证书编号重复，请检查后重新输入。"); - } + List list = userQualificationInfoRepository.listByIdAndCertificateNo(cmd.getId(), cmd.getCertificateNo()); + userQualificationInfoE.checkNull(BeanUtil.copyToList(list, UserQualificationInfoE.class)); - UserQualificationInfoE userQualificationInfoE = new UserQualificationInfoE(); - BeanUtils.copyProperties(userQualificationInfoUpdateCmd, userQualificationInfoE); + BeanUtils.copyProperties(cmd, userQualificationInfoE); boolean res = userQualificationInfoGateway.update(userQualificationInfoE); if (!res) { throw new BizException("修改失败"); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java index f0c77b0..322aae1 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java @@ -40,12 +40,6 @@ public class UserQualificationInfoQueryExe { */ public PageResponse execute(UserQualificationInfoPageQry userQualificationInfoPageQry) { - if(userQualificationInfoPageQry != null && StringUtils.isNotEmpty(userQualificationInfoPageQry.getUserIdString())){ - userQualificationInfoPageQry.setEqUserId(Long.valueOf(userQualificationInfoPageQry.getUserIdString())); - } - if(userQualificationInfoPageQry != null && StringUtils.isNotEmpty(userQualificationInfoPageQry.getCorpinfoIdString())){ - userQualificationInfoPageQry.setEqCorpinfoId(Long.valueOf(userQualificationInfoPageQry.getCorpinfoIdString())); - } Map params = PageQueryHelper.toHashMap(userQualificationInfoPageQry); PageResponse pageResponse = userQualificationInfoRepository.listPage(params); @@ -59,13 +53,6 @@ public class UserQualificationInfoQueryExe { public MultiResponse executeList(UserQualificationInfoPageQry userQualificationInfoPageQry) { - if(userQualificationInfoPageQry != null && StringUtils.isNotEmpty(userQualificationInfoPageQry.getUserIdString())){ - userQualificationInfoPageQry.setEqUserId(Long.valueOf(userQualificationInfoPageQry.getUserIdString())); - } - if(userQualificationInfoPageQry != null && StringUtils.isNotEmpty(userQualificationInfoPageQry.getCorpinfoIdString())){ - userQualificationInfoPageQry.setEqCorpinfoId(Long.valueOf(userQualificationInfoPageQry.getCorpinfoIdString())); - } - Map params = PageQueryHelper.toHashMap(userQualificationInfoPageQry); MultiResponse listResponse = userQualificationInfoRepository.list(params); if(listResponse != null && listResponse.getData() != null && listResponse.getData().size() > 0){ diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoAddCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoAddCmd.java index d6bfaf3..4c4a5c6 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoAddCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoAddCmd.java @@ -25,9 +25,8 @@ public class UserQualificationInfoAddCmd extends Command { @ApiModelProperty(value = "企业id", name = "corpinfoId") private Long corpinfoId; - @ApiModelProperty(value = "用户id", name = "userIdString", required = true) + @ApiModelProperty(value = "用户id", name = "userId", required = true) @NotEmpty(message = "用户id不能为空") - private String userIdString; private Long userId; @ApiModelProperty(value = "资质名称", name = "qualificationName", required = true) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java index 4e0ced4..2fad3ac 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoPageQry.java @@ -28,13 +28,11 @@ public class UserQualificationInfoPageQry extends PageQuery { * - `le`: 小于等于比较查询 * - `ne`: 不等比较查询，对应SQL的!=操作符 */ - @ApiModelProperty(value = "企业id", name = "corpinfoIdString", required = true) + @ApiModelProperty(value = "企业id", name = "eqCorpinfoId", required = true) @NotEmpty(message = "企业id不能为空") - private String corpinfoIdString; private Long eqCorpinfoId; - @ApiModelProperty(value = "用户id", name = "userIdString") - private String userIdString; + @ApiModelProperty(value = "用户id", name = "eqUserId") private Long eqUserId; @ApiModelProperty(value = "资质类型,1-特种作业证书,2-安全人员证书", name = "eqQualificationinfoType", required = true) diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoRemoveCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoRemoveCmd.java index fea3c88..a68a69e 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoRemoveCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoRemoveCmd.java @@ -23,9 +23,8 @@ import java.util.Date; @AllArgsConstructor public class UserQualificationInfoRemoveCmd extends Command { - @ApiModelProperty(value = "主键", name = "idsString", required = true) + @ApiModelProperty(value = "主键", name = "ids", required = true) @NotNull(message = "主键不能为空") - private String[] idsString; private Long[] ids; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoUpdateCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoUpdateCmd.java index 5c8a754..6a04129 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQualificationInfoUpdateCmd.java @@ -21,18 +21,16 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor public class UserQualificationInfoUpdateCmd extends Command { - @ApiModelProperty(value = "主键", name = "String", required = true) + @ApiModelProperty(value = "主键", name = "id", required = true) @NotEmpty(message = "主键不能为空") - private String idString; private Long id; @ApiModelProperty(value = "业务主键id", name = "userQualificationinfoId", required = true) @NotEmpty(message = "业务主键id不能为空") private String userQualificationinfoId; - @ApiModelProperty(value = "用户id", name = "userIdString", required = true) + @ApiModelProperty(value = "用户id", name = "userId", required = true) @NotEmpty(message = "用户id不能为空") - private String userIdString; private Long userId; @ApiModelProperty(value = "资质名称", name = "qualificationName", required = true) diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java index e4e4d01..8822c94 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserQualificationInfoE.java @@ -1,6 +1,8 @@ package com.zcloud.basic.info.domain.model; +import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.domain.Entity; +import com.alibaba.cola.exception.BizException; import com.jjb.saas.framework.domain.model.BaseE; import lombok.Data; import lombok.EqualsAndHashCode; @@ -8,6 +10,7 @@ import lombok.EqualsAndHashCode; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Date; +import java.util.List; /** * web-domain @@ -67,5 +70,12 @@ public class UserQualificationInfoE extends BaseE { private String remarks; //环境 private String env; + + // 验重 + public void checkNull(List list){ + if(CollUtil.isNotEmpty(list)){ + throw new BizException("该证书编号重复"); + } + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserQualificationInfoRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserQualificationInfoRepository.java index 569e77c..c88c0c1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserQualificationInfoRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserQualificationInfoRepository.java @@ -21,5 +21,11 @@ public interface UserQualificationInfoRepository extends BaseRepository getInfoById(Long id); List getTypeCountByCorpInfoId(Long id); + + List listByCertificateNo(String certificateNo); + + List listByIdAndCertificateNo(Long id, String certificateNo); + + } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java index e674bf5..837b864 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java @@ -27,6 +27,8 @@ public interface UserRepository extends BaseRepository { UserDO getInfoById(Long id); Long countUserByUsername(Map params); + List listByPostId(Long postId); + List listByPostIds(Long[] postIds); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java index 5b6b9f9..a5664b8 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserQualificationInfoRepositoryImpl.java @@ -2,6 +2,7 @@ package com.zcloud.basic.info.persistence.repository.impl; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.SingleResponse; +import com.alibaba.cola.exception.BizException; import com.jjb.saas.framework.repository.common.PageHelper; import com.zcloud.basic.info.persistence.dataobject.UserQualificationInfoDO; import com.zcloud.basic.info.persistence.mapper.UserQualificationInfoMapper; @@ -16,6 +17,7 @@ import com.zcloud.gbscommon.utils.Tools; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -61,5 +63,24 @@ public class UserQualificationInfoRepositoryImpl extends BaseRepositoryImpl result = userQualificationInfoMapper.selectList(queryWrapper); return result; } + + @Override + public List listByCertificateNo(String certificateNo) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("certificate_no", certificateNo); + queryWrapper.eq("delete_enum", "FALSE"); + List list = this.list(queryWrapper); + return list; + } + + @Override + public List listByIdAndCertificateNo(Long id, String certificateNo) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.ne("id", id); + queryWrapper.eq("certificate_no", certificateNo); + queryWrapper.eq("delete_enum", "FALSE"); + List list = this.list(queryWrapper); + return list; + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index a2dc713..d920bd1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -3,6 +3,7 @@ package com.zcloud.basic.info.persistence.repository.impl; import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.dto.MultiResponse; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.exception.BizException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; @@ -17,6 +18,7 @@ import com.zcloud.gbscommon.utils.Query; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -89,5 +91,23 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i queryWrapper.ne("id", params.get("id")); return userMapper.selectCount(queryWrapper); } + + @Override + public List listByPostId(Long postId) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("post_id", postId); + queryWrapper.eq("delete_enum", "FALSE"); + List userPostList = this.list(queryWrapper); + return userPostList; + } + + @Override + public List listByPostIds(Long[] postIds) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.in("post_id", postIds); + queryWrapper.eq("delete_enum", "FALSE"); + List userPostList = this.list(queryWrapper); + return userPostList; + } }