feat/项目动态，/project/log/list,修改为远程调用

laigeoffer · Jun 25, 2024 · 987ebd4 · 987ebd4
1 parent b1517bc
commit 987ebd4
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 12 deletions.
diff --git a/...es/pmhub-project/src/main/java/com/laigeoffer/pmhub/project/mapper/ProjectTaskMapper.java b/...es/pmhub-project/src/main/java/com/laigeoffer/pmhub/project/mapper/ProjectTaskMapper.java
@@ -29,8 +29,7 @@ public interface ProjectTaskMapper extends BaseMapper<ProjectTask> {
     List<TaskNotifyDTO> queryTaskNotifyJob();
     List<TaskNotifyDTO> queryTaskNotifyJob2();
     String queryVxUserName(@Param("userId") Long userId);
-    String queryUserName(@Param("userId") Long userId);
-    String queryNickName(@Param("username") String username);
+
     String queryApproved(@Param("taskId") String taskId);
     Integer queryProjectStatus(@Param("projectId") String projectId);
     List<Project> queryProjectsStatus(@Param("projectIds") List<String> projectIds);

diff --git a/...roject/src/main/java/com/laigeoffer/pmhub/project/service/impl/ProjectLogServiceImpl.java b/...roject/src/main/java/com/laigeoffer/pmhub/project/service/impl/ProjectLogServiceImpl.java
@@ -27,7 +27,9 @@
 import javax.annotation.Resource;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @author canghe
@@ -124,6 +126,35 @@ public void run(LogVO logVO) {
     @Override
     public PageInfo<ProjectLogVO> list(ProjectVO projectVO) {
         PageHelper.startPage(projectVO.getPageNum(), projectVO.getPageSize());
-        return new PageInfo<>(projectLogMapper.queryLogList(projectVO.getProjectId()));
+        List<ProjectLogVO> projectLogVOS = projectLogMapper.queryLogList(projectVO.getProjectId());
+        if (CollectionUtils.isEmpty(projectLogVOS)) {
+            return new PageInfo<>();
+        }
+        // 拿到userids
+        List<Long> userIds = projectLogVOS.stream().map(ProjectLogVO::getUserId)
+                .distinct()
+                .collect(Collectors.toList());
+        SysUserDTO sysUserDTO = new SysUserDTO();
+        sysUserDTO.setUserIds(userIds);
+        R<List<SysUserVO>> userResult = userFeignService.listOfInner(sysUserDTO, SecurityConstants.INNER);
+
+        if (Objects.isNull(userResult) || CollectionUtils.isEmpty(userResult.getData())) {
+            throw new ServiceException("远程调用查询用户列表：" + userIds + " 失败");
+        }
+        List<SysUserVO> userVOList = userResult.getData();
+
+        // 匹配设置值
+        Map<Long, SysUserVO> userMap = userVOList.stream().collect(Collectors.toMap(SysUserVO::getUserId, a -> a));
+        projectLogVOS.forEach(a -> {
+
+            // 设置用户信息
+            SysUserVO sysUserVO = userMap.get(a.getUserId());
+            if (Objects.nonNull(sysUserVO)) {
+                a.setUserName(sysUserVO.getUserName());
+                a.setNickName(sysUserVO.getNickName());
+                a.setAvatar(sysUserVO.getAvatar());
+            }
+        });
+        return new PageInfo<>(projectLogVOS);
     }
 }
diff --git a/...oject/src/main/java/com/laigeoffer/pmhub/project/service/impl/ProjectTaskServiceImpl.java b/...oject/src/main/java/com/laigeoffer/pmhub/project/service/impl/ProjectTaskServiceImpl.java
@@ -391,7 +391,7 @@ public String add(TaskReqVO taskReqVO) {
     private void extracted(String taskName, Long userId, String username, String taskId) {
         String name = projectTaskMapper.queryVxUserName(userId);
         if (StringUtils.isNotBlank(name)) {
-            // TODO: 2024.04.25 语雀任务提醒暂时关闭 
+            // TODO: 2024.04.25 逾期任务提醒暂时关闭
 //            TaskAssignRemindDTO taskAssignRemindDTO = new TaskAssignRemindDTO();
 //            taskAssignRemindDTO.setTaskName(taskName);
 //            taskAssignRemindDTO.setUserIds(Collections.singletonList(name));

diff --git a/pmhub-modules/pmhub-project/src/main/resources/mapper/ProjectLogMapper.xml b/pmhub-modules/pmhub-project/src/main/resources/mapper/ProjectLogMapper.xml
@@ -5,11 +5,10 @@
 <mapper namespace="com.laigeoffer.pmhub.project.mapper.ProjectLogMapper">
     <select id="queryLogList" resultType="com.laigeoffer.pmhub.project.domain.vo.project.log.ProjectLogVO">
         select pl.type, pl.id as projectLogId, pl.operate_type,pl.remark,p.id as project_id,pt.id as taskId,p.project_name,pt.task_name,pl.created_time
-             ,su.user_id,su.user_name,su.nick_name,su.avatar
+             ,pl.user_id
         from pmhub_project_log pl
                  left join pmhub_project p on p.id = pl.project_id
                  left join pmhub_project_task pt on pt.id = pl.pt_id
-                 left join sys_user su on pl.user_id = su.user_id
         where p.id = #{projectId} order by pl.created_time desc
     </select>
     <select id="queryAllLog" resultType="com.laigeoffer.pmhub.project.domain.vo.project.log.ProjectLogVO">

diff --git a/pmhub-modules/pmhub-project/src/main/resources/mapper/ProjectTaskMapper.xml b/pmhub-modules/pmhub-project/src/main/resources/mapper/ProjectTaskMapper.xml
@@ -132,12 +132,8 @@
     <select id="queryVxUserName" resultType="java.lang.String">
         select user_wx_name from sys_user where user_id = #{userId}
     </select>
-    <select id="queryUserName" resultType="java.lang.String">
-        select user_name from sys_user where user_id = #{userId}
-    </select>
-    <select id="queryNickName" resultType="java.lang.String">
-        select nick_name from sys_user where user_name = #{username}
-    </select>
+
+
     <select id="queryApproved" resultType="java.lang.String">
        select approved from pmhub_materials_approval_set where type = 'task' and extra_id = #{taskId}
     </select>