modify:修改配置查询接口

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/change/AdminChangeConfigServiceImpl.java

@@ -14,11 +14,13 @@ import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
 import com.netease.mail.yanxuan.change.common.bean.RequestLocalBean;
 import com.netease.mail.yanxuan.change.common.bean.ResponseCode;
 import com.netease.mail.yanxuan.change.common.bean.ResponseCodeEnum;
+import com.netease.mail.yanxuan.change.common.enums.ChangeCommanderEnum;
 import com.netease.mail.yanxuan.change.common.enums.ChangeSubjectEnum;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeConfig;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeExecConfig;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeType;
 import com.netease.mail.yanxuan.change.dal.mapper.ChangeConfigMapper;
+import com.netease.mail.yanxuan.change.dal.meta.model.dto.ChangeExecConfigDTO;
 import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigDeleteReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigQueryReq;
@@ -26,18 +28,20 @@ import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeConfigArrayVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeConfigVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.PageVO;
+import com.netease.mail.yanxuan.change.integration.flow.UserQueryDTO;
+import com.netease.mail.yanxuan.change.integration.flow.ius.IusRpcService;
+import com.netease.mail.yanxuan.change.integration.flow.ius.rsp.IusUserInfoRsp;
+import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -60,6 +64,10 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
     private ChangeExecConfigService execConfigService;
     @Autowired
     private StringRedisTemplate redisTemplate;
+
+    @Autowired
+    private IusRpcService iusRpcService;
+
     private ValueOperations<String, String> value;
 
     @Override
@@ -255,7 +263,31 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
         ChangeConfigVO vo = new ChangeConfigVO();
         vo.setChangeConfig(changeConfig);
         vo.setChangeTypes(changeTypes);
-        vo.setChangeExecConfigs(changeExecConfigs);
+        List<ChangeExecConfig> creatorConfig = changeExecConfigs.stream().filter(i -> i.getChangeExecUserType().equals(ChangeCommanderEnum.COMMANDER_ORIGINATOR.getId())).collect(Collectors.toList());
+        List<ChangeExecConfig> fixedConfig = changeExecConfigs.stream().filter(i -> i.getChangeExecUserType().equals(ChangeCommanderEnum.FIXED_PERSON.getId())).collect(Collectors.toList());
+        List<Long> creatorIds = creatorConfig.stream().map(ChangeExecConfig::getId).collect(Collectors.toList());
+        List<Long> fixedIds = fixedConfig.stream().map(ChangeExecConfig::getId).collect(Collectors.toList());
+        Set<String> fixedEmail = fixedConfig.stream().map(ChangeExecConfig::getChangeExecUser).collect(Collectors.toSet());
+        AjaxResponse<List<IusUserInfoRsp>> userListInfo = iusRpcService.queryUserListInfo(UserQueryDTO.builder().uids(new ArrayList<>(fixedEmail)).build());
+        List<IusUserInfoRsp> userInfoRspList = userListInfo.getData();
+        List<ChangeExecConfigDTO> changeExecConfigDTOS = changeExecConfigs.stream().map(i -> {
+            ChangeExecConfigDTO changeExecConfigDTO = new ChangeExecConfigDTO();
+            BeanUtils.copyProperties(i, changeExecConfigDTO);
+            //创建人
+            if (creatorIds.contains(i.getId())) {
+                changeExecConfigDTO.setChangeExecUser(RequestLocalBean.getUid());
+                changeExecConfigDTO.setChangeExecUserName(RequestLocalBean.getName());
+            }
+            //固定人
+            if (fixedIds.contains(i.getId())) {
+                Optional<IusUserInfoRsp> anyFixedUser = userInfoRspList.stream().filter(u -> u.getUid().equals(i.getChangeExecUser())).findAny();
+                if (anyFixedUser.isPresent()) {
+                    changeExecConfigDTO.setChangeExecUserName(anyFixedUser.get().getName());
+                }
+            }
+            return changeExecConfigDTO;
+        }).collect(Collectors.toList());
+        vo.setChangeExecConfigs(changeExecConfigDTOS);
         return JSONObject.toJSONString(vo);
     }
 

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/dto/ChangeExecConfigDTO.java

+package com.netease.mail.yanxuan.change.dal.meta.model.dto;
+
+import lombok.Data;
+
+@Data
+public class ChangeExecConfigDTO {
+
+    private Long id;
+
+    /**
+     * 变更类型配置记录id
+     */
+    private Long changeTemplateId;
+
+    /**
+     * 变更执行部门名
+     */
+    private String changeExecDepartment;
+
+    /**
+     * 变更行动人类型
+     */
+    private Integer changeExecUserType;
+
+    /**
+     * 变更行动人（不同类型存储不同内容）
+     */
+    private String changeExecUser;
+
+    /**
+     * 行动人名
+     */
+    private String changeExecUserName;
+
+    /**
+     * 变更风险描述
+     */
+    private String changeRiskDesc;
+
+    /**
+     * 行动项
+     */
+    private String changeExecProject;
+
+    /**
+     * 变更验证措施
+     */
+    private String changeChecking;
+
+    /**
+     * 创建时间
+     */
+    private Long createTime;
+
+    /**
+     * 更新时间
+     */
+    private Long updateTime;
+}

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/vo/ChangeConfigVO.java

@@ -4,6 +4,8 @@ import com.netease.mail.yanxuan.change.dal.entity.ChangeConfig;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeExecConfig;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeType;
 import java.util.List;
+
+import com.netease.mail.yanxuan.change.dal.meta.model.dto.ChangeExecConfigDTO;
 import lombok.Data;
 
 /**
@@ -27,6 +29,6 @@ public class ChangeConfigVO {
     /**
      *  变更执行方案
      */
-    private List<ChangeExecConfig> changeExecConfigs;
+    private List<ChangeExecConfigDTO> changeExecConfigs;
 
 }