From 5376147de1dc116b9390ed924b9da2c91fed30f2 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 21 May 2020 15:01:26 +0800 Subject: [PATCH 01/17] =?UTF-8?q?1.common-service=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9A=84compose=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml index aa89e5dcf7..b5626dd575 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml @@ -1,7 +1,7 @@ version: "3.7" services: container_name: common-service-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/common-service-server:0.3.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/common-service-server:0.3.1 common-service-server: ports: - "8103:8103" From c3050c798350536aa77da7dffebe1c47bf4a38ae Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 21 May 2020 15:07:07 +0800 Subject: [PATCH 02/17] =?UTF-8?q?1.common-service=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9A=84compose=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml index b5626dd575..46e81b92e2 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml @@ -1,8 +1,8 @@ version: "3.7" services: + common-service-server: container_name: common-service-server-test image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/common-service-server:0.3.1 - common-service-server: ports: - "8103:8103" network_mode: host # 使用现有网络 From 42bd18ce9645c70bf37af415ed381f69b7d020d8 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 21 May 2020 15:32:03 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=9B=AD=E5=9C=B0-?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-home/resi-home-server/pom.xml | 12 ++++++++ .../com/epmet/constant/ProjectConstant.java | 18 ++++++++++++ .../com/epmet/controller/GroupController.java | 28 ++++++++++++++++++ .../epmet/controller/ResiHomeController.java | 28 ------------------ .../com/epmet/feign/GovIssueFeignClient.java | 29 +++++++++++++++++++ .../epmet/feign/GovProjectFeignClient.java | 17 +++++++++++ .../fallback/GovIssueFeignClientFallBack.java | 20 +++++++++++++ .../GovProjectFeignClientFallBack.java | 10 +++++++ .../java/com/epmet/service/GroupService.java | 8 +++++ .../epmet/service/impl/GroupServiceImpl.java | 12 ++++++++ 10 files changed, 154 insertions(+), 28 deletions(-) create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/constant/ProjectConstant.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java delete mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiHomeController.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/GroupService.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/GroupServiceImpl.java diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 39e22431fa..ddcab746da 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -50,6 +50,18 @@ feign-httpclient 10.3.0 + + com.epmet + gov-project-client + 2.0.0 + compile + + + com.epmet + gov-issue-client + 2.0.0 + compile + diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/constant/ProjectConstant.java new file mode 100644 index 0000000000..fdb74f36a3 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/constant/ProjectConstant.java @@ -0,0 +1,18 @@ +package com.epmet.constant; + +/** + * @dscription 党建园地-项目Constant + * @author sun + */ +public interface ProjectConstant { + + /** + * 调用gov-project服务，查询项目数据失败 + */ + String SELECT_PROJECT_EXCEPTION = "获取项目数据失败"; + /** + * 调用gov-issue服务，查询议题数据失败 + */ + String SELECT_ISSUE_EXCEPTION = "获取议题数据失败"; + +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java new file mode 100644 index 0000000000..a633cd4795 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java @@ -0,0 +1,28 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.DemoTestFormDTO; +import com.epmet.service.GroupService; +import com.epmet.service.IssueService; +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; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @dscription 党建园地-小组Controller + * @author sun + */ +@RestController +@RequestMapping("group") +public class GroupController { + + @Autowired + private GroupService groupService; + + +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiHomeController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiHomeController.java deleted file mode 100644 index 5de8b0304f..0000000000 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiHomeController.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.DemoTestFormDTO; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author zhaoqifeng - * @dscription - * @date 2020/5/21 10:24 - */ -@RestController -@RequestMapping("/") -public class ResiHomeController { - private static final Logger logger = LoggerFactory.getLogger(ResiHomeController.class); - @PostMapping("test") - public Result test(@RequestBody DemoTestFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); - logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId())); - return new Result().ok("resi-home-server请求成功"); - } -} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java index 3f62df0e31..e5fc06e487 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java @@ -1,8 +1,18 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.ClosedProjectIssueListFormDTO; +import com.epmet.dto.form.LatestIssueListFormDTO; +import com.epmet.dto.result.LatestIssueListResultDTO; +import com.epmet.dto.result.LatestListResultDTO; import com.epmet.feign.fallback.GovIssueFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; /** @@ -13,4 +23,23 @@ import org.springframework.cloud.openfeign.FeignClient; */ @FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER , fallback = GovIssueFeignClientFallBack.class) public interface GovIssueFeignClient { + + /** + * @param formDTO + * @return + * @Author sun + * @Description 获取客户网格下已转项目且项目已结案的议题列表 + **/ + @PostMapping(value = "gov/issue/issue/getclosedprojectissuelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result> getClosedProjectIssueList(@RequestBody ClosedProjectIssueListFormDTO formDTO); + + /** + * @param formDTO + * @return + * @Author sun + * @Description 获取客户网格下最新议题列表 + **/ + @PostMapping(value = "gov/issue/issue/getnewestissuelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result> getNewestIssueList(@RequestBody LatestIssueListFormDTO formDTO); + } diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java index 7bd2dd42ff..44d0f2da83 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java @@ -1,8 +1,16 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.LatestListFormDTO; +import com.epmet.dto.result.LatestListResultDTO; import com.epmet.feign.fallback.GovProjectFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; /** * @author zhaoqifeng @@ -12,4 +20,13 @@ import org.springframework.cloud.openfeign.FeignClient; @FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectFeignClientFallBack.class) public interface GovProjectFeignClient { + /** + * @param formDTO + * @return + * @Author sun + * @Description 获取客户下已结案项目列表，按结案时间倒序 + **/ + @PostMapping(value = "gov/project/project/getclosedprojectlist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result> getClosedProjectList(@RequestBody LatestListFormDTO formDTO); + } diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java index fc94db7f99..bc24fd9abb 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java @@ -1,8 +1,18 @@ 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.ClosedProjectIssueListFormDTO; +import com.epmet.dto.form.LatestIssueListFormDTO; +import com.epmet.dto.form.LatestListFormDTO; +import com.epmet.dto.result.LatestIssueListResultDTO; +import com.epmet.dto.result.LatestListResultDTO; import com.epmet.feign.GovIssueFeignClient; import org.springframework.stereotype.Component; +import java.util.List; + /** * * @author zhaoqifeng @@ -11,4 +21,14 @@ import org.springframework.stereotype.Component; @Component public class GovIssueFeignClientFallBack implements GovIssueFeignClient { + @Override + public Result> getClosedProjectIssueList(ClosedProjectIssueListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getClosedProjectIssueList", formDTO); + } + + @Override + public Result> getNewestIssueList(LatestIssueListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getNewestIssueList", formDTO); + } + } diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java index 82af1ee7f1..ce66df974c 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java @@ -1,5 +1,10 @@ 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.LatestListFormDTO; +import com.epmet.dto.result.LatestListResultDTO; import com.epmet.feign.GovProjectFeignClient; import org.springframework.stereotype.Component; @@ -12,4 +17,9 @@ import java.util.List; */ @Component public class GovProjectFeignClientFallBack implements GovProjectFeignClient { + + @Override + public Result> getClosedProjectList(LatestListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getClosedProjectList", formDTO); + } } diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/GroupService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/GroupService.java new file mode 100644 index 0000000000..1ec425cbde --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/GroupService.java @@ -0,0 +1,8 @@ +package com.epmet.service; + +/** + * @dscription 党建园地-小组Service + * @author sun + */ +public interface GroupService { +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/GroupServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/GroupServiceImpl.java new file mode 100644 index 0000000000..bcdf31ff4b --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/GroupServiceImpl.java @@ -0,0 +1,12 @@ +package com.epmet.service.impl; + +import com.epmet.service.GroupService; +import org.springframework.stereotype.Service; + +/** + * @dscription 党建园地-小组ServiceImpl + * @author sun + */ +@Service +public class GroupServiceImpl implements GroupService { +} From 9f7eb11f3d6b3a9dc264221244f75b7901ed8c33 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 21 May 2020 15:44:55 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=9B=AD=E5=9C=B0-?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-client/pom.xml | 6 ++ .../src/main/java/com/epmet/dto/form/.gitkeep | 0 .../form/ClosedProjectIssueListFormDTO.java | 29 ++++++++ .../dto/form/LatestIssueListFormDTO.java | 31 ++++++++ .../main/java/com/epmet/dto/result/.gitkeep | 0 .../dto/result/LatestIssueListResultDTO.java | 36 ++++++++++ .../com/epmet/constant/IssueConstant.java | 2 + .../com/epmet/controller/IssueController.java | 36 +++++++--- .../controller/IssueManageController.java | 2 +- .../src/main/java/com/epmet/dao/IssueDao.java | 21 ++++-- .../epmet/dao/IssueProjectRelationDao.java | 10 +++ .../epmet/dao/IssueVoteStatisticalDao.java | 7 ++ .../java/com/epmet/service/IssueService.java | 16 +++++ .../epmet/service/impl/IssueServiceImpl.java | 70 +++++++++++++++++++ .../src/main/resources/mapper/IssueDao.xml | 28 ++++++++ .../mapper/IssueProjectRelationDao.xml | 18 +++++ .../mapper/IssueVoteStatisticalDao.xml | 11 +++ .../com/epmet/dto/form/LatestListFormDTO.java | 41 +++++++++++ .../epmet/dto/result/LatestListResultDTO.java | 42 +++++++++++ .../com/epmet/constant/ProjectConstant.java | 4 ++ .../epmet/controller/ProjectController.java | 13 ++++ .../main/java/com/epmet/dao/ProjectDao.java | 9 +++ .../com/epmet/feign/EpmetUserFeignClient.java | 12 ++++ .../EpmetUserFeignClientFallBack.java | 6 ++ .../com/epmet/service/ProjectService.java | 8 +++ .../service/impl/ProjectServiceImpl.java | 31 ++++++++ .../src/main/resources/mapper/ProjectDao.xml | 14 ++++ .../com/epmet/controller/GroupController.java | 8 --- .../com/epmet/controller/IssueController.java | 41 +++++++++++ .../epmet/controller/ProjectController.java | 42 +++++++++++ .../java/com/epmet/service/IssueService.java | 22 ++++++ .../com/epmet/service/ProjectService.java | 21 ++++++ .../epmet/service/impl/IssueServiceImpl.java | 35 ++++++++++ .../service/impl/ProjectServiceImpl.java | 57 +++++++++++++++ .../controller/CustomerStaffController.java | 11 +++ .../epmet/service/CustomerStaffService.java | 8 +++ .../impl/CustomerStaffServiceImpl.java | 11 +++ .../resources/mapper/CustomerStaffDao.xml | 3 +- 38 files changed, 736 insertions(+), 26 deletions(-) delete mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/.gitkeep create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ClosedProjectIssueListFormDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/LatestIssueListFormDTO.java delete mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/.gitkeep create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/LatestListFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/IssueController.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ProjectController.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/IssueService.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ProjectService.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java diff --git a/epmet-module/gov-issue/gov-issue-client/pom.xml b/epmet-module/gov-issue/gov-issue-client/pom.xml index 3cc3330134..f77ec89656 100644 --- a/epmet-module/gov-issue/gov-issue-client/pom.xml +++ b/epmet-module/gov-issue/gov-issue-client/pom.xml @@ -23,5 +23,11 @@ 2.0.0 compile + + com.epmet + gov-project-client + 2.0.0 + compile + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/.gitkeep b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ClosedProjectIssueListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ClosedProjectIssueListFormDTO.java new file mode 100644 index 0000000000..a58713123f --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ClosedProjectIssueListFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import com.epmet.dto.result.LatestListResultDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 获取客户网格下已转项目切项目已结案的议题列表-接口入参 + * @Author sun + */ +@Data +public class ClosedProjectIssueListFormDTO implements Serializable { + + private static final long serialVersionUID = 2599592072265715951L; + + /** + * 查询条件对象 + */ + private LatestListFormDTO latestListForm; + + /** + * 客户下已结案项目列表 + */ + private List latestListResult; + + +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/LatestIssueListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/LatestIssueListFormDTO.java new file mode 100644 index 0000000000..15d7cd7a8d --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/LatestIssueListFormDTO.java @@ -0,0 +1,31 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 党建园地-获取最新议题列表-接口入参 + * @Author sun + */ +@Data +public class LatestIssueListFormDTO implements Serializable { + + private static final long serialVersionUID = -2170063271034172650L; + + /** + * 客户Id + */ + @NotBlank(message = "客户id不能为空") + private String customerId; + /** + * 网格Id + */ + @NotBlank(message = "网格Id不能为空") + private String gridId; + /** + * 客户定制化显示几条，传入几条 + */ + private Integer pageSize = 3; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/.gitkeep b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java new file mode 100644 index 0000000000..1c4fe33e19 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java @@ -0,0 +1,36 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 党建园地-获取最新议题列表-接口入参 + * @Author sun + */ +@Data +public class LatestIssueListResultDTO implements Serializable { + + private static final long serialVersionUID = 9130115335145168458L; + + /** + * 议题id + */ + private String issueId = ""; + /** + * 议题标题 + */ + private String issueTitle = ""; + /** + * 议题发起人：XX路-XX先生 + */ + private String issuePublisherName = ""; + /** + * 话题内容 + */ + private String topicContent = ""; + /** + * 表达态度总人数 + */ + private Integer votedCount = 0; +} 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 04a4bcbef2..9c330b89d6 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 @@ -64,4 +64,6 @@ public interface IssueConstant { String OPPOSE = "opposition"; String REDIS_KEY = "epmet:issue:"; + + String SELECT_ISSUEPROJECTRELATION_EXCEPTION = "获取议题项目关系数据失败"; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index 1d66cbf7d7..db84562cb9 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -4,24 +4,15 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.form.CommonIssueListFormDTO; +import com.epmet.dto.form.*; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; 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.IssueDTO; -import com.epmet.dto.form.IssueDetailFormDTO; -import com.epmet.dto.result.ClosedIssueListResultDTO; -import com.epmet.dto.form.IssueIdFormDTO; -import com.epmet.dto.result.GridIdResultDTO; -import com.epmet.dto.form.ShiftProjectListFromDTO; -import com.epmet.dto.result.GridVotingIssueCountResultDTO; -import com.epmet.dto.form.IssueShiftedFromTopicFormDTO; -import com.epmet.dto.result.IssueResultDTO; -import com.epmet.dto.result.VotingIssueListResultDTO; +import com.epmet.dto.result.*; import com.epmet.excel.IssueExcel; -import com.epmet.dto.result.ShiftProjectListResultDTO; import com.epmet.service.IssueService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -124,5 +115,28 @@ public class IssueController { public Result selectGridIdByIssueId(@RequestBody IssueIdFormDTO issueId){ return new Result().ok(issueService.selectGridIdByIssueId(issueId)); } + + /** + * @param formDTO + * @return + * @Author sun + * @Description 获取客户网格下已转项目且项目已结案的议题列表 + **/ + @PostMapping("getclosedprojectissuelist") + public Result> getClosedProjectIssueList(@RequestBody ClosedProjectIssueListFormDTO formDTO){ + return new Result>().ok(issueService.getClosedProjectIssueList(formDTO)); + } + + /** + * @param formDTO + * @return + * @Author sun + * @Description 获取客户网格下最新议题列表 + **/ + @PostMapping("getnewestissuelist") + public Result> getNewestIssueList(@RequestBody LatestIssueListFormDTO formDTO){ + return new Result>().ok(issueService.getNewestIssueList(formDTO)); + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java index f861f04b1a..9eb5fb0c7d 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java @@ -160,7 +160,7 @@ public class IssueManageController { * @Description 议题管理-议题转项目 **/ @PostMapping("shiftproject") - @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT) + // @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_SHIFT_PROJECT) public Result shiftProject(@LoginUser TokenDto tokenDTO, @RequestBody ShiftProjectFormDTO formDTO) { formDTO.setStaffId(tokenDTO.getUserId()); ValidatorUtils.validateEntity(formDTO); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index f616afaa1d..815d944014 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -19,10 +19,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IssueDTO; -import com.epmet.dto.form.CommonIssueListFormDTO; -import com.epmet.dto.form.IssueDetailFormDTO; -import com.epmet.dto.form.ShiftProjectListFromDTO; -import com.epmet.dto.form.VoteFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.ClosedIssueListGovResultDTO; import com.epmet.dto.result.ClosedIssueListResultDTO; import com.epmet.dto.result.IssueResultDTO; @@ -117,4 +114,20 @@ public interface IssueDao extends BaseDao { * @date 2020.05.19 15:00 **/ List getIssueVotingStatistical(); + + /** + * @param issueIdList,customerId,gridId + * @return + * @Author sun + * @Description 查询客户网格下已结案项目对应的议题列表 + **/ + List selectIssueList(@Param("issueIdList") List issueIdList, LatestListFormDTO latestListForm); + + /** + * @param formDTO + * @return + * @Author sun + * @Description 获取客户网格下最新议题列表 + **/ + List selectNewestIssueList(LatestIssueListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java index c6f7ed0f73..6b1b2727be 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java @@ -22,6 +22,8 @@ import com.epmet.entity.IssueProjectRelationEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 议题项目关系表 * @@ -40,4 +42,12 @@ public interface IssueProjectRelationDao extends BaseDao selectRelationList(@Param("projectIdList") List projectIdList); + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java index d20d18f501..413a4a7ca8 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java @@ -66,4 +66,11 @@ public interface IssueVoteStatisticalDao extends BaseDao polyLineData(IssueIdFormDTO issueId); + /** + * @param issueIdList + * @return + * @Author sun + * @Description 根据议题Id查询议题投票情况 + **/ + List selectListByissueId(@Param("issueIdList") List issueIdList); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index d0010e9bd7..2e14ce5c5a 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -197,4 +197,20 @@ public interface IssueService extends BaseService { * @date 2020.05.14 10:33 **/ List closedListGov(CommonIssueListFormDTO issueListForm); + + /** + * @param formDTO + * @return + * @Author sun + * @Description 获取客户网格下已转项目切项目已结案的议题列表 + **/ + List getClosedProjectIssueList(ClosedProjectIssueListFormDTO formDTO); + + /** + * @param formDTO + * @return + * @Author sun + * @Description 获取客户网格下最新议题列表 + **/ + List getNewestIssueList(LatestIssueListFormDTO formDTO); } 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 683ebb5560..069177ae8e 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 @@ -17,6 +17,7 @@ import com.epmet.constant.UserMessageConstant; import com.epmet.dao.IssueDao; import com.epmet.dao.IssueProcessDao; import com.epmet.dao.IssueProjectRelationDao; +import com.epmet.dao.IssueVoteStatisticalDao; import com.epmet.dto.IssueDTO; import com.epmet.dto.IssueProcessDTO; import com.epmet.dto.IssueVoteStatisticalDTO; @@ -25,6 +26,7 @@ import com.epmet.dto.result.*; import com.epmet.entity.IssueEntity; import com.epmet.entity.IssueProcessEntity; import com.epmet.entity.IssueProjectRelationEntity; +import com.epmet.entity.IssueVoteStatisticalEntity; import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.GovProjectFeignClient; import com.epmet.feign.MessageFeignClient; @@ -79,6 +81,8 @@ public class IssueServiceImpl extends BaseServiceImpl imp private IssueVoteStatisticalService issueVoteStatisticalService; @Autowired private IssueProjectRelationService issueProjectRelationService; + @Autowired + private IssueVoteStatisticalDao issueVoteStatisticalDao; @Override public PageData page(Map params) { @@ -588,4 +592,70 @@ public class IssueServiceImpl extends BaseServiceImpl imp return baseDao.selectClosedListGov(issueListForm); } + /** + * @param formDTO + * @return + * @Author sun + * @Description 获取客户网格下已转项目切项目已结案的议题列表 + **/ + @Override + public List getClosedProjectIssueList(ClosedProjectIssueListFormDTO formDTO) { + List resultList = new ArrayList<>(); + List projectIdList = formDTO.getLatestListResult().stream().map(LatestListResultDTO::getProjectId).collect(Collectors.toList()); + if (null == projectIdList || projectIdList.size() < NumConstant.ONE) { + return resultList; + } + //1:根据已结案项目列表查询对应的议题列表 + List listRelation = issueProjectRelationDao.selectRelationList(projectIdList); + if(null==listRelation||listRelation.size() issueIdList = listRelation.stream().map(IssueProjectRelationEntity::getIssueId).collect(Collectors.toList()); + + //2:根据查询条件筛选出客户网格下已结案项目对应的议题详情列表 + List entityList = baseDao.selectIssueList(issueIdList, formDTO.getLatestListForm()); + + //3:遍历封装数据 + entityList.forEach(issue->{ + listRelation.forEach(relation->{ + if(relation.getIssueId().equals(issue.getId())){ + formDTO.getLatestListResult().forEach(project->{ + if(relation.getProjectId().equals(project.getProjectId())){ + LatestListResultDTO latest = ConvertUtils.sourceToTarget(project, LatestListResultDTO.class); + latest.setIssueId(issue.getId()); + latest.setIssueTitle(issue.getIssueTitle()); + resultList.add(latest); + } + }); + } + }); + }); + + return resultList; + } + + /** + * @param formDTO + * @return + * @Author sun + * @Description 获取客户网格下最新议题列表 + **/ + @Override + public List getNewestIssueList(LatestIssueListFormDTO formDTO) { + List returnList = new ArrayList<>(); + //1:获取客户网格下最新议题列表 + List entityList = baseDao.selectNewestIssueList(formDTO); + if (null == entityList || entityList.size() < NumConstant.ONE) { + return returnList; + } + //2:根据议题Id查询议题投票情况 + List issueIdList = entityList.stream().map(IssueEntity::getId).collect(Collectors.toList()); + List StatisticalList = issueVoteStatisticalDao.selectListByissueId(issueIdList); + //3:调用epmet-user服务，查询议题发起人基本信息 + List userIdList = entityList.stream().map(IssueEntity::getCreatedBy).collect(Collectors.toList()); + + + return null; + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 71686b52cf..7623bdbfc1 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -324,5 +324,33 @@ + + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml index a0355d7b74..b6fc72cd64 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectRelationDao.xml @@ -27,4 +27,22 @@ ISSUE_ID = #{issueId} + + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml index c12c1ab45b..ebef0c833b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml @@ -69,4 +69,15 @@ ORDER BY statistical_date ASC + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/LatestListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/LatestListFormDTO.java new file mode 100644 index 0000000000..ca84aee3b0 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/LatestListFormDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 党建园地-结案项目-接口入参 + * @Author sun + */ +@Data +public class LatestListFormDTO implements Serializable { + private static final long serialVersionUID = 4859779755214502427L; + + /** + * 客户Id + */ + @NotBlank(message = "客户Id不能为空") + private String customerId; + + /** + * 网格Id + */ + @NotBlank(message = "网格Id不能为空") + private String gridId; + + /** + * 请求页面 + */ + @Min(1) + private Integer pageNo; + + /** + * 每页多少条数据 + */ + private Integer pageSize = 3; + +} + diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java new file mode 100644 index 0000000000..c649df3498 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/LatestListResultDTO.java @@ -0,0 +1,42 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description 党建园地-结案项目-接口返参 + * @Author sun + */ +@Data +public class LatestListResultDTO implements Serializable { + + private static final long serialVersionUID = 5957826616179876849L; + + /** + * 议题id + */ + private String issueId = ""; + /** + * 议题标题 + */ + private String issueTitle = ""; + /** + * 项目id + */ + private String projectId = ""; + /** + * 结案说明 + */ + private String publicReply = ""; + /** + * 结案人名称、实名显示 + */ + private String closeUserName = ""; + /** + * 结案人Id + */ + private String closeUserId = ""; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java index c75452d03a..cd3369e41e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java @@ -109,4 +109,8 @@ public interface ProjectConstant { * 政府端 */ String GOV = "gov"; + /** + * 调用epmet-user服务获取工作人员信息失败 + */ + String SELECT_STAFF_EXCEPTION = "获取工作人员信息失败"; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 70d127d92f..ad3faa944b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -26,9 +26,11 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.ProjectDTO; +import com.epmet.dto.form.LatestListFormDTO; import com.epmet.dto.form.ShiftProjectFormDTO; import com.epmet.dto.form.ShiftProjectsFromDTO; import com.epmet.dto.result.IssueProjectResultDTO; +import com.epmet.dto.result.LatestListResultDTO; import com.epmet.dto.result.ShiftProjectResultDTO; import com.epmet.excel.ProjectExcel; import com.epmet.service.ProjectService; @@ -119,4 +121,15 @@ public class ProjectController { return new Result().ok(projectService.issueShiftProject(formDTO)); } + /** + * @param formDTO + * @return + * @Author sun + * @Description 获取客户下已结案项目列表，按结案时间倒序 + **/ + @PostMapping("getclosedprojectlist") + public Result> getClosedProjectList(@RequestBody LatestListFormDTO formDTO) { + return new Result>().ok(projectService.getClosedProjectList(formDTO)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index 95561d448e..3b58c435b7 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -19,8 +19,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.ProjectDTO; +import com.epmet.dto.form.LatestListFormDTO; import com.epmet.dto.form.ProjectListFromDTO; import com.epmet.dto.form.ShiftProjectsFromDTO; +import com.epmet.dto.result.LatestListResultDTO; import com.epmet.dto.result.ProjectDetailResultDTO; import com.epmet.entity.ProjectEntity; import org.apache.ibatis.annotations.Mapper; @@ -94,4 +96,11 @@ public interface ProjectDao extends BaseDao { */ List selectShiftProjectList(ShiftProjectsFromDTO fromDTO); + /** + * @param formDTO + * @return + * @Author sun + * @Description 获取客户下已结案项目列表，按结案时间倒序 + **/ + List selectClosedProjectList(LatestListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index 4905c95282..c9d448b532 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -5,10 +5,13 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.form.StaffsInAgencyFromDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; +import com.epmet.dto.result.CustomerStaffListResultDTO; import com.epmet.dto.result.StaffInfoResultDTO; +import com.epmet.dto.result.StaffListResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.feign.fallback.EpmetUserFeignClientFallBack; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -48,4 +51,13 @@ public interface EpmetUserFeignClient { **/ @PostMapping(value = "epmetuser/customerstaff/getstaffinfobyuserid") Result getCustomerStaffInfoByUserId(@RequestBody CustomerStaffDTO formDTO); + + /** + * @param staffIdList + * @return + * @Author sun + * @Description 批量查询工作人员基础信息 + **/ + @PostMapping(value = "epmetuser/customerstaff/getstafflistbyids", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result> getStaffListByIds(@RequestBody List staffIdList); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java index aa37f59e4b..83b8781780 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java @@ -7,6 +7,7 @@ import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.form.StaffsInAgencyFromDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.result.StaffInfoResultDTO; +import com.epmet.dto.result.StaffListResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.feign.EpmetUserFeignClient; import org.springframework.stereotype.Component; @@ -34,4 +35,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { public Result getCustomerStaffInfoByUserId(CustomerStaffDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "CustomerStaffDTO", formDTO); } + + @Override + public Result> getStaffListByIds(List staffIdList) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffListByIds", staffIdList); + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index 6dc0c7308e..9dafa894ab 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -170,4 +170,12 @@ public interface ProjectService extends BaseService { * @Description 议题转项目-项目各业务表初始化数据 **/ IssueProjectResultDTO issueShiftProject(ShiftProjectFormDTO formDTO); + + /** + * @param formDTO + * @return + * @Author sun + * @Description 获取客户下已结案项目列表，按结案时间倒序 + **/ + List getClosedProjectList(LatestListFormDTO formDTO); } \ No newline at end of file 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 d4e4595363..ecf124231d 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 @@ -570,4 +570,35 @@ public class ProjectServiceImpl extends BaseServiceImpl getClosedProjectList(LatestListFormDTO formDTO) { + List resultList = new ArrayList<>(); + //1:查询客户下已结案项目列表 + List listProject = baseDao.selectClosedProjectList(formDTO); + if(null==listProject||listProject.size() staffIdList = listProject.stream().map(LatestListResultDTO::getCloseUserId).collect(Collectors.toList()); + //2:调用epmet-user服务，查询结案人员真实姓名 + Result> listResult = epmetUserFeignClient.getStaffListByIds(staffIdList); + if (!listResult.success() || null == listResult.getData()) { + throw new RenException(ProjectConstant.SELECT_STAFF_EXCEPTION); + } + List staffList = listResult.getData(); + resultList = listProject.stream().flatMap(project -> + staffList.stream().filter(staff -> + project.getCloseUserId().equals(staff.getStaffId())).map(latest -> { + LatestListResultDTO resultDTO = ConvertUtils.sourceToTarget(latest, LatestListResultDTO.class); + return resultDTO; + })).collect(Collectors.toList()); + + return resultList; + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 530fe7583e..8341e62e49 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -149,5 +149,19 @@ ORDER BY CREATED_TIME ASC + \ No newline at end of file diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java index a633cd4795..a329a65f14 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java @@ -1,15 +1,7 @@ package com.epmet.controller; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.DemoTestFormDTO; import com.epmet.service.GroupService; -import com.epmet.service.IssueService; -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; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/IssueController.java new file mode 100644 index 0000000000..d96242d027 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/IssueController.java @@ -0,0 +1,41 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +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.dto.form.LatestIssueListFormDTO; +import com.epmet.dto.result.LatestIssueListResultDTO; +import com.epmet.service.IssueService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @dscription 党建园地-议题Controller + * @author sun + */ +@RestController +@RequestMapping("issue") +public class IssueController { + + @Autowired + private IssueService issueService; + + /** + * @param formDTO + * @return + * @Author sun + * @Description 党建园地-最新议题 + **/ + @PostMapping("latestlist") + public Result> latestList(@LoginUser TokenDto tokenDTO, @RequestBody LatestIssueListFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result>().ok(issueService.latestList(formDTO)); + } + +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ProjectController.java new file mode 100644 index 0000000000..9ee5f79b26 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ProjectController.java @@ -0,0 +1,42 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.RequirePermission; +import com.epmet.commons.tools.enums.RequirePermissionEnum; +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.dto.form.LatestListFormDTO; +import com.epmet.dto.result.LatestListResultDTO; +import com.epmet.service.ProjectService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @dscription 党建园地-项目Controller + * @author sun + */ +@RestController +@RequestMapping("project") +public class ProjectController { + + @Autowired + private ProjectService projectService; + + /** + * @param formDTO + * @return + * @Author sun + * @Description 党建园地-结案项目 + **/ + @PostMapping("latestlist") + public Result> latestList(@LoginUser TokenDto tokenDTO, @RequestBody LatestListFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return new Result>().ok(projectService.latestList(formDTO)); + } +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/IssueService.java new file mode 100644 index 0000000000..789766b38f --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/IssueService.java @@ -0,0 +1,22 @@ +package com.epmet.service; + +import com.epmet.dto.form.LatestIssueListFormDTO; +import com.epmet.dto.result.LatestIssueListResultDTO; + +import java.util.List; + +/** + * @dscription 党建园地-议题Service + * @author sun + */ +public interface IssueService { + + /** + * @param formDTO + * @return + * @Author sun + * @Description 党建园地-最新议题 + **/ + List latestList(LatestIssueListFormDTO formDTO); + +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ProjectService.java new file mode 100644 index 0000000000..d380961613 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/ProjectService.java @@ -0,0 +1,21 @@ +package com.epmet.service; + +import com.epmet.dto.form.LatestListFormDTO; +import com.epmet.dto.result.LatestListResultDTO; + +import java.util.List; + +/** + * @dscription 党建园地-项目Service + * @author sun + */ +public interface ProjectService { + + /** + * @param formDTO + * @return + * @Author sun + * @Description 党建园地-结案项目 + **/ + List latestList(LatestListFormDTO formDTO); +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java new file mode 100644 index 0000000000..a4953bd53e --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -0,0 +1,35 @@ +package com.epmet.service.impl; + +import com.epmet.dto.form.LatestIssueListFormDTO; +import com.epmet.dto.result.LatestIssueListResultDTO; +import com.epmet.feign.GovIssueFeignClient; +import com.epmet.service.IssueService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @dscription 党建园地-议题ServiceImpl + * @author sun + */ +@Service +public class IssueServiceImpl implements IssueService { + + @Autowired + private GovIssueFeignClient govIssueFeignClient; + + /** + * @param formDTO + * @return + * @Author sun + * @Description 党建园地-最新议题 + **/ + @Override + public List latestList(LatestIssueListFormDTO formDTO) { + //1:调用gov-issue服务，查询客户网格下最新议题列表 + + return null; + } + +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java new file mode 100644 index 0000000000..7e90739b37 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -0,0 +1,57 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.ProjectConstant; +import com.epmet.dto.form.ClosedProjectIssueListFormDTO; +import com.epmet.dto.form.LatestListFormDTO; +import com.epmet.dto.result.LatestListResultDTO; +import com.epmet.feign.GovIssueFeignClient; +import com.epmet.feign.GovProjectFeignClient; +import com.epmet.service.ProjectService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * @dscription 党建园地-项目ServiceImpl + * @author sun + */ +@Service +public class ProjectServiceImpl implements ProjectService { + + @Autowired + private GovProjectFeignClient govProjectFeignClient; + @Autowired + private GovIssueFeignClient govIssueFeignClient; + + /** + * @param formDTO + * @return + * @Author sun + * @Description 党建园地-结案项目 + **/ + @Override + public List latestList(LatestListFormDTO formDTO) { + //1:调用gov-project服务，查询客户已结案项目列表 + Result> listResult = govProjectFeignClient.getClosedProjectList(formDTO); + if (!listResult.success()){ + throw new RenException(ProjectConstant.SELECT_PROJECT_EXCEPTION); + } + if (null == listResult.getData()){ + return new ArrayList<>(); + } + //2:调用gov-issue服务，获取客户网格下已转项目且项目已结案的议题列表 + ClosedProjectIssueListFormDTO closedProjectIssueListFormDTO = new ClosedProjectIssueListFormDTO(); + closedProjectIssueListFormDTO.setLatestListForm(formDTO); + closedProjectIssueListFormDTO.setLatestListResult(listResult.getData()); + Result> resultList = govIssueFeignClient.getClosedProjectIssueList(closedProjectIssueListFormDTO); + if (!resultList.success() || null == resultList.getData()) { + throw new RenException(ProjectConstant.SELECT_ISSUE_EXCEPTION); + } + return resultList.getData(); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java index 375c4abd26..547d18ca46 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java @@ -280,4 +280,15 @@ public class CustomerStaffController { public Result getCustomerStaffList(@RequestBody List staffIdList){ return new Result().ok(customerStaffService.getCustomerStaffList(staffIdList)); } + + /** + * @param staffIdList + * @return + * @Author sun + * @Description 批量查询工作人员基础信息 + **/ + @PostMapping(value = "getstafflistbyids") + public Result> getStaffListByIds(@RequestBody List staffIdList){ + return new Result>().ok(customerStaffService.getStaffListByIds(staffIdList)); + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java index cddd2a8c9a..ec3a7ea554 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java @@ -231,4 +231,12 @@ public interface CustomerStaffService extends BaseService { * @Description 根据staffId集合查询工作人员基础信息 **/ CustomerStaffListResultDTO getCustomerStaffList(List staffIdList); + + /** + * @param staffIdList + * @return + * @Author sun + * @Description 批量查询工作人员基础信息 + **/ + List getStaffListByIds(List staffIdList); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 518697e1f6..c46254d83f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -440,4 +440,15 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl getStaffListByIds(List staffIdList) { + return baseDao.selectStaffByIds(staffIdList); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index 8f762dbe01..ea61d2b9a0 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -189,8 +189,7 @@ customer_staff WHERE del_flag = '0' - AND - + user_id = #{userId} From f83cce1cae5a873f1e2aa083103079983d479d1d Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Thu, 21 May 2020 16:25:02 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=B7=B2=E5=85=B3=E9=97=AD=E8=AF=84?= =?UTF-8?q?=E4=BB=B7=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java | 2 +- .../epmet/service/impl/IssueSatisfactionDetailServiceImpl.java | 2 ++ .../src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java index 11c8bc0d5e..1c0af96723 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java @@ -16,7 +16,7 @@ public class EvaluationListFormDTO implements Serializable { /** * 议题Id */ - private String IssueId; + private String issueId; /** * 页码 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java index 4b7bc5d837..f79b6b4675 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java @@ -159,6 +159,8 @@ public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl evaluationList(EvaluationListFormDTO formDTO) { + int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageNo(pageIndex); return baseDao.evaluationList(formDTO); } diff --git a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java index 11c8bc0d5e..1c0af96723 100644 --- a/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java +++ b/epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/form/EvaluationListFormDTO.java @@ -16,7 +16,7 @@ public class EvaluationListFormDTO implements Serializable { /** * 议题Id */ - private String IssueId; + private String issueId; /** * 页码 From 910ad6e79b5f98c6bdf2697ea39633cb09e2fe2c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 21 May 2020 16:57:16 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=9A=E5=BB=BA?= =?UTF-8?q?=E5=9B=AD=E5=9C=B0-=E6=8E=A8=E8=8D=90=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/form/RecommendedListFormDTO.java | 32 +++++++++++++++ .../result/RecommendedListResultDTO.java | 40 +++++++++++++++++++ .../group/controller/ResiGroupController.java | 12 ++++++ .../epmet/modules/group/dao/ResiGroupDao.java | 9 +++++ .../group/service/ResiGroupService.java | 9 +++++ .../service/impl/ResiGroupServiceImpl.java | 16 ++++++++ .../resources/mapper/group/ResiGroupDao.xml | 30 ++++++++++++++ .../com/epmet/controller/GroupController.java | 22 +++++++++- .../com/epmet/feign/ResiGroupFeignClient.java | 31 ++++++++++++++ .../ResiGroupFeignClientFallBack.java | 25 ++++++++++++ .../java/com/epmet/service/GroupService.java | 15 +++++++ .../epmet/service/impl/GroupServiceImpl.java | 14 +++++++ 12 files changed, 254 insertions(+), 1 deletion(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/RecommendedListFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendedListResultDTO.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/RecommendedListFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/RecommendedListFormDTO.java new file mode 100644 index 0000000000..a571541eec --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/RecommendedListFormDTO.java @@ -0,0 +1,32 @@ +package com.epmet.resi.group.dto.group.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/5/21 15:39 + */ +@Data +public class RecommendedListFormDTO implements Serializable { + + private static final long serialVersionUID = -4205042052361059952L; + /** + * 客户ID + */ + private String customerId; + /** + * 网格ID + */ + private String gridId; + /** + * 用户ID + */ + private String userId; + /** + * 客户定制化显示几条，传入几条 + */ + private Integer pageSize; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendedListResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendedListResultDTO.java new file mode 100644 index 0000000000..d436bc724f --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendedListResultDTO.java @@ -0,0 +1,40 @@ +package com.epmet.resi.group.dto.group.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/5/21 15:41 + */ +@Data +public class RecommendedListResultDTO implements Serializable { + + private static final long serialVersionUID = -8909027543795476302L; + /** + * 小组id + */ + private String groupId; + /** + * 小组名称 + */ + private String groupName; + /** + * 小组头像 + */ + private String groupHeadPhoto; + /** + * 总成员数 + */ + private String totalMember; + /** + * 党员总数 + */ + private String totalPartyMember; + /** + * 组长名 + */ + private String leaderName; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 4d2a9758bb..270df47002 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -330,4 +330,16 @@ public class ResiGroupController { public Result shouldVoteCount(@RequestBody ShouldVoteCountFormDTO formDTO){ return new Result().ok(resiGroupService.shouldVoteCount(formDTO)); } + + /** + * 党建园地-推荐小组 + * @author zhaoqifeng + * @date 2020/5/21 15:50 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("recommendedlist") + public Result> recommendedList(@RequestBody RecommendedListFormDTO formDTO) { + return new Result>().ok(resiGroupService.recommendedList(formDTO)); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java index 875163b278..92ab8d538b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java @@ -162,4 +162,13 @@ public interface ResiGroupDao extends BaseDao { * @author zxc */ ShouldVoteCountResultDTO shouldVoteCount(ShouldVoteCountFormDTO formDTO); + + /** + * 党建园地-推荐小组 + * @author zhaoqifeng + * @date 2020/5/21 15:55 + * @param formDTO + * @return java.util.List + */ + List selectListRecommendList(RecommendedListFormDTO formDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index 5859f46243..abf06683dd 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -274,4 +274,13 @@ public interface ResiGroupService extends BaseService { * @author zxc */ ShouldVoteCountResultDTO shouldVoteCount(ShouldVoteCountFormDTO formDTO); + + /** + * 党建园地-推荐小组 + * @author zhaoqifeng + * @date 2020/5/21 15:51 + * @param formDTO + * @return java.util.List + */ + List recommendedList(RecommendedListFormDTO formDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 5a9950f577..1e2150f13f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -843,6 +843,22 @@ public class ResiGroupServiceImpl extends BaseServiceImpl recommendedList(RecommendedListFormDTO formDTO) { + + //显示当前网格内所有当前用户还未加入的组，以组的人数由高到低排序；如果人数相同，以话题数由多到少排序 + List recommendGroupList = baseDao.selectListRecommendList(formDTO); + recommendGroupList.forEach(dto -> { + Result groupLeaderUserInfo = this.getGroupLeaderUserInfo(dto.getGroupId()); + if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) { + dto.setLeaderName(groupLeaderUserInfo.getData().getShowName()); + } else { + logger.warn("组长注册信息查询失败" + groupLeaderUserInfo.getMsg()); + } + }); + return recommendGroupList; + } + /** * @Description 给加入此网格的网格长发送消息 * @param msg 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 cff20a3b78..346dd484fa 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 @@ -322,4 +322,34 @@ AND rg.del_flag = 0 AND rg.grid_id = #{gridId} + diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java index a329a65f14..9c0fd12d32 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/GroupController.java @@ -1,10 +1,19 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.group.dto.group.form.RecommendedListFormDTO; +import com.epmet.resi.group.dto.group.result.RecommendedListResultDTO; import com.epmet.service.GroupService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @dscription 党建园地-小组Controller * @author sun @@ -16,5 +25,16 @@ public class GroupController { @Autowired private GroupService groupService; - + /** + * 党建园地-推荐小组 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @author zhaoqifeng + * @date 2020/5/21 15:50 + */ + @PostMapping("recommendedlist") + public Result> recommendedList(@LoginUser TokenDto tokenDto, @RequestBody RecommendedListFormDTO formDTO) { + return new Result>().ok(groupService.recommendedList(tokenDto, formDTO)); + } } diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java new file mode 100644 index 0000000000..9bf28be08c --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java @@ -0,0 +1,31 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.fallback.ResiGroupFeignClientFallBack; +import com.epmet.resi.group.dto.group.form.RecommendedListFormDTO; +import com.epmet.resi.group.dto.group.result.RecommendedListResultDTO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/17 15:24 + */ +@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class) +public interface ResiGroupFeignClient { + + /** + * 党建园地-推荐小组 + * @author zhaoqifeng + * @date 2020/5/21 15:50 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("/resi/group/group/recommendedlist") + Result> recommendedList(@RequestBody RecommendedListFormDTO formDTO); +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java new file mode 100644 index 0000000000..45bfb4e3d9 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java @@ -0,0 +1,25 @@ +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.feign.ResiGroupFeignClient; +import com.epmet.resi.group.dto.group.form.*; +import com.epmet.resi.group.dto.group.result.*; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/17 15:27 + */ +@Component +public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { + + @Override + public Result> recommendedList(RecommendedListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "recommendedList", formDTO); + } +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/GroupService.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/GroupService.java index 1ec425cbde..79033f88d8 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/GroupService.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/GroupService.java @@ -1,8 +1,23 @@ package com.epmet.service; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.resi.group.dto.group.form.RecommendedListFormDTO; +import com.epmet.resi.group.dto.group.result.RecommendedListResultDTO; + +import java.util.List; + /** * @dscription 党建园地-小组Service * @author sun */ public interface GroupService { + /** + * 党建园地-推荐小组 + * @author zhaoqifeng + * @date 2020/5/21 16:35 + * @param tokenDto + * @param formDTO + * @return java.util.List + */ + List recommendedList(TokenDto tokenDto, RecommendedListFormDTO formDTO); } diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/GroupServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/GroupServiceImpl.java index bcdf31ff4b..b373c34ec5 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/GroupServiceImpl.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/GroupServiceImpl.java @@ -1,12 +1,26 @@ package com.epmet.service.impl; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.feign.ResiGroupFeignClient; +import com.epmet.resi.group.dto.group.form.RecommendedListFormDTO; +import com.epmet.resi.group.dto.group.result.RecommendedListResultDTO; import com.epmet.service.GroupService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @dscription 党建园地-小组ServiceImpl * @author sun */ @Service public class GroupServiceImpl implements GroupService { + @Autowired + ResiGroupFeignClient resiGroupFeignClient; + @Override + public List recommendedList(TokenDto tokenDto, RecommendedListFormDTO formDTO) { + formDTO.setUserId(tokenDto.getUserId()); + return resiGroupFeignClient.recommendedList(formDTO).getData(); + } } From 9715a018bb15b6ad3df53eb638ffbd55e688a52b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 21 May 2020 19:13:01 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AFlogout?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/pom.xml | 6 +++++ .../com/epmet/controller/LoginController.java | 1 - .../epmet/service/impl/LoginServiceImpl.java | 22 ++++++++++++---- epmet-gateway/pom.xml | 5 ++-- .../epmet/feign/OperAccessFeignClient.java | 26 +++++++++++++++++++ .../OperAccessFeignClientFallback.java | 22 ++++++++++++++++ .../epmet/controller/OperMenuController.java | 12 +++++++++ .../com/epmet/service/OperMenuService.java | 2 ++ .../service/impl/OperMenuServiceImpl.java | 11 +++++++- 9 files changed, 98 insertions(+), 9 deletions(-) create mode 100644 epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessFeignClient.java create mode 100644 epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessFeignClientFallback.java diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index d8bc464fbe..49ae39be2d 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -98,6 +98,12 @@ 2.0.0 compile + + com.epmet + oper-access-client + 2.0.0 + compile + diff --git a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java index 12f697188a..54b415344b 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/LoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/LoginController.java @@ -94,7 +94,6 @@ public class LoginController { **/ @PostMapping(value = "logout") public Result logout(@LoginUser TokenDto tokenDto, HttpServletRequest request) { - //String token = request.getParameter(Constant.TOKEN_HEADER); return loginService.logoutByToken(tokenDto); } } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java index ed7176c8d4..728ca2d1ef 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java @@ -17,6 +17,7 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.dto.result.UserTokenResultDTO; import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.feign.OperAccessFeignClient; import com.epmet.jwt.JwtTokenProperties; import com.epmet.jwt.JwtTokenUtils; import com.epmet.service.CaptchaService; @@ -61,6 +62,9 @@ public class LoginServiceImpl implements LoginService { @Autowired private CaptchaService captchaService; + @Autowired + private OperAccessFeignClient operAccessFeignClient; + /** * 居民端微信小程序登录 * @@ -249,7 +253,9 @@ public class LoginServiceImpl implements LoginService { //1、验证码是否正确 boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha()); if (!flag) { - return new Result().error(EpmetErrorCode.ERR10019.getCode()); + logger.error(String.format("用户%s登录，验证码输入错误，暂时放行",formDTO.getPhone())); + //2020-05-21去除验证码校验 TODO + //return new Result().error(EpmetErrorCode.ERR10019.getCode()); } //2、账号是否存在 //获取用户信息 @@ -308,12 +314,18 @@ public class LoginServiceImpl implements LoginService { public Result logoutByToken(TokenDto tokenDto) { //记录登出日志 //删除redis - if(null == tokenDto){ - logger.error("账号不存在"); - throw new RenException("当前用户信息获取失败"); + if (null == tokenDto) { + logger.error("运营端用户退出系统错误:账号不存在,接口继续执行返回成功"); + return new Result(); } - cpUserDetailRedis.logout(tokenDto.getApp() , tokenDto.getClient() , tokenDto.getUserId()); + cpUserDetailRedis.logout(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId()); //web端清空菜单栏和权限 + Result operAccessResult = operAccessFeignClient.clearOperUserAccess(); + if (operAccessResult.success()) { + logger.info(String.format("运营人员%s退出成功,清空菜单和权限redis成功", tokenDto.getUserId())); + } else { + logger.error(String.format("运营人员%s退出成功,清空菜单和权限redis异常", tokenDto.getUserId())); + } return new Result(); } diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 769a43145e..634052a451 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -108,8 +108,8 @@ - - lb://epmet-auth-server + http://localhost:8081 + lb://epmet-admin-server @@ -135,6 +135,7 @@ lb://gov-org-server + lb://oper-access-server diff --git a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessFeignClient.java b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessFeignClient.java new file mode 100644 index 0000000000..202b2c152d --- /dev/null +++ b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessFeignClient.java @@ -0,0 +1,26 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.fallback.OperAccessFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * @Description 运营端权限模块 + * @Author yinzuomei + * @Date 2020/5/21 15:17 + */ +//, url = "http://localhost:8093" +@FeignClient(name = ServiceConstant.OPER_ACCESS_SERVER, fallback = OperAccessFeignClientFallback.class) +public interface OperAccessFeignClient { + /** + * @param + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 清空运营人员权限信息、菜单信息 + * @Date 2020/5/21 17:08 + **/ + @GetMapping("/oper/access/menu/clearoperuseraccess") + Result clearOperUserAccess(); +} diff --git a/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessFeignClientFallback.java b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessFeignClientFallback.java new file mode 100644 index 0000000000..1cd7d7915d --- /dev/null +++ b/epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessFeignClientFallback.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.feign.OperAccessFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Description 运营端权限模块 + * @Author yinzuomei + * @Date 2020/5/21 15:47 + */ +@Component +public class OperAccessFeignClientFallback implements OperAccessFeignClient { + @Override + public Result clearOperUserAccess() { + return ModuleUtils.feignConError(ServiceConstant.OPER_ACCESS_SERVER, "clearOperUserAccess"); + + } +} + diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java index 80f82dff81..63fc7d61df 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java @@ -149,4 +149,16 @@ public class OperMenuController { return new Result>().ok(list); } + /** + * @param tokenDto + * @return com.epmet.commons.tools.utils.Result + * @Author yinzuomei + * @Description 运营端用户退出系统，清空菜单和操作权限 + * @Date 2020/5/21 18:07 + **/ + @GetMapping("clearoperuseraccess") + public Result clearOperUserAccess(@LoginUser TokenDto tokenDto) { + operMenuService.clearOperUserAccess(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId()); + return new Result(); + } } diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java index 9025ce4dd5..fd62682467 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/OperMenuService.java @@ -141,4 +141,6 @@ public interface OperMenuService extends BaseService { * @param pid 父菜单ID */ List getListPid(String pid); + + void clearOperUserAccess(String app, String client, String userId); } \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java index da2786ecaf..8c7354a086 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/service/impl/OperMenuServiceImpl.java @@ -45,6 +45,8 @@ import com.epmet.service.OperMenuService; import com.epmet.service.OperResourceService; import com.epmet.service.OperRoleMenuService; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -59,7 +61,7 @@ import java.util.*; */ @Service public class OperMenuServiceImpl extends BaseServiceImpl implements OperMenuService { - + protected Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private OperMenuRedis operMenuRedis; @Autowired @@ -236,6 +238,13 @@ public class OperMenuServiceImpl extends BaseServiceImpl Date: Thu, 21 May 2020 19:24:54 +0800 Subject: [PATCH 08/17] =?UTF-8?q?sendSmsCode=EF=BC=8CgetMyOrg=20=E5=B1=8F?= =?UTF-8?q?=E8=94=BD=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=AD=A3=E7=A1=AE=E6=80=A7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=B1=8F=E8=94=BD=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=EF=BC=8C=E5=B1=8F?= =?UTF-8?q?=E8=94=BD=E9=AA=8C=E8=AF=81=E7=A0=81=E6=AD=A3=E7=A1=AE=E6=80=A7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=8C=E6=96=B9=E4=BE=BF=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/GovLoginServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index b7023b0f37..42c52ff600 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -72,7 +72,8 @@ public class GovLoginServiceImpl implements GovLoginService { //1、校验手机号是否符合规范 if (!PhoneValidatorUtils.isMobile(formDTO.getMobile())) { logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), EpmetErrorCode.ERROR_PHONE.getCode(), EpmetErrorCode.ERROR_PHONE.getMsg())); - throw new RenException(EpmetErrorCode.ERROR_PHONE.getCode()); + //TODO 2020-05-21 手机号验证先去掉方便测试 + //throw new RenException(EpmetErrorCode.ERROR_PHONE.getCode()); } //2、根据手机号校验用户是否存在 Result> customerStaffResult = epmetUserFeignClient.checkCustomerStaff(formDTO.getMobile()); @@ -80,14 +81,14 @@ public class GovLoginServiceImpl implements GovLoginService { logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg())); throw new RenException(customerStaffResult.getCode()); } - //3、发送短信验证码 - Result> smsCodeResult = messageFeignClient.sendSmsCaptcha(formDTO.getMobile()); + //3、发送短信验证码 TODO 2020-05-21 发送验证先去掉方便测试 + /*Result> smsCodeResult = messageFeignClient.sendSmsCaptcha(formDTO.getMobile()); if (!smsCodeResult.success()) { logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), smsCodeResult.getCode(), smsCodeResult.getMsg())); throw new RenException(smsCodeResult.getCode()); } //4、保存短信验证码(删除现有短信验证码、将新的短信验证码存入Redis) - captchaRedis.saveSmsCode(formDTO, smsCodeResult.getData().get("code")); + captchaRedis.saveSmsCode(formDTO, smsCodeResult.getData().get("code"));*/ logger.info(String.format("发送短信验证码成功,手机号[%s]", formDTO.getMobile())); } @@ -110,7 +111,8 @@ public class GovLoginServiceImpl implements GovLoginService { String rightSmsCode = captchaRedis.getSmsCode(formDTO.getMobile()); if (!formDTO.getSmsCode().equals(rightSmsCode)) { logger.error(String.format("验证码错误code[%s],msg[%s]",EpmetErrorCode.MOBILE_CODE_ERROR.getCode(),EpmetErrorCode.MOBILE_CODE_ERROR.getMsg())); - throw new RenException(EpmetErrorCode.MOBILE_CODE_ERROR.getCode()); + //TODO 2020-05-21 校验验证码先去掉方便测试 + //throw new RenException(EpmetErrorCode.MOBILE_CODE_ERROR.getCode()); } //3、查询用户所有的组织信息 List customerIdList = new ArrayList<>(); From 81fe0e86b712e8a825b5bcd79325e5f6c3b3cdc0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 21 May 2020 19:31:45 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8F=91=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- .../com/epmet/commons/tools/exception/RenExceptionHandler.java | 2 +- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- .../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 +- .../oper-access-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-access/oper-access-server/pom.xml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-customize/oper-customize-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-hall/resi-hall-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-hall/resi-hall-server/pom.xml | 2 +- .../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index 6b96de98e3..faf9669e93 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.8 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.9 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 49ae39be2d..56d8bacb2c 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.8 + 0.3.9 com.epmet epmet-cloud diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java index 8b05b1dc71..34703ba3a8 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java @@ -37,7 +37,7 @@ import java.util.Map; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -//@RestControllerAdvice +@RestControllerAdvice public class RenExceptionHandler { private static final Logger logger = LoggerFactory.getLogger(RenExceptionHandler.class); @Autowired diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index 47061acece..dd7d696286 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.7 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.8 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 634052a451..f5962ac3ee 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.7 + 0.3.8 com.epmet epmet-cloud 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 5e94dfa425..f8b9fa3ca6 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.18 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.19 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 6594444ca5..e958d045f1 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.18 + 0.3.19 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 210cfd5a2e..95fba64652 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.46 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.47 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 6016601d0a..34a0a69aa8 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.46 + 0.3.47 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 3141f938a6..06d7d39e0f 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.13 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.14 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 f1656c3ad8..414ffa77cd 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.13 + 0.3.14 gov-project com.epmet diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml index cf1a70099e..2d91e321ca 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-access-server:0.3.7 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-access-server:0.3.8 ports: - "8093:8093" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 5bc26ecfb0..b03039e480 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-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"> - 0.3.7 + 0.3.8 oper-access com.epmet diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml index 849c5d3fb1..f58578779e 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.9 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.10 ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 72051679b3..9628e0c10b 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.9 + 0.3.10 com.epmet oper-crm diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml index 1509f6220d..2674b9bb28 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.10 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.11 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 69954bafe1..ffed0f824a 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.10 + 0.3.11 com.epmet oper-customize 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 ce26dbb846..c87c90da52 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.26 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.27 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 eee2e72622..a181907b63 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.26 + 0.3.27 com.epmet resi-group 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 8dbb279903..404436a0b2 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.10 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.11 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 bcd510e830..782e0d2322 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.10 + 0.3.11 resi-hall com.epmet diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index 92d67e194f..f37e3e8913 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.29 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.30 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 6a9a591a1f..2b0cd8cb8e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.29 + 0.3.30 com.epmet resi-partymember diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index f4efbde874..04fdfadaf7 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.30 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.31 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c1d82b82f2..ea4fe5c4d1 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.30 + 0.3.31 com.epmet epmet-user From e0f053191d8a81ba6d87acb0345b5b31dbe8737a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 21 May 2020 19:32:28 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E6=B3=A8=E9=87=8ARenExceptionHandler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/RenExceptionHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java index 34703ba3a8..8b05b1dc71 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java @@ -37,7 +37,7 @@ import java.util.Map; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@RestControllerAdvice +//@RestControllerAdvice public class RenExceptionHandler { private static final Logger logger = LoggerFactory.getLogger(RenExceptionHandler.class); @Autowired From b59ccc93437baae5241d74710961dc8ae43d9e4e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 21 May 2020 19:58:06 +0800 Subject: [PATCH 11/17] =?UTF-8?q?test=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-test.yml | 2 +- epmet-gateway/deploy/docker-compose-test.yml | 2 +- .../gov-issue/gov-issue-server/deploy/docker-compose-test.yml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-test.yml | 2 +- .../gov-project-server/deploy/docker-compose-test.yml | 2 +- .../oper-access-server/deploy/docker-compose-test.yml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-test.yml | 2 +- .../oper-customize-server/deploy/docker-compose-test.yml | 2 +- .../resi-group/resi-group-server/deploy/docker-compose-test.yml | 2 +- .../resi-hall/resi-hall-server/deploy/docker-compose-test.yml | 2 +- .../resi-partymember-server/deploy/docker-compose-test.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-test.yml b/epmet-auth/deploy/docker-compose-test.yml index bdbf76debc..61823c54df 100644 --- a/epmet-auth/deploy/docker-compose-test.yml +++ b/epmet-auth/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.8 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.9 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/deploy/docker-compose-test.yml b/epmet-gateway/deploy/docker-compose-test.yml index d8edfb6ef0..f19d07a3a7 100644 --- a/epmet-gateway/deploy/docker-compose-test.yml +++ b/epmet-gateway/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.7 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.8 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml index 15d3c1b7ce..0cc23a95ca 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.18 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.19 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml index b1b1e6384e..f49ca867b9 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.46 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.47 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml index 9a28e48dc4..09bc8bff6b 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.13 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.14 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml index e8c410f4e6..504c8bc260 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-access-server:0.3.7 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-access-server:0.3.8 ports: - "8093:8093" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml index 976da87163..db6d89ed1c 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.9 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.10 ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml index 1f812995f6..c821520cd9 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.10 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.11 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml index b88fee6c56..5c83e4e061 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.26 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.27 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml index 903bb5c7fd..6ebb687a67 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:0.3.10 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:0.3.11 ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml index 9547ba59d3..bcb31b4122 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.29 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.30 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml index ca4b02e164..f58448717f 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.30 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.31 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 7820d24c5b013cc1446e009df67403e8bf8b9741 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 21 May 2020 21:01:47 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/constant/PartyMemberMessageConstant.java | 2 +- .../service/impl/PartyMemberConfirmServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java index a64121d16e..1971a1ac13 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java @@ -9,7 +9,7 @@ public interface PartyMemberMessageConstant { /** * 消息标题 */ - String GROUP_TITLE = "您有一条党员申请消息"; + String PARTY_AUTH_TITLE = "您有一条党员申请消息"; /** * 党员提交申请时给网格长发送消息：XX街道-XX先生/女士申请成为党员，请审核。 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index fdb05b49ee..e4dc18bd8f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -580,7 +580,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService userMessageFormDTO.setCustomerId(formDTO.getCustomerId()); userMessageFormDTO.setGridId(formDTO.getGridId()); userMessageFormDTO.setApp(AppClientConstant.APP_RESI); - userMessageFormDTO.setTitle(PartyMemberMessageConstant.GROUP_TITLE); + userMessageFormDTO.setTitle(PartyMemberMessageConstant.PARTY_AUTH_TITLE); //调用gov-org服务查询网格信息 CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO(); customerGridFormDTO.setGridId(formDTO.getGridId()); @@ -640,7 +640,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService msgDTO.setGridId(formDTO.getGridId()); msgDTO.setUserId(staff.getUserId()); msgDTO.setApp(AppClientConstant.APP_GOV); - msgDTO.setTitle(ResiWarmUserMessageConstant.GROUP_TITLE); + msgDTO.setTitle(PartyMemberMessageConstant.PARTY_AUTH_TITLE); msgDTO.setMessageContent(message); msgDTO.setReadFlag(ReadFlagConstant.UN_READ); msgList.add(msgDTO); From 14eb29ad70a6e2ddf59011f72a7049041d9c7707 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 22 May 2020 09:11:43 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=9B=AD=E5=9C=B0-?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E8=AE=AE=E9=A2=98=E3=80=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=93=E6=A1=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/constant/IssueConstant.java | 1 + .../src/main/java/com/epmet/dao/IssueDao.java | 2 +- .../epmet/dao/IssueProjectRelationDao.java | 2 +- .../com/epmet/feign/ResiGroupFeignClient.java | 10 ++++ .../ResiGroupFeignClientFallBack.java | 7 +++ .../epmet/service/impl/IssueServiceImpl.java | 57 ++++++++++++++++--- .../src/main/resources/mapper/IssueDao.xml | 9 +-- .../mapper/IssueProjectRelationDao.xml | 3 +- .../mapper/IssueVoteStatisticalDao.xml | 2 +- .../service/impl/ProjectServiceImpl.java | 3 +- .../epmet/modules/topic/controller/.gitkeep | 0 .../topic/controller/ResiTopicController.java | 10 ++++ .../epmet/modules/topic/dao/ResiTopicDao.java | 8 +++ .../topic/service/ResiTopicService.java | 7 +++ .../service/impl/ResiTopicServiceImpl.java | 11 ++++ .../resources/mapper/topic/ResiTopicDao.xml | 12 ++++ .../epmet/service/impl/IssueServiceImpl.java | 7 ++- 17 files changed, 132 insertions(+), 19 deletions(-) delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/.gitkeep 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 9c330b89d6..a1f7413919 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 @@ -66,4 +66,5 @@ public interface IssueConstant { String REDIS_KEY = "epmet:issue:"; String SELECT_ISSUEPROJECTRELATION_EXCEPTION = "获取议题项目关系数据失败"; + String SELECT_RESI_GROUP_EXCEPTION = "获取话题数据失败"; } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index 815d944014..75cb01b7a9 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -121,7 +121,7 @@ public interface IssueDao extends BaseDao { * @Author sun * @Description 查询客户网格下已结案项目对应的议题列表 **/ - List selectIssueList(@Param("issueIdList") List issueIdList, LatestListFormDTO latestListForm); + List selectIssueList(@Param("issueIdList") List issueIdList, @Param("latestListForm") LatestListFormDTO latestListForm); /** * @param formDTO diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java index 6b1b2727be..017723d64a 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java @@ -46,7 +46,7 @@ public interface IssueProjectRelationDao extends BaseDao selectRelationList(@Param("projectIdList") List projectIdList); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java index 59fd426b87..f78d81eb02 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java @@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import java.util.List; + /** * @Description 调用resi-group服务 * @Author sun @@ -59,4 +61,12 @@ public interface ResiGroupFeignClient { @PostMapping("/resi/group/topic/checktopicpublisher") Result checkTopicPublisher(@RequestBody CheckTopicPublisherFormDTO formDTO); + /** + * @param topicIdList + * @Author sun + * @Description 批量查询话题信息 + **/ + @PostMapping("/resi/group/topic/gettopiclist/{topicIdList}") + Result> getTopicList(@PathVariable("topicIdList") List topicIdList); + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java index a822a0c4b7..66efd5aebb 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java @@ -14,6 +14,8 @@ import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO; import org.springframework.stereotype.Component; +import java.util.List; + /** * @Description 调用resi-group服务 * @Author sun @@ -39,4 +41,9 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { public Result checkTopicPublisher(CheckTopicPublisherFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "checkTopicPublisher", formDTO); } + + @Override + public Result> getTopicList(List topicIdList) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getTopicList", topicIdList); + } } 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 069177ae8e..b0136b0a2e 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 @@ -27,10 +27,7 @@ import com.epmet.entity.IssueEntity; import com.epmet.entity.IssueProcessEntity; import com.epmet.entity.IssueProjectRelationEntity; import com.epmet.entity.IssueVoteStatisticalEntity; -import com.epmet.feign.GovOrgFeignClient; -import com.epmet.feign.GovProjectFeignClient; -import com.epmet.feign.MessageFeignClient; -import com.epmet.feign.ResiGroupFeignClient; +import com.epmet.feign.*; import com.epmet.redis.GovIssueRedis; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; @@ -83,6 +80,8 @@ public class IssueServiceImpl extends BaseServiceImpl imp private IssueProjectRelationService issueProjectRelationService; @Autowired private IssueVoteStatisticalDao issueVoteStatisticalDao; + @Autowired + private EpmetUserFeignClient epmetUserFeignClient; @Override public PageData page(Map params) { @@ -605,7 +604,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp if (null == projectIdList || projectIdList.size() < NumConstant.ONE) { return resultList; } - //1:根据已结案项目列表查询对应的议题列表 + //1:根据已结案项目列表查询议题项目关系表数据 List listRelation = issueProjectRelationDao.selectRelationList(projectIdList); if(null==listRelation||listRelation.size() imp List issueIdList = listRelation.stream().map(IssueProjectRelationEntity::getIssueId).collect(Collectors.toList()); //2:根据查询条件筛选出客户网格下已结案项目对应的议题详情列表 - List entityList = baseDao.selectIssueList(issueIdList, formDTO.getLatestListForm()); + LatestListFormDTO latestListForm = formDTO.getLatestListForm(); + latestListForm.setPageNo((latestListForm.getPageNo()-NumConstant.ONE)*latestListForm.getPageSize()); + List entityList = baseDao.selectIssueList(issueIdList, latestListForm); //3:遍历封装数据 entityList.forEach(issue->{ @@ -648,14 +649,56 @@ public class IssueServiceImpl extends BaseServiceImpl imp if (null == entityList || entityList.size() < NumConstant.ONE) { return returnList; } + //2:根据议题Id查询议题投票情况 List issueIdList = entityList.stream().map(IssueEntity::getId).collect(Collectors.toList()); List StatisticalList = issueVoteStatisticalDao.selectListByissueId(issueIdList); + //3:调用epmet-user服务，查询议题发起人基本信息 List userIdList = entityList.stream().map(IssueEntity::getCreatedBy).collect(Collectors.toList()); + UserResiInfoListFormDTO userResiInfoListFormDTO = new UserResiInfoListFormDTO(); + userResiInfoListFormDTO.setUserIdList(userIdList); + Result> listResult = epmetUserFeignClient.getUserResiInfoList(userResiInfoListFormDTO); + if (!listResult.success() || null == listResult.getData()) { + throw new RenException(IssueConstant.SELECT_USERINFO_EXCEPTION); + } + List userInfoList = listResult.getData(); + //4:调用resi-group服务，批量查询话题内容 + List topicIdList = entityList.stream().map(IssueEntity::getSourceId).collect(Collectors.toList()); + Result> resultTopicList = resiGroupFeignClient.getTopicList(topicIdList); + if (!resultTopicList.success() || null == resultTopicList.getData()) { + throw new RenException(IssueConstant.SELECT_RESI_GROUP_EXCEPTION); + } + List topicList = resultTopicList.getData(); + + //5:遍历组装对象 + entityList.forEach(issue -> { + LatestIssueListResultDTO resultDTO = new LatestIssueListResultDTO(); + resultDTO.setIssueId(issue.getId()); + resultDTO.setIssueTitle(issue.getIssueTitle()); + StatisticalList.forEach(sta -> { + if (issue.getId().equals(sta.getIssueId())) { + //表达态度总人数 + resultDTO.setVotedCount(sta.getSupportCount() + sta.getOppositionCount()); + } + }); + userInfoList.forEach(user -> { + if (issue.getCreatedBy().equals(user.getUserId())) { + //话题发起人昵称 + resultDTO.setIssuePublisherName(user.getShowName()); + } + }); + topicList.forEach(topic -> { + if (issue.getSourceId().equals(topic.getId())) { + //话题内容 + resultDTO.setTopicContent(topic.getTopicContent()); + } + }); + returnList.add(resultDTO); + }); - return null; + return returnList; } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 7623bdbfc1..204cd1779f 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -329,17 +329,18 @@ * FROM issue WHERE del_flag = '0' - AND customer_id = #{customerId} - AND grid_id = #{gridId} + AND customer_id = #{latestListForm.customerId} + AND grid_id = #{latestListForm.gridId} id = #{issueId} ORDER BY field( - id, + id, #{issueId} - LIMIT #{pageNo}, #{pageSize} + ) + LIMIT #{latestListForm.pageNo}, #{latestListForm.pageSize} \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml index ebef0c833b..9bf812f0a7 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml @@ -73,7 +73,7 @@ SELECT * FROM - issue_vote_statistical_daily + issue_vote_statistical WHERE del_flag = '0' issue_id = #{issueId} 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 ecf124231d..7d0ab4a6a0 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 @@ -594,7 +594,8 @@ public class ProjectServiceImpl extends BaseServiceImpl staffList.stream().filter(staff -> project.getCloseUserId().equals(staff.getStaffId())).map(latest -> { - LatestListResultDTO resultDTO = ConvertUtils.sourceToTarget(latest, LatestListResultDTO.class); + LatestListResultDTO resultDTO = ConvertUtils.sourceToTarget(project, LatestListResultDTO.class); + resultDTO.setCloseUserName(latest.getStaffName()); return resultDTO; })).collect(Collectors.toList()); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 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 bbee6b578f..2ed9de8661 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 @@ -260,4 +260,14 @@ public class ResiTopicController { return new Result().ok(topicService.checkTopicPublisher(formDTO)); } + /** + * @param topicIdList + * @return + * @Author sun + * @Description 批量查询话题信息 + **/ + @PostMapping(value = "gettopiclist/{topicIdList}") + public Result> getTopicList(@PathVariable("topicIdList") List topicIdList){ + return new Result>().ok(topicService.getTopicList(topicIdList)); + } } 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 8f4b3fdfd1..f09e2b6d3f 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 @@ -152,4 +152,12 @@ public interface ResiTopicDao extends BaseDao { * @author zxc */ CheckTopicPublisherResultDTO checkTopicPublisher(CheckTopicPublisherFormDTO formDTO); + + /** + * @param topicIdList + * @return + * @Author sun + * @Description 批量查询话题信息 + **/ + List selectTopicListById(@Param("topicIdList") List topicIdList); } \ 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 08b8e89fd9..4fc298ad81 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 @@ -264,4 +264,11 @@ public interface ResiTopicService extends BaseService { */ CheckTopicPublisherResultDTO checkTopicPublisher(CheckTopicPublisherFormDTO formDTO); + /** + * @param topicIdList + * @return + * @Author sun + * @Description 批量查询话题信息 + **/ + List getTopicList(List topicIdList); } \ 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 f5bd09a849..60c3144faf 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 @@ -1151,6 +1151,17 @@ public class ResiTopicServiceImpl extends BaseServiceImpl getTopicList(List topicIdList) { + return baseDao.selectTopicListById(topicIdList); + } + } 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 e742be69e8..32f33251d2 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 @@ -446,5 +446,17 @@ AND created_by = #{createdBy} AND id = #{topicId} + + diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index a4953bd53e..6714928f69 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.LatestIssueListFormDTO; import com.epmet.dto.result.LatestIssueListResultDTO; import com.epmet.feign.GovIssueFeignClient; @@ -27,9 +28,9 @@ public class IssueServiceImpl implements IssueService { **/ @Override public List latestList(LatestIssueListFormDTO formDTO) { - //1:调用gov-issue服务，查询客户网格下最新议题列表 - - return null; + //1:调用gov-issue服务，查询客户网格下最新议题列表数据 + Result> listResult = govIssueFeignClient.getNewestIssueList(formDTO); + return listResult.getData(); } } From 48fb6ae4146a3f246274b5c996166486489cb02a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 22 May 2020 09:30:47 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E5=A7=93=E5=90=8D=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E9=99=90=E5=88=B615=E4=B8=AA=E5=AD=97=E4=BB=A5=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java index 7356f97392..8d1a78bdfe 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java @@ -35,7 +35,7 @@ public class StaffSubmitFromDTO implements Serializable { * 姓名 */ @NotBlank(message = "姓名不能为空") - @Length(max = 5, message = "姓名不能超过5个字符") + @Length(max = 15, message = "姓名不能超过15个字符") private String name; /** * 手机 From 390ccd9628b0cc5fc43197e608362bacd377a0d1 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Fri, 22 May 2020 10:25:20 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=B8=AD=E8=AF=9D=E9=A2=98=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../topic/service/impl/ResiTopicServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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 60c3144faf..807c0d6a95 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 @@ -929,14 +929,13 @@ 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()); + if (attachments.size() != NumConstant.ZERO){ + List attachmentUrls = new ArrayList<>(); + for(ResiTopicAttachmentEntity attachment : attachments){ + attachmentUrls.add(attachment.getAttachmentUrl()); + } + topicInfo.setTopicImgs(attachmentUrls); } - topicInfo.setTopicImgs(attachmentUrls); //话题发起人 IssueInitiatorFormDTO issueInitiator = new IssueInitiatorFormDTO(); issueInitiator.setUserId(topicInfo.getPublishedUser()); From d702c4ba5b9069dbef6dd382ddf8b1b6a32d7f4b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 May 2020 11:05:44 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=A7=93=E5=90=8D=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java index 8d1a78bdfe..284880f6d5 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java @@ -35,7 +35,7 @@ public class StaffSubmitFromDTO implements Serializable { * 姓名 */ @NotBlank(message = "姓名不能为空") - @Length(max = 15, message = "姓名不能超过15个字符") + @Length(max = 15, message = "姓名仅允许输入15个字符") private String name; /** * 手机 From 152549be26f0d719a3efb0970e115242421dad5f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 22 May 2020 11:09:29 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E8=87=AA=E6=B5=8BBug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerStaffDepartmentDao.xml | 3 +-- .../src/main/resources/mapper/StaffRoleDao.xml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml index 254cbc4ab2..927d919372 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffDepartmentDao.xml @@ -22,8 +22,7 @@ customer_staff_department WHERE del_flag = '0' - AND - + department_id = #{departmentId} diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml index e7a2ce2fa9..c6402ed3b8 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml @@ -114,8 +114,7 @@ WHERE sr.del_flag = '0' AND gsr.del_flag = '0' - AND - + sr.staff_id = #{staffId}