From 1d4c09868bcadaf60810207f0c158f0a9b8a35ed Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Mon, 11 May 2020 19:49:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/BelongGridNameFormDTO.java | 23 +++++++++ .../dto/result/BelongGridNameResultDTO.java | 21 ++++++++ .../controller/CustomerGridController.java | 12 +++++ .../java/com/epmet/dao/CustomerGridDao.java | 13 +++-- .../epmet/service/CustomerGridService.java | 8 +++ .../service/impl/CustomerGridServiceImpl.java | 11 ++++ .../main/resources/mapper/CustomerGridDao.xml | 15 ++++++ .../resi/group/dto/topic/TopicInfoDTO.java | 43 ++++++++++++++++ .../dto/topic/form/TopicInfoFormDTO.java | 23 +++++++++ .../modules/feign/EpmetUserFeignClient.java | 11 ++++ .../EpmetUserFeignClientFallback.java | 6 +++ .../topic/controller/ResiTopicController.java | 12 +++++ .../epmet/modules/topic/dao/ResiTopicDao.java | 10 ++++ .../topic/service/ResiTopicService.java | 10 ++++ .../service/impl/ResiTopicServiceImpl.java | 35 +++++++++++++ .../resources/mapper/topic/ResiTopicDao.xml | 14 +++++ .../main/java/com/epmet/dto/PolyLineDTO.java | 43 ++++++++++++++++ .../epmet/dto/form/BelongGridNameFormDTO.java | 23 +++++++++ .../com/epmet/dto/form/IssueIdFormDTO.java | 21 ++++++++ .../epmet/dto/form/IssueInitiatorFormDTO.java | 4 +- .../com/epmet/dto/form/TopicInfoFormDTO.java | 23 +++++++++ .../dto/result/BelongGridNameResultDTO.java | 23 +++++++++ .../com/epmet/dto/result/IssueResultDTO.java | 48 +++++++++++++++++ .../dto/result/VotingTrendResultDTO.java | 38 ++++++++++++++ .../resi-hall/resi-hall-server/pom.xml | 5 -- .../com/epmet/controller/IssueController.java | 7 ++- .../com/epmet/feign/EpmetUserFeignClient.java | 2 +- .../com/epmet/feign/GovIssueFeignClient.java | 29 +++++++++++ .../com/epmet/feign/GovOrgFeignClient.java | 24 +++++++++ .../com/epmet/feign/ResiGroupFeignClient.java | 28 ++++++++++ .../fallback/GovIssueFeignClientFallBack.java | 22 ++++++++ .../fallback/GovOrgFeignClientFallBack.java | 23 +++++++++ .../ResiGroupFeignClientFallBack.java | 21 ++++++++ .../java/com/epmet/service/IssueService.java | 4 +- .../epmet/service/impl/IssueServiceImpl.java | 51 ++++++++++++++++--- .../epmet/dto/form/IssueInitiatorFormDTO.java | 23 +++++++++ .../dto/result/IssueInitiatorResultDTO.java | 20 ++++++++ .../controller/UserResiInfoController.java | 12 +++++ .../java/com/epmet/dao/UserResiInfoDao.java | 10 ++++ .../epmet/service/UserResiInfoService.java | 10 ++++ .../service/impl/UserResiInfoServiceImpl.java | 13 +++++ .../main/resources/mapper/UserResiInfoDao.xml | 24 +++++++++ 42 files changed, 795 insertions(+), 23 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicInfoFormDTO.java create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/TopicInfoFormDTO.java create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java create mode 100644 epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java create mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java new file mode 100644 index 0000000000..8df402c618 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 查询所属网格 + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class BelongGridNameFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 网格id + */ + private String gridId; + + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java new file mode 100644 index 0000000000..f4a0b8a9c7 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @CreateTime 2020/5/11 18:30 + */ +@Data +public class BelongGridNameResultDTO implements Serializable { + + private static final long serialVersionUID = -5513674274570554563L; + + /** + * 所属网格(网格所属机关单位名称-网格名称) + */ + private String BelongsGridName; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 5e092efda6..c5a2779d16 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.form.BelongGridNameFormDTO; import com.epmet.dto.form.SelectGridNameByGridIdFormDTO; import com.epmet.dto.result.*; import com.epmet.dto.form.CustomerGridFormDTO; @@ -182,4 +183,15 @@ public class CustomerGridController { return customerGridService.getGridListByGridIds(gridIdList); } + /** + * @Description 获取所属网格 + * @param formDTO + * @author zxc + * @date 2020/5/11 18:37 + */ + @PostMapping("getgridnamebygridid") + public Result getGridNameByGridId(@RequestBody BelongGridNameFormDTO formDTO){ + return new Result().ok(customerGridService.getGridNameByGridId(formDTO)); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index ccf6d62ed9..cc9f544cfb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -19,11 +19,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.*; -import com.epmet.dto.form.ListCustomerGridFormDTO; -import com.epmet.dto.form.SelectGridNameByGridIdFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.dto.form.CustomerGridFormDTO; -import com.epmet.dto.form.DeleteGridFormDTO; import com.epmet.dto.result.CustomerGridForStrangerResultDTO; import com.epmet.entity.CustomerGridEntity; import org.apache.ibatis.annotations.Mapper; @@ -155,4 +152,12 @@ public interface CustomerGridDao extends BaseDao { * @Author sun */ List selectGridByIds(@Param("gridIdList") List gridIdList); + + /** + * @Description 获取所属网格 + * @param formDTO + * @author zxc + * @date 2020/5/11 18:50 + */ + BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index 0553e60758..0f62db96e5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -228,4 +228,12 @@ public interface CustomerGridService extends BaseService { */ Result> getGridListByGridIds(List gridIdList); + /** + * @Description 获取所属网格 + * @param formDTO + * @author zxc + * @date 2020/5/11 18:36 + */ + BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 367ee133fa..da1371aca7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -536,4 +536,15 @@ public class CustomerGridServiceImpl extends BaseServiceImpl list = baseDao.selectGridByIds(gridIdList); return result.ok(list); } + + /** + * @Description 获取所属网格 + * @param formDTO + * @author zxc + * @date 2020/5/11 18:37 + */ + @Override + public BelongGridNameResultDTO getGridNameByGridId(BelongGridNameFormDTO formDTO) { + return baseDao.getGridNameByGridId(formDTO); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index aebba044c4..5f40d5c0d8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -270,4 +270,19 @@ ) + + + \ No newline at end of file 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 new file mode 100644 index 0000000000..e643a1bd75 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java @@ -0,0 +1,43 @@ +package com.epmet.resi.group.dto.topic; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * 话题详情(议题详情中的) + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class TopicInfoDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题id + */ + private String topicId; + + /** + * 话题内容 + */ + private String topicContent; + + /** + * 图片列表 + */ + private List topicImgs; + + /** + * 话题发表人（山东路168-尹女士） + */ + private String publishedUser; + + /** + * 话题发表时间 (时间戳 毫秒级) + */ + private Long publishedTime; + +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicInfoFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicInfoFormDTO.java new file mode 100644 index 0000000000..9c8c2dc5e4 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/TopicInfoFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.resi.group.dto.topic.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 查询话题信息 + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class TopicInfoFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题id + */ + private String topicId; + + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index c9ad7e98a8..5ce70364f8 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -3,6 +3,7 @@ package com.epmet.modules.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.*; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallback; @@ -17,6 +18,7 @@ import java.util.List; * @Description epmet_user服务fegin * @Author yinzuomei * @Date 2020/3/16 14:48 + * url = "localhost:8087" */ @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class) public interface EpmetUserFeignClient { @@ -63,4 +65,13 @@ public interface EpmetUserFeignClient { @PostMapping(value = "epmetuser/staffrole/specificrolesstaffs", consumes = MediaType.APPLICATION_JSON_VALUE) Result> specificRolesStaffs(RolesUsersListFormDTO rolesUsersListFormDTO); + + /** + * @Description 查询议题发起人 + * @param formDTO + * @author zxc + * @date 2020/5/11 10:53 + */ + @PostMapping(value = "/epmetuser/userresiinfo/selectissueinitiator") + Result selectIssueInitiator(@RequestBody IssueInitiatorFormDTO formDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java index e778691743..3f2377fa95 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallback.java @@ -4,6 +4,7 @@ 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.*; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; @@ -43,4 +44,9 @@ public class EpmetUserFeignClientFallback implements EpmetUserFeignClient { public Result> specificRolesStaffs(RolesUsersListFormDTO rolesUsersListFormDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "specificRolesStaffs", rolesUsersListFormDTO); } + + @Override + public Result selectIssueInitiator(IssueInitiatorFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectIssueInitiator", formDTO); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java index f0f488efe5..6a86db52ff 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.topic.service.ResiTopicService; +import com.epmet.resi.group.dto.topic.TopicInfoDTO; import com.epmet.resi.group.dto.topic.form.*; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO; @@ -187,4 +188,15 @@ public class ResiTopicController { return topicService.getTopicDetailGov(topicDetailFormDTO.getTopicId()); } + /** + * @Description 根据topicId查询话题信息 （议题详情——话题信息） + * @param topicInfo + * @author zxc + * @date 2020/5/11 14:15 + */ + @PostMapping(value = "selectdetail") + public Result selectDetail(@RequestBody TopicInfoFormDTO topicInfo){ + return new Result().ok(topicService.selectDetail(topicInfo)); + } + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java index 7399e0ca43..95d679080a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java @@ -21,8 +21,10 @@ package com.epmet.modules.topic.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.topic.entity.ResiTopicEntity; import com.epmet.resi.group.dto.topic.ResiTopicDTO; +import com.epmet.resi.group.dto.topic.TopicInfoDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO; +import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -110,4 +112,12 @@ public interface ResiTopicDao extends BaseDao { * @Date 2020.04.01 15:21 **/ List selectTopicList(ResiTopicDTO resiTopicDTO); + + /** + * @Description 根据topicId查询话题信息 （议题详情——话题信息） + * @param formDTO + * @author zxc + * @date 2020/5/11 15:28 + */ + TopicInfoDTO selectDetail(TopicInfoFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index 2282d66cb9..f7694dcf76 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -26,9 +26,11 @@ import com.epmet.modules.topic.entity.ResiTopicEntity; import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; +import com.epmet.resi.group.dto.topic.TopicInfoDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; +import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO; @@ -219,4 +221,12 @@ public interface ResiTopicService extends BaseService { **/ Result getTopicDetailGov(String topicId); + /** + * @Description 根据topicId查询话题信息 （议题详情——话题信息） + * @param formDTO + * @author zxc + * @date 2020/5/11 14:16 + */ + TopicInfoDTO selectDetail(TopicInfoFormDTO formDTO); + } \ No newline at end of file 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 aa688b9d26..920c6cfda4 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 @@ -29,7 +29,9 @@ import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.constant.GroupMemberConstant; import com.epmet.modules.feign.EpmetUserFeignClient; @@ -60,9 +62,11 @@ import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO; import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO; import com.epmet.resi.group.dto.member.result.ResiGroupMemberInfoRedisResultDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; +import com.epmet.resi.group.dto.topic.TopicInfoDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO; +import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueDetailResultDTO; import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO; @@ -117,6 +121,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq(FieldConstant.DEL_FLAG,NumConstant.ZERO_STR); + wrapper.eq(TopicConstant.TOPIC_ID,formDTO.getTopicId()); + wrapper.orderByAsc(TopicConstant.SORT); + List attachments = resiTopicAttachmentDao.selectList(wrapper); + List attachmentUrls = new ArrayList<>(); + for(ResiTopicAttachmentEntity attachment : attachments){ + attachmentUrls.add(attachment.getAttachmentUrl()); + } + topicInfo.setTopicImgs(attachmentUrls); + //话题发起人 + IssueInitiatorFormDTO issueInitiator = new IssueInitiatorFormDTO(); + issueInitiator.setUserId(topicInfo.getTopicId()); + Result 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/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index f274faffff..62cef3f328 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -337,4 +337,18 @@ + + + diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java new file mode 100644 index 0000000000..b4fee06837 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/PolyLineDTO.java @@ -0,0 +1,43 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * 投票折线数据 + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class PolyLineDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题id + */ + private String topicId; + + /** + * 话题内容 + */ + private String topicContent; + + /** + * 图片列表 + */ + private List topicImgs; + + /** + * 话题发表人（山东路168-尹女士） + */ + private String publishedUser; + + /** + * 话题发表时间 (时间戳 毫秒级) + */ + private Long publishedTime; + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java new file mode 100644 index 0000000000..8df402c618 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/BelongGridNameFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 查询所属网格 + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class BelongGridNameFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 网格id + */ + private String gridId; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java new file mode 100644 index 0000000000..6b16e733ec --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueIdFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 议题Id + * @Author zxc + * @Date 2020/5/11 9:30 + */ +@Data +public class IssueIdFormDTO implements Serializable { + private static final long serialVersionUID = 4859779755214503489L; + + @NotBlank(message = "议题id不能为空") + private String issueId; + +} + diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java index 42b2885f66..00231b0b9d 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java @@ -15,9 +15,9 @@ public class IssueInitiatorFormDTO implements Serializable { private static final long serialVersionUID = 1L; /** - * 话题id + * userId 用户id */ - private String topicId; + private String userId; } diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/TopicInfoFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/TopicInfoFormDTO.java new file mode 100644 index 0000000000..cf85fae8c8 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/TopicInfoFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 查询话题信息 + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class TopicInfoFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题id + */ + private String topicId; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java new file mode 100644 index 0000000000..5d7091a66d --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/BelongGridNameResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 查询所属网格 + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class BelongGridNameResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 所属网格名称 eg:所属网格(网格所属机关单位名称-网格名称) + */ + private String belongsGridName; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java new file mode 100644 index 0000000000..b278b9f585 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/IssueResultDTO.java @@ -0,0 +1,48 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 议题详情回参 + * @CreateTime 2020/5/11 9:31 + */ +@Data +public class IssueResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 议题标题 + */ + private String issueTitle; + + /** + * 议题状态(voting 已转项目：shift_project 已关闭：closed) + */ + private String issueStatus; + + /** + * 议题建议 + */ + private String issueSuggestion; + + /** + * 网格Id + */ + private String gridId; + + /** + * 用户id + */ + private String userId; + + /** + * 话题Id + */ + private String topicId; + + +} diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java new file mode 100644 index 0000000000..b92e466fce --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/result/VotingTrendResultDTO.java @@ -0,0 +1,38 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 议题表决折线图 + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class VotingTrendResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 应表决数量 + */ + private Integer shouldVoteCount; + + /** + * 实际表决数量 + */ + private Integer realityVoteCount; + + /** + * 截至今日赞成票总数 + */ + private Integer supportAmount; + + /** + * 截至今日反对票总数 + */ + private Integer oppositionAmount; + + +} diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index 66d1426a33..4c3d9cdefc 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -19,11 +19,6 @@ resi-hall-client 2.0.0 - - com.epmet - epmet-commons-mybatis - 2.0.0 - org.springframework.boot spring-boot-starter-web 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 e14c45ec0c..48d63f37c9 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 @@ -31,10 +31,15 @@ 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(@RequestBody IssueDetailFormDTO issueDetail){ return new Result().ok(issueService.detail(issueDetail)); } + /*@PostMapping(value = "votingtrend") + public Result<> votingTrend(){ + return + }*/ + } diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index 168555cc4a..6b397e298e 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody; * @dscription * @date 2020/5/11 10:32 */ -//url = "8087" +//url = "localhost:8087" @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class) public interface EpmetUserFeignClient { diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java new file mode 100644 index 0000000000..972dad25ff --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java @@ -0,0 +1,29 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.IssueDetailFormDTO; +import com.epmet.dto.result.IssueResultDTO; +import com.epmet.feign.fallback.GovIssueFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * @Description Feign调用gov-issue-server模块 + * @ClassName GovIssueFeignFallBack + * url = "localhost:8101" + */ +@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class) +public interface GovIssueFeignClient { + + /** + * @Description 议题详情 + * @param issueDetail + * @author zxc + * @date 2020/5/11 16:50 + */ + @PostMapping("/gov/issue/issue/issuedetail") + Result issueDetail(@RequestBody IssueDetailFormDTO issueDetail); +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java new file mode 100644 index 0000000000..fbb1aeea7e --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -0,0 +1,24 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.BelongGridNameFormDTO; +import com.epmet.dto.result.BelongGridNameResultDTO; +import com.epmet.feign.fallback.GovOrgFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + + +/** + * @Description Feign调用gov-org-server模块 + * @ClassName GovOrgFeginFallBack + * url = "localhost:8092" + */ +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) +public interface GovOrgFeignClient { + + + @PostMapping("/gov/org/customergrid/getgridnamebygridid") + Result getGridNameByGridId(@RequestBody BelongGridNameFormDTO formDTO); +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java new file mode 100644 index 0000000000..661ef0e761 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java @@ -0,0 +1,28 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.TopicInfoDTO; +import com.epmet.dto.form.TopicInfoFormDTO; +import com.epmet.feign.fallback.ResiGroupFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @author zxc + * url = "localhost:8095" + */ +@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class) +public interface ResiGroupFeignClient { + + /** + * @Description 获取话题详情 + * @param formDTO + * @author zxc + * @date 2020/5/11 15:42 + */ + @PostMapping("/resi/group/topic/selectdetail") + Result selectDetail(TopicInfoFormDTO formDTO); + + +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java new file mode 100644 index 0000000000..62d2ceb77b --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java @@ -0,0 +1,22 @@ +package com.epmet.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.IssueDetailFormDTO; +import com.epmet.dto.result.IssueResultDTO; +import com.epmet.feign.GovIssueFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description Feign + * @ClassName GovIssueFeginFallBack + */ +@Component +public class GovIssueFeignClientFallBack implements GovIssueFeignClient { + + @Override + public Result issueDetail(IssueDetailFormDTO issueDetail) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueDetail", issueDetail); + } +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java new file mode 100644 index 0000000000..1c58c6f9ed --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -0,0 +1,23 @@ +package com.epmet.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.BelongGridNameFormDTO; +import com.epmet.dto.result.BelongGridNameResultDTO; +import com.epmet.feign.GovOrgFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description Feign + * @ClassName GovOrgFeginFallBack + */ +@Component +public class GovOrgFeignClientFallBack implements GovOrgFeignClient { + + + @Override + public Result getGridNameByGridId(BelongGridNameFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridNameByGridId", formDTO); + } +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java new file mode 100644 index 0000000000..d75c1a0f91 --- /dev/null +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java @@ -0,0 +1,21 @@ +package com.epmet.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.TopicInfoDTO; +import com.epmet.dto.form.TopicInfoFormDTO; +import com.epmet.feign.ResiGroupFeignClient; +import org.springframework.stereotype.Component; + +/** + * @author zxc + */ +@Component +public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { + + @Override + public Result selectDetail(TopicInfoFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectDetail", formDTO); + } +} diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java index a6bc3862f2..999fb46355 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueService.java @@ -1,15 +1,13 @@ package com.epmet.service; -import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dto.form.IssueDetailFormDTO; import com.epmet.dto.result.IssueDetailResultDTO; -import com.epmet.entity.IssueEntity; /** * @Author zxc * @CreateTime 2020/5/11 9:44 */ -public interface IssueService extends BaseService { +public interface IssueService { /** * @Description 议题详情 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 ccf27d6be4..b27ed53daf 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 @@ -1,11 +1,21 @@ package com.epmet.service.impl; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.dao.IssueDao; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.TopicInfoDTO; +import com.epmet.dto.form.BelongGridNameFormDTO; import com.epmet.dto.form.IssueDetailFormDTO; +import com.epmet.dto.form.IssueInitiatorFormDTO; +import com.epmet.dto.form.TopicInfoFormDTO; +import com.epmet.dto.result.BelongGridNameResultDTO; import com.epmet.dto.result.IssueDetailResultDTO; -import com.epmet.entity.IssueEntity; +import com.epmet.dto.result.IssueInitiatorResultDTO; +import com.epmet.dto.result.IssueResultDTO; +import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.feign.GovIssueFeignClient; +import com.epmet.feign.GovOrgFeignClient; +import com.epmet.feign.ResiGroupFeignClient; import com.epmet.service.IssueService; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,10 +24,16 @@ import org.springframework.stereotype.Service; * @CreateTime 2020/5/11 9:46 */ @Service -public class IssueServiceImpl extends BaseServiceImpl implements IssueService { +public class IssueServiceImpl implements IssueService { @Autowired - private IssueDao issueDao; + private EpmetUserFeignClient userFeignClient; + @Autowired + private GovOrgFeignClient govOrgFeignClient; + @Autowired + private ResiGroupFeignClient resiGroupFeignClient; + @Autowired + private GovIssueFeignClient govIssueFeignClient; /** * @Description 议题详情 @@ -27,8 +43,29 @@ public class IssueServiceImpl extends BaseServiceImpl imp */ @Override public IssueDetailResultDTO detail(IssueDetailFormDTO issueDetail) { - IssueDetailResultDTO issueDetailResult = issueDao.issueDetail(issueDetail); - + IssueDetailResultDTO issueDetailResult = new IssueDetailResultDTO(); + //议题信息 + Result issueResultDTOResult = govIssueFeignClient.issueDetail(issueDetail); + IssueResultDTO issueResult = issueResultDTOResult.getData(); + if (issueResult==null){ + return issueDetailResult; + } + BeanUtils.copyProperties(issueResult,issueDetailResult); + //话题发起人 + IssueInitiatorFormDTO initiatorFormDTO = new IssueInitiatorFormDTO(); + initiatorFormDTO.setUserId(issueResult.getUserId()); + Result initiatorResult = userFeignClient.selectIssueInitiator(initiatorFormDTO); + issueDetailResult.setIssueInitiator(initiatorResult.getData().getIssueInitiator()); + //网格名称 + BelongGridNameFormDTO belongGridName = new BelongGridNameFormDTO(); + belongGridName.setGridId(issueResult.getGridId()); + Result belongGridNameResult = govOrgFeignClient.getGridNameByGridId(belongGridName); + issueDetailResult.setBelongsGridName(belongGridNameResult.getData().getBelongsGridName()); + //话题信息 + TopicInfoFormDTO topicInfoFormDTO = new TopicInfoFormDTO(); + topicInfoFormDTO.setTopicId(issueResult.getTopicId()); + Result topicInfoDTOResult = resiGroupFeignClient.selectDetail(topicInfoFormDTO); + issueDetailResult.setTopicInfo(topicInfoDTOResult.getData()); return issueDetailResult; } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java new file mode 100644 index 0000000000..e52d7c19e6 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IssueInitiatorFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 查询议题发起人dto + * @CreateTime 2020/5/11 9:36 + */ +@Data +public class IssueInitiatorFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 话题id + */ + private String userId; + + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java new file mode 100644 index 0000000000..08e0113ace --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IssueInitiatorResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 返回议题发起人dto eg：山东路178号——刘女士 + * @CreateTime 2020/5/11 10:49 + */ +@Data +public class IssueInitiatorResultDTO implements Serializable { + + /** + * 议题发起人（山东路168-尹女士） + */ + private String issueInitiator; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java index 825cc6e78b..8844cfbdc1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java @@ -26,9 +26,11 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.excel.UserResiInfoExcel; import com.epmet.service.UserResiInfoService; @@ -150,4 +152,14 @@ public class UserResiInfoController { return userResiInfoService.saveResiInfo(userResiInfoDTO); } + /** + * @Description 根据userId查询议题发起人 eg:山东路168号——刘女士 + * @param formDTO + * @author zxc + */ + @PostMapping("selectissueinitiator") + public Result selectIssueInitiator(@RequestBody IssueInitiatorFormDTO formDTO){ + return new Result().ok(userResiInfoService.selectIssueInitiator(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index e14b927f1b..4f57bfa73c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -19,7 +19,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.UserResiInfoEntity; import org.apache.ibatis.annotations.Mapper; @@ -59,4 +61,12 @@ public interface UserResiInfoDao extends BaseDao { * @Date 2020/4/7 18:26 **/ List selectListUserResiInfoDTO(@Param("userIdList") List userIdList); + + /** + * @Description 根据userId查询议题发起人 + * @param formDTO + * @author zxc + * @date 2020/5/11 11:18 + */ + IssueInitiatorResultDTO selectIssueInitiator(IssueInitiatorFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java index 5f0817a62e..d01c706fd5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java @@ -21,9 +21,11 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.UserResiInfoEntity; @@ -141,4 +143,12 @@ public interface UserResiInfoService extends BaseService { * @Date 2020/4/7 18:21 **/ Result> getUserResiInfoList(UserResiInfoListFormDTO userResiInfoListFormDTO); + + /** + * @Description 根据userId查询议题发起人 + * @param formDTO + * @author zxc + * @date 2020/5/11 10:59 + */ + IssueInitiatorResultDTO selectIssueInitiator(IssueInitiatorFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index b11fd29898..af31e780ec 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -31,9 +31,11 @@ import com.epmet.constant.UserRoleConstant; import com.epmet.dao.UserResiInfoDao; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; +import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; +import com.epmet.dto.result.IssueInitiatorResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.UserResiInfoEntity; import com.epmet.feign.MessageFeignClient; @@ -272,4 +274,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl + + +