Browse Source

Merge remote-tracking branch 'origin/dev_issue_project' into dev_issue_project

dev_shibei_match
wangchao 5 years ago
parent
commit
b583db7ef3
  1. 6
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java
  2. 5
      epmet-gateway/pom.xml
  3. 22
      epmet-gateway/src/main/resources/bootstrap.yml
  4. 2
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
  5. 2
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
  6. 2
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
  7. 2
      epmet-module/gov-grid/gov-grid-server/pom.xml
  8. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
  9. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
  10. 2
      epmet-module/gov-issue/gov-issue-server/pom.xml
  11. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  12. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
  13. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  14. 29
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
  15. 7
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
  16. 7
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
  17. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
  18. 8
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
  19. 15
      epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java
  20. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
  21. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
  22. 13
      epmet-module/oper-crm/oper-crm-server/pom.xml
  23. 35
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
  24. 26
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
  25. 25
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
  26. 20
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
  27. 63
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
  28. 1
      epmet-module/pom.xml
  29. 23
      epmet-module/resi-home/pom.xml
  30. 24
      epmet-module/resi-home/resi-home-client/pom.xml
  31. 20
      epmet-module/resi-home/resi-home-client/src/main/java/com/epmet/dto/DemoTestFormDTO.java
  32. 11
      epmet-module/resi-home/resi-home-server/Dockerfile
  33. 17
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
  34. 17
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
  35. 133
      epmet-module/resi-home/resi-home-server/pom.xml
  36. 23
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/ResiHomeApplication.java
  37. 26
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/ModuleConfigImpl.java
  38. 28
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/controller/ResiHomeController.java
  39. 16
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java
  40. 15
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/GovProjectFeignClient.java
  41. 14
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovIssueFeignClientFallBack.java
  42. 15
      epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/feign/fallback/GovProjectFeignClientFallBack.java
  43. 71
      epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml
  44. 159
      epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml
  45. 2
      epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
  46. 2
      epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
  47. 2
      epmet-module/resi-partymember/resi-partymember-server/pom.xml
  48. 11
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StaffRoleFormDTO.java
  49. 2
      epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
  50. 2
      epmet-user/epmet-user-server/deploy/docker-compose-test.yml
  51. 2
      epmet-user/epmet-user-server/pom.xml
  52. 22
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffRoleController.java

6
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;

5
epmet-gateway/pom.xml

@ -165,6 +165,9 @@
<gateway.routes.gov-project-server.uri>lb://gov-project-server</gateway.routes.gov-project-server.uri>
<!-- 24、公共服务 -->
<gateway.routes.common-service-server.uri>lb://common-service-server</gateway.routes.common-service-server.uri>
<!-- 25、党建园地 -->
<gateway.routes.resi-home-server.uri>lb://resi-home-server</gateway.routes.resi-home-server.uri>
<!-- <gateway.routes.resi-home-server.uri>http://localhost:8104</gateway.routes.resi-home-server.uri>-->
</properties>
</profile>
<profile>
@ -235,6 +238,8 @@
<gateway.routes.gov-project-server.uri>lb://gov-project-server</gateway.routes.gov-project-server.uri>
<!-- 24、公共服务 -->
<gateway.routes.common-service-server.uri>lb://common-service-server</gateway.routes.common-service-server.uri>
<!-- 25、党建园地 -->
<gateway.routes.resi-home-server.uri>lb://resi-home-server</gateway.routes.resi-home-server.uri>
</properties>
</profile>
</profiles>

22
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:

2
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 # 使用现有网络

2
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 # 使用现有网络

2
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 # 使用现有网络

2
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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.20</version>
<version>0.3.21</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-grid</artifactId>

2
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 # 使用现有网络

2
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 # 使用现有网络

2
epmet-module/gov-issue/gov-issue-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<version>0.3.17</version>
<version>0.3.18</version>
<parent>
<artifactId>gov-issue</artifactId>
<groupId>com.epmet</groupId>

2
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.46
ports:
- "8092:8092"
network_mode: host # 使用现有网络

2
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 # 使用现有网络

2
epmet-module/gov-org/gov-org-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.44</version>
<version>0.3.46</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId>

29
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<CustomerAgencyDTO>();
}
/**
* 查询客户根级组织
* @param customerId
* @return
*/
@PostMapping("customerrootagency/{customerId}")
public Result<CustomerAgencyDTO> getCustomerRootAgency(@PathVariable String customerId) {
CustomerAgencyDTO customerRootAgency = agencyService.getCustomerRootAgency(customerId);
return new Result().ok(customerRootAgency);
}
/**
* 批量查询客户根级组织
* @param customerIds
* @return
*/
@PostMapping("customerrootagencybatch")
public Result<Map<String, CustomerAgencyDTO>> getCustomerRootAgencyBatch(@RequestBody List<String> customerIds) {
Map<String, CustomerAgencyDTO> customerRootAgencies = new HashMap<>();
customerIds.stream().forEach(customerId -> {
CustomerAgencyDTO rootAgency = agencyService.getCustomerRootAgency(customerId);
customerRootAgencies.put(customerId, rootAgency);
});
return new Result().ok(customerRootAgencies);
}
}

7
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@ -100,4 +100,11 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
* @Description 查询当前组织的下一级组织列表
**/
List<AgencySubResultDTO> selectSubAgencyList(@Param("subAgencyPids") String subAgencyPids);
/**
* 查询客户根级组织
* @param customerId
* @return
*/
CustomerAgencyDTO getCustomerRootAgency(@Param("customerId") String customerId);
}

7
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);
}

5
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);
}
}

8
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@ -136,4 +136,12 @@
ORDER BY created_time DESC
</select>
<select id="getCustomerRootAgency" resultType="com.epmet.dto.CustomerAgencyDTO">
SELECT *
FROM customer_agency ca
WHERE ca.PID = '0'
AND ca.CUSTOMER_ID = #{customerId}
AND ca.DEL_FLAG = 0
</select>
</mapper>

15
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;
}

2
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 # 使用现有网络

2
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 # 使用现有网络

13
epmet-module/oper-crm/oper-crm-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.8</version>
<version>0.3.9</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId>
@ -17,6 +17,11 @@
<artifactId>oper-crm-client</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>gov-org-client</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-commons-tools</artifactId>
@ -64,6 +69,12 @@
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-user-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

35
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@ -0,0 +1,35 @@
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;
//, url = "localhost:8087"
@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
public interface EpmetUserFeignClient {
/**
* 根据机构Id查询机构下是网格长角色的用户
* @param staffRoleFormDTO
* @return
* @Author sun
*/
@PostMapping("/epmetuser/staffrole/staffsinrole")
Result<List<GovStaffRoleResultDTO>> getStaffsInRole(@RequestBody StaffRoleFormDTO staffRoleFormDTO);
/**
* 一次性查询多个机构下指定角色的用户列表
* @param staffRoleFormDTO
* @return
*/
@PostMapping("/epmetuser/staffrole/staffsinroleoforgs")
Result<Map<String, List<GovStaffRoleResultDTO>>> getStaffsInRoleOfOrgs(@RequestBody StaffRoleFormDTO staffRoleFormDTO);
}

26
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.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.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;
//, url = "localhost:8092"
@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
public interface GovOrgFeignClient {
/**
* 批量查询客户根级组织
* @param customerIds
* @return
*/
@PostMapping("/gov/org/agency/customerrootagencybatch")
Result<Map<String, CustomerAgencyDTO>> getCustomerRootAgencyBatch(List<String> customerIds);
}

25
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<List<GovStaffRoleResultDTO>> getStaffsInRole(StaffRoleFormDTO staffRoleFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffsInRole", staffRoleFormDTO);
}
@Override
public Result<Map<String, List<GovStaffRoleResultDTO>>> getStaffsInRoleOfOrgs(StaffRoleFormDTO staffRoleFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getStaffsInRoleOfOrgs", staffRoleFormDTO);
}
}

20
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<Map<String, CustomerAgencyDTO>> getCustomerRootAgencyBatch(List<String> customerIds) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCustomerRootAgencyBatch", customerIds);
}
}

63
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<CustomerDao, CustomerEntity> 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<CustomerDTO> page(Map<String, Object> params) {
IPage<CustomerEntity> page = baseDao.selectPage(
@ -113,7 +128,47 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
*/
@Override
public Result<List<ValidCustomerResultDTO>> getValidCustomerList() {
return new Result<List<ValidCustomerResultDTO>>().ok(baseDao.selectListValidCustomerResultDTO());
List<ValidCustomerResultDTO> validCustomers = baseDao.selectListValidCustomerResultDTO();
List<String> customerIds = validCustomers.stream().map(customer -> customer.getCustomerId()).collect(Collectors.toList());
Result<Map<String, CustomerAgencyDTO>> rootAgencyResult = govOrgFeignClient.getCustomerRootAgencyBatch(customerIds);
// 1.查询客户的根级组织,批量查询
ArrayList<String> rootAgencyIds = new ArrayList<>();
if (rootAgencyResult.success()) {
Map<String, CustomerAgencyDTO> 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<Map<String, List<GovStaffRoleResultDTO>>> managersResult = epmetUserFeignClient.getStaffsInRoleOfOrgs(staffRoleFormDTO);
if (managersResult.success()) {
Map<String, List<GovStaffRoleResultDTO>> rootAgencyManagerMap = managersResult.getData();
validCustomers.stream().forEach(customer -> {
List<GovStaffRoleResultDTO> 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<List<ValidCustomerResultDTO>>().ok(validCustomers);
}
/**

1
epmet-module/pom.xml

@ -34,6 +34,7 @@
<module>gov-issue</module>
<module>gov-project</module>
<module>epmet-common-service</module>
<module>resi-home</module>
</modules>
</project>

23
epmet-module/resi-home/pom.xml

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>epmet-module</artifactId>
<groupId>com.epmet</groupId>
<version>2.0.0</version>
</parent>
<groupId>com.epmet</groupId>
<artifactId>resi-home</artifactId>
<packaging>pom</packaging>
<modules>
<module>resi-home-client</module>
<module>resi-home-server</module>
</modules>
</project>

24
epmet-module/resi-home/resi-home-client/pom.xml

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<parent>
<artifactId>resi-home</artifactId>
<groupId>com.epmet</groupId>
<version>2.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>resi-home-client</artifactId>
<dependencies>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
</project>

20
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;
}

11
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"]

17
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

17
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

133
epmet-module/resi-home/resi-home-server/pom.xml

@ -0,0 +1,133 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.1</version>
<parent>
<artifactId>resi-home</artifactId>
<groupId>com.epmet</groupId>
<version>2.0.0</version>
</parent>
<artifactId>resi-home-server</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>resi-home-client</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-commons-tools</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!-- 替换Feign原生httpclient -->
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-httpclient</artifactId>
<version>10.3.0</version>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<resources>
<resource>
<filtering>true</filtering>
<directory>${basedir}/src/main/resources</directory>
</resource>
</resources>
</build>
<profiles>
<profile>
<id>dev</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<server.port>8104</server.port>
<spring.profiles.active>dev</spring.profiles.active>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>192.168.1.130</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>123456</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>122.152.200.70:8848</nacos.server-addr>
<nacos.discovery.namespace>fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>
<nacos.ip/>
</properties>
</profile>
<profile>
<id>test</id>
<!--<activation>
<activeByDefault>true</activeByDefault>
</activation>-->
<properties>
<server.port>8104</server.port>
<spring.profiles.active>test</spring.profiles.active>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
<nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
<nacos.config.namespace></nacos.config.namespace>
<nacos.config.group></nacos.config.group>
<nacos.config-enabled>false</nacos.config-enabled>
<nacos.ip/>
</properties>
</profile>
</profiles>
</project>

23
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);
}
}

26
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";
}
}

28
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请求成功");
}
}

16
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 {
}

15
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 {
}

14
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 {
}

15
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 {
}

71
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

159
epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml

@ -0,0 +1,159 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
<property name="log.path" value="logs/resi-home"/>
<!-- 彩色日志格式 -->
<property name="CONSOLE_LOG_PATTERN"
value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
<!--1. 输出到控制台-->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<!--此日志appender是为开发使用,只配置最底级别,控制台输出的日志级别是大于或等于此级别的日志信息-->
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>debug</level>
</filter>
<encoder>
<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
<!-- 设置字符集 -->
<charset>UTF-8</charset>
</encoder>
</appender>
<!--2. 输出到文档-->
<!-- 2.1 level为 DEBUG 日志,时间滚动输出 -->
<appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文档的路径及文档名 -->
<file>${log.path}/debug.log</file>
<!--日志文档输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志归档 -->
<fileNamePattern>${log.path}/debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录debug级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>debug</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 2.2 level为 INFO 日志,时间滚动输出 -->
<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文档的路径及文档名 -->
<file>${log.path}/info.log</file>
<!--日志文档输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset>
</encoder>
<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 每天日志归档路径以及格式 -->
<fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录info级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>info</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 2.3 level为 WARN 日志,时间滚动输出 -->
<appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文档的路径及文档名 -->
<file>${log.path}/warn.log</file>
<!--日志文档输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录warn级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>warn</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 2.4 level为 ERROR 日志,时间滚动输出 -->
<appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文档的路径及文档名 -->
<file>${log.path}/error.log</file>
<!--日志文档输出格式-->
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
<charset>UTF-8</charset> <!-- 此处设置字符集 -->
</encoder>
<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>100MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文档保留天数-->
<maxHistory>15</maxHistory>
</rollingPolicy>
<!-- 此日志文档只记录ERROR级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 开发、测试环境 -->
<springProfile name="dev,test">
<logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO"/>
<logger name="com.epmet.dao" level="INFO"/>
<logger name="com.epmet.dao" level="DEBUG"/>
<root level="INFO">
<appender-ref ref="DEBUG_FILE"/>
<appender-ref ref="INFO_FILE"/>
<appender-ref ref="WARN_FILE"/>
<appender-ref ref="ERROR_FILE"/>
</root>
</springProfile>
<!-- 生产环境 -->
<springProfile name="prod">
<logger name="org.springframework.web" level="INFO"/>
<logger name="org.springboot.sample" level="INFO"/>
<logger name="com.epmet.dao" level="INFO"/>
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="DEBUG_FILE"/>
<appender-ref ref="INFO_FILE"/>
<appender-ref ref="WARN_FILE"/>
<appender-ref ref="ERROR_FILE"/>
</root>
</springProfile>
</configuration>

2
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 # 使用现有网络

2
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.29
ports:
- "8096:8096"
network_mode: host # 使用现有网络

2
epmet-module/resi-partymember/resi-partymember-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.28</version>
<version>0.3.29</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-partymember</artifactId>

11
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<String> orgIds;
}

2
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 # 不会创建新的网络

2
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 # 不会创建新的网络

2
epmet-user/epmet-user-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.29</version>
<version>0.3.30</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId>

22
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<List<GovStaffRoleResultDTO>>().ok(staffRoleDTOS);
}
/**
* 一次性查询多个机构下指定角色的用户列表
* @param staffRoleFormDTO
* @return
*/
@PostMapping("staffsinroleoforgs")
public Result<Map<String, List<GovStaffRoleResultDTO>>> getStaffsInRoleOfOrgs(@RequestBody StaffRoleFormDTO staffRoleFormDTO) {
HashMap<String, List<GovStaffRoleResultDTO>> resultMap = new HashMap<>();
ValidatorUtils.validateEntity(staffRoleFormDTO, StaffRoleFormDTO.GetStaffsInRoleOrOrgs.class);
List<String> orgIds = staffRoleFormDTO.getOrgIds();
if (!CollectionUtil.isEmpty(orgIds)) {
for (String orgId : orgIds) {
List<GovStaffRoleResultDTO> staffRole = staffRoleService.listStaffsInRole(staffRoleFormDTO.getRoleKey(), orgId, DataScope.getDefault());
resultMap.put(orgId, staffRole);
}
}
return new Result<Map<String, List<GovStaffRoleResultDTO>>>().ok(resultMap);
}
/**
* @return Result<StaffRolesResultDTO>
* @Description 查询一个员工在指定客户下的角色

Loading…
Cancel
Save