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