|
|
@ -10,17 +10,13 @@ import com.epmet.constant.ReadFlagConstant; |
|
|
import com.epmet.constant.UserMessageConstant; |
|
|
import com.epmet.constant.UserMessageConstant; |
|
|
import com.epmet.dao.IssueDao; |
|
|
import com.epmet.dao.IssueDao; |
|
|
import com.epmet.dao.IssueProcessDao; |
|
|
import com.epmet.dao.IssueProcessDao; |
|
|
import com.epmet.dto.form.CloseIssueFormDTO; |
|
|
import com.epmet.dto.ProjectDTO; |
|
|
import com.epmet.dto.form.DepartmentStaffListFormDTO; |
|
|
import com.epmet.dto.form.*; |
|
|
import com.epmet.dto.form.IssueDetailFormDTO; |
|
|
import com.epmet.dto.result.*; |
|
|
import com.epmet.dto.form.UserMessageFormDTO; |
|
|
|
|
|
import com.epmet.dto.result.AgencyGridResultDTO; |
|
|
|
|
|
import com.epmet.dto.result.DepartmentStaffListResultDTO; |
|
|
|
|
|
import com.epmet.dto.result.GridVotingIssueCountResultDTO; |
|
|
|
|
|
import com.epmet.dto.result.IssueResultDTO; |
|
|
|
|
|
import com.epmet.entity.IssueEntity; |
|
|
import com.epmet.entity.IssueEntity; |
|
|
import com.epmet.entity.IssueProcessEntity; |
|
|
import com.epmet.entity.IssueProcessEntity; |
|
|
import com.epmet.feign.GovOrgFeignClient; |
|
|
import com.epmet.feign.GovOrgFeignClient; |
|
|
|
|
|
import com.epmet.feign.GovProjectFeignClient; |
|
|
import com.epmet.feign.MessageFeignClient; |
|
|
import com.epmet.feign.MessageFeignClient; |
|
|
import com.epmet.feign.ResiGroupFeignClient; |
|
|
import com.epmet.feign.ResiGroupFeignClient; |
|
|
import com.epmet.redis.GovIssueRedis; |
|
|
import com.epmet.redis.GovIssueRedis; |
|
|
@ -33,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional; |
|
|
import java.util.ArrayList; |
|
|
import java.util.ArrayList; |
|
|
import java.util.Date; |
|
|
import java.util.Date; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* @Author zxc |
|
|
* @Author zxc |
|
|
@ -41,132 +38,162 @@ import java.util.List; |
|
|
@Service |
|
|
@Service |
|
|
public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> implements IssueService { |
|
|
public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> implements IssueService { |
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
private IssueDao issueDao; |
|
|
private IssueDao issueDao; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private GovOrgFeignClient govOrgFeignClient; |
|
|
private GovOrgFeignClient govOrgFeignClient; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private IssueProcessDao issueProcessDao; |
|
|
private IssueProcessDao issueProcessDao; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private ResiGroupFeignClient resiGroupFeignClient; |
|
|
private ResiGroupFeignClient resiGroupFeignClient; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private MessageFeignClient messageFeignClient; |
|
|
private MessageFeignClient messageFeignClient; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private GovIssueRedis govIssueRedis; |
|
|
private GovIssueRedis govIssueRedis; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
private GovProjectFeignClient govProjectFeignClient; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* @Description 议题详情 |
|
|
* @param issueDetail |
|
|
* @param issueDetail |
|
|
* @Description 议题详情 |
|
|
* @author zxc |
|
|
* @author zxc |
|
|
* @date 2020/5/11 10:04 |
|
|
* @date 2020/5/11 10:04 |
|
|
*/ |
|
|
*/ |
|
|
@Override |
|
|
@Override |
|
|
public IssueResultDTO detail(IssueDetailFormDTO issueDetail) { |
|
|
public IssueResultDTO detail(IssueDetailFormDTO issueDetail) { |
|
|
//议题信息
|
|
|
//议题信息
|
|
|
IssueResultDTO issueResult = issueDao.issueDetail(issueDetail); |
|
|
IssueResultDTO issueResult = issueDao.issueDetail(issueDetail); |
|
|
return issueResult; |
|
|
return issueResult; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* @param formDTO |
|
|
* @param formDTO |
|
|
* @return |
|
|
* @return |
|
|
* @Author sun |
|
|
* @Author sun |
|
|
* @Description 议题管理-关闭议题 |
|
|
* @Description 议题管理-关闭议题 |
|
|
**/ |
|
|
**/ |
|
|
@Override |
|
|
@Override |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
public void closeIssue(CloseIssueFormDTO formDTO) { |
|
|
public void closeIssue(CloseIssueFormDTO formDTO) { |
|
|
Date date = new Date(); |
|
|
Date date = new Date(); |
|
|
//1:更新议题详情表数据
|
|
|
//1:更新议题详情表数据
|
|
|
IssueEntity entity = baseDao.selectById(formDTO.getIssueId()); |
|
|
IssueEntity entity = baseDao.selectById(formDTO.getIssueId()); |
|
|
if (null == entity) { |
|
|
if (null == entity) { |
|
|
throw new RenException(IssueConstant.SELECT_EXCEPTION); |
|
|
throw new RenException(IssueConstant.SELECT_EXCEPTION); |
|
|
} |
|
|
} |
|
|
entity.setIssueStatus(IssueConstant.ISSUE_CLOSED); |
|
|
entity.setIssueStatus(IssueConstant.ISSUE_CLOSED); |
|
|
entity.setCloseReason(formDTO.getCloseReason()); |
|
|
entity.setCloseReason(formDTO.getCloseReason()); |
|
|
entity.setResolveType(formDTO.getResolveType()); |
|
|
entity.setResolveType(formDTO.getResolveType()); |
|
|
entity.setVotingDeadline(date); |
|
|
entity.setVotingDeadline(date); |
|
|
entity.setClosedTime(date); |
|
|
entity.setClosedTime(date); |
|
|
if (baseDao.updateById(entity) < NumConstant.ONE) { |
|
|
if (baseDao.updateById(entity) < NumConstant.ONE) { |
|
|
throw new RenException(IssueConstant.UPPDATE_EXCEPTION); |
|
|
throw new RenException(IssueConstant.UPPDATE_EXCEPTION); |
|
|
} |
|
|
} |
|
|
//2:调用gov-org服务，查询组织网格名称
|
|
|
//2:调用gov-org服务，查询组织网格名称
|
|
|
AgencyGridResultDTO agencyGridResultDTO = new AgencyGridResultDTO(); |
|
|
AgencyGridResultDTO agencyGridResultDTO = new AgencyGridResultDTO(); |
|
|
agencyGridResultDTO.setAgencyId(entity.getOrgId()); |
|
|
agencyGridResultDTO.setAgencyId(entity.getOrgId()); |
|
|
agencyGridResultDTO.setGridId(entity.getGridId()); |
|
|
agencyGridResultDTO.setGridId(entity.getGridId()); |
|
|
Result<AgencyGridResultDTO> resultDTO = govOrgFeignClient.getAgencyAndGrid(agencyGridResultDTO); |
|
|
Result<AgencyGridResultDTO> resultDTO = govOrgFeignClient.getAgencyAndGrid(agencyGridResultDTO); |
|
|
agencyGridResultDTO = resultDTO.getData(); |
|
|
agencyGridResultDTO = resultDTO.getData(); |
|
|
//3:议题进展记录表新增数据
|
|
|
//3:议题进展记录表新增数据
|
|
|
IssueProcessEntity processEntity = new IssueProcessEntity(); |
|
|
IssueProcessEntity processEntity = new IssueProcessEntity(); |
|
|
processEntity.setIssueId(formDTO.getIssueId()); |
|
|
processEntity.setIssueId(formDTO.getIssueId()); |
|
|
processEntity.setIssueStatus(IssueConstant.ISSUE_CLOSED); |
|
|
processEntity.setIssueStatus(IssueConstant.ISSUE_CLOSED); |
|
|
processEntity.setOrgType(IssueConstant.ISSUE_GRID); |
|
|
processEntity.setOrgType(IssueConstant.ISSUE_GRID); |
|
|
processEntity.setOrgId(entity.getOrgId()); |
|
|
processEntity.setOrgId(entity.getOrgId()); |
|
|
processEntity.setOperationExplain(formDTO.getCloseReason()); |
|
|
processEntity.setOperationExplain(formDTO.getCloseReason()); |
|
|
processEntity.setOrgName(agencyGridResultDTO.getAgencyName()+"-"+agencyGridResultDTO.getGridName()); |
|
|
processEntity.setOrgName(agencyGridResultDTO.getAgencyName() + "-" + agencyGridResultDTO.getGridName()); |
|
|
issueProcessDao.insert(processEntity); |
|
|
issueProcessDao.insert(processEntity); |
|
|
//4:调用epmet-message服务，给居民端话题创建人和议题发起人发送消息
|
|
|
//4:调用epmet-message服务，给居民端话题创建人和议题发起人发送消息
|
|
|
if(!saveUserMessageList(formDTO, entity).success()){ |
|
|
if (!saveUserMessageList(formDTO, entity).success()) { |
|
|
throw new RenException(IssueConstant.SAVE_MSG_EXCEPTION); |
|
|
throw new RenException(IssueConstant.SAVE_MSG_EXCEPTION); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public List<GridVotingIssueCountResultDTO> queryVotingIssueCount(List<String> gridIdList) { |
|
|
public List<GridVotingIssueCountResultDTO> queryVotingIssueCount(List<String> gridIdList) { |
|
|
List<GridVotingIssueCountResultDTO> list=new ArrayList<>(); |
|
|
List<GridVotingIssueCountResultDTO> list = new ArrayList<>(); |
|
|
for(String gridId:gridIdList){ |
|
|
for (String gridId : gridIdList) { |
|
|
GridVotingIssueCountResultDTO gridVotingIssueCountResultDTO=new GridVotingIssueCountResultDTO(); |
|
|
GridVotingIssueCountResultDTO gridVotingIssueCountResultDTO = new GridVotingIssueCountResultDTO(); |
|
|
gridVotingIssueCountResultDTO.setGridId(gridId); |
|
|
gridVotingIssueCountResultDTO.setGridId(gridId); |
|
|
Long auditingCount=govIssueRedis.queryVotingIssueCount(gridId); |
|
|
Long auditingCount = govIssueRedis.queryVotingIssueCount(gridId); |
|
|
gridVotingIssueCountResultDTO.setCount(auditingCount); |
|
|
gridVotingIssueCountResultDTO.setCount(auditingCount); |
|
|
list.add(gridVotingIssueCountResultDTO); |
|
|
list.add(gridVotingIssueCountResultDTO); |
|
|
} |
|
|
} |
|
|
return list; |
|
|
return list; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* @Description 关闭议题给话题创建人和议题发起人发送消息 |
|
|
* @Description 关闭议题给话题创建人和议题发起人发送消息 |
|
|
* @author sun |
|
|
* @author sun |
|
|
*/ |
|
|
*/ |
|
|
private Result saveUserMessageList(CloseIssueFormDTO formDTO, IssueEntity entity){ |
|
|
private Result saveUserMessageList(CloseIssueFormDTO formDTO, IssueEntity entity) { |
|
|
//1:调用resi-group查询话题创建人数据(目前议题来源只有来自话题)
|
|
|
//1:调用resi-group查询话题创建人数据(目前议题来源只有来自话题)
|
|
|
Result<ResiTopicDTO> resultTopicDTO = resiGroupFeignClient.getTopicById(entity.getSourceId()); |
|
|
Result<ResiTopicDTO> resultTopicDTO = resiGroupFeignClient.getTopicById(entity.getSourceId()); |
|
|
if (!resultTopicDTO.success() || null == resultTopicDTO.getData()) { |
|
|
if (!resultTopicDTO.success() || null == resultTopicDTO.getData()) { |
|
|
throw new RenException(IssueConstant.SELECT_TOPIC_EXCEPTION); |
|
|
throw new RenException(IssueConstant.SELECT_TOPIC_EXCEPTION); |
|
|
} |
|
|
} |
|
|
ResiTopicDTO topicDTO = resultTopicDTO.getData(); |
|
|
ResiTopicDTO topicDTO = resultTopicDTO.getData(); |
|
|
//2:分别给话题创建人、议题发起人发送消息
|
|
|
//2:分别给话题创建人、议题发起人发送消息
|
|
|
List<UserMessageFormDTO> msgList = new ArrayList<>(); |
|
|
List<UserMessageFormDTO> msgList = new ArrayList<>(); |
|
|
UserMessageFormDTO msgDTO = new UserMessageFormDTO(); |
|
|
UserMessageFormDTO msgDTO = new UserMessageFormDTO(); |
|
|
msgDTO.setCustomerId(entity.getCustomerId()); |
|
|
msgDTO.setCustomerId(entity.getCustomerId()); |
|
|
msgDTO.setGridId(entity.getGridId()); |
|
|
msgDTO.setGridId(entity.getGridId()); |
|
|
msgDTO.setApp(AppClientConstant.APP_RESI); |
|
|
msgDTO.setApp(AppClientConstant.APP_RESI); |
|
|
msgDTO.setTitle(UserMessageConstant.ISSUE_TITLE); |
|
|
msgDTO.setTitle(UserMessageConstant.ISSUE_TITLE); |
|
|
String messageContent = ""; |
|
|
String messageContent = ""; |
|
|
if (IssueConstant.ISSUE_RESLOVED.equals(formDTO.getResolveType())) { |
|
|
if (IssueConstant.ISSUE_RESLOVED.equals(formDTO.getResolveType())) { |
|
|
messageContent = String.format(UserMessageConstant.ISSUE_RESLOVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason()); |
|
|
messageContent = String.format(UserMessageConstant.ISSUE_RESLOVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason()); |
|
|
} else if (IssueConstant.ISSUE_UNRESLOVED.equals(formDTO.getResolveType())) { |
|
|
} else if (IssueConstant.ISSUE_UNRESLOVED.equals(formDTO.getResolveType())) { |
|
|
messageContent = String.format(UserMessageConstant.ISSUE_UNRESLOVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason()); |
|
|
messageContent = String.format(UserMessageConstant.ISSUE_UNRESLOVED_MSG, topicDTO.getTopicContent(), formDTO.getCloseReason()); |
|
|
} |
|
|
} |
|
|
msgDTO.setMessageContent(messageContent); |
|
|
msgDTO.setMessageContent(messageContent); |
|
|
msgDTO.setReadFlag(ReadFlagConstant.UN_READ); |
|
|
msgDTO.setReadFlag(ReadFlagConstant.UN_READ); |
|
|
msgDTO.setUserId(topicDTO.getCreatedBy()); |
|
|
msgDTO.setUserId(topicDTO.getCreatedBy()); |
|
|
msgList.add(msgDTO); |
|
|
msgList.add(msgDTO); |
|
|
msgDTO.setUserId(entity.getCreatedBy()); |
|
|
msgDTO.setUserId(entity.getCreatedBy()); |
|
|
msgList.add(msgDTO); |
|
|
msgList.add(msgDTO); |
|
|
return messageFeignClient.saveUserMessageList(msgList); |
|
|
return messageFeignClient.saveUserMessageList(msgList); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* @param formDTO |
|
|
* @param formDTO |
|
|
* @return |
|
|
* @return |
|
|
* @Author sun |
|
|
* @Author sun |
|
|
* @Description 议题管理-部门人员选择 |
|
|
* @Description 议题管理-部门人员选择 |
|
|
**/ |
|
|
**/ |
|
|
@Override |
|
|
@Override |
|
|
public DepartmentStaffListResultDTO departmentStaffList(DepartmentStaffListFormDTO formDTO) { |
|
|
public DepartmentStaffListResultDTO departmentStaffList(DepartmentStaffListFormDTO formDTO) { |
|
|
//1:调用gov-org服务，分别查询组织下人员，组织下部门人员，组织下网格人员列表信息
|
|
|
//1:调用gov-org服务，分别查询组织下人员，组织下部门人员，组织下网格人员列表信息
|
|
|
Result<DepartmentStaffListResultDTO> resultDTOResult = govOrgFeignClient.departmentStaffList(formDTO.getAgencyId()); |
|
|
Result<DepartmentStaffListResultDTO> resultDTOResult = govOrgFeignClient.departmentStaffList(formDTO.getAgencyId()); |
|
|
return resultDTOResult.getData(); |
|
|
return resultDTOResult.getData(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public List<ShiftProjectListResultDTO> getShiftProjectList(ShiftProjectListFromDTO fromDTO) { |
|
|
|
|
|
List<ShiftProjectListResultDTO> resultList = new ArrayList<>(); |
|
|
|
|
|
//查询条件
|
|
|
|
|
|
int pageIndex = (fromDTO.getPageNo() - NumConstant.ONE) * fromDTO.getPageSize(); |
|
|
|
|
|
fromDTO.setPageNo(pageIndex); |
|
|
|
|
|
List<IssueEntity> issueList = baseDao.selectIssueListByGridId(fromDTO); |
|
|
|
|
|
if (null == issueList || issueList.size() == 0) { |
|
|
|
|
|
return resultList; |
|
|
|
|
|
} |
|
|
|
|
|
//遍历获取所有的userId
|
|
|
|
|
|
List<String> issueIds = issueList.stream().map(IssueEntity::getId).collect(Collectors.toList()); |
|
|
|
|
|
ShiftProjectsFromDTO shiftProjectsFromDTO = new ShiftProjectsFromDTO(); |
|
|
|
|
|
shiftProjectsFromDTO.setIssueIds(issueIds); |
|
|
|
|
|
List<ShiftProjectResultDTO> projectList = govProjectFeignClient.getProjectByIssue(shiftProjectsFromDTO).getData(); |
|
|
|
|
|
resultList = issueList.stream().flatMap(issue -> projectList.stream().filter(p -> issue.getId().equals(p.getOriginId())).map(project ->{ |
|
|
|
|
|
ShiftProjectListResultDTO shiftProject = new ShiftProjectListResultDTO(); |
|
|
|
|
|
shiftProject.setIssueId(issue.getId()); |
|
|
|
|
|
shiftProject.setIssueTitle(issue.getIssueTitle()); |
|
|
|
|
|
shiftProject.setDepartmentNameList(project.getDepartmentNameList()); |
|
|
|
|
|
shiftProject.setPublicReply(project.getPublicReply()); |
|
|
|
|
|
shiftProject.setShiftedTime(project.getCreatedTime().getTime()); |
|
|
|
|
|
shiftProject.setProjectStatus(project.getStatus()); |
|
|
|
|
|
return shiftProject; |
|
|
|
|
|
})).collect(Collectors.toList()); |
|
|
|
|
|
return resultList; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
zhaoqifeng
5 years ago