diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java index cf436dfdbb..d2f4938490 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java @@ -54,4 +54,7 @@ public interface IssueConstant { String ISSUE_GRID = "grid"; String SELECT_USERINFO_EXCEPTION = "获取用户昵称、头像失败"; + String SELECT_GOV_ORG_EXCEPTION = "获取议题所属组织、网格信息失败"; + String OPERATION_EXCEPTION = "议题已关闭，不能再次关闭"; + String GOV_PRJECT_EXCEPTION = "议题转项目，获取项目数据失败"; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index f521975727..0807db399e 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -27,7 +27,7 @@ public interface GovOrgFeignClient { * @Author sun * @Description 根据组织Id、网格Id查询组织、网格名称 **/ - @PostMapping("/gov/org/customergrid/getcustomergridbygridid") + @PostMapping("/gov/org/customeragency/getagencyandgrid") Result getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO); /** diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java index a659baa435..014a6632cb 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -21,7 +21,7 @@ public class GovOrgFeignClientFallBack implements GovOrgFeignClient { @Override public Result getAgencyAndGrid(AgencyGridResultDTO agencyGridResultDTO) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getagencyandgrid", agencyGridResultDTO); + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyAndGrid", agencyGridResultDTO); } @Override diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index d183de75ac..066333305c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -346,6 +346,9 @@ public class IssueServiceImpl extends BaseServiceImpl imp if (null == entity) { throw new RenException(IssueConstant.SELECT_EXCEPTION); } + if (IssueConstant.ISSUE_CLOSED.equals(entity.getIssueStatus())) { + throw new RenException(IssueConstant.OPERATION_EXCEPTION); + } entity.setIssueStatus(IssueConstant.ISSUE_CLOSED); entity.setCloseReason(formDTO.getCloseReason()); entity.setResolveType(formDTO.getResolveType()); @@ -360,6 +363,9 @@ public class IssueServiceImpl extends BaseServiceImpl imp agencyGridResultDTO.setAgencyId(entity.getOrgId()); agencyGridResultDTO.setGridId(entity.getGridId()); Result resultDTO = govOrgFeignClient.getAgencyAndGrid(agencyGridResultDTO); + if (!resultDTO.success() || null == resultDTO.getData()) { + throw new RenException(IssueConstant.SELECT_GOV_ORG_EXCEPTION); + } agencyGridResultDTO = resultDTO.getData(); //3:议题进展记录表新增数据 @@ -367,7 +373,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp processEntity.setIssueId(formDTO.getIssueId()); processEntity.setIssueStatus(IssueConstant.ISSUE_CLOSED); processEntity.setOrgType(IssueConstant.ISSUE_GRID); - processEntity.setOrgId(entity.getOrgId()); + processEntity.setOrgId(entity.getGridId()); processEntity.setOperationExplain(formDTO.getCloseReason()); processEntity.setOrgName(agencyGridResultDTO.getAgencyName() + "-" + agencyGridResultDTO.getGridName()); issueProcessDao.insert(processEntity); @@ -409,10 +415,11 @@ public class IssueServiceImpl extends BaseServiceImpl imp msgDTO.setTitle(UserMessageConstant.ISSUE_TITLE); msgDTO.setMessageContent(messageContent); msgDTO.setReadFlag(ReadFlagConstant.UN_READ); + UserMessageFormDTO msgIssue = ConvertUtils.sourceToTarget(msgDTO,UserMessageFormDTO.class); msgDTO.setUserId(topicDTO.getCreatedBy()); msgList.add(msgDTO); - msgDTO.setUserId(entity.getCreatedBy()); - msgList.add(msgDTO); + msgIssue.setUserId(entity.getCreatedBy()); + msgList.add(msgIssue); return messageFeignClient.saveUserMessageList(msgList); } @@ -466,6 +473,9 @@ public class IssueServiceImpl extends BaseServiceImpl imp //2:调用gov-project服务，新增项目各业务表初始数据 Result resultDTO = govProjectFeignClient.issueShiftProject(formDTO); + if (!resultDTO.success() || null == resultDTO.getData()) { + throw new RenException(IssueConstant.GOV_PRJECT_EXCEPTION); + } IssueProjectResultDTO issueProjectResultDTO = resultDTO.getData(); //3:更新议题相关业务表数据 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java index f30c8c65ce..c4d48ee458 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java @@ -51,4 +51,8 @@ public interface CustomerAgencyConstant { * 工作人员角色-网格长 */ String GRID_MANAGER = "grid_manager"; + /** + * 调用epmet-user服务查询用户基础信息失败 + */ + String SELECT_USER_EXCEPTION = "获取用户基本信息失败"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 8ddc017fa2..1ccdc9738b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -125,7 +125,7 @@ public class CustomerAgencyController { * @Description 查询组织下人员,组织下部门人员,组织下网格人员列表信息 **/ @PostMapping("departmentstafflist") - public Result departmentStaffList(CanTickStaffListFormDTO canTick) { + public Result departmentStaffList(@RequestBody CanTickStaffListFormDTO canTick) { return new Result().ok(customerAgencyService.departmentStaffList(canTick)); } @@ -136,7 +136,7 @@ public class CustomerAgencyController { * @Description 根据组织Id集合、部门Id集合、网格Id集合查询各自对应详细信息 **/ @PostMapping("getagencydeptgridlist") - public Result getAgencyDeptGridList(AgencyDeptGridFormDTO formDTO) { + public Result getAgencyDeptGridList(@RequestBody AgencyDeptGridFormDTO formDTO) { return new Result().ok(customerAgencyService.getAgencyDeptGridList(formDTO)); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 5be49bf353..f93114f028 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -190,7 +190,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyStaffList = customerStaffAgencyDao.selectAgencyStaffList(canTick.getAgencyId(),staffId); @@ -241,6 +241,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl(new LinkedHashSet<>(staffIdList)); Result userList = epmetUserFeignClient.getCustomerStaffList(staffIdList); + if(!userList.success()||null==userList.getData()){ + throw new RenException(CustomerAgencyConstant.SELECT_USER_EXCEPTION); + } //5:循环数据，将人员数据放到对应数据结构下 CustomerStaffListResultDTO dto = userList.getData(); List staffList = dto.getStaffList(); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index 608f78f468..b7ab25727b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -206,6 +206,9 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl resultDTO = govOrgFeignClient.getAgencyDeptGridList(agencyDeptGridFormDTO); + if (!resultDTO.success() || null == resultDTO.getData()) { + throw new RenException(ProjectConstant.SELECT_GOV_ORG_EXCEPTION); + } AgencyDeptGridResultDTO agencyDeptGrid = resultDTO.getData(); //3.2:批量新增项目人员关联表数据 List entityList = new ArrayList<>(); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java index 310d1f6bc0..e831d30530 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java @@ -27,6 +27,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.constant.ProjectConstant; import com.epmet.dao.ProjectSatisfactionDetailDao; import com.epmet.dto.ProjectSatisfactionDetailDTO; @@ -42,10 +43,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -130,13 +128,15 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl userIds = evaluationList.stream().map(EvaluationListResultDTO::getUserId).collect(Collectors.toList()); + userIds = new ArrayList(new LinkedHashSet<>(userIds)); //2.2:获取所有用户的头像 昵称 UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO(); userResiInfoListFormDTO.setUserIdList(userIds); - List userResiInfoList = epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO).getData(); - if (null == userResiInfoList || userResiInfoList.size() < NumConstant.ONE) { + Result> listResult = epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO); + if (null == listResult.getData()) { throw new RenException(ProjectConstant.SELECT_USERINFO_EXCEPTION); } + List userResiInfoList = listResult.getData(); //3:将每个用户的头像 昵称放到对应实体中返回给前台 List resultList = evaluationList.stream().flatMap(evaluation -> userResiInfoList.stream().filter(user -> evaluation.getUserId().equals(user.getUserId())).map(userInfo -> { diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java index 19d65197a7..340fe15393 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectStaffServiceImpl.java @@ -140,6 +140,9 @@ public class ProjectStaffServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.departmentStaffList(canTick); + if(null==resultDTOResult.getData()){ + throw new RenException(ProjectConstant.SELECT_GOV_ORG_EXCEPTION); + } return resultDTOResult.getData(); }