From 68d1efb2d9a93ddc90acb03744e7a00bb5e9461b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 21 May 2020 06:49:00 +0800 Subject: [PATCH 01/10] =?UTF-8?q?govgrid=E3=80=81resipartymember=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-grid/gov-grid-server/deploy/docker-compose-dev.yml | 2 +- .../gov-grid/gov-grid-server/deploy/docker-compose-test.yml | 2 +- epmet-module/gov-grid/gov-grid-server/pom.xml | 2 +- .../resi-partymember-server/deploy/docker-compose-test.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml index 1192c903ed..e7e173ca1d 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.20 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.21 ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml index 5c880b4154..343700934f 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.20 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.21 ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 6d9168a888..130b0ce146 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-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.20 + 0.3.21 com.epmet gov-grid 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 9aee5d77d6..8bf682f113 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.26 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.28 ports: - "8096:8096" network_mode: host # 使用现有网络 From 2c14e9ccd236dd14299df658106906a359b70115 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 21 May 2020 10:17:53 +0800 Subject: [PATCH 02/10] =?UTF-8?q?gov-org=E6=9C=8D=E5=8A=A1=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org/gov-org-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 25cf30185d..952c3e67ac 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.44 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.45 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 e620382c2e..7e95f0f07e 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.44 + 0.3.45 com.epmet gov-org From 5846f60b05822b78435fc6a096e7220849512b79 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 21 May 2020 12:36:35 +0800 Subject: [PATCH 03/10] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9C=89=E6=95=88?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0hasManager=E5=92=8ChasRootAgency=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/aspect/BaseRequestLogAspect.java | 6 +- .../epmet/controller/AgencyController.java | 29 +++++++++ .../java/com/epmet/dao/CustomerAgencyDao.java | 7 +++ .../java/com/epmet/service/AgencyService.java | 7 +++ .../epmet/service/impl/AgencyServiceImpl.java | 5 ++ .../resources/mapper/CustomerAgencyDao.xml | 8 +++ .../dto/result/ValidCustomerResultDTO.java | 15 +++++ .../com/epmet/feign/EpmetUserFeignClient.java | 34 ++++++++++ .../com/epmet/feign/GovOrgFeignClient.java | 25 ++++++++ .../EpmetUserFeignClientFallBack.java | 25 ++++++++ .../fallback/GovOrgFeignClientFallBack.java | 20 ++++++ .../service/impl/CustomerServiceImpl.java | 63 +++++++++++++++++-- .../com/epmet/dto/form/StaffRoleFormDTO.java | 11 +++- .../epmet/controller/StaffRoleController.java | 22 +++++++ 14 files changed, 270 insertions(+), 7 deletions(-) create mode 100644 epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java create mode 100644 epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java create mode 100644 epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java create mode 100644 epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java index 54417b7117..02e26acdf9 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java @@ -70,9 +70,11 @@ public abstract class BaseRequestLogAspect { long execTimeMillis = Duration.between(startTime, endTime).toMillis(); if (exception != null) { - log.info("<<<<<<<<异常响应<<<<<<<<:线程ID:{},执行时长:{}ms, 异常信息:{}", id, execTimeMillis, ExceptionUtils.getErrorStackTrace(exception)); + log.info("<<<<<<<<异常响应<<<<<<<<:线程ID:{},执行时长:{}ms, 响应数据:{}, 异常信息:{}", + id, execTimeMillis, result == null ? result : result.toString(), ExceptionUtils.getErrorStackTrace(exception)); } else { - log.info("<<<<<<<<正常响应<<<<<<<<:线程ID:{},执行时长:{}ms, 响应数据:{}", id, execTimeMillis, result == null ? result : result.toString()); + log.info("<<<<<<<<正常响应<<<<<<<<:线程ID:{},执行时长:{}ms, 响应数据:{}", + id, execTimeMillis, result == null ? result : result.toString()); } } return result; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index 59cde8f71c..babbdf49b9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -38,7 +38,9 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** @@ -177,4 +179,31 @@ public class AgencyController { return new Result(); } + /** + * 查询客户根级组织 + * @param customerId + * @return + */ + @PostMapping("customerrootagency/{customerId}") + public Result getCustomerRootAgency(@PathVariable String customerId) { + CustomerAgencyDTO customerRootAgency = agencyService.getCustomerRootAgency(customerId); + return new Result().ok(customerRootAgency); + } + + /** + * 批量查询客户根级组织 + * @param customerIds + * @return + */ + @PostMapping("customerrootagencybatch") + public Result> getCustomerRootAgencyBatch(@RequestBody List customerIds) { + Map customerRootAgencies = new HashMap<>(); + customerIds.stream().forEach(customerId -> { + CustomerAgencyDTO rootAgency = agencyService.getCustomerRootAgency(customerId); + customerRootAgencies.put(customerId, rootAgency); + }); + + return new Result().ok(customerRootAgencies); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index a9846b3a76..6857d9c045 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -100,4 +100,11 @@ public interface CustomerAgencyDao extends BaseDao { * @Description 查询当前组织的下一级组织列表 **/ List selectSubAgencyList(@Param("subAgencyPids") String subAgencyPids); + + /** + * 查询客户根级组织 + * @param customerId + * @return + */ + CustomerAgencyDTO getCustomerRootAgency(@Param("customerId") String customerId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java index 0f19dac336..6ebd81f812 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java @@ -18,6 +18,7 @@ package com.epmet.service; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.AddAgencyResultDTO; import com.epmet.dto.result.AgencyListResultDTO; @@ -90,4 +91,10 @@ public interface AgencyService { CustomerAgencyEntity getAgencyById(String agencyId); CustomerAgencyEntity getAgencyByStaff(String staffId); + + /** + * 查询客户根级组织 + * @param customerId + */ + CustomerAgencyDTO getCustomerRootAgency(String customerId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 72b95f4181..f5f97eea0d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -249,4 +249,9 @@ public class AgencyServiceImpl implements AgencyService { public CustomerAgencyEntity getAgencyByStaff(String staffId) { return customerAgencyDao.getAgencyByStaffId(staffId); } + + @Override + public CustomerAgencyDTO getCustomerRootAgency(String customerId) { + return customerAgencyDao.getCustomerRootAgency(customerId); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index d0c7b4dcf0..940b3063ac 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -136,4 +136,12 @@ ORDER BY created_time DESC + + \ No newline at end of file diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java index 4d21495d3f..666a45b69c 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java @@ -22,4 +22,19 @@ public class ValidCustomerResultDTO implements Serializable { * 客户名称 */ private String customerName; + + /** + * 是否有管理员 + */ + private Boolean hasManager; + + /** + * 是否有根级组织 + */ + private Boolean hasRootAgency; + + /** + * 根级组织ID + */ + private String rootAgencyId; } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java new file mode 100644 index 0000000000..9058ae2178 --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -0,0 +1,34 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.StaffRoleFormDTO; +import com.epmet.dto.result.GovStaffRoleResultDTO; +import com.epmet.feign.fallback.EpmetUserFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; +import java.util.Map; + +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class, url = "localhost:8087") +public interface EpmetUserFeignClient { + + /** + * 根据机构Id查询机构下是网格长角色的用户 + * @param staffRoleFormDTO + * @return + * @Author sun + */ + @PostMapping("/epmetuser/staffrole/staffsinrole") + Result> getStaffsInRole(@RequestBody StaffRoleFormDTO staffRoleFormDTO); + + /** + * 一次性查询多个机构下，指定角色的用户列表 + * @param staffRoleFormDTO + * @return + */ + @PostMapping("/epmetuser/staffrole/staffsinroleoforgs") + Result>> getStaffsInRoleOfOrgs(@RequestBody StaffRoleFormDTO staffRoleFormDTO); +} diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java new file mode 100644 index 0000000000..058cbdc189 --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -0,0 +1,25 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CustomerAgencyDTO; +import com.epmet.feign.fallback.GovOrgFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; +import java.util.Map; + +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class, url = "localhost:8092") +public interface GovOrgFeignClient { + + /** + * 批量查询客户根级组织 + * @param customerIds + * @return + */ + @PostMapping("/gov/org/agency/customerrootagencybatch") + Result> getCustomerRootAgencyBatch(List customerIds); + +} diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java new file mode 100644 index 0000000000..4df7aedb61 --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.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.dto.form.StaffRoleFormDTO; +import com.epmet.dto.result.GovStaffRoleResultDTO; +import com.epmet.feign.EpmetUserFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +@Component +public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { + @Override + public Result> getStaffsInRole(StaffRoleFormDTO staffRoleFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffsInRole", staffRoleFormDTO); + } + + @Override + public Result>> getStaffsInRoleOfOrgs(StaffRoleFormDTO staffRoleFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffsInRoleOfOrgs", staffRoleFormDTO); + } +} diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java new file mode 100644 index 0000000000..b24bc5a7f1 --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java @@ -0,0 +1,20 @@ +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.CustomerAgencyDTO; +import com.epmet.feign.GovOrgFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +@Component +public class GovOrgFeignClientFallBack implements GovOrgFeignClient { + + @Override + public Result> getCustomerRootAgencyBatch(List customerIds) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCustomerRootAgencyBatch", customerIds); + } +} diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 89bab2936a..708deb0894 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -25,20 +25,27 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.CustomerDao; +import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerDTO; import com.epmet.dto.form.CustomerFormDTO; +import com.epmet.dto.form.StaffRoleFormDTO; +import com.epmet.dto.result.GovStaffRoleResultDTO; import com.epmet.dto.result.ValidCustomerResultDTO; import com.epmet.entity.CustomerEntity; +import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.feign.GovOrgFeignClient; import com.epmet.redis.CustomerRedis; import com.epmet.service.CustomerService; 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; +import org.springframework.util.CollectionUtils; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * 客户表 @@ -49,9 +56,17 @@ import java.util.Map; @Service public class CustomerServiceImpl extends BaseServiceImpl implements CustomerService { + private static final Logger log = LoggerFactory.getLogger(CustomerServiceImpl.class); + @Autowired private CustomerRedis customerRedis; + @Autowired + private EpmetUserFeignClient epmetUserFeignClient; + + @Autowired + private GovOrgFeignClient govOrgFeignClient; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -113,7 +128,47 @@ public class CustomerServiceImpl extends BaseServiceImpl> getValidCustomerList() { - return new Result>().ok(baseDao.selectListValidCustomerResultDTO()); + List validCustomers = baseDao.selectListValidCustomerResultDTO(); + List customerIds = validCustomers.stream().map(customer -> customer.getCustomerId()).collect(Collectors.toList()); + Result> rootAgencyResult = govOrgFeignClient.getCustomerRootAgencyBatch(customerIds); + + // 1.查询客户的根级组织，批量查询 + ArrayList rootAgencyIds = new ArrayList<>(); + if (rootAgencyResult.success()) { + Map rootAgencies = rootAgencyResult.getData(); + validCustomers.stream().forEach(customer -> { + CustomerAgencyDTO rootAgency = rootAgencies.get(customer.getCustomerId()); + customer.setHasRootAgency(rootAgency == null ? false : true); + customer.setRootAgencyId(rootAgency == null ? null : rootAgency.getId()); + if (rootAgency != null) { + rootAgencyIds.add(rootAgency.getId()); + } + }); + } else { + log.error("查询有效客户列表:查询客户的根级组织失败:{}", rootAgencyResult.toString()); + } + + if (!CollectionUtils.isEmpty(rootAgencyIds)) { + //2.查询客户的根级组织对应的管理员角色列表，批量查询 + StaffRoleFormDTO staffRoleFormDTO = new StaffRoleFormDTO(); + staffRoleFormDTO.setOrgIds(rootAgencyIds); + staffRoleFormDTO.setRoleKey("manager");// TODO ，此处应该将所有的角色key放到EpmetUser的client中 + Result>> managersResult = epmetUserFeignClient.getStaffsInRoleOfOrgs(staffRoleFormDTO); + if (managersResult.success()) { + Map> rootAgencyManagerMap = managersResult.getData(); + validCustomers.stream().forEach(customer -> { + List rootAgencyManagers = null; + if (customer.getRootAgencyId() != null) { + rootAgencyManagers = rootAgencyManagerMap.get(customer.getRootAgencyId()); + } + customer.setHasManager(CollectionUtils.isEmpty(rootAgencyManagers) ? false : true); + }); + } else { + log.error("查询有效客户列表:查询客户根级组织的管理员失败:{}", managersResult.toString()); + } + } + + return new Result>().ok(validCustomers); } /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffRoleFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffRoleFormDTO.java index 02ffc22867..8b919d6a46 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffRoleFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffRoleFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.List; @Data public class StaffRoleFormDTO { @@ -15,6 +16,9 @@ public class StaffRoleFormDTO { // 查询某角色下的人员列表group public interface GetStaffsInRole {} + // 一次性查询多个机构下，指定角色的用户列表 + public interface GetStaffsInRoleOrOrgs {} + /**===========校验分组结束============*/ @NotBlank(message = "工作人员ID不能为空", groups = {GetRolesOfStaff.class}) @@ -29,6 +33,11 @@ public class StaffRoleFormDTO { /** * 角色key */ - @NotBlank(message = "角色Key不能为空", groups = {GetStaffsInRole.class}) + @NotBlank(message = "角色Key不能为空", groups = {GetStaffsInRole.class, GetStaffsInRoleOrOrgs.class}) private String roleKey; + + /** + * 组织ID列表 + */ + private List orgIds; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java index 54dd2f09f7..209e8fd251 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import cn.hutool.core.collection.CollectionUtil; import com.epmet.commons.mybatis.entity.DataScope; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -20,7 +21,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @return 工作人员相关api @@ -74,6 +77,25 @@ public class StaffRoleController { return new Result>().ok(staffRoleDTOS); } + /** + * 一次性查询多个机构下，指定角色的用户列表 + * @param staffRoleFormDTO + * @return + */ + @PostMapping("staffsinroleoforgs") + public Result>> getStaffsInRoleOfOrgs(@RequestBody StaffRoleFormDTO staffRoleFormDTO) { + HashMap> resultMap = new HashMap<>(); + ValidatorUtils.validateEntity(staffRoleFormDTO, StaffRoleFormDTO.GetStaffsInRoleOrOrgs.class); + List orgIds = staffRoleFormDTO.getOrgIds(); + if (!CollectionUtil.isEmpty(orgIds)) { + for (String orgId : orgIds) { + List staffRole = staffRoleService.listStaffsInRole(staffRoleFormDTO.getRoleKey(), orgId, DataScope.getDefault()); + resultMap.put(orgId, staffRole); + } + } + return new Result>>().ok(resultMap); + } + /** * @return Result * @Description 查询一个员工在指定客户下的角色 From 7fd507a45cd83908fbcd85a5ec03f0c8bc057427 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 21 May 2020 12:38:10 +0800 Subject: [PATCH 04/10] =?UTF-8?q?1.=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/feign/EpmetUserFeignClient.java | 3 ++- .../src/main/java/com/epmet/feign/GovOrgFeignClient.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java index 9058ae2178..047782a221 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java @@ -12,7 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class, url = "localhost:8087") +//, url = "localhost:8087" +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class) public interface EpmetUserFeignClient { /** diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index 058cbdc189..10a05d5547 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -11,7 +11,8 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; -@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class, url = "localhost:8092") +//, url = "localhost:8092" +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) public interface GovOrgFeignClient { /** From 78109ba714977059cf25b624c7b13e57eb759206 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 21 May 2020 12:55:12 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-crm/oper-crm-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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index 1998833325..5e94dfa425 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.17 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.18 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 259563803a..6594444ca5 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.17 + 0.3.18 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 952c3e67ac..210cfd5a2e 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.45 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.46 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 7e95f0f07e..6016601d0a 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.45 + 0.3.46 com.epmet gov-org 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 91318f2653..849c5d3fb1 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.8 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.9 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 daa6d9de2d..d994c1b697 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.8 + 0.3.9 com.epmet oper-crm 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 f37311ea73..92d67e194f 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.28 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.29 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 042a2a305f..6a9a591a1f 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.28 + 0.3.29 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 66ce45c17b..f4efbde874 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.29 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.30 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 8110a99d58..c1d82b82f2 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.29 + 0.3.30 com.epmet epmet-user From c4be8da9a9ea2d610e082b444d3a3bcde9084bf8 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 21 May 2020 12:58:44 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0resi=5Fhome=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 5 + .../src/main/resources/bootstrap.yml | 22 ++- epmet-module/pom.xml | 1 + epmet-module/resi-home/pom.xml | 23 +++ .../resi-home/resi-home-client/pom.xml | 24 +++ .../java/com/epmet/dto/DemoTestFormDTO.java | 20 +++ .../resi-home/resi-home-server/Dockerfile | 11 ++ .../deploy/docker-compose-dev.yml | 17 ++ .../deploy/docker-compose-test.yml | 17 ++ .../resi-home/resi-home-server/pom.xml | 133 +++++++++++++++ .../java/com/epmet/ResiHomeApplication.java | 23 +++ .../com/epmet/config/ModuleConfigImpl.java | 26 +++ .../epmet/controller/ResiHomeController.java | 28 +++ .../com/epmet/feign/GovIssueFeignClient.java | 16 ++ .../epmet/feign/GovProjectFeignClient.java | 15 ++ .../fallback/GovIssueFeignClientFallBack.java | 14 ++ .../GovProjectFeignClientFallBack.java | 15 ++ .../src/main/resources/bootstrap.yml | 71 ++++++++ .../src/main/resources/logback-spring.xml | 159 ++++++++++++++++++ 19 files changed, 634 insertions(+), 6 deletions(-) create mode 100644 epmet-module/resi-home/pom.xml create mode 100644 epmet-module/resi-home/resi-home-client/pom.xml create mode 100644 epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/DemoTestFormDTO.java create mode 100644 epmet-module/resi-home/resi-home-server/Dockerfile create mode 100644 epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml create mode 100644 epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml create mode 100644 epmet-module/resi-home/resi-home-server/pom.xml create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/ResiHomeApplication.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/ModuleConfigImpl.java create 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/feign/GovIssueFeignClient.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java create mode 100644 epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml create mode 100644 epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 7e8232f7fb..02baae7b11 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -165,6 +165,9 @@ lb://gov-project-server lb://common-service-server + + + http://localhost:8104 @@ -235,6 +238,8 @@ lb://gov-project-server lb://common-service-server + + lb://resi-home-server diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index a009c0c628..ba74ff4bfd 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -181,7 +181,7 @@ spring: #政府端权限服务 - id: gov-access-server uri: @gateway.routes.gov-access-server.uri@ - order: 18 + order: 19 predicates: - Path=${server.servlet.context-path}/gov/access/** filters: @@ -191,7 +191,7 @@ spring: #政府端-我的-服务 - id: gov-mine-server uri: @gateway.routes.gov-mine-server.uri@ - order: 19 + order: 20 predicates: - Path=${server.servlet.context-path}/gov/mine/** filters: @@ -200,7 +200,7 @@ spring: #居民端党群e事 - id: resi-hall-server uri: @gateway.routes.resi-hall-server.uri@ - order: 20 + order: 21 predicates: - Path=${server.servlet.context-path}/resi/hall/** filters: @@ -209,7 +209,7 @@ spring: #政府工作端议题管理 - id: gov-issue-server uri: @gateway.routes.gov-issue-server.uri@ - order: 21 + order: 22 predicates: - Path=${server.servlet.context-path}/gov/issue/** filters: @@ -218,7 +218,7 @@ spring: #政府工作端项目管理 - id: gov-project-server uri: @gateway.routes.gov-project-server.uri@ - order: 22 + order: 23 predicates: - Path=${server.servlet.context-path}/gov/project/** filters: @@ -227,11 +227,20 @@ spring: #政府工作端项目管理 - id: common-service-server uri: @gateway.routes.common-service-server.uri@ - order: 23 + order: 24 predicates: - Path=${server.servlet.context-path}/commonservice/** filters: - StripPrefix=1 + #党建园地 + - id: resi-home-server + uri: @gateway.routes.resi-home-server.uri@ + order: 25 + predicates: + - Path=${server.servlet.context-path}/resi/home/** + filters: + - StripPrefix=1 + - CpAuth=true nacos: discovery: server-addr: @nacos.server-addr@ @@ -345,6 +354,7 @@ epmet: - /resi/hall/** - /gov/issue/** - /gov/project/** + - /resi/home/** swaggerUrls: jwt: diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml index 5637182706..7cb7d3e138 100644 --- a/epmet-module/pom.xml +++ b/epmet-module/pom.xml @@ -34,6 +34,7 @@ gov-issue gov-project epmet-common-service + resi-home diff --git a/epmet-module/resi-home/pom.xml b/epmet-module/resi-home/pom.xml new file mode 100644 index 0000000000..9f05706cd0 --- /dev/null +++ b/epmet-module/resi-home/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + + epmet-module + com.epmet + 2.0.0 + + + com.epmet + resi-home + pom + + + resi-home-client + resi-home-server + + + + \ No newline at end of file diff --git a/epmet-module/resi-home/resi-home-client/pom.xml b/epmet-module/resi-home/resi-home-client/pom.xml new file mode 100644 index 0000000000..e6c61b76a3 --- /dev/null +++ b/epmet-module/resi-home/resi-home-client/pom.xml @@ -0,0 +1,24 @@ + + + + resi-home + com.epmet + 2.0.0 + + 4.0.0 + + resi-home-client + + + javax.validation + validation-api + + + org.projectlombok + lombok + + + + \ No newline at end of file diff --git a/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/DemoTestFormDTO.java b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/DemoTestFormDTO.java new file mode 100644 index 0000000000..ff6d66c808 --- /dev/null +++ b/epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/DemoTestFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/5/21 10:31 + */ +@Data +public class DemoTestFormDTO implements Serializable { + private static final long serialVersionUID = -3091524430403897917L; + @NotBlank(message = "客户id不能为空") + private String customerId; + @NotBlank(message = "网格id不能为空") + private String gridId; +} \ No newline at end of file diff --git a/epmet-module/resi-home/resi-home-server/Dockerfile b/epmet-module/resi-home/resi-home-server/Dockerfile new file mode 100644 index 0000000000..00ce6c09fe --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8104 + +ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"] \ No newline at end of file diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml new file mode 100644 index 0000000000..3034f6ff01 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml @@ -0,0 +1,17 @@ +version: "3.7" +services: + resi-home-server: + container_name: resi-home-server-dev + image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.1 + ports: + - "8104:8104" + network_mode: host # 使用现有网络 + volumes: + - "/opt/epmet-cloud-logs/dev:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar" + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml new file mode 100644 index 0000000000..2230b743f0 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml @@ -0,0 +1,17 @@ +version: "3.7" +services: + resi-home-server: + container_name: resi-home-server-test + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:0.3.26 + ports: + - "8104:8104" + network_mode: host # 使用现有网络 + volumes: + - "/opt/epmet-cloud-logs/test:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar" + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml new file mode 100644 index 0000000000..39e22431fa --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -0,0 +1,133 @@ + + + 4.0.0 + 0.3.1 + + + resi-home + com.epmet + 2.0.0 + + resi-home-server + jar + + + + com.epmet + resi-home-client + 2.0.0 + + + com.epmet + epmet-commons-tools + 2.0.0 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework + spring-context-support + + + org.springframework.boot + spring-boot-starter-actuator + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + io.github.openfeign + feign-httpclient + 10.3.0 + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + ${project.basedir}/src/main/java + + + true + ${basedir}/src/main/resources + + + + + + + dev + + true + + + 8104 + dev + + + 0 + 192.168.1.130 + 6379 + 123456 + + true + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + + + false + + + + + test + + + 8104 + test + + + 0 + r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com + 6379 + EpmEtrEdIs!q@w + + true + 192.168.10.150:8848 + 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae + + + false + + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/ResiHomeApplication.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/ResiHomeApplication.java new file mode 100644 index 0000000000..9c7e8f6a66 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/ResiHomeApplication.java @@ -0,0 +1,23 @@ +package com.epmet; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; + +/** + * + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients +public class ResiHomeApplication { + + public static void main(String[] args) { + SpringApplication.run(ResiHomeApplication.class, args); + } + +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/ModuleConfigImpl.java new file mode 100644 index 0000000000..4081491cf9 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/ModuleConfigImpl.java @@ -0,0 +1,26 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.config; + +import com.epmet.commons.tools.config.ModuleConfig; +import org.springframework.stereotype.Service; + +/** + * 模块配置信息 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Service +public class ModuleConfigImpl implements ModuleConfig { + @Override + public String getName() { + return "resihome"; + } +} 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 new file mode 100644 index 0000000000..5de8b0304f --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiHomeController.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 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 new file mode 100644 index 0000000000..3f62df0e31 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java @@ -0,0 +1,16 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.feign.fallback.GovIssueFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; + + +/** + * @Description gov-issue服务fegin + * @Author wangc + * @Date 2020/5/12 10:00 + * url = "localhost:8101" + */ +@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER , fallback = GovIssueFeignClientFallBack.class) +public interface GovIssueFeignClient { +} 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 new file mode 100644 index 0000000000..7bd2dd42ff --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java @@ -0,0 +1,15 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.feign.fallback.GovProjectFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/5/14 13:26 + */ +@FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectFeignClientFallBack.class) +public interface GovProjectFeignClient { + +} 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 new file mode 100644 index 0000000000..fc94db7f99 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java @@ -0,0 +1,14 @@ +package com.epmet.feign.fallback; + +import com.epmet.feign.GovIssueFeignClient; +import org.springframework.stereotype.Component; + +/** + * + * @author zhaoqifeng + * @date 2020/5/21 12:12 + */ +@Component +public class GovIssueFeignClientFallBack implements GovIssueFeignClient { + +} 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 new file mode 100644 index 0000000000..82af1ee7f1 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java @@ -0,0 +1,15 @@ +package com.epmet.feign.fallback; + +import com.epmet.feign.GovProjectFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/5/14 13:26 + */ +@Component +public class GovProjectFeignClientFallBack implements GovProjectFeignClient { +} diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000000..78690a6d9f --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml @@ -0,0 +1,71 @@ +server: + port: @server.port@ + servlet: + context-path: /resi/home + +spring: + main: + allow-bean-definition-overriding: true + application: + name: resi-home-server + #环境 dev|test|prod + profiles: + active: dev + messages: + encoding: UTF-8 + basename: i18n/messages_common + jackson: + time-zone: GMT+8 + date-format: yyyy-MM-dd HH:mm:ss + redis: + database: @spring.redis.index@ + host: @spring.redis.host@ + port: @spring.redis.port@ + password: @spring.redis.password@ + timeout: 30s + cloud: + nacos: + discovery: + server-addr: @nacos.server-addr@ + #nacos的命名空间ID，默认是public + namespace: @nacos.discovery.namespace@ + #不把自己注册到注册中心的地址 + register-enabled: @nacos.register-enabled@ + ip: @nacos.ip@ + config: + enabled: @nacos.config-enabled@ + server-addr: @nacos.server-addr@ + namespace: @nacos.config.namespace@ + group: @nacos.config.group@ + file-extension: yaml +management: + endpoints: + web: + exposure: + include: "*" + endpoint: + health: + show-details: ALWAYS + + +feign: + hystrix: + enabled: true + client: + config: + default: + loggerLevel: BASIC + httpclient: + enabled: true + +hystrix: + command: + default: + execution: + isolation: + thread: + timeoutInMilliseconds: 60000 #缺省为1000 + +ribbon: + ReadTimeout: 300000 + ConnectTimeout: 300000 diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml new file mode 100644 index 0000000000..142e0bb289 --- /dev/null +++ b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + debug + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + + + + ${log.path}/debug.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/debug-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + debug + ACCEPT + DENY + + + + + + + ${log.path}/info.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + + ${log.path}/info-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + info + ACCEPT + DENY + + + + + + + ${log.path}/warn.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/warn-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + warn + ACCEPT + DENY + + + + + + + ${log.path}/error.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/error-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d5f5a7f91a4ce9e89dcc1bb181b8d7c7a7ca45c7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 21 May 2020 12:58:57 +0800 Subject: [PATCH 07/10] =?UTF-8?q?job=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-job/epmet-job-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml index 1fd4ef1cc1..19c0084d34 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-job-server:0.3.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.1 ports: - "8084:8084" network_mode: host # 使用现有网络 From 6b83c4fec644ba20a47d79cf9ada39c401053969 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 21 May 2020 13:02:06 +0800 Subject: [PATCH 08/10] =?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 --- .../gov-issue/gov-issue-server/deploy/docker-compose-test.yml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-test.yml | 2 +- .../oper-crm/oper-crm-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 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 e9bad4bebd..15d3c1b7ce 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.17 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.18 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 b6d777e2fa..b1b1e6384e 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.44 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.46 ports: - "8092:8092" 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 e28bd29d45..976da87163 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.8 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.9 ports: - "8090:8090" 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 8bf682f113..9547ba59d3 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.28 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.29 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 374049e773..ca4b02e164 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.29 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.30 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 2ebaa50437ba40125c716447216a9509229a20b3 Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 21 May 2020 13:06:32 +0800 Subject: [PATCH 09/10] =?UTF-8?q?1.=E7=BC=BA=E5=B0=91=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/oper-crm/oper-crm-server/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index daa6d9de2d..8313ecb4a5 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -17,6 +17,11 @@ oper-crm-client 2.0.0 + + com.epmet + gov-org-client + 2.0.0 + com.epmet epmet-commons-tools @@ -64,6 +69,12 @@ 2.0.0 compile + + com.epmet + epmet-user-client + 2.0.0 + compile + From 2182f7effcfe6546dbdd9d6196b416f65589dfb3 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 21 May 2020 13:42:24 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0resi=5Fhome=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 02baae7b11..769a43145e 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -166,8 +166,8 @@ lb://common-service-server - - http://localhost:8104 + lb://resi-home-server +