Browse Source

Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

master
wxz 5 years ago
parent
commit
997488ee15
  1. 2
      epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
  2. 2
      epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml
  3. 2
      epmet-admin/epmet-admin-server/pom.xml
  4. 2
      epmet-auth/deploy/docker-compose-dev.yml
  5. 2
      epmet-auth/deploy/docker-compose-test.yml
  6. 2
      epmet-auth/pom.xml
  7. 4
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java
  8. 2
      epmet-gateway/deploy/docker-compose-dev.yml
  9. 2
      epmet-gateway/deploy/docker-compose-test.yml
  10. 2
      epmet-gateway/pom.xml
  11. 2
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
  12. 2
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml
  13. 2
      epmet-module/epmet-common-service/common-service-server/pom.xml
  14. 2
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
  15. 2
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
  16. 2
      epmet-module/epmet-job/epmet-job-server/pom.xml
  17. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
  18. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
  19. 2
      epmet-module/epmet-message/epmet-message-server/pom.xml
  20. 2
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
  21. 2
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
  22. 2
      epmet-module/epmet-oss/epmet-oss-server/pom.xml
  23. 2
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
  24. 2
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
  25. 2
      epmet-module/gov-access/gov-access-server/pom.xml
  26. 2
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
  27. 2
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
  28. 2
      epmet-module/gov-grid/gov-grid-server/pom.xml
  29. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
  30. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
  31. 2
      epmet-module/gov-issue/gov-issue-server/pom.xml
  32. 2
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
  33. 2
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
  34. 2
      epmet-module/gov-mine/gov-mine-server/pom.xml
  35. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  36. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
  37. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  38. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  39. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
  40. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
  41. 2
      epmet-module/gov-project/gov-project-server/pom.xml
  42. 6
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectRelatedPersonnelDao.xml
  43. 2
      epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
  44. 2
      epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml
  45. 2
      epmet-module/oper-access/oper-access-server/pom.xml
  46. 33
      epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/PageQueryFormDTO.java
  47. 27
      epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerResultDTO.java
  48. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
  49. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
  50. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  51. 17
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
  52. 9
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java
  53. 9
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java
  54. 47
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
  55. 14
      epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
  56. 16
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFunctionListFormDTO.java
  57. 25
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveCustomerFunctionFormDTO.java
  58. 42
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFunctionListResultDTO.java
  59. 30
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomizedFunctionListResultDTO.java
  60. 30
      epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/DefaultFunctionListResultDTO.java
  61. 2
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
  62. 2
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
  63. 8
      epmet-module/oper-customize/oper-customize-server/pom.xml
  64. 27
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/CustomerFunctionConstant.java
  65. 37
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionController.java
  66. 21
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionDao.java
  67. 8
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/FunctionDao.java
  68. 29
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
  69. 24
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java
  70. 19
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFunctionService.java
  71. 113
      epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionServiceImpl.java
  72. 32
      epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDao.xml
  73. 10
      epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionDao.xml
  74. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
  75. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
  76. 2
      epmet-module/resi-group/resi-group-server/pom.xml
  77. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
  78. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
  79. 2
      epmet-module/resi-guide/resi-guide-server/pom.xml
  80. 2
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
  81. 2
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
  82. 2
      epmet-module/resi-hall/resi-hall-server/pom.xml
  83. 2
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
  84. 2
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
  85. 2
      epmet-module/resi-home/resi-home-server/pom.xml
  86. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
  87. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
  88. 2
      epmet-module/resi-mine/resi-mine-server/pom.xml
  89. 2
      epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
  90. 2
      epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
  91. 2
      epmet-module/resi-partymember/resi-partymember-server/pom.xml
  92. 2
      epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
  93. 2
      epmet-user/epmet-user-server/deploy/docker-compose-test.yml
  94. 2
      epmet-user/epmet-user-server/pom.xml

2
epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-admin-server: epmet-admin-server:
container_name: epmet-admin-server-dev container_name: epmet-admin-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.11 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.12
ports: ports:
- "8082:8082" - "8082:8082"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-admin-server: epmet-admin-server:
container_name: epmet-admin-server-test container_name: epmet-admin-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-admin-server:0.3.10 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-admin-server:0.3.12
ports: ports:
- "8082:8082" - "8082:8082"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-admin/epmet-admin-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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.11</version> <version>0.3.12</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-admin</artifactId> <artifactId>epmet-admin</artifactId>

2
epmet-auth/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-auth-server: epmet-auth-server:
container_name: epmet-auth-server-dev container_name: epmet-auth-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.14 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.15
ports: ports:
- "8081:8081" - "8081:8081"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-auth/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-auth-server: epmet-auth-server:
container_name: epmet-auth-server-test container_name: epmet-auth-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.13 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.15
ports: ports:
- "8081:8081" - "8081:8081"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-auth/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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.14</version> <version>0.3.15</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId> <artifactId>epmet-cloud</artifactId>

4
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java

@ -33,11 +33,11 @@ import java.util.Map;
/** /**
* 异常处理器 * 异常处理器
* * 暂停使用,改用BaseRequestLogAspect
* @author Mark sunlightcs@gmail.com * @author Mark sunlightcs@gmail.com
* @since 1.0.0 * @since 1.0.0
*/ */
@RestControllerAdvice //@RestControllerAdvice
public class RenExceptionHandler { public class RenExceptionHandler {
private static final Logger logger = LoggerFactory.getLogger(RenExceptionHandler.class); private static final Logger logger = LoggerFactory.getLogger(RenExceptionHandler.class);
@Autowired @Autowired

2
epmet-gateway/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-gateway-server: epmet-gateway-server:
container_name: epmet-gateway-server-dev container_name: epmet-gateway-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.11 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.12
ports: ports:
- "8080:8080" - "8080:8080"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-gateway/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-gateway-server: epmet-gateway-server:
container_name: epmet-gateway-server-test container_name: epmet-gateway-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.10 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.12
ports: ports:
- "8080:8080" - "8080:8080"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-gateway/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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.11</version> <version>0.3.12</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId> <artifactId>epmet-cloud</artifactId>

2
epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
common-service-server: common-service-server:
container_name: common-service-server-dev container_name: common-service-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.2 image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.3
ports: ports:
- "8103:8103" - "8103:8103"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
common-service-server: common-service-server:
container_name: common-service-server-test container_name: common-service-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/common-service-server:0.3.2 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/common-service-server:0.3.3
ports: ports:
- "8103:8103" - "8103:8103"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-common-service/common-service-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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.2</version> <version>0.3.3</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-common-service</artifactId> <artifactId>epmet-common-service</artifactId>

2
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-job-server: epmet-job-server:
container_name: epmet-job-server-dev container_name: epmet-job-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.5 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.6
ports: ports:
- "8084:8084" - "8084:8084"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-job-server: epmet-job-server:
container_name: epmet-job-server-test container_name: epmet-job-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.4 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.6
ports: ports:
- "8084:8084" - "8084:8084"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-job/epmet-job-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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.5</version> <version>0.3.6</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-job</artifactId> <artifactId>epmet-job</artifactId>

2
epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-message-server: epmet-message-server:
container_name: epmet-message-server-dev container_name: epmet-message-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.9 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.10
ports: ports:
- "8085:8085" - "8085:8085"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-message-server: epmet-message-server:
container_name: epmet-message-server-test container_name: epmet-message-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.8 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.10
ports: ports:
- "8085:8085" - "8085:8085"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-message/epmet-message-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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.9</version> <version>0.3.10</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-message</artifactId> <artifactId>epmet-message</artifactId>

2
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml

@ -3,7 +3,7 @@ services:
epmet-oss-server: epmet-oss-server:
container_name: epmet-oss-server-dev container_name: epmet-oss-server-dev
# image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2 # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.10 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.11
ports: ports:
- "8083:8083" - "8083:8083"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml

@ -3,7 +3,7 @@ services:
epmet-oss-server: epmet-oss-server:
container_name: epmet-oss-server-test container_name: epmet-oss-server-test
# image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2 # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-oss-server:0.3.10 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-oss-server:0.3.11
ports: ports:
- "8083:8083" - "8083:8083"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-oss/epmet-oss-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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.10</version> <version>0.3.11</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-oss</artifactId> <artifactId>epmet-oss</artifactId>

2
epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-access-server: gov-access-server:
container_name: gov-access-server-dev container_name: gov-access-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.21 image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.22
ports: ports:
- "8099:8099" - "8099:8099"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-access-server: gov-access-server:
container_name: gov-access-server-test container_name: gov-access-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.20 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.22
ports: ports:
- "8099:8099" - "8099:8099"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.21</version> <version>0.3.22</version>
<parent> <parent>
<artifactId>gov-access</artifactId> <artifactId>gov-access</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

2
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-grid-server: gov-grid-server:
container_name: gov-grid-server-dev container_name: gov-grid-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.25 image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.26
ports: ports:
- "8097:8097" - "8097:8097"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-grid-server: gov-grid-server:
container_name: gov-grid-server-test container_name: gov-grid-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.24 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.26
ports: ports:
- "8097:8097" - "8097:8097"
network_mode: host # 使用现有网络 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" 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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.25</version> <version>0.3.26</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>gov-grid</artifactId> <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: services:
gov-issue-server: gov-issue-server:
container_name: gov-issue-server-dev container_name: gov-issue-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.34 image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.35
ports: ports:
- "8101:8101" - "8101:8101"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-issue-server: gov-issue-server:
container_name: gov-issue-server-test container_name: gov-issue-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.33 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.35
ports: ports:
- "8101:8101" - "8101:8101"
network_mode: host # 使用现有网络 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" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.34</version> <version>0.3.35</version>
<parent> <parent>
<artifactId>gov-issue</artifactId> <artifactId>gov-issue</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

2
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-mine-server: gov-mine-server:
container_name: gov-mine-server-dev container_name: gov-mine-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.23 image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.24
ports: ports:
- "8098:8098" - "8098:8098"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-mine-server: gov-mine-server:
container_name: gov-mine-server-test container_name: gov-mine-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.22 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.24
ports: ports:
- "8098:8098" - "8098:8098"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.23</version> <version>0.3.24</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>gov-mine</artifactId> <artifactId>gov-mine</artifactId>

2
epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-org-server: gov-org-server:
container_name: gov-org-server-dev container_name: gov-org-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.56 image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.57
ports: ports:
- "8092:8092" - "8092:8092"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-org-server: gov-org-server:
container_name: gov-org-server-test container_name: gov-org-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.55 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.57
ports: ports:
- "8092:8092" - "8092:8092"
network_mode: host # 使用现有网络 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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.56</version> <version>0.3.57</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId> <artifactId>gov-org</artifactId>

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@ -152,7 +152,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("areaCode",areaCode); map.put("areaCode",areaCode);
map.put("cityCode",areaCode.substring(0,areaCode.length()-2)); map.put("cityCode",areaCode.substring(0,areaCode.length()-NumConstant.FOUR));
map.put("pageSize",listCustomerGridFormDTO.getPageSize()); map.put("pageSize",listCustomerGridFormDTO.getPageSize());
map.put("pageNo",listCustomerGridFormDTO.getPageNo()); map.put("pageNo",listCustomerGridFormDTO.getPageNo());

2
epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-project-server: gov-project-server:
container_name: gov-project-server-dev container_name: gov-project-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.20 image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.21
ports: ports:
- "8102:8102" - "8102:8102"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-project-server: gov-project-server:
container_name: gov-project-server-test container_name: gov-project-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.19 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.21
ports: ports:
- "8102:8102" - "8102:8102"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.20</version> <version>0.3.21</version>
<parent> <parent>
<artifactId>gov-project</artifactId> <artifactId>gov-project</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

6
epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectRelatedPersonnelDao.xml

@ -17,8 +17,10 @@
<result property="updatedTime" column="UPDATED_TIME"/> <result property="updatedTime" column="UPDATED_TIME"/>
</resultMap> </resultMap>
<select id="selectPersonnelListByProjectId" resultType="com.epmet.dto.ProjectRelatedPersonnelDTO"> <select id="selectPersonnelListByProjectId" resultType="com.epmet.dto.ProjectRelatedPersonnelDTO">
SELECT SELECT DISTINCT
* APP,
GRID_ID,
USER_ID
FROM FROM
project_related_personnel project_related_personnel
WHERE WHERE

2
epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-access-server: oper-access-server:
container_name: oper-access-server-dev container_name: oper-access-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/oper-access-server:0.3.12 image: 192.168.1.130:10080/epmet-cloud-dev/oper-access-server:0.3.13
ports: ports:
- "8093:8093" - "8093:8093"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-access-server: oper-access-server:
container_name: oper-access-server-test container_name: oper-access-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-access-server:0.3.11 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-access-server:0.3.13
ports: ports:
- "8093:8093" - "8093:8093"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/oper-access/oper-access-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.12</version> <version>0.3.13</version>
<parent> <parent>
<artifactId>oper-access</artifactId> <artifactId>oper-access</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

33
epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/PageQueryFormDTO.java

@ -0,0 +1,33 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.List;
/**
* @Description 运营端-客户列表查询-接口入参
* @Author sun
*/
@Data
public class PageQueryFormDTO implements Serializable {
/**
* 客户名称
*/
private String customerName;
/**
* 页码
* */
@Min(1)
private Integer pageNo;
/**
* 每页多少条
* */
private Integer pageSize = 10;
}

27
epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerResultDTO.java

@ -0,0 +1,27 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description 运营端-客户列表查询-接口返参
* @Author sun
*/
@Data
public class CustomerResultDTO implements Serializable {
private static final long serialVersionUID = -916195251545143333L;
/**
* 客户id
*/
private String customerId = "";
/**
* 客户名称
*/
private String customerName = "";
/**
* 客户logo
*/
private String logo = "";
}

2
epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-crm-server: oper-crm-server:
container_name: oper-crm-server-dev container_name: oper-crm-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.17 image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.19
ports: ports:
- "8090:8090" - "8090:8090"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-crm-server: oper-crm-server:
container_name: oper-crm-server-test container_name: oper-crm-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.16 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.19
ports: ports:
- "8090:8090" - "8090:8090"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.17</version> <version>0.3.19</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId> <artifactId>oper-crm</artifactId>

17
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java

@ -17,9 +17,11 @@
package com.epmet.controller; package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.AssertUtils;
@ -31,19 +33,18 @@ import com.epmet.dto.CustomerDTO;
import com.epmet.dto.form.AddRootAgencyFormDTO; import com.epmet.dto.form.AddRootAgencyFormDTO;
import com.epmet.dto.form.CustomerFormDTO; import com.epmet.dto.form.CustomerFormDTO;
import com.epmet.dto.form.CustomerManagerFormDTO; import com.epmet.dto.form.CustomerManagerFormDTO;
import com.epmet.dto.form.PageQueryFormDTO;
import com.epmet.dto.result.CustomerDetailResultDTO; import com.epmet.dto.result.CustomerDetailResultDTO;
import com.epmet.dto.result.ValidCustomerResultDTO; import com.epmet.dto.result.ValidCustomerResultDTO;
import com.epmet.excel.CustomerExcel; import com.epmet.excel.CustomerExcel;
import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.GovOrgFeignClient;
import com.epmet.service.CustomerService; import com.epmet.service.CustomerService;
import org.apache.ibatis.mapping.ResultMap;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.xml.validation.Validator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -222,4 +223,16 @@ public class CustomerController {
CustomerDetailResultDTO customerDetailResultDto = customerService.getcustomerDetail(form.getCustomerId()); CustomerDetailResultDTO customerDetailResultDto = customerService.getcustomerDetail(form.getCustomerId());
return new Result().ok(customerDetailResultDto); return new Result().ok(customerDetailResultDto);
} }
/**
* @param formDTO
* @return
* @Author sun
* @Description 运营端-客户列表查询
**/
@PostMapping("pagequery")
public Result<PageData> pageQuery(@LoginUser TokenDto tokenDTO, @RequestBody PageQueryFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return new Result<PageData>().ok(customerService.pageQuery(formDTO));
}
} }

9
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java

@ -19,6 +19,7 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.CustomerDTO; import com.epmet.dto.CustomerDTO;
import com.epmet.dto.result.CustomerResultDTO;
import com.epmet.dto.result.ValidCustomerResultDTO; import com.epmet.dto.result.ValidCustomerResultDTO;
import com.epmet.entity.CustomerEntity; import com.epmet.entity.CustomerEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -58,4 +59,12 @@ public interface CustomerDao extends BaseDao<CustomerEntity> {
* @return * @return
*/ */
CustomerDTO selectByCustomerName(@Param("customerName") String customerName); CustomerDTO selectByCustomerName(@Param("customerName") String customerName);
/**
* @param customerName
* @return
* @Author sun
* @Description 查询有效客户数据(不区分是否在有效期内)按名称模糊查询
**/
List<CustomerResultDTO> selectCustomerList(@Param("customerName") String customerName);
} }

9
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java

@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerDTO; import com.epmet.dto.CustomerDTO;
import com.epmet.dto.form.CustomerFormDTO; import com.epmet.dto.form.CustomerFormDTO;
import com.epmet.dto.form.CustomerManagerFormDTO; import com.epmet.dto.form.CustomerManagerFormDTO;
import com.epmet.dto.form.PageQueryFormDTO;
import com.epmet.dto.result.CustomerDetailResultDTO; import com.epmet.dto.result.CustomerDetailResultDTO;
import com.epmet.dto.result.ValidCustomerResultDTO; import com.epmet.dto.result.ValidCustomerResultDTO;
import com.epmet.entity.CustomerEntity; import com.epmet.entity.CustomerEntity;
@ -149,4 +150,12 @@ public interface CustomerService extends BaseService<CustomerEntity> {
void addManager(CustomerManagerFormDTO form); void addManager(CustomerManagerFormDTO form);
CustomerDetailResultDTO getcustomerDetail(String customerId); CustomerDetailResultDTO getcustomerDetail(String customerId);
/**
* @param formDTO
* @return
* @Author sun
* @Description 运营端-客户列表查询
**/
PageData pageQuery(PageQueryFormDTO formDTO);
} }

47
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@ -20,18 +20,17 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.RoleKeyConstants; import com.epmet.constant.RoleKeyConstants;
import com.epmet.constant.UserWorkType; import com.epmet.constant.UserWorkType;
import com.epmet.dao.CustomerDao; import com.epmet.dao.CustomerDao;
import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.CustomerDTO; import com.epmet.dto.CustomerDTO;
import com.epmet.dto.CustomerHomeDTO;
import com.epmet.dto.GovStaffRoleDTO; import com.epmet.dto.GovStaffRoleDTO;
import com.epmet.dto.form.*; import com.epmet.dto.form.*;
import com.epmet.dto.result.*; import com.epmet.dto.result.*;
@ -41,6 +40,8 @@ import com.epmet.feign.GovOrgFeignClient;
import com.epmet.feign.OperCustomizeFeignClient; import com.epmet.feign.OperCustomizeFeignClient;
import com.epmet.redis.CustomerRedis; import com.epmet.redis.CustomerRedis;
import com.epmet.service.CustomerService; import com.epmet.service.CustomerService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -229,19 +230,19 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ERROR.getCode()); throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ERROR.getCode());
} }
//// 2. 给客户初始化角色列表 // 2. 给客户初始化角色列表
//Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(customerEntity.getId()); Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(customerEntity.getId());
//if (!initResult.success()) { if (!initResult.success()) {
// throw new RenException("客户新增:为客户初始化角色调用user服务失败:".concat(initResult.toString())); throw new RenException("客户新增:为客户初始化角色调用user服务失败:".concat(initResult.toString()));
//} }
//
////3. 给客户初始化 定制化首页 //3. 给客户初始化 定制化首页
//CustomerHomeDTO initHomeForm = new CustomerHomeDTO(); CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
//initHomeForm.setCustomerId(customerEntity.getId()); initHomeForm.setCustomerId(customerEntity.getId());
//Result initHomeResult = operCustomizeFeignClient.init(initHomeForm); Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
//if (!initHomeResult.success()) { if (!initHomeResult.success()) {
// throw new RenException("初始化首页失败:".concat(initHomeResult.getInternalMsg())); throw new RenException("初始化首页失败:".concat(initHomeResult.getInternalMsg()));
//} }
return customerEntity.getId(); return customerEntity.getId();
} }
@ -371,4 +372,20 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
return new Date(new Date().getTime() + Long.valueOf(life)); return new Date(new Date().getTime() + Long.valueOf(life));
} }
/**
* @param formDTO
* @return
* @Author sun
* @Description 运营端-客户列表查询
**/
@Override
public PageData pageQuery(PageQueryFormDTO formDTO) {
//1:查询有效客户数据(不区分是否在有效期内)
PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
List<CustomerResultDTO> list = baseDao.selectCustomerList(formDTO.getCustomerName());
//PageInfo<CustomerResultDTO> pi = new PageInfo<>(list);
PageData resultDTO = new PageData(list,list.size());
return resultDTO;
}
} }

14
epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml

@ -56,4 +56,18 @@
FROM customer FROM customer
WHERE CUSTOMER_NAME = #{customerName} WHERE CUSTOMER_NAME = #{customerName}
</select> </select>
<select id="selectCustomerList" resultType="com.epmet.dto.result.CustomerResultDTO">
SELECT
id AS "customerId",
customer_name AS "customerName",
IFNULL(logo,"") AS "logo"
FROM
customer
WHERE
del_flag = '0'
<if test='customerName != "" and customerName != null'>
AND customer_name LIKE concat('%', trim(#{customerName}), '%')
</if>
</select>
</mapper> </mapper>

16
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFunctionListFormDTO.java

@ -0,0 +1,16 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@Data
public class CustomerFunctionListFormDTO {
/**
* 客户Id
*/
@NotBlank(message = "客户Id不能为空")
private String customerId;
}

25
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveCustomerFunctionFormDTO.java

@ -0,0 +1,25 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.List;
@Data
public class SaveCustomerFunctionFormDTO {
/**
* 客户Id
*/
@NotBlank(message = "客户Id不能为空")
private String customerId;
/**
* 勾选的默认功能列表Id集合
*/
private List<String> defaultFunctionList;
/**
* 勾选的定制功能列表Id集合
*/
private List<String> customizedFunctionList;
}

42
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerFunctionListResultDTO.java

@ -0,0 +1,42 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
* @Description 运营端-客户定制化服务-查询客户功能列表详情-接口返参
* @Author sun
*/
@Data
public class CustomerFunctionListResultDTO implements Serializable {
private static final long serialVersionUID = 2971689193155710437L;
/**
* 客户id
*/
private String customerId;
/**
* 客户名称
*/
private String customerName;
/**
* logo的url
*/
private String logo;
/**
* 默认功能列表
*/
private List<DefaultFunctionListResultDTO> defaultFunctionList = new ArrayList<>();
/**
* 定制功能列表
*/
private List<CustomizedFunctionListResultDTO> customizedFunctionList = new ArrayList<>();
}

30
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomizedFunctionListResultDTO.java

@ -0,0 +1,30 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description 运营端-客户定制化服务-查询客户功能列表详情-定制功能列表详情-接口返参
* @Author sun
*/
@Data
public class CustomizedFunctionListResultDTO implements Serializable {
private static final long serialVersionUID = 2971689193155710437L;
/**
* 功能id
*/
private String functionId = "";
/**
* 功能名称
*/
private String functionName = "";
/**
* 是否勾选过(true代表拥有此功能)
*/
private Boolean flag = false;
}

30
epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/DefaultFunctionListResultDTO.java

@ -0,0 +1,30 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description 运营端-客户定制化服务-查询客户功能列表详情-默认功能列表详情-接口返参
* @Author sun
*/
@Data
public class DefaultFunctionListResultDTO implements Serializable {
private static final long serialVersionUID = 2971689193155710437L;
/**
* 功能id
*/
private String functionId = "";
/**
* 功能名称
*/
private String functionName = "";
/**
* 是否勾选过(true代表拥有此功能)
*/
private Boolean flag = false;
}

2
epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-customize-server: oper-customize-server:
container_name: oper-customize-server-dev container_name: oper-customize-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.16 image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.17
ports: ports:
- "8089:8089" - "8089:8089"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-customize-server: oper-customize-server:
container_name: oper-customize-server-test container_name: oper-customize-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.15 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.17
ports: ports:
- "8089:8089" - "8089:8089"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

8
epmet-module/oper-customize/oper-customize-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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.16</version> <version>0.3.17</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>oper-customize</artifactId> <artifactId>oper-customize</artifactId>
@ -58,6 +58,12 @@
<artifactId>feign-httpclient</artifactId> <artifactId>feign-httpclient</artifactId>
<version>10.3.0</version> <version>10.3.0</version>
</dependency> </dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>oper-crm-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

27
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/constant/CustomerFunctionConstant.java

@ -0,0 +1,27 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
* <p>
* https://www.renren.io
* <p>
* 版权所有侵权必究
*/
package com.epmet.constant;
/**
* 常量
* @author sun
* @since 1.0.0
*/
public interface CustomerFunctionConstant {
/**
* 调用opr-crm服务查询客户基本信息失败
*/
String SELECT_CUSTOMER_EXCEPTION = "获取客户基本信息失败";
/**
* 既没有勾选默认功能有没有勾选定制功能
*/
String PARAMETER_EXCEPTION = "请至少勾选一条默认功能或定制功能数据";
}

37
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/CustomerFunctionController.java

@ -17,15 +17,23 @@
package com.epmet.controller; package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.ValidateException;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.constant.CustomerFunctionConstant;
import com.epmet.dto.CustomerFunctionDTO; import com.epmet.dto.CustomerFunctionDTO;
import com.epmet.dto.form.CustomerFunctionListFormDTO;
import com.epmet.dto.form.SaveCustomerFunctionFormDTO;
import com.epmet.dto.result.CustomerFunctionListResultDTO;
import com.epmet.excel.CustomerFunctionExcel; import com.epmet.excel.CustomerFunctionExcel;
import com.epmet.service.CustomerFunctionService; import com.epmet.service.CustomerFunctionService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -91,4 +99,31 @@ public class CustomerFunctionController {
ExcelUtils.exportExcelToTarget(response, null, list, CustomerFunctionExcel.class); ExcelUtils.exportExcelToTarget(response, null, list, CustomerFunctionExcel.class);
} }
/**
* @param formDTO
* @return
* @Author sun
* @Description 运营端-获取客户功能(已勾选未勾选)详情列表
**/
@PostMapping("customerfunctionlist")
public Result<CustomerFunctionListResultDTO> customerFunctionList(@LoginUser TokenDto tokenDTO, @RequestBody CustomerFunctionListFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return new Result<CustomerFunctionListResultDTO>().ok(customerFunctionService.customerFunctionList(formDTO));
}
/**
* @param formDTO
* @return
* @Author sun
* @Description 运营端-保存客户功能关系数据
**/
@PostMapping("savecustomerfunction")
public Result saveCustomerFunction(@LoginUser TokenDto tokenDTO, @RequestBody SaveCustomerFunctionFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
if ((formDTO.getDefaultFunctionList().size() + formDTO.getCustomizedFunctionList().size()) < NumConstant.ONE) {
throw new ValidateException(CustomerFunctionConstant.PARAMETER_EXCEPTION);
}
customerFunctionService.saveCustomerFunction(formDTO);
return new Result();
}
} }

21
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/CustomerFunctionDao.java

@ -18,8 +18,12 @@
package com.epmet.dao; package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.CustomerFunctionDTO;
import com.epmet.entity.CustomerFunctionEntity; import com.epmet.entity.CustomerFunctionEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* 客户功能权限表 * 客户功能权限表
@ -29,5 +33,20 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface CustomerFunctionDao extends BaseDao<CustomerFunctionEntity> { public interface CustomerFunctionDao extends BaseDao<CustomerFunctionEntity> {
/**
* @param customerId
* @return
* @Author sun
* @Description 根据客户Id查询客户已经配置的功能列表
**/
List<CustomerFunctionDTO> selectCustomerFunctionList(@Param("customerId") String customerId);
/**
* @param customerId
* @return
* @Author sun
* @Description 根据客户Id逻辑删除客户功能关联数据
**/
void updateByCustomerId(String customerId);
} }

8
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/FunctionDao.java

@ -40,4 +40,12 @@ public interface FunctionDao extends BaseDao<FunctionEntity> {
* @Date 2020/3/23 22:15 * @Date 2020/3/23 22:15
**/ **/
List<FunctionDTO> selectFunctionList(); List<FunctionDTO> selectFunctionList();
/**
* @param shoppingStatus
* @return
* @Author sun
* @Description 查询所有已上架功能列表(默认定制功能)
**/
List<FunctionDTO> selectShopFunctionList(int shoppingStatus);
} }

29
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java

@ -0,0 +1,29 @@
package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerDTO;
import com.epmet.dto.result.ValidCustomerResultDTO;
import com.epmet.feign.fallback.OperCrmFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @Description 运营端客户管理服务
* @Author sun
*/
@FeignClient(name = ServiceConstant.OPER_CRM_SERVER, fallback = OperCrmFeignClientFallBack.class)
public interface OperCrmFeignClient {
/**
* @param id
* @return
* @Author sun
* @Description 根据客户Id查询客户基本信息
**/
@GetMapping("/oper/crm/customer/{id}")
Result<CustomerDTO> queryCustomerInfo(@PathVariable("id") String id);
}

24
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/feign/fallback/OperCrmFeignClientFallBack.java

@ -0,0 +1,24 @@
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.CustomerDTO;
import com.epmet.dto.result.ValidCustomerResultDTO;
import com.epmet.feign.OperCrmFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* @Description 运营端客户管理服务
* @Author sun
*/
@Component
public class OperCrmFeignClientFallBack implements OperCrmFeignClient {
@Override
public Result<CustomerDTO> queryCustomerInfo(String id) {
return ModuleUtils.feignConError(ServiceConstant.OPER_CRM_SERVER, "get",id);
}
}

19
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/CustomerFunctionService.java

@ -20,6 +20,9 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.CustomerFunctionDTO; import com.epmet.dto.CustomerFunctionDTO;
import com.epmet.dto.form.CustomerFunctionListFormDTO;
import com.epmet.dto.form.SaveCustomerFunctionFormDTO;
import com.epmet.dto.result.CustomerFunctionListResultDTO;
import com.epmet.entity.CustomerFunctionEntity; import com.epmet.entity.CustomerFunctionEntity;
import java.util.List; import java.util.List;
@ -92,4 +95,20 @@ public interface CustomerFunctionService extends BaseService<CustomerFunctionEnt
* @date 2020-03-10 * @date 2020-03-10
*/ */
void delete(String[] ids); void delete(String[] ids);
/**
* @param formDTO
* @return
* @Author sun
* @Description 运营端-获取客户功能(已勾选未勾选)详情列表
**/
CustomerFunctionListResultDTO customerFunctionList(CustomerFunctionListFormDTO formDTO);
/**
* @param formDTO
* @return
* @Author sun
* @Description 运营端-保存客户功能关系数据
**/
void saveCustomerFunction(SaveCustomerFunctionFormDTO formDTO);
} }

113
epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/CustomerFunctionServiceImpl.java

@ -20,12 +20,25 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.CustomerFunctionConstant;
import com.epmet.dao.CustomerFunctionDao; import com.epmet.dao.CustomerFunctionDao;
import com.epmet.dao.FunctionDao;
import com.epmet.dto.CustomerDTO;
import com.epmet.dto.CustomerFunctionDTO; import com.epmet.dto.CustomerFunctionDTO;
import com.epmet.dto.FunctionDTO;
import com.epmet.dto.form.CustomerFunctionListFormDTO;
import com.epmet.dto.form.SaveCustomerFunctionFormDTO;
import com.epmet.dto.result.CustomerFunctionListResultDTO;
import com.epmet.dto.result.CustomizedFunctionListResultDTO;
import com.epmet.dto.result.DefaultFunctionListResultDTO;
import com.epmet.entity.CustomerFunctionEntity; import com.epmet.entity.CustomerFunctionEntity;
import com.epmet.feign.OperCrmFeignClient;
import com.epmet.redis.CustomerFunctionRedis; import com.epmet.redis.CustomerFunctionRedis;
import com.epmet.service.CustomerFunctionService; import com.epmet.service.CustomerFunctionService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -33,12 +46,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* 客户功能权限表 * 客户功能权限表
* *
* @author generator generator@elink-cn.com * @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-10 * @since v1.0.0 2020-03-10
@ -48,6 +62,10 @@ public class CustomerFunctionServiceImpl extends BaseServiceImpl<CustomerFunctio
@Autowired @Autowired
private CustomerFunctionRedis customerFunctionRedis; private CustomerFunctionRedis customerFunctionRedis;
@Autowired
private FunctionDao functionDao;
@Autowired
private OperCrmFeignClient operCrmFeignClient;
@Override @Override
public PageData<CustomerFunctionDTO> page(Map<String, Object> params) { public PageData<CustomerFunctionDTO> page(Map<String, Object> params) {
@ -101,4 +119,95 @@ public class CustomerFunctionServiceImpl extends BaseServiceImpl<CustomerFunctio
baseDao.deleteBatchIds(Arrays.asList(ids)); baseDao.deleteBatchIds(Arrays.asList(ids));
} }
/**
* @param formDTO
* @return
* @Author sun
* @Description 运营端-获取客户功能(已勾选未勾选)详情列表
**/
@Override
public CustomerFunctionListResultDTO customerFunctionList(CustomerFunctionListFormDTO formDTO) {
CustomerFunctionListResultDTO resultDTO = new CustomerFunctionListResultDTO();
//1:调用oper-crm服务。查询客户基本信息
Result<CustomerDTO> result = operCrmFeignClient.queryCustomerInfo(formDTO.getCustomerId());
if (!result.success() || null == result.getData()) {
throw new RenException(CustomerFunctionConstant.SELECT_CUSTOMER_EXCEPTION);
}
CustomerDTO customerDTO = result.getData();
resultDTO.setCustomerId(customerDTO.getId());
resultDTO.setCustomerName(customerDTO.getCustomerName());
resultDTO.setLogo(customerDTO.getLogo());
//2:查询所有已上架功能列表(默认、定制功能)
List<FunctionDTO> funList = functionDao.selectShopFunctionList(NumConstant.ONE);
if(null==funList||funList.size()<NumConstant.ONE){
return resultDTO;
}
//3:查询当前客户已拥有的功能
List<CustomerFunctionDTO> csList = baseDao.selectCustomerFunctionList(formDTO.getCustomerId());
//4:封装数据,客户已拥有但已下架的功能不展示
List<DefaultFunctionListResultDTO> defaultFunctionList = new ArrayList<>();
List<CustomizedFunctionListResultDTO> customizedFunctionList = new ArrayList<>();
funList.forEach(fun -> {
//默认功能
if (fun.getFunctionGroup() == NumConstant.ZERO) {
DefaultFunctionListResultDTO df = new DefaultFunctionListResultDTO();
df.setFunctionId(fun.getId());
df.setFunctionName(fun.getFunctionName());
csList.forEach(cs -> {
if (fun.getId().equals(cs.getFunctionId())) {
df.setFlag(true);
}
});
defaultFunctionList.add(df);
}
//定制功能
if (fun.getFunctionGroup() == NumConstant.ONE) {
CustomizedFunctionListResultDTO cf = new CustomizedFunctionListResultDTO();
cf.setFunctionId(fun.getId());
cf.setFunctionName(fun.getFunctionName());
csList.forEach(cs -> {
if (fun.getId().equals(cs.getFunctionId())) {
cf.setFlag(true);
}
});
customizedFunctionList.add(cf);
}
});
resultDTO.setDefaultFunctionList(defaultFunctionList);
resultDTO.setCustomizedFunctionList(customizedFunctionList);
return resultDTO;
}
/**
* @param formDTO
* @return
* @Author sun
* @Description 运营端-保存客户功能关系数据
**/
@Override
@Transactional(rollbackFor = Exception.class)
public void saveCustomerFunction(SaveCustomerFunctionFormDTO formDTO) {
//1:逻辑删除旧的客户功能关联数据
baseDao.updateByCustomerId(formDTO.getCustomerId());
//2:批量新增新的客户功能关系数据
List<CustomerFunctionEntity> entityList = new ArrayList<>();
formDTO.getDefaultFunctionList().forEach(dfId -> {
CustomerFunctionEntity entity = new CustomerFunctionEntity();
entity.setCustomerId(formDTO.getCustomerId());
entity.setFunctionId(dfId);
entityList.add(entity);
});
formDTO.getCustomizedFunctionList().forEach(cfId -> {
CustomerFunctionEntity entity = new CustomerFunctionEntity();
entity.setCustomerId(formDTO.getCustomerId());
entity.setFunctionId(cfId);
entityList.add(entity);
});
insertBatch(entityList);
}
} }

32
epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDao.xml

@ -3,17 +3,27 @@
<mapper namespace="com.epmet.dao.CustomerFunctionDao"> <mapper namespace="com.epmet.dao.CustomerFunctionDao">
<resultMap type="com.epmet.entity.CustomerFunctionEntity" id="customerFunctionMap"> <select id="selectCustomerFunctionList" resultType="com.epmet.dto.CustomerFunctionDTO">
<result property="id" column="ID"/> SELECT
<result property="functionId" column="FUNCTION_ID"/> id,
<result property="customerId" column="CUSTOMER_ID"/> function_id,
<result property="delFlag" column="DEL_FLAG"/> customer_id
<result property="revision" column="REVISION"/> FROM
<result property="createdBy" column="CREATED_BY"/> customer_function
<result property="createdTime" column="CREATED_TIME"/> WHERE
<result property="updatedBy" column="UPDATED_BY"/> del_flag = '0'
<result property="updatedTime" column="UPDATED_TIME"/> AND customer_id = #{customerId}
</resultMap> </select>
<update id="updateByCustomerId" parameterType="string">
UPDATE
customer_function
SET
del_flag = '1'
WHERE
del_flag = '0'
AND
customer_id = #{customerId}
</update>
</mapper> </mapper>

10
epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionDao.xml

@ -28,4 +28,14 @@
f.DEL_FLAG = '0' f.DEL_FLAG = '0'
AND f.SHOPPING_STATUS = '1' AND f.SHOPPING_STATUS = '1'
</select> </select>
<select id="selectShopFunctionList" resultType="com.epmet.dto.FunctionDTO">
SELECT
*
FROM
function
WHERE
del_flag = '0'
AND
shopping_status = #{shoppingStatus}
</select>
</mapper> </mapper>

2
epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-group-server: resi-group-server:
container_name: resi-group-server-dev container_name: resi-group-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.40 image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.41
ports: ports:
- "8095:8095" - "8095:8095"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-group-server: resi-group-server:
container_name: resi-group-server-test container_name: resi-group-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.39 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.41
ports: ports:
- "8095:8095" - "8095:8095"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-group/resi-group-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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.40</version> <version>0.3.41</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>resi-group</artifactId> <artifactId>resi-group</artifactId>

2
epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-guide-server: resi-guide-server:
container_name: resi-guide-server-dev container_name: resi-guide-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.11 image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.12
ports: ports:
- "8091:8091" - "8091:8091"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-guide-server: resi-guide-server:
container_name: resi-guide-server-test container_name: resi-guide-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:0.3.10 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:0.3.12
ports: ports:
- "8091:8091" - "8091:8091"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-guide/resi-guide-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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.11</version> <version>0.3.12</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>resi-guide</artifactId> <artifactId>resi-guide</artifactId>

2
epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-hall-server: resi-hall-server:
container_name: resi-hall-server-dev container_name: resi-hall-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.15 image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.16
ports: ports:
- "8100:8100" - "8100:8100"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-hall-server: resi-hall-server:
container_name: resi-hall-server-test container_name: resi-hall-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:0.3.14 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:0.3.16
ports: ports:
- "8100:8100" - "8100:8100"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.15</version> <version>0.3.16</version>
<parent> <parent>
<artifactId>resi-hall</artifactId> <artifactId>resi-hall</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

2
epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-home-server: resi-home-server:
container_name: resi-home-server-dev container_name: resi-home-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.9 image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.10
ports: ports:
- "8104:8104" - "8104:8104"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-home-server: resi-home-server:
container_name: resi-home-server-test container_name: resi-home-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:0.3.8 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:0.3.10
ports: ports:
- "8104:8104" - "8104:8104"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.9</version> <version>0.3.10</version>
<parent> <parent>
<artifactId>resi-home</artifactId> <artifactId>resi-home</artifactId>

2
epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-mine-server: resi-mine-server:
container_name: resi-mine-server-dev container_name: resi-mine-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.20 image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.21
ports: ports:
- "8094:8094" - "8094:8094"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-mine-server: resi-mine-server:
container_name: resi-mine-server-test container_name: resi-mine-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.19 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.21
ports: ports:
- "8094:8094" - "8094:8094"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

2
epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-partymember-server: resi-partymember-server:
container_name: resi-partymember-server-dev container_name: resi-partymember-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.36 image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.37
ports: ports:
- "8096:8096" - "8096:8096"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-partymember-server: resi-partymember-server:
container_name: resi-partymember-server-test container_name: resi-partymember-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.35 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.37
ports: ports:
- "8096:8096" - "8096:8096"
network_mode: host # 使用现有网络 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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.36</version> <version>0.3.37</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>resi-partymember</artifactId> <artifactId>resi-partymember</artifactId>

2
epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-user-server: epmet-user-server:
container_name: epmet-user-server-dev container_name: epmet-user-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.50 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.51
ports: ports:
- "8087:8087" - "8087:8087"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-user/epmet-user-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-user-server: epmet-user-server:
container_name: epmet-user-server-test container_name: epmet-user-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.49 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.51
ports: ports:
- "8087:8087" - "8087:8087"
network_mode: host # 不会创建新的网络 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" <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"> 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> <modelVersion>4.0.0</modelVersion>
<version>0.3.50</version> <version>0.3.51</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId> <artifactId>epmet-user</artifactId>

Loading…
Cancel
Save