|
@ -28,7 +28,9 @@ import org.springframework.stereotype.Service; |
|
|
import org.springframework.util.CollectionUtils; |
|
|
import org.springframework.util.CollectionUtils; |
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
import java.util.ArrayList; |
|
|
|
|
|
import java.util.HashSet; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
|
|
|
import java.util.Set; |
|
|
import java.util.stream.Collectors; |
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
@ -167,7 +169,7 @@ public class IssueServiceImpl implements IssueService { |
|
|
//议题来源话题id集合
|
|
|
//议题来源话题id集合
|
|
|
List<String> topicIds=new ArrayList<>(); |
|
|
List<String> topicIds=new ArrayList<>(); |
|
|
List<String> projectIds=new ArrayList<>(); |
|
|
List<String> projectIds=new ArrayList<>(); |
|
|
List<String> gridIds=new ArrayList<>(); |
|
|
Set<String> gridIds=new HashSet<>(); |
|
|
issueResult.getData().forEach(issueDTO ->{ |
|
|
issueResult.getData().forEach(issueDTO ->{ |
|
|
if(IssueOpenConstant.SOURCE_TYPE_RT.equals(issueDTO.getSourceType())&& StringUtils.isNotBlank(issueDTO.getSourceId())){ |
|
|
if(IssueOpenConstant.SOURCE_TYPE_RT.equals(issueDTO.getSourceType())&& StringUtils.isNotBlank(issueDTO.getSourceId())){ |
|
|
topicIds.add(issueDTO.getSourceId()); |
|
|
topicIds.add(issueDTO.getSourceId()); |
|
@ -176,7 +178,7 @@ public class IssueServiceImpl implements IssueService { |
|
|
} |
|
|
} |
|
|
} ); |
|
|
} ); |
|
|
//查询网格名称
|
|
|
//查询网格名称
|
|
|
Result<List<AllGridsByUserIdResultDTO>> gridNameList = govOrgOpenFeignClient.getGridListByGridIds(gridIds); |
|
|
Result<List<AllGridsByUserIdResultDTO>> gridNameList = govOrgOpenFeignClient.getGridListByGridIds(new ArrayList<>(gridIds)); |
|
|
if (!gridNameList.success()){ |
|
|
if (!gridNameList.success()){ |
|
|
logger.error("查询议题来源网格名称失败......"); |
|
|
logger.error("查询议题来源网格名称失败......"); |
|
|
} |
|
|
} |
|
@ -224,7 +226,7 @@ public class IssueServiceImpl implements IssueService { |
|
|
} |
|
|
} |
|
|
//议题来源话题id集合
|
|
|
//议题来源话题id集合
|
|
|
List<String> topicIds=new ArrayList<>(); |
|
|
List<String> topicIds=new ArrayList<>(); |
|
|
List<String> gridIds=new ArrayList<>(); |
|
|
Set<String> gridIds=new HashSet<>(); |
|
|
issueResult.getData().forEach(issueDTO ->{ |
|
|
issueResult.getData().forEach(issueDTO ->{ |
|
|
if(IssueOpenConstant.SOURCE_TYPE_RT.equals(issueDTO.getSourceType())&& StringUtils.isNotBlank(issueDTO.getSourceId())){ |
|
|
if(IssueOpenConstant.SOURCE_TYPE_RT.equals(issueDTO.getSourceType())&& StringUtils.isNotBlank(issueDTO.getSourceId())){ |
|
|
topicIds.add(issueDTO.getSourceId()); |
|
|
topicIds.add(issueDTO.getSourceId()); |
|
@ -232,7 +234,7 @@ public class IssueServiceImpl implements IssueService { |
|
|
} |
|
|
} |
|
|
} ); |
|
|
} ); |
|
|
//查询网格名称
|
|
|
//查询网格名称
|
|
|
Result<List<AllGridsByUserIdResultDTO>> gridNameList = govOrgOpenFeignClient.getGridListByGridIds(gridIds); |
|
|
Result<List<AllGridsByUserIdResultDTO>> gridNameList = govOrgOpenFeignClient.getGridListByGridIds(new ArrayList<>(gridIds)); |
|
|
if (!gridNameList.success()){ |
|
|
if (!gridNameList.success()){ |
|
|
logger.error("查询议题来源网格名称失败......"); |
|
|
logger.error("查询议题来源网格名称失败......"); |
|
|
} |
|
|
} |
|
|