dev:特种/安全证书修改(未完成)

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();
     }

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<UserQualificationInfoDO> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("certificate_no", cmd.getCertificateNo());
-        queryWrapper.eq("delete_enum", "FALSE");
-        List<UserQualificationInfoDO> list = userQualificationInfoRepository.list(queryWrapper);
-        if(list != null && list.size() > 0){
-            throw new BizException("该证书编号重复");
-        }
-
         UserQualificationInfoE userQualificationInfoE = new UserQualificationInfoE();
+        // 证书编号验重
+        List<UserQualificationInfoDO> list = userQualificationInfoRepository.listByCertificateNo(cmd.getCertificateNo());
+        userQualificationInfoE.checkNull(BeanUtil.copyToList(list, UserQualificationInfoE.class));
+
         BeanUtils.copyProperties(cmd, userQualificationInfoE);
         boolean res = false;
         try {

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) {
+    public void execute(UserQualificationInfoUpdateCmd cmd) {
-
+        UserQualificationInfoE userQualificationInfoE = new UserQualificationInfoE();
-        if(StringUtils.isNotEmpty(userQualificationInfoUpdateCmd.getIdString())){
-            userQualificationInfoUpdateCmd.setId(Long.valueOf(userQualificationInfoUpdateCmd.getIdString()));
-        }
-        if(StringUtils.isNotEmpty(userQualificationInfoUpdateCmd.getUserIdString())){
-            userQualificationInfoUpdateCmd.setUserId(Long.valueOf(userQualificationInfoUpdateCmd.getUserIdString()));
-        }
 
         // 证书编号验重
-        QueryWrapper<UserQualificationInfoDO> queryWrapper = new QueryWrapper<>();
+        List<UserQualificationInfoDO> list = userQualificationInfoRepository.listByIdAndCertificateNo(cmd.getId(), cmd.getCertificateNo());
-        queryWrapper.ne("id", userQualificationInfoUpdateCmd.getId());
+        userQualificationInfoE.checkNull(BeanUtil.copyToList(list, UserQualificationInfoE.class));
-        queryWrapper.eq("certificate_no", userQualificationInfoUpdateCmd.getCertificateNo());
-        queryWrapper.eq("delete_enum", "FALSE");
-        List<UserQualificationInfoDO> list = userQualificationInfoRepository.list(queryWrapper);
-        if(list != null && list.size() > 0){
-            throw new BizException("该证书编号重复，请检查后重新输入。");
-        }
 
-        UserQualificationInfoE userQualificationInfoE = new UserQualificationInfoE();
+        BeanUtils.copyProperties(cmd, userQualificationInfoE);
-        BeanUtils.copyProperties(userQualificationInfoUpdateCmd, userQualificationInfoE);
         boolean res = userQualificationInfoGateway.update(userQualificationInfoE);
         if (!res) {
             throw new BizException("修改失败");

web-app/src/main/java/com/zcloud/basic/info/command/query/UserQualificationInfoQueryExe.java

@@ -40,12 +40,6 @@ public class UserQualificationInfoQueryExe {
     */
     public PageResponse<UserQualificationInfoCO> 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<String,Object> params = PageQueryHelper.toHashMap(userQualificationInfoPageQry);
         PageResponse<UserQualificationInfoDO> pageResponse = userQualificationInfoRepository.listPage(params);
@@ -59,13 +53,6 @@ public class UserQualificationInfoQueryExe {
 
     public MultiResponse<UserQualificationInfoCO> 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<String,Object> params = PageQueryHelper.toHashMap(userQualificationInfoPageQry);
         MultiResponse<UserQualificationInfoDO> listResponse = userQualificationInfoRepository.list(params);
         if(listResponse != null && listResponse.getData() != null && listResponse.getData().size() > 0){

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)

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")
+    @ApiModelProperty(value = "用户id", name = "eqUserId")
-    private String userIdString;
     private Long eqUserId;
 
     @ApiModelProperty(value = "资质类型,1-特种作业证书,2-安全人员证书", name = "eqQualificationinfoType", required = true)

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;
 
 }

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)

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<UserQualificationInfoE> list){
+        if(CollUtil.isNotEmpty(list)){
+            throw new BizException("该证书编号重复");
+        }
+    }
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserQualificationInfoRepository.java

@@ -21,5 +21,11 @@ public interface UserQualificationInfoRepository extends BaseRepository<UserQual
     SingleResponse<UserQualificationInfoDO> getInfoById(Long id);
 
     List<UserQualificationInfoDO> getTypeCountByCorpInfoId(Long id);
+
+    List<UserQualificationInfoDO> listByCertificateNo(String certificateNo);
+
+    List<UserQualificationInfoDO> listByIdAndCertificateNo(Long id, String certificateNo);
+
+
 }
 

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/UserRepository.java

@@ -27,6 +27,8 @@ public interface UserRepository extends BaseRepository<UserDO> {
     UserDO getInfoById(Long id);
     Long countUserByUsername(Map<String,Object> params);
 
+    List<UserDO> listByPostId(Long postId);
+    List<UserDO> listByPostIds(Long[] postIds);
 
 }
 

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<User
         List<UserQualificationInfoDO> result = userQualificationInfoMapper.selectList(queryWrapper);
         return result;
     }
+
+    @Override
+    public List<UserQualificationInfoDO> listByCertificateNo(String certificateNo) {
+        QueryWrapper<UserQualificationInfoDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("certificate_no", certificateNo);
+        queryWrapper.eq("delete_enum", "FALSE");
+        List<UserQualificationInfoDO> list = this.list(queryWrapper);
+        return list;
+    }
+
+    @Override
+    public List<UserQualificationInfoDO> listByIdAndCertificateNo(Long id, String certificateNo) {
+        QueryWrapper<UserQualificationInfoDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ne("id", id);
+        queryWrapper.eq("certificate_no", certificateNo);
+        queryWrapper.eq("delete_enum", "FALSE");
+        List<UserQualificationInfoDO> list = this.list(queryWrapper);
+        return list;
+    }
 }
 

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<UserMapper, UserDO> i
         queryWrapper.ne("id", params.get("id"));
         return userMapper.selectCount(queryWrapper);
     }
+
+    @Override
+    public List<UserDO> 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<UserDO> listByPostIds(Long[] postIds) {
+        QueryWrapper<UserDO> queryWrapper = new QueryWrapper();
+        queryWrapper.in("post_id", postIds);
+        queryWrapper.eq("delete_enum", "FALSE");
+        List<UserDO> userPostList = this.list(queryWrapper);
+        return userPostList;
+    }
 }