فهرست منبع

留言创建人

lyhzzz 2 سال پیش
والد
کامیت
2c36eb9ab6

+ 2 - 1
src/main/java/com/fdkankan/fusion/entity/TmMessage.java

@@ -73,5 +73,6 @@ public class TmMessage implements Serializable {
     @TableField("creator_id")
     @TableField("creator_id")
     private String creatorId;
     private String creatorId;
 
 
-
+    @TableField(exist = false)
+    private String userName;
 }
 }

+ 4 - 0
src/main/java/com/fdkankan/fusion/service/ITmUserService.java

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.fusion.httpClient.response.FdkkResponse;
 import com.fdkankan.fusion.httpClient.response.FdkkResponse;
 import com.fdkankan.fusion.response.UserAddRequest;
 import com.fdkankan.fusion.response.UserAddRequest;
 
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
+import java.util.Set;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -41,4 +43,6 @@ public interface ITmUserService extends IService<TmUser> {
     PageInfo pageList(String nickName, String deptId, Integer status, Long pageNum, Long pageSize);
     PageInfo pageList(String nickName, String deptId, Integer status, Long pageNum, Long pageSize);
 
 
     Object getUserListSelect(String deptId);
     Object getUserListSelect(String deptId);
+
+    HashMap<String, TmUser> getByIds(Set<String> createorIds);
 }
 }

+ 15 - 0
src/main/java/com/fdkankan/fusion/service/impl/TmMessageServiceImpl.java

@@ -1,5 +1,8 @@
 package com.fdkankan.fusion.service.impl;
 package com.fdkankan.fusion.service.impl;
 import java.util.Date;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -10,12 +13,14 @@ import com.fdkankan.fusion.common.enums.IdPreEnum;
 import com.fdkankan.fusion.common.util.IdUtils;
 import com.fdkankan.fusion.common.util.IdUtils;
 import com.fdkankan.fusion.entity.TmMessage;
 import com.fdkankan.fusion.entity.TmMessage;
 import com.fdkankan.fusion.entity.TmProject;
 import com.fdkankan.fusion.entity.TmProject;
+import com.fdkankan.fusion.entity.TmUser;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.mapper.ITmMessageMapper;
 import com.fdkankan.fusion.mapper.ITmMessageMapper;
 import com.fdkankan.fusion.request.MessageReqDto;
 import com.fdkankan.fusion.request.MessageReqDto;
 import com.fdkankan.fusion.service.ITmMessageService;
 import com.fdkankan.fusion.service.ITmMessageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.fusion.service.ITmProjectService;
 import com.fdkankan.fusion.service.ITmProjectService;
+import com.fdkankan.fusion.service.ITmUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -33,6 +38,8 @@ public class TmMessageServiceImpl extends ServiceImpl<ITmMessageMapper, TmMessag
 
 
     @Autowired
     @Autowired
     ITmProjectService tmProjectService;
     ITmProjectService tmProjectService;
+    @Autowired
+    ITmUserService tmUserService;
 
 
     @Override
     @Override
     public void addNew(MessageReqDto body) {
     public void addNew(MessageReqDto body) {
@@ -62,6 +69,14 @@ public class TmMessageServiceImpl extends ServiceImpl<ITmMessageMapper, TmMessag
         LambdaQueryWrapper<TmMessage> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<TmMessage> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TmMessage::getProjectId,messageReqDto.getProjectId());
         wrapper.eq(TmMessage::getProjectId,messageReqDto.getProjectId());
         Page<TmMessage> page = this.page(new Page<>(messageReqDto.getPageNum(), messageReqDto.getPageSize()), wrapper);
         Page<TmMessage> page = this.page(new Page<>(messageReqDto.getPageNum(), messageReqDto.getPageSize()), wrapper);
+        Set<String> createorIds = page.getRecords().stream().map(TmMessage::getCreatorId).collect(Collectors.toSet());
+        HashMap<String, TmUser> map = tmUserService.getByIds(createorIds);
+        for (TmMessage record : page.getRecords()) {
+            TmUser tmUser = map.get(record.getCreatorId());
+            if(tmUser != null){
+                tmUser.setUserName(tmUser.getUserName());
+            }
+        }
         return PageInfo.PageInfo(page);
         return PageInfo.PageInfo(page);
     }
     }
 }
 }

+ 14 - 0
src/main/java/com/fdkankan/fusion/service/impl/TmUserServiceImpl.java

@@ -27,7 +27,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
@@ -292,4 +294,16 @@ public class TmUserServiceImpl extends ServiceImpl<ITmUserMapper, TmUser> implem
         wrapper.in(TmUser::getDeptId,deptIds);
         wrapper.in(TmUser::getDeptId,deptIds);
         return this.list(wrapper);
         return this.list(wrapper);
     }
     }
+
+    @Override
+    public HashMap<String, TmUser> getByIds(Set<String> createorIds) {
+        HashMap<String, TmUser> map = new HashMap<>();
+        LambdaQueryWrapper<TmUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(TmUser::getId,createorIds);
+        List<TmUser> list = this.list(wrapper);
+        for (TmUser tmUser : list) {
+            map.put(tmUser.getId(),tmUser);
+        }
+        return map;
+    }
 }
 }