|
|
|
@ -1,24 +1,30 @@ |
|
|
|
package com.epmet.modules.person.service.impl; |
|
|
|
|
|
|
|
import com.epmet.commons.tools.constant.NumConstant; |
|
|
|
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|
|
|
import com.epmet.commons.tools.exception.RenException; |
|
|
|
import com.epmet.commons.tools.security.dto.TokenDto; |
|
|
|
import com.epmet.commons.tools.security.user.LoginUserUtil; |
|
|
|
import com.epmet.commons.tools.utils.ConvertUtils; |
|
|
|
import com.epmet.commons.tools.utils.Result; |
|
|
|
import com.epmet.constant.IssueOpenConstant; |
|
|
|
import com.epmet.dto.IssueDTO; |
|
|
|
import com.epmet.dto.ProjectDTO; |
|
|
|
import com.epmet.dto.form.MyPartIssuesFormDTO; |
|
|
|
import com.epmet.dto.form.MyPubIssuesAuditingFormDTO; |
|
|
|
import com.epmet.dto.form.UserPubAuditingIssueFormDTO; |
|
|
|
import com.epmet.dto.result.*; |
|
|
|
import com.epmet.feign.GovIssueOpenFeignClient; |
|
|
|
import com.epmet.feign.GovOrgOpenFeignClient; |
|
|
|
import com.epmet.feign.GovProjectOpenFeignClient; |
|
|
|
import com.epmet.modules.person.service.IssueService; |
|
|
|
import com.epmet.resi.group.dto.group.ResiGroupDTO; |
|
|
|
import com.epmet.resi.group.dto.group.form.GroupInfoFormDTO; |
|
|
|
import com.epmet.resi.group.dto.group.result.GroupInfoResultDTO; |
|
|
|
import com.epmet.resi.group.dto.topic.result.IssueGridResultDTO; |
|
|
|
import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; |
|
|
|
import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; |
|
|
|
import com.epmet.resi.mine.dto.result.UserPubAuditingIssueResultDTO; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.commons.logging.Log; |
|
|
|
@ -27,10 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.util.CollectionUtils; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.HashSet; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Set; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
/** |
|
|
|
@ -50,7 +53,8 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
private GovProjectOpenFeignClient govProjectOpenFeignClient; |
|
|
|
@Autowired |
|
|
|
private GovOrgOpenFeignClient govOrgOpenFeignClient; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private LoginUserUtil loginUserUtil; |
|
|
|
|
|
|
|
/** |
|
|
|
* @Description 个人中心-我参与的议题列表 |
|
|
|
@ -256,4 +260,51 @@ public class IssueServiceImpl implements IssueService { |
|
|
|
} |
|
|
|
return resultDTOList; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* @param fomrDTO |
|
|
|
* @author yinzuomei |
|
|
|
* @description 个人中心-我发起的议题列表-审核中列表 |
|
|
|
* @Date 2020/11/23 9:08 |
|
|
|
**/ |
|
|
|
@Override |
|
|
|
public List<UserPubAuditingIssueResultDTO> getMyPubAuditingIssues(PageFormDTO fomrDTO) { |
|
|
|
UserPubAuditingIssueFormDTO userPubAuditingIssueFormDTO=new UserPubAuditingIssueFormDTO(); |
|
|
|
userPubAuditingIssueFormDTO.setUserId(loginUserUtil.getLoginUserId()); |
|
|
|
userPubAuditingIssueFormDTO.setPageNo(fomrDTO.getPageNo()); |
|
|
|
userPubAuditingIssueFormDTO.setPageSize(fomrDTO.getPageSize()); |
|
|
|
Result<List<UserPubAuditingIssueResDTO>> resultList = issueOpenFeignClient.queryUserPubAuditingIssues(userPubAuditingIssueFormDTO); |
|
|
|
if (!resultList.success() || CollectionUtils.isEmpty(resultList.getData())) { |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
List<UserPubAuditingIssueResDTO> list = resultList.getData(); |
|
|
|
//网格id 、 小组id
|
|
|
|
Set<String> gridIds = new HashSet<>(); |
|
|
|
Set<String> groupIds = new HashSet<>(); |
|
|
|
list.forEach(userPubAuditingIssueResDTO -> { |
|
|
|
gridIds.add(userPubAuditingIssueResDTO.getGridId()); |
|
|
|
groupIds.add(userPubAuditingIssueResDTO.getGroupId()); |
|
|
|
}); |
|
|
|
//查询网格名称、 小组名称
|
|
|
|
Result<List<AllGridsByUserIdResultDTO>> gridNameList = govOrgOpenFeignClient.getGridListByGridIds(new ArrayList<>(gridIds)); |
|
|
|
if (!gridNameList.success() || CollectionUtils.isEmpty(gridNameList.getData())) { |
|
|
|
logger.warn("个人中心-我发起的议题列表-审核中列表,查询网格名称失败......"); |
|
|
|
} else { |
|
|
|
//赋值
|
|
|
|
list.forEach(resDTO -> { |
|
|
|
gridNameList.getData().stream().filter(o -> resDTO.getGridId().equals(o.getGridId())).forEach(o -> resDTO.setGridName(o.getGridName())); |
|
|
|
}); |
|
|
|
} |
|
|
|
//查询话题来源小组名称
|
|
|
|
Result<HashMap<String, ResiGroupDTO>> groupInfoMapRes = resiGroupOpenFeignClient.getGroupInfo(new ArrayList<>(groupIds)); |
|
|
|
if (!groupInfoMapRes.success() || CollectionUtils.isEmpty(groupInfoMapRes.getData())) { |
|
|
|
logger.warn("个人中心-我发起的议题列表-审核中列表,查询小组信息失败......"); |
|
|
|
} else { |
|
|
|
//赋值
|
|
|
|
list.forEach(resDTO -> { |
|
|
|
resDTO.setGroupName(null == groupInfoMapRes.getData().get(resDTO.getGroupId()) ? "" : groupInfoMapRes.getData().get(resDTO.getGroupId()).getGroupName()); |
|
|
|
}); |
|
|
|
} |
|
|
|
return ConvertUtils.sourceToTarget(list,UserPubAuditingIssueResultDTO.class); |
|
|
|
} |
|
|
|
} |
|
|
|
|
yinzuomei
5 years ago