From e0baa80c14df3599ecb80a730db2ff3ffa93cd6f Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Mon, 18 May 2020 12:03:19 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BF=9B=E5=B1=95=E8=A1=A5=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IssueProcessDao.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java index d48ecb94cb..c236ee2712 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProcessDao.java @@ -19,11 +19,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.IssueIdFormDTO; -import com.epmet.dto.result.IssueProcessResultDTO; import com.epmet.dto.IssueProcessDTO; +import com.epmet.dto.result.ProcessListResultDTO; import com.epmet.entity.IssueProcessEntity; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -50,8 +49,13 @@ public interface IssueProcessDao extends BaseDao { * @param issueId * @author zxc */ - List issueProcess(IssueIdFormDTO issueId); + List issueProcess(IssueIdFormDTO issueId); - IssueProcessResultDTO issueBeginInfo(IssueIdFormDTO formDTO); + /** + * @Description 查询转议题信息 + * @param formDTO + * @author zxc + */ + ProcessListResultDTO issueBeginInfo(IssueIdFormDTO formDTO); } \ No newline at end of file From 3147b83adcc05d8f9157ec897fc2881212a7071d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 18 May 2020 14:24:30 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E8=B7=9F=E8=B8=AA-=E8=87=AA?= =?UTF-8?q?=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/constant/IssueConstant.java | 3 +++ .../java/com/epmet/feign/GovOrgFeignClient.java | 2 +- .../fallback/GovOrgFeignClientFallBack.java | 2 +- .../com/epmet/service/impl/IssueServiceImpl.java | 16 +++++++++++++--- .../epmet/constant/CustomerAgencyConstant.java | 4 ++++ .../controller/CustomerAgencyController.java | 4 ++-- .../service/impl/CustomerAgencyServiceImpl.java | 5 ++++- .../service/impl/ProjectProcessServiceImpl.java | 3 +++ .../ProjectSatisfactionDetailServiceImpl.java | 12 ++++++------ .../service/impl/ProjectStaffServiceImpl.java | 3 +++ 10 files changed, 40 insertions(+), 14 deletions(-) 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(); } From 4a967f3fc61b791eeb9e248595a1dd83bc3c1ca3 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Mon, 18 May 2020 14:48:08 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E3=80=81=E6=8A=95=E7=A5=A8=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/resi/group/dto/topic/TopicInfoDTO.java | 8 ++++---- .../topic/service/impl/ResiTopicServiceImpl.java | 5 ++++- .../main/resources/mapper/group/ResiGroupDao.xml | 16 ++++++++++++---- .../epmet/dto/result/IssueDetailResultDTO.java | 2 +- .../com/epmet/service/impl/IssueServiceImpl.java | 2 +- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java index e643a1bd75..f65dc96c40 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java @@ -18,12 +18,12 @@ public class TopicInfoDTO implements Serializable { /** * 话题id */ - private String topicId; + private String topicId = ""; /** * 话题内容 */ - private String topicContent; + private String topicContent = ""; /** * 图片列表 @@ -33,11 +33,11 @@ public class TopicInfoDTO implements Serializable { /** * 话题发表人（山东路168-尹女士） */ - private String publishedUser; + private String publishedUser = ""; /** * 话题发表时间 (时间戳 毫秒级) */ - private Long publishedTime; + private Long publishedTime = 0L; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index d971d03543..1e56b56073 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -928,6 +928,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl attachments = resiTopicAttachmentDao.selectList(wrapper); + if (attachments.size()==NumConstant.ZERO){ + return new TopicInfoDTO(); + } List attachmentUrls = new ArrayList<>(); for(ResiTopicAttachmentEntity attachment : attachments){ attachmentUrls.add(attachment.getAttachmentUrl()); @@ -935,7 +938,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl issueInitiatorResult = epmetUserFeignClient.selectIssueInitiator(issueInitiator); topicInfo.setPublishedUser(issueInitiatorResult.getData().getIssueInitiator()); return topicInfo; diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 50e26b0f32..8c4fd73028 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -283,11 +283,19 @@ SELECT COUNT(*) AS joinTeamCounts FROM - resi_group_member joinTeamCounts + resi_group_member rgm WHERE - del_flag = 0 - AND resi_group_id = ALL ( SELECT id FROM resi_group WHERE del_flag = 0 AND grid_id = #{gridId} ) - AND customer_user_id = #{userId} + rgm.del_flag = 0 + AND rgm.resi_group_id = ALL ( + SELECT + rg.id + FROM + resi_group rg + WHERE + rg.del_flag = 0 + AND rg.grid_id = #{gridId} + AND rgm.resi_group_id = rg.id ) + AND rgm.customer_user_id = #{userId} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java index aa5fa7c6f9..0d95ff6c84 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueDetailResultDTO.java @@ -48,7 +48,7 @@ public class IssueDetailResultDTO implements Serializable { /** * 项目状态 已结案：true，未结案：false */ - private Boolean projectStatus; + private Boolean projectStatus = false; /** * 投票状态 已投票：true，未投票：false diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index df554f8843..b503ef9fcc 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -171,8 +171,8 @@ public class IssueServiceImpl implements IssueService { voteResultDTOResult.setOppositionCount(NumConstant.ZERO); voteResultDTOResult.setSupportCount(NumConstant.ZERO); }else { - voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization()); voteResultDTOResult = govIssueFeignClient.voteCount(issueId).getData(); + voteResultDTOResult.setVoteAuthorization(check.getVoteAuthorization()); } return voteResultDTOResult; } From c3981c81d0dcb8dee49726c9bad87d82fe075b92 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Mon, 18 May 2020 14:51:45 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/IssueController.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java index 08a38bc643..5740ebacb0 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java @@ -40,7 +40,7 @@ public class IssueController { * @date 2020/5/11 9:42 */ @PostMapping(value = "/detail") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result detail(@LoginUser TokenDto tokenDto,@RequestBody IssueDetailFormDTO issueDetail){ ValidatorUtils.validateEntity(issueDetail); return new Result().ok(issueService.detail(tokenDto,issueDetail)); @@ -52,7 +52,7 @@ public class IssueController { * @author zxc */ @PostMapping(value = "votingtrend") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result votingTrend(@RequestBody IssueIdFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); return new Result().ok(issueService.votingTrend(formDTO)); @@ -64,7 +64,7 @@ public class IssueController { * @author zxc */ @PostMapping(value = "support") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result support(@LoginUser TokenDto tokenDto, @RequestBody IssueIdFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); issueService.support(tokenDto,formDTO); @@ -77,7 +77,7 @@ public class IssueController { * @author zxc */ @PostMapping(value = "oppose") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result oppose(@LoginUser TokenDto tokenDto,@RequestBody IssueIdFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); issueService.oppose(tokenDto,formDTO); @@ -103,7 +103,7 @@ public class IssueController { * @author zxc */ @PostMapping("initevaluation") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result initEvaluation(@LoginUser TokenDto tokenDto, @RequestBody IssueIdFormDTO issueId){ ValidatorUtils.validateEntity(issueId); return new Result().ok(issueService.initEvaluation(tokenDto,issueId)); @@ -116,7 +116,7 @@ public class IssueController { * @author zxc */ @PostMapping("projectinitevaluation") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result projectInitEvaluation(@LoginUser TokenDto tokenDto, @RequestBody ProjectIdFormDTO projectId){ ValidatorUtils.validateEntity(projectId); return new Result().ok(issueService.projectInitEvaluation(tokenDto,projectId)); @@ -128,7 +128,7 @@ public class IssueController { * @author zxc */ @PostMapping("evaluate") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result evaluate(@LoginUser TokenDto tokenDto,@RequestBody EvaluateFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); issueService.evaluate(tokenDto,formDTO); @@ -141,7 +141,7 @@ public class IssueController { * @author zxc */ @PostMapping("projectevaluate") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result projectEvaluate(@LoginUser TokenDto tokenDto,@RequestBody ProjectEvaluateFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); issueService.projectEvaluate(tokenDto,formDTO); @@ -154,7 +154,7 @@ public class IssueController { * @author zxc */ @PostMapping("evaluationlist") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result> evaluationList(@RequestBody EvaluationListFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); return new Result>().ok(issueService.evaluationList(formDTO)); @@ -166,7 +166,7 @@ public class IssueController { * @author zxc */ @PostMapping("projectevaluationlist") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result> projectEvaluationList(@RequestBody ProjectEvaluationListFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); return new Result>().ok(issueService.projectEvaluationList(formDTO)); @@ -178,7 +178,7 @@ public class IssueController { * @author zxc */ @PostMapping("shiftproject") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT) +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT) public Result> getShiftProjectList(@RequestBody ShiftProjectListFromDTO formDTO){ ValidatorUtils.validateEntity(formDTO); return new Result>().ok(issueService.getShiftProjectList(formDTO)); @@ -216,7 +216,7 @@ public class IssueController { * @author zxc */ @PostMapping("processlist") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) +// @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL) public Result> processList(@RequestBody IssueIdFormDTO issueId){ ValidatorUtils.validateEntity(issueId); return new Result>().ok(issueService.processList(issueId)); From e27dd4f41ecf3e56cef53045bd38c2ce0e2578eb Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 18 May 2020 15:30:16 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B1=E5=90=8C?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/constant/ServiceConstant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java index c6b5591ff0..3ac97e8e0e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java @@ -102,5 +102,5 @@ public interface ServiceConstant { /** * 共通 */ - String EPMET_COMMON_SERVICE = "epmet-common-service"; + String EPMET_COMMON_SERVICE = "common-service-server"; } From 9454eada6a7708d54b6fd7a7de5a9159563e5faf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 18 May 2020 15:36:15 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BE=A4=E9=82=80?= =?UTF-8?q?=E8=AF=B7=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E8=BF=9B=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/pom.xml | 6 +++++ .../modules/feign/ResiGuideFeignClient.java | 23 ++++++++++++++++ .../ResiGuideFeignClientFallback.java | 26 +++++++++++++++++++ .../impl/GroupInvitationServiceImpl.java | 12 +++++++++ .../epmet/controller/UserGuideController.java | 7 +++-- 5 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/ResiGuideFeignClient.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/ResiGuideFeignClientFallback.java diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index c141ba8898..baddf63009 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -88,6 +88,12 @@ 2.0.0 compile + + com.epmet + resi-guide-client + 2.0.0 + compile + diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/ResiGuideFeignClient.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/ResiGuideFeignClient.java new file mode 100644 index 0000000000..e72f454d3d --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/ResiGuideFeignClient.java @@ -0,0 +1,23 @@ +package com.epmet.modules.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.UserEnterGridFormDTO; +import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; +import com.epmet.modules.feign.fallback.ResiGuideFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @Description TODO + * @Author yinzuomei + * @Date 2020/5/18 15:13 + */ +//,url = "http://localhost:8091" +@FeignClient(name = ServiceConstant.RESI_GUIDE_SERVER, fallback = ResiGuideFeignClientFallback.class) +public interface ResiGuideFeignClient { + + @PostMapping("/resi/guide/user/entergrid") + Result enterGrid(@RequestBody UserEnterGridFormDTO userEnterGridFormDTO); +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/ResiGuideFeignClientFallback.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/ResiGuideFeignClientFallback.java new file mode 100644 index 0000000000..0dcf2567b1 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/ResiGuideFeignClientFallback.java @@ -0,0 +1,26 @@ +package com.epmet.modules.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.UserEnterGridFormDTO; +import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; +import com.epmet.modules.feign.ResiGuideFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description TODO + * @Author yinzuomei + * @Date 2020/5/18 15:14 + */ +@Component +public class ResiGuideFeignClientFallback implements ResiGuideFeignClient { + + + @Override + public Result enterGrid(UserEnterGridFormDTO userEnterGridFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GUIDE_SERVER,"enterGrid",userEnterGridFormDTO); + + } +} + diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java index 92f2ebbd6f..82fc088a2a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java @@ -27,13 +27,16 @@ 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.ReadFlagConstant; +import com.epmet.dto.form.UserEnterGridFormDTO; import com.epmet.dto.form.UserInvitationFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.feign.MessageFeignClient; import com.epmet.modules.constant.UserMessageConstant; import com.epmet.modules.feign.EpmetUserFeignClient; +import com.epmet.modules.feign.ResiGuideFeignClient; import com.epmet.modules.group.dao.ResiGroupDao; import com.epmet.modules.group.entity.ResiGroupEntity; import com.epmet.modules.group.service.ResiGroupService; @@ -96,6 +99,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl page(Map params) { @@ -212,6 +217,13 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl result=resiGuideFeignClient.enterGrid(userEnterGridFormDTO); + if(!result.success()){ + logger.error("进入网格失败"+result.getMsg()); + } return linkGroupInfoResultDTO; } diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java index fe4d4d15ea..42920ff788 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -7,6 +8,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.UserEnterGridFormDTO; import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.service.UserAccessService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -22,13 +25,13 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("user") public class UserGuideController { - + private Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private UserAccessService userAccessService; @PostMapping("entergrid") Result enterGrid(@LoginUser TokenDto token, @RequestBody UserEnterGridFormDTO userEnterGridFormDTO){ - + logger.info("进网格TokenDto:"+ JSON.toJSON(token)); ValidatorUtils.validateEntity(userEnterGridFormDTO); return userAccessService.enterGrid(token,userEnterGridFormDTO); From 9f1782c380e2db5bf20aad628c90d2a70daeaefd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 18 May 2020 15:39:00 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../resi-guide/resi-guide-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-guide/resi-guide-server/pom.xml | 2 +- .../resi-hall/resi-hall-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-hall/resi-hall-server/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index fd00916118..8e8eb36dcb 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.7 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.8 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 6e8fed3389..b1f8a177e9 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.7 + 0.3.8 gov-issue com.epmet diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 239c3fcea4..0abde8187f 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.37 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.38 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 16135101cc..bab556d2a9 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.37 + 0.3.38 com.epmet gov-org diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 6084c92c7c..7243211cf4 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.5 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.6 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index d4e18d18d4..c8e73701ca 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.5 + 0.3.6 gov-project com.epmet diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 42084082bf..15ce732a08 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.22 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.23 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index baddf63009..c8c83e8605 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.22 + 0.3.23 com.epmet resi-group diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml index 425c1088b6..66e42c6272 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.6 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.7 ports: - "8091:8091" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 1baa1a8209..ee7df2894b 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.6 + 0.3.7 com.epmet resi-guide diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml index f1a133ab3c..8d4c6032da 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.6 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.7 ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index 4f96a103d9..6de3bc3a44 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.6 + 0.3.7 resi-hall com.epmet From 097ccfe24dd966a786801cf895dcef67a1374711 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 18 May 2020 16:30:28 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ProjectServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index d3c37b531e..64b6a08ede 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -251,7 +251,7 @@ public class ProjectServiceImpl extends BaseServiceImpl departmentList = projectStaffService.getDepartmentNameList(projectStaffDTO); if (null != departmentList && departmentList.size() > 0) { - resultDTO.setProcessable(false); - } else { resultDTO.setProcessable(true); + } else { + resultDTO.setProcessable(false); } } From efd1b003b0d86190717621c49883ae3fdaaf0261 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 18 May 2020 16:52:29 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=88=B3=E7=B2=BE?= =?UTF-8?q?=E7=A1=AE=E5=88=B0=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IssueServiceImpl.java | 2 +- .../java/com/epmet/service/impl/ProjectServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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 066333305c..822055a280 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 @@ -195,7 +195,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp shiftProject.setIssueTitle(issue.getIssueTitle()); shiftProject.setDepartmentNameList(project.getDepartmentNameList()); shiftProject.setPublicReply(project.getPublicReply()); - shiftProject.setShiftedTime(project.getCreatedTime().getTime()); + shiftProject.setShiftedTime(project.getCreatedTime().getTime()/NumConstant.ONE_THOUSAND); shiftProject.setProjectStatus(project.getStatus()); return shiftProject; })).collect(Collectors.toList()); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 64b6a08ede..6aa25ec3b8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -146,7 +146,7 @@ public class ProjectServiceImpl extends BaseServiceImpl finalDays) { pend.setWarningFlag(true); @@ -178,7 +178,7 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Mon, 18 May 2020 18:07:08 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3Bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CustomerAgencyServiceImpl.java | 64 +++++++++++-------- 1 file changed, 36 insertions(+), 28 deletions(-) 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 f93114f028..b333f09cd3 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 @@ -198,41 +198,49 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl listDept = customerDepartmentDao.selectDepartmentList(canTick.getAgencyId()); List departmentList = ConvertUtils.sourceToTarget(listDept, DeptListResultDTO.class); - //2.2:查询每一个部门下人员列表 - List deptIdList = departmentList.stream().map(DeptListResultDTO::getDepartmentId).collect(Collectors.toList()); - List deptStaffs = customerStaffDepartmentDao.selectDeptStaffs(deptIdList); - departmentList.forEach(dept->{ - List departmentStaffList = new ArrayList<>(); - deptStaffs.forEach(ds->{ - if (dept.getDepartmentId().equals(ds.getDepartmentId())) { - if (!"project".equals(canTick.getType()) || "".equals(canTick.getDeptOrGridId()) || !dept.getDepartmentId().equals(canTick.getDeptOrGridId())) { - StaffListResultDTO sf = new StaffListResultDTO(); - sf.setStaffId(ds.getUserId()); - departmentStaffList.add(sf); + List deptStaffs = new ArrayList<>(); + if (null != departmentList && departmentList.size() > NumConstant.ZERO) { + //2.2:查询每一个部门下人员列表 + List deptIdList = departmentList.stream().map(DeptListResultDTO::getDepartmentId).collect(Collectors.toList()); + deptStaffs = customerStaffDepartmentDao.selectDeptStaffs(deptIdList); + List finalDeptStaffs = deptStaffs; + departmentList.forEach(dept->{ + List departmentStaffList = new ArrayList<>(); + finalDeptStaffs.forEach(ds->{ + if (dept.getDepartmentId().equals(ds.getDepartmentId())) { + if (!"project".equals(canTick.getType()) || "".equals(canTick.getDeptOrGridId()) || !dept.getDepartmentId().equals(canTick.getDeptOrGridId())) { + StaffListResultDTO sf = new StaffListResultDTO(); + sf.setStaffId(ds.getUserId()); + departmentStaffList.add(sf); + } } - } + }); + dept.setDepartmentStaffList(departmentStaffList); }); - dept.setDepartmentStaffList(departmentStaffList); - }); + } //3:根据组织Id查询该组织下网格、人员列表 //3.1:查询组织下网格列表 List gridList = customerGridDao.selectGridList(canTick.getAgencyId()); - //3.2:查询每一个网格下人员列表 - List gridIdList = gridList.stream().map(GridListResultDTO::getGridId).collect(Collectors.toList()); - List gridStaffs = customerStaffGridDao.selectGridStaffs(gridIdList); - gridList.forEach(grid->{ - List gridStaffList = new ArrayList<>(); - gridStaffs.forEach(gs->{ - if(grid.getGridId().equals(gs.getGridId())){ - if (!"project".equals(canTick.getType()) || "".equals(canTick.getDeptOrGridId()) || !grid.getGridId().equals(canTick.getDeptOrGridId())) { - StaffListResultDTO sf = new StaffListResultDTO(); - sf.setStaffId(gs.getUserId()); - gridStaffList.add(sf); + List gridStaffs = new ArrayList<>(); + if (null != gridList && gridList.size() > NumConstant.ZERO) { + //3.2:查询每一个网格下人员列表 + List gridIdList = gridList.stream().map(GridListResultDTO::getGridId).collect(Collectors.toList()); + gridStaffs = customerStaffGridDao.selectGridStaffs(gridIdList); + List finalGridStaffs = gridStaffs; + gridList.forEach(grid->{ + List gridStaffList = new ArrayList<>(); + finalGridStaffs.forEach(gs->{ + if(grid.getGridId().equals(gs.getGridId())){ + if (!"project".equals(canTick.getType()) || "".equals(canTick.getDeptOrGridId()) || !grid.getGridId().equals(canTick.getDeptOrGridId())) { + StaffListResultDTO sf = new StaffListResultDTO(); + sf.setStaffId(gs.getUserId()); + gridStaffList.add(sf); + } } - } + }); + grid.setGridStaffList(gridStaffList); }); - grid.setGridStaffList(gridStaffList); - }); + } //4:汇总组织下人员、组织下部门下人员、组织下网格下人员Id集合，调用epmet-user服务查询工作人员基本信息 List staffIdList1 = agencyStaffList.stream().map(StaffListResultDTO::getStaffId).collect(Collectors.toList()); List staffIdList2 = deptStaffs.stream().map(CustomerStaffDepartmentDTO::getUserId).collect(Collectors.toList());