Browse Source

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

master
sunyuchao 5 years ago
parent
commit
3ce43d2fc0
  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. 44
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java
  8. 5
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java
  9. 4
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
  10. 4
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java
  11. 2
      epmet-gateway/deploy/docker-compose-dev.yml
  12. 2
      epmet-gateway/deploy/docker-compose-test.yml
  13. 2
      epmet-gateway/pom.xml
  14. 21
      epmet-gateway/src/main/java/com/epmet/filter/FeignRequestFilter.java
  15. 2
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
  16. 2
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml
  17. 2
      epmet-module/epmet-common-service/common-service-server/pom.xml
  18. 2
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
  19. 2
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
  20. 2
      epmet-module/epmet-job/epmet-job-server/pom.xml
  21. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml
  22. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
  23. 2
      epmet-module/epmet-message/epmet-message-server/pom.xml
  24. 2
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
  25. 2
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml
  26. 2
      epmet-module/epmet-oss/epmet-oss-server/pom.xml
  27. 38
      epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
  28. 2
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
  29. 2
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
  30. 2
      epmet-module/gov-access/gov-access-server/pom.xml
  31. 2
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
  32. 2
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
  33. 2
      epmet-module/gov-grid/gov-grid-server/pom.xml
  34. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
  35. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
  36. 2
      epmet-module/gov-issue/gov-issue-server/pom.xml
  37. 2
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
  38. 2
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
  39. 2
      epmet-module/gov-mine/gov-mine-server/pom.xml
  40. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  41. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
  42. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  43. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  44. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
  45. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
  46. 2
      epmet-module/gov-project/gov-project-server/pom.xml
  47. 6
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectRelatedPersonnelDao.xml
  48. 2
      epmet-module/oper-access/oper-access-server/deploy/docker-compose-dev.yml
  49. 2
      epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml
  50. 2
      epmet-module/oper-access/oper-access-server/pom.xml
  51. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
  52. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
  53. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  54. 27
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
  55. 2
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
  56. 2
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
  57. 2
      epmet-module/oper-customize/oper-customize-server/pom.xml
  58. 37
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ResiRolesOfGroupMemberFormDTO.java
  59. 45
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ResiIdentityFormDTO.java
  60. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
  61. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
  62. 2
      epmet-module/resi-group/resi-group-server/pom.xml
  63. 17
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
  64. 12
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java
  65. 33
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java
  66. 10
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java
  67. 28
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
  68. 57
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java
  69. 11
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
  70. 4
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
  71. 2
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
  72. 37
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml
  73. 19
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
  74. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
  75. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
  76. 2
      epmet-module/resi-guide/resi-guide-server/pom.xml
  77. 9
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java
  78. 2
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
  79. 2
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
  80. 2
      epmet-module/resi-hall/resi-hall-server/pom.xml
  81. 2
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
  82. 2
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
  83. 2
      epmet-module/resi-home/resi-home-server/pom.xml
  84. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
  85. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
  86. 2
      epmet-module/resi-mine/resi-mine-server/pom.xml
  87. 2
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/aspect/RequestLogAspect.java
  88. 47
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ResiIdentityFormDTO.java
  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-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/aspect/RequestLogAspect.java
  93. 29
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/ResiGroupFeignClient.java
  94. 30
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/ResiGroupFeignClientFallBack.java
  95. 14
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
  96. 11
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
  97. 5
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
  98. 2
      epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
  99. 2
      epmet-user/epmet-user-server/deploy/docker-compose-test.yml
  100. 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:
epmet-admin-server:
container_name: epmet-admin-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.10
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.12
ports:
- "8082:8082"
network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-admin-server:
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:
- "8082:8082"
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"
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.10</version>
<version>0.3.12</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-admin</artifactId>

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

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

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

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-auth-server:
container_name: epmet-auth-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.13
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.15
ports:
- "8081:8081"
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"
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.13</version>
<version>0.3.15</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>

44
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java

@ -1,10 +1,12 @@
package com.epmet.commons.tools.aspect;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.exception.ErrorCode;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.exception.ValidateException;
import com.epmet.commons.tools.utils.Result;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -13,6 +15,7 @@ import org.springframework.dao.DuplicateKeyException;
import javax.servlet.http.HttpServletRequest;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.UUID;
/**
* 日志切面
@ -47,56 +50,65 @@ public abstract class BaseRequestLogAspect {
protected Object proceed(ProceedingJoinPoint point, HttpServletRequest request) throws Throwable {
String requestURI = request.getRequestURI();
long threadId = Thread.currentThread().getId();
// 获取事务流水号
String transactionSerial = request.getHeader(AppClientConstant.TRANSACTION_SERIAL_KEY);
//if (StringUtils.isEmpty(transactionSerial)) {
// transactionSerial = UUID.randomUUID().toString();
//}
// 将当前线程名称设置为事务流水号
if (!StringUtils.isEmpty(transactionSerial)) {
Thread.currentThread().setName(transactionSerial);
}
Object result;
LocalDateTime startTime = LocalDateTime.now();
try {
Object[] args = point.getArgs();
log.info(">>>>>>>>请求信息>>>>>>>>:线程ID:{},url:{},请求参数:{}", threadId, requestURI, objectsToString(args));
log.info(">>>>>>>>请求信息>>>>>>>>:事务流水号:{},url:{},请求参数:{}", transactionSerial, requestURI, objectsToString(args));
result = point.proceed();
resultInfoLog(threadId, getExecPeriod(startTime), result);
resultInfoLog(transactionSerial, getExecPeriod(startTime), result);
} catch (RenException e) {
result = handleRenException(e);
resultErrorLog(threadId, getExecPeriod(startTime), result, e.getMsg(), ExceptionUtils.getErrorStackTrace(e));
resultErrorLog(transactionSerial, getExecPeriod(startTime), result, e.getMsg(), ExceptionUtils.getErrorStackTrace(e));
} catch (ValidateException e) {
result = handleValidateException(e);
resultErrorLog(threadId, getExecPeriod(startTime), result, e.getMsg(), ExceptionUtils.getErrorStackTrace(e));
resultErrorLog(transactionSerial, getExecPeriod(startTime), result, e.getMsg(), ExceptionUtils.getErrorStackTrace(e));
} catch (DuplicateKeyException e) {
result = handlerDuplicateKeyException(e);
resultErrorLog(threadId, getExecPeriod(startTime), result, e.getMessage(), ExceptionUtils.getErrorStackTrace(e));
resultErrorLog(transactionSerial, getExecPeriod(startTime), result, e.getMessage(), ExceptionUtils.getErrorStackTrace(e));
} catch (RuntimeException re) {
result = handlerRuntimeException(re);
resultErrorLog(threadId, getExecPeriod(startTime), result, re.getMessage(), ExceptionUtils.getErrorStackTrace(re));
resultErrorLog(transactionSerial, getExecPeriod(startTime), result, re.getMessage(), ExceptionUtils.getErrorStackTrace(re));
} catch (Exception e) {
result = handlerException(e);
resultErrorLog(threadId, getExecPeriod(startTime), result, e.getMessage(), ExceptionUtils.getErrorStackTrace(e));
resultErrorLog(transactionSerial, getExecPeriod(startTime), result, e.getMessage(), ExceptionUtils.getErrorStackTrace(e));
}
return result;
}
/**
* info日志
* @param threadId
* @param transactionSerial
* @param execTimeMillis
* @param result
*/
private void resultInfoLog(Long threadId, Long execTimeMillis, Object result) {
log.info("<<<<<<<<正常响应<<<<<<<<:线程ID:{},执行时长:{}ms, 响应数据:{}",
threadId, execTimeMillis, result == null ? result : result.toString());
private void resultInfoLog(String transactionSerial, Long execTimeMillis, Object result) {
log.info("<<<<<<<<正常响应<<<<<<<<:事务流水号:{}, 执行时长:{}ms, 响应数据:{}",
transactionSerial, execTimeMillis, result == null ? result : result.toString());
}
/**
* 异常信息
* @param threadId
* @param transactionSerial
* @param execTimeMillis
* @param result
* @param exceptionMsg
* @param exceptionDetail
*/
private void resultErrorLog(Long threadId, Long execTimeMillis, Object result, String exceptionMsg, String exceptionDetail) {
log.error("<<<<<<<<异常响应<<<<<<<<:线程ID:{},执行时长:{}ms, 响应数据:{}, 异常信息:{}, 堆栈信息:{}",
threadId, execTimeMillis, result == null ? result : result.toString(), exceptionMsg, exceptionDetail);
private void resultErrorLog(String transactionSerial, Long execTimeMillis, Object result, String exceptionMsg, String exceptionDetail) {
log.error("<<<<<<<<异常响应<<<<<<<<:事务流水号:{}, 执行时长:{}ms, 响应数据:{}, 异常信息:{}, 堆栈信息:{}",
transactionSerial, execTimeMillis, result == null ? result : result.toString(), exceptionMsg, exceptionDetail);
}
/**

5
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java

@ -40,4 +40,9 @@ public interface AppClientConstant {
* 客户端
* */
String CLIENT = "client";
/**
* 事务流水号每次请求串起来的多个服务拥有相同的流水号,便于日志追踪
*/
String TRANSACTION_SERIAL_KEY = "Transaction-Serial";
}

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

@ -61,7 +61,9 @@ public enum EpmetErrorCode {
OPER_ADD_CUSTOMER_ROOT_AGENCY_EXISTS(8703, "添加客户根级组织失败,根级组织已存在"),
OPER_CUSTOMER_EXISTS(8704, "客户已存在"),
OPER_ADD_CUSTOMER_ERROR(8705, "新增客户失败"),
OPER_ADD_CUSTOMER_MANAGER_ERROR(8706, "新增客户管理员失败");
OPER_ADD_CUSTOMER_MANAGER_ERROR(8706, "新增客户管理员失败"),
OPER_UPLOAD_FILE_OVER_SIZE(8707, "文件体积过大"),
OPER_UPLOAD_FILE_TYPE_ERROR(8708, "文件类型错误");
private int code;
private String msg;

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
* @since 1.0.0
*/
@RestControllerAdvice
//@RestControllerAdvice
public class RenExceptionHandler {
private static final Logger logger = LoggerFactory.getLogger(RenExceptionHandler.class);
@Autowired

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

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

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

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-gateway-server:
container_name: epmet-gateway-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.10
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.12
ports:
- "8080:8080"
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"
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.10</version>
<version>0.3.12</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>

21
epmet-gateway/src/main/java/com/epmet/filter/FeignRequestFilter.java

@ -55,10 +55,29 @@ public class FeignRequestFilter implements GlobalFilter, UserTokenFilter {
if (baseTokenDto != null) {
ServerHttpRequest build = exchange.getRequest().mutate()
.header(AppClientConstant.USER_ID, new String[]{baseTokenDto.getUserId()}).build();
.header(AppClientConstant.USER_ID, new String[]{baseTokenDto.getUserId()})
.header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{getTransactionSerial()})
.build();
return chain.filter(exchange.mutate().request(build).build());
}
return chain.filter(exchange);
}
/**
* 获取事务流水号
* @return
*/
public static String getTransactionSerial() {
String[] letterPool = {"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n"
, "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"};
StringBuilder sb = new StringBuilder();
for (int i = 0; i < 2; i++) {
sb.append(letterPool[(int) (Math.random() * 25)]);
}
sb.append(System.currentTimeMillis());
return sb.toString();
}
}

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

@ -2,7 +2,7 @@ version: "3.7"
services:
common-service-server:
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:
- "8103:8103"
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:
common-service-server:
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:
- "8103:8103"
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"
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.2</version>
<version>0.3.3</version>
<parent>
<groupId>com.epmet</groupId>
<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:
epmet-job-server:
container_name: epmet-job-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.4
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.6
ports:
- "8084:8084"
network_mode: host # 使用现有网络

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-release/epmet-job-server:0.3.4
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.6
ports:
- "8084:8084"
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"
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.4</version>
<version>0.3.6</version>
<parent>
<groupId>com.epmet</groupId>
<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:
epmet-message-server:
container_name: epmet-message-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.8
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.10
ports:
- "8085:8085"
network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-message-server:
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:
- "8085:8085"
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"
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.10</version>
<parent>
<groupId>com.epmet</groupId>
<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:
container_name: epmet-oss-server-dev
# 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.12
ports:
- "8083:8083"
network_mode: host # 使用现有网络

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

@ -3,7 +3,7 @@ services:
epmet-oss-server:
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-release/epmet-oss-server:0.3.10
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-oss-server:0.3.12
ports:
- "8083:8083"
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"
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.10</version>
<version>0.3.12</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-oss</artifactId>

38
epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@ -10,6 +10,8 @@ package com.epmet.controller;
import com.epmet.cloud.CloudStorageConfig;
import com.epmet.cloud.OssFactory;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -29,6 +31,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
@ -145,6 +148,41 @@ public class OssController {
*/
@PostMapping("customerlogo/upload")
public Result uploadCustomerLogo(@RequestParam("file") MultipartFile file) {
// 校验文件类型
if (!MediaType.IMAGE_PNG_VALUE.equals(file.getContentType())) {
throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getCode()
, EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getMsg());
}
// 校验文件体积,不超过1m
long maxSize = 1024 * 1024;
long size = file.getSize();
if (size > maxSize) {
throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode()
, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg());
}
return ossService.uploadImg(file);
}
@PostMapping("function/upload")
public Result uploadFunctionLogo(@RequestParam("file") MultipartFile file) {
// 校验文件类型
if (!MediaType.IMAGE_PNG_VALUE.equals(file.getContentType())) {
throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getCode()
, EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getMsg());
}
// 校验文件体积,不超过1m
long maxSize = 1024 * 1024;
long size = file.getSize();
if (size > maxSize) {
throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode()
, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg());
}
return ossService.uploadImg(file);
}

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

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

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

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-access-server:
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:
- "8099:8099"
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"
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.20</version>
<version>0.3.22</version>
<parent>
<artifactId>gov-access</artifactId>
<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:
gov-grid-server:
container_name: gov-grid-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.24
image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.26
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.24
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.26
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.24</version>
<version>0.3.26</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.32
image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.35
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.31
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.35
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.32</version>
<version>0.3.35</version>
<parent>
<artifactId>gov-issue</artifactId>
<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:
gov-mine-server:
container_name: gov-mine-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.22
image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.24
ports:
- "8098:8098"
network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-mine-server:
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:
- "8098:8098"
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"
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.22</version>
<version>0.3.24</version>
<parent>
<groupId>com.epmet</groupId>
<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:
gov-org-server:
container_name: gov-org-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.55
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.57
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.55
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.57
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.55</version>
<version>0.3.57</version>
<parent>
<groupId>com.epmet</groupId>
<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.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("pageNo",listCustomerGridFormDTO.getPageNo());

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

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

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

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-project-server:
container_name: gov-project-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.19
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.21
ports:
- "8102:8102"
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"
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.19</version>
<version>0.3.21</version>
<parent>
<artifactId>gov-project</artifactId>
<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"/>
</resultMap>
<select id="selectPersonnelListByProjectId" resultType="com.epmet.dto.ProjectRelatedPersonnelDTO">
SELECT
*
SELECT DISTINCT
APP,
GRID_ID,
USER_ID
FROM
project_related_personnel
WHERE

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

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

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

@ -2,7 +2,7 @@ version: "3.7"
services:
oper-access-server:
container_name: oper-access-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-access-server:0.3.10
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-access-server:0.3.13
ports:
- "8093:8093"
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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.11</version>
<version>0.3.13</version>
<parent>
<artifactId>oper-access</artifactId>
<groupId>com.epmet</groupId>

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.16
image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.20
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.16
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.20
ports:
- "8090:8090"
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"
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.16</version>
<version>0.3.20</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId>

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

@ -31,6 +31,7 @@ import com.epmet.constant.UserWorkType;
import com.epmet.dao.CustomerDao;
import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.CustomerDTO;
import com.epmet.dto.CustomerHomeDTO;
import com.epmet.dto.GovStaffRoleDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
@ -230,19 +231,19 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ERROR.getCode());
}
//// 2. 给客户初始化角色列表
//Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(customerEntity.getId());
//if (!initResult.success()) {
// throw new RenException("客户新增:为客户初始化角色调用user服务失败:".concat(initResult.toString()));
//}
//
////3. 给客户初始化 定制化首页
//CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
//initHomeForm.setCustomerId(customerEntity.getId());
//Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
//if (!initHomeResult.success()) {
// throw new RenException("初始化首页失败:".concat(initHomeResult.getInternalMsg()));
//}
// 2. 给客户初始化角色列表
Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(customerEntity.getId());
if (!initResult.success()) {
throw new RenException("客户新增:为客户初始化角色调用user服务失败:".concat(initResult.toString()));
}
//3. 给客户初始化 定制化首页
CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
initHomeForm.setCustomerId(customerEntity.getId());
Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
if (!initHomeResult.success()) {
throw new RenException("初始化首页失败:".concat(initHomeResult.getInternalMsg()));
}
return customerEntity.getId();
}

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

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

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

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

2
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"
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.15</version>
<version>0.3.17</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-customize</artifactId>

37
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ResiRolesOfGroupMemberFormDTO.java

@ -0,0 +1,37 @@
package com.epmet.resi.group.dto.group.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Description
* @ClassName ResiRolesOfGroupMemberFormDTO
* @Auth wangc
* @Date 2020-05-26 14:27
*/
@Data
public class ResiRolesOfGroupMemberFormDTO implements Serializable {
private static final long serialVersionUID = 881671287108605309L;
/**
* 组Id
* */
private String groupId;
/**
* 热心居民标识 1 0不是 网格级别
* */
private String warmFlag;
/**
* 党员标识 1 0不是
* */
private String partyFlag;
/**
* 修改人Id
* */
private String updatedBy;
}

45
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ResiIdentityFormDTO.java

@ -0,0 +1,45 @@
package com.epmet.resi.group.dto.member.form;
import lombok.Data;
import java.io.Serializable;
/**
* @Description partymember服务调用传参用户认证[党员热心居民]成功后更新组的缓存统计信息及组统计信息
* @ClassName ResiIdentityFormDTO
* @Auth wangc
* @Date 2020-05-26 13:55
*/
@Data
public class ResiIdentityFormDTO implements Serializable {
private static final long serialVersionUID = -6822310777491335787L;
/**
* 用户Id
* */
private String userId;
/**
* 网格Id
* */
private String gridId;
/**
* 客户Id
* */
private String customerId;
/**
* 热心居民标识 1 0不是 网格级别
* */
private String warmFlag;
/**
* 党员标识 1 0不是
* */
private String partyFlag;
/**
* 操作人的Id
* */
private String operatorId;
}

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

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

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

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-group-server:
container_name: resi-group-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.39
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.41
ports:
- "8095:8095"
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"
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.39</version>
<version>0.3.43</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-group</artifactId>

17
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@ -23,9 +23,11 @@ import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.modules.group.service.ResiGroupService;
import com.epmet.modules.group.service.ResiGroupStatisticalService;
import com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO;
import com.epmet.resi.group.dto.group.form.*;
import com.epmet.resi.group.dto.group.result.*;
import com.epmet.resi.group.dto.member.form.ResiIdentityFormDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -43,6 +45,8 @@ import java.util.List;
public class ResiGroupController {
@Autowired
private ResiGroupService resiGroupService;
@Autowired
private ResiGroupStatisticalService resiGroupStatisticalService;
/**
* @param tokenDto
@ -342,4 +346,17 @@ public class ResiGroupController {
public Result<List<RecommendedListResultDTO>> recommendedList(@RequestBody RecommendedListFormDTO formDTO) {
return new Result<List<RecommendedListResultDTO>>().ok(resiGroupService.recommendedList(formDTO));
}
/**
* @Description partymember服务审核通过热心居民党员申请之后需要遍历这个人所在的组进行组的缓存与数据库的更新
* @param resiIdentityFormDTO
* @return
* @author wangc
* @date 2020.05.26 14:12
**/
@PostMapping("updatewhenauditedresirole")
public Result updateWhenAuditedResiRole(@RequestBody ResiIdentityFormDTO resiIdentityFormDTO){
resiGroupStatisticalService.updateWhenAuditedResiRole(resiIdentityFormDTO);
return new Result();
}
}

12
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java

@ -19,9 +19,12 @@ package com.epmet.modules.group.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.modules.group.entity.ResiGroupStatisticalEntity;
import com.epmet.resi.group.dto.group.form.ResiRolesOfGroupMemberFormDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 群组统计信息表
*
@ -47,4 +50,13 @@ public interface ResiGroupStatisticalDao extends BaseDao<ResiGroupStatisticalEnt
* @date 2020.05.24 00:03
**/
void incryTotalIssues(@Param("groupId") String groupId);
/**
* @Description 批量更新组里的党员数热心居民数
* @param list
* @return
* @author wangc
* @date 2020.05.26 14:36
**/
void incryResiRoleMembersBatch(List<ResiRolesOfGroupMemberFormDTO> list);
}

33
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java

@ -24,11 +24,13 @@ import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.modules.constant.ResiGroupRedisKeys;
import com.epmet.modules.group.service.ResiGroupService;
import com.epmet.modules.group.service.ResiGroupStatisticalService;
import com.epmet.modules.utils.ModuleConstant;
import com.epmet.resi.group.constant.TopicConstant;
import com.epmet.resi.group.dto.group.ResiGroupDTO;
import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO;
import com.epmet.resi.group.dto.group.ResiGroupStatisticalDTO;
import com.epmet.resi.group.dto.group.ResiGroupStatisticalInfoRedisDTO;
import com.epmet.resi.group.dto.group.form.ResiRolesOfGroupMemberFormDTO;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -209,4 +211,35 @@ public class ResiGroupRedis {
}
return auditingGroupCount;
}
/**
* @Description 增加群缓存信息中的热心居民数和党员数
* @param list List<ResiRolesOfGroupMemberFormDTO>
* @return
* @author wangc
* @date 2020.05.26 15:53
**/
public void increaseRolesCount(List<ResiRolesOfGroupMemberFormDTO> list){
list.forEach(o -> {
ResiGroupInfoRedisDTO cache = get(o.getGroupId());
if(null != cache && null != cache.getGroupStatisticalInfo()){
if(StringUtils.equals(NumConstant.ONE_STR,o.getPartyFlag())){
cache.getGroupStatisticalInfo().setTotalPartyMembers(
null == cache.getGroupStatisticalInfo().getTotalPartyMembers() ? NumConstant.ONE :
cache.getGroupStatisticalInfo().getTotalPartyMembers() + NumConstant.ONE
);
}else if(StringUtils.equals(NumConstant.ONE_STR,o.getWarmFlag())){
cache.getGroupStatisticalInfo().setTotalEarnestMembers(
null == cache.getGroupStatisticalInfo().getTotalEarnestMembers() ? NumConstant.ONE :
cache.getGroupStatisticalInfo().getTotalEarnestMembers() + NumConstant.ONE
);
}
cache.setGroupId(o.getGroupId());
set(cache);
logger.debug(String.format(ModuleConstant.UPDATE_GROUP_CACHE_SUCCESSFULLY_LOG_TEMPLATE,o.getGroupId()));
}else {
logger.warn(String.format(ModuleConstant.NO_GROUP_CACHE_LOG_TEMPLATE, o.getGroupId()));
}
});
}
}

10
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java

@ -24,6 +24,7 @@ import com.epmet.modules.group.entity.ResiGroupStatisticalEntity;
import com.epmet.modules.member.entity.ResiGroupMemberEntity;
import com.epmet.resi.group.dto.group.ResiGroupStatisticalDTO;
import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
import com.epmet.resi.group.dto.member.form.ResiIdentityFormDTO;
import java.util.List;
import java.util.Map;
@ -103,4 +104,13 @@ public interface ResiGroupStatisticalService extends BaseService<ResiGroupStatis
* @author sun
*/
Result upGroupStatistical(RemoveMemberFormDTO removeMemberFormDTO, ResiGroupMemberEntity resiGroupMemberEntity);
/**
* @Description partymember服务审核通过热心居民党员申请之后需要遍历这个人所在的组进行组的缓存与数据库的更新
* @param resiIdentityFormDTO
* @return
* @author wangc
* @date 2020.05.26 14:12
**/
void updateWhenAuditedResiRole(ResiIdentityFormDTO resiIdentityFormDTO);
}

28
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@ -666,16 +666,26 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
formDTO.setPageNo(pageIndex);
List<ResiGroupEntity> list = baseDao.selectGroupsByGridId(formDTO);
list.stream().filter(group -> StringUtils.equals(ModuleConstant.GROUP_STATUS_APPROVED,group.getState())).collect(Collectors.toList()).forEach(i -> {
//缓存中获取组信息
ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(i.getId());
list.forEach(group -> {
GroupsInGridResultDTO groupsInGridResultDTO = new GroupsInGridResultDTO();
groupsInGridResultDTO.setGroupId(resiGroupInfoRedisDTO.getGroupId());
groupsInGridResultDTO.setGroupName(resiGroupInfoRedisDTO.getGroupName());
groupsInGridResultDTO.setGroupHeadPhoto(resiGroupInfoRedisDTO.getGroupHeadPhoto());
groupsInGridResultDTO.setStatus(resiGroupInfoRedisDTO.getGroupState());
groupsInGridResultDTO.setTotalMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalMembers());
groupsInGridResultDTO.setTotalPartyMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalPartyMembers());
if (MemberStateConstant.REJECTED.equals(group.getState())) {
groupsInGridResultDTO.setGroupId(group.getId());
groupsInGridResultDTO.setGroupName(group.getGroupName());
groupsInGridResultDTO.setGroupHeadPhoto(group.getGroupHeadPhoto());
groupsInGridResultDTO.setStatus(group.getState());
groupsInGridResultDTO.setTotalMember(NumConstant.ZERO);
groupsInGridResultDTO.setTotalPartyMember(NumConstant.ZERO);
} else if(MemberStateConstant.APPROVED.equals(group.getState())) {
//缓存中获取组信息
ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(group.getId());
groupsInGridResultDTO.setGroupId(resiGroupInfoRedisDTO.getGroupId());
groupsInGridResultDTO.setGroupName(resiGroupInfoRedisDTO.getGroupName());
groupsInGridResultDTO.setGroupHeadPhoto(resiGroupInfoRedisDTO.getGroupHeadPhoto());
groupsInGridResultDTO.setStatus(resiGroupInfoRedisDTO.getGroupState());
groupsInGridResultDTO.setTotalMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalMembers());
groupsInGridResultDTO.setTotalPartyMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalPartyMembers());
}
resultList.add(groupsInGridResultDTO);
});

57
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java

@ -19,10 +19,12 @@ package com.epmet.modules.group.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.R;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
@ -35,11 +37,15 @@ import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.group.dao.ResiGroupStatisticalDao;
import com.epmet.modules.group.entity.ResiGroupEntity;
import com.epmet.modules.group.entity.ResiGroupStatisticalEntity;
import com.epmet.modules.group.redis.ResiGroupRedis;
import com.epmet.modules.group.service.ResiGroupStatisticalService;
import com.epmet.modules.member.dao.ResiGroupMemberDao;
import com.epmet.modules.member.entity.ResiGroupMemberEntity;
import com.epmet.modules.utils.ModuleConstant;
import com.epmet.resi.group.dto.group.ResiGroupStatisticalDTO;
import com.epmet.resi.group.dto.group.form.ResiRolesOfGroupMemberFormDTO;
import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO;
import com.epmet.resi.group.dto.member.form.ResiIdentityFormDTO;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -50,6 +56,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 群组统计信息表
@ -64,6 +71,10 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
private ResiGroupServiceImpl resiGroupServiceImpl;
@Autowired
private EpmetUserFeignClient epmetUserFeignClient;
@Autowired
private ResiGroupMemberDao resiGroupMemberDao;
@Autowired
private ResiGroupRedis resiGroupRedis;
@Override
public PageData<ResiGroupStatisticalDTO> page(Map<String, Object> params) {
@ -168,4 +179,50 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
return result;
}
/**
* @Description partymember服务审核通过热心居民党员申请之后需要遍历这个人所在的组进行组的缓存与数据库的更新
* @param resiIdentityFormDTO
* @return
* @author wangc
* @date 2020.05.26 14:12
**/
@Override
@Transactional(rollbackFor = Exception.class)
public void updateWhenAuditedResiRole(ResiIdentityFormDTO resiIdentityFormDTO) {
//用户Id不能为空
//warmFlag为"1"时,网格Id不能为空
//warmFlag与partyFlag不能同时不为0
if(StringUtils.isBlank(resiIdentityFormDTO.getUserId())
|| (StringUtils.isBlank(resiIdentityFormDTO.getGridId()) && StringUtils.equals(NumConstant.ONE_STR,resiIdentityFormDTO.getWarmFlag()))
|| (StringUtils.equals(NumConstant.ONE_STR,resiIdentityFormDTO.getPartyFlag()) && StringUtils.equals(NumConstant.ONE_STR,resiIdentityFormDTO.getWarmFlag()))){
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
}
//查出这个人所在这个网格下的所有的组Id
List<String> groupIds =
resiGroupMemberDao.getGroupIdByUserIdAndGridId(resiIdentityFormDTO.getGridId(),
resiIdentityFormDTO.getUserId(),
StringUtils.equals(NumConstant.ONE_STR,resiIdentityFormDTO.getWarmFlag()) ? NumConstant.ONE_STR : NumConstant.THREE_STR
);
if(null != groupIds && groupIds.size() > NumConstant.ZERO){
List<ResiRolesOfGroupMemberFormDTO> params = groupIds.stream().map(groupId -> {
ResiRolesOfGroupMemberFormDTO param = new ResiRolesOfGroupMemberFormDTO();
param.setGroupId(groupId);
if(StringUtils.equals(NumConstant.ONE_STR,resiIdentityFormDTO.getWarmFlag())){
param.setWarmFlag(NumConstant.ONE_STR);
}else{
param.setPartyFlag(NumConstant.ONE_STR);
}
param.setUpdatedBy(resiIdentityFormDTO.getOperatorId());
return param;
}).collect(Collectors.toList());
baseDao.incryResiRoleMembersBatch(params);
resiGroupRedis.increaseRolesCount(params);
}
return;
}
}

11
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java

@ -108,4 +108,15 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
Integer getMembersCountInGrid(@Param("gridId")String gridId);
List<VotableCountResultDTO> getMembersCountInGrids(@Param("gridIds")List<String> gridIds);
/**
* @Description 根据用户Id和网格Id查询这个人所在的指定网格下所有的组Id
* @param gridId
* @param userId
* @param roleFlag 1:热心居民 其他党员
* @return List<String> 组Id
* @author wangc
* @date 2020.05.26 14:22
**/
List<String> getGroupIdByUserIdAndGridId(@Param("gridId")String gridId,@Param("userId")String userId,@Param("roleFlag")String roleFlag);
}

4
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@ -313,4 +313,8 @@ public interface ModuleConstant extends Constant {
String GROUP_STATUS_UNDER_AUDITTING = "under_auditting";
String ALREADY_SHIFT_ISSUE = "话题已转议题,请勿重复操作";
String NO_GROUP_CACHE_LOG_TEMPLATE = "没有相应的组缓存信息,组Id:【%s】";
String UPDATE_GROUP_CACHE_SUCCESSFULLY_LOG_TEMPLATE = "更新组缓存信息成功,组Id:【%s】";
}

2
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@ -224,7 +224,7 @@
AND GRID_ID = #{gridId}
AND DEL_FLAG = '0'
ORDER BY
UPDATED_TIME DESC
LATEST_TOPIC_PUBLISH_DATE DESC
LIMIT #{pageNo}, #{pageSize}
</select>

37
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml

@ -37,4 +37,41 @@
AND DEL_FLAG = '0'
</update>
<!-- 批量更新组里的党员数、热心居民数 -->
<update id="incryResiRoleMembersBatch" parameterType="list">
update resi_group_statistical
<trim prefix="set" suffixOverrides=",">
<trim prefix="TOTAL_PARTY_MEMBERS= (case" suffix="end),">
<foreach collection="list" item="i" index="index">
<if test='i.partyFlag == "1"'>
when RESI_GROUP_ID=#{i.groupId} then TOTAL_PARTY_MEMBERS +1
</if>
</foreach>
</trim>
<trim prefix=" TOTAL_EARNEST_MEMEBERS =(case" suffix="end),">
<foreach collection="list" item="i" index="index">
<if test='i.warmFlag == "1"'>
when RESI_GROUP_ID=#{i.groupId} then TOTAL_EARNEST_MEMEBERS + 1
</if>
</foreach>
</trim>
<trim prefix="updated_by =(case" suffix="end)," >
<foreach collection="list" item="i" index="index">
<if test="i.updatedBy!=null">
when RESI_GROUP_ID=#{i.groupId} then #{i.updatedBy}
</if>
</foreach>
</trim>
updated_time = now()
</trim>
where
DEL_FLAG = '0'
<trim prefix="AND ( " suffix=" )">
<foreach collection="list" separator="or" item="i" index="index" >
RESI_GROUP_ID=#{i.groupId}
</foreach>
</trim>
</update>
</mapper>

19
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml

@ -134,4 +134,23 @@
GROUP BY
groupp.GRID_ID
</select>
<!-- 根据用户Id和网格Id查询这个人所在的指定网格下所有的组Id -->
<select id="getGroupIdByUserIdAndGridId" resultType="string">
SELECT
DISTINCT
member.RESI_GROUP_ID
FROM
RESI_GROUP_MEMBER member
LEFT JOIN RESI_GROUP groupp ON member.RESI_GROUP_ID = groupp.ID AND groupp.DEL_FLAG = '0'
<where>
member.DEL_FLAG = '0'
AND
member.CUSTOMER_USER_ID = #{userId}
<if test='roleFlag == "1"'>
AND groupp.GRID_ID = #{gridId}
</if>
</where>
</select>
</mapper>

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

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

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

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-guide-server:
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:
- "8091:8091"
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"
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.10</version>
<version>0.3.12</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-guide</artifactId>

9
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/UserAccessServiceImpl.java

@ -1,12 +1,11 @@
package com.epmet.service.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.StrangerResiGuideConstant;
import com.epmet.dto.form.EnterGridFormDTO;
import com.epmet.dto.form.UserEnterGridFormDTO;
import com.epmet.dto.form.VisitedFormDTO;
import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
import com.epmet.feign.EpmetUserFeignClient;
import com.epmet.service.UserAccessService;
@ -41,7 +40,7 @@ public class UserAccessServiceImpl implements UserAccessService {
epmetUserFeignClient.getUserInfoAndRoles(userInfoParams);
if(userInfoResult.success()){
//2:调用epmet-user服务查询数据 新建网格记录数据
VisitedFormDTO visitedFormDTO = new VisitedFormDTO();
/*VisitedFormDTO visitedFormDTO = new VisitedFormDTO();
visitedFormDTO.setGridId(userInfoParams.getGridId());
visitedFormDTO.setCustomerId(userInfoParams.getCustomerId());
visitedFormDTO.setUserId(userInfoParams.getUserId());
@ -53,10 +52,10 @@ public class UserAccessServiceImpl implements UserAccessService {
Result re = epmetUserFeignClient.saveVisitedRecord(visitedFormDTO);
if (!re.success()) {
log.warn(StrangerResiGuideConstant.EPMET_USER_EXCEPTION);
}
}*/
}else{
//getUserInfoAndRoles调用失败
log.warn(StrangerResiGuideConstant.EPMET_USER_EXCEPTION);
}
return userInfoResult;

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

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

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

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-hall-server:
container_name: resi-hall-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:0.3.14
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:0.3.16
ports:
- "8100:8100"
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"
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.14</version>
<version>0.3.16</version>
<parent>
<artifactId>resi-hall</artifactId>
<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:
resi-home-server:
container_name: resi-home-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.8
image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.10
ports:
- "8104:8104"
network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@ 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.7
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:0.3.10
ports:
- "8104:8104"
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"
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.10</version>
<parent>
<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:
resi-mine-server:
container_name: resi-mine-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.19
image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.22
ports:
- "8094:8094"
network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@ version: "3.7"
services:
resi-mine-server:
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.22
ports:
- "8094:8094"
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"
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.19</version>
<version>0.3.22</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-mine</artifactId>

2
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/aspect/RequestLogAspect.java

@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
public class RequestLogAspect extends BaseRequestLogAspect {
@Override
@Around(value = "execution(* com.epmet.controller.*Controller*.*(..)) ")
@Around(value = "execution(* com.epmet.modules.*.controller.*Controller*.*(..)) ")
public Object proceed(ProceedingJoinPoint point) throws Throwable {
return super.proceed(point, getRequest());
}

47
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ResiIdentityFormDTO.java

@ -0,0 +1,47 @@
package com.epmet.resi.partymember.dto;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description 调用resi_group服务用户认证[党员热心居民]成功后更新组的缓存统计信息及组统计信息
* @ClassName ResiIdentityFormDTO
* @Auth wangc
* @Date 2020-05-26 13:55
*/
@Data
public class ResiIdentityFormDTO implements Serializable {
private static final long serialVersionUID = -6822310777491335787L;
/**
* 用户Id
* */
@NotBlank(message = "用户Id不能为空")
private String userId;
/**
* 网格Id
* */
private String gridId;
/**
* 客户Id
* */
private String customerId;
/**
* 热心居民标识 1 0不是 网格级别
* */
private String warmFlag;
/**
* 党员标识 1 0不是
* */
private String partyFlag;
/**
* 操作人的Id
* */
private String operatorId;
}

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.35
image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.38
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.35
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.38
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.35</version>
<version>0.3.38</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-partymember</artifactId>

2
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/aspect/RequestLogAspect.java

@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
public class RequestLogAspect extends BaseRequestLogAspect {
@Override
@Around(value = "execution(* com.epmet.controller.*Controller*.*(..)) ")
@Around(value = "execution(* com.epmet.modules.*.controller.*Controller*.*(..)) ")
public Object proceed(ProceedingJoinPoint point) throws Throwable {
return super.proceed(point, getRequest());
}

29
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/ResiGroupFeignClient.java

@ -0,0 +1,29 @@
package com.epmet.modules.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.feign.fallback.GovOrgFeignClientFallBack;
import com.epmet.resi.partymember.dto.ResiIdentityFormDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* @Description Feign调用resi-group模块
* @ClassName ResiGroupFeignClient
* @Author wangc
*/
@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = GovOrgFeignClientFallBack.class)
public interface ResiGroupFeignClient {
/**
* @Description partymember服务审核通过热心居民党员申请之后需要遍历这个人所在的组进行组的缓存与数据库的更新
* @param resiIdentityFormDTO
* @return
* @author wangc
* @date 2020.05.26 14:12
**/
@PostMapping("/resi/group/group/updatewhenauditedresirole")
Result updateWhenAuditedResiRole(@RequestBody ResiIdentityFormDTO resiIdentityFormDTO);
}

30
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/ResiGroupFeignClientFallBack.java

@ -0,0 +1,30 @@
package com.epmet.modules.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.modules.feign.ResiGroupFeignClient;
import com.epmet.resi.partymember.dto.ResiIdentityFormDTO;
import org.springframework.stereotype.Component;
/**
* @Description
* @ClassName ResiGroupFeignClientFallBack
* @Auth wangc
* @Date 2020-05-26 16:04
*/
@Component
public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient {
/**
* @Description partymember服务审核通过热心居民党员申请之后需要遍历这个人所在的组进行组的缓存与数据库的更新
* @param resiIdentityFormDTO
* @return
* @author wangc
* @date 2020.05.26 14:12
**/
@Override
public Result updateWhenAuditedResiRole(ResiIdentityFormDTO resiIdentityFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "updateWhenAuditedResiRole",resiIdentityFormDTO);
}
}

14
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@ -25,6 +25,7 @@ import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.modules.feign.EpmetMessageFeignClient;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.feign.GovOrgFeignClient;
import com.epmet.modules.feign.ResiGroupFeignClient;
import com.epmet.modules.partymember.entity.*;
import com.epmet.modules.partymember.redis.PartymemberInfoRedis;
import com.epmet.modules.partymember.service.*;
@ -35,6 +36,7 @@ import com.epmet.redis.ResiPartyMemberRedis;
import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
import com.epmet.resi.partymember.dto.ResiIdentityFormDTO;
import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO;
import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
@ -89,6 +91,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
private GovOrgFeignClient govOrgFeignClient;
@Autowired
private ResiPartyMemberRedis resiPartyMemberRedis;
@Autowired
private ResiGroupFeignClient resiGroupFeignClient;
@Override
@Transactional(rollbackFor = Exception.class)
public Result<PartyMemberInitResultDTO> init(PartyMemberInitFromDTO fromDto) {
@ -231,6 +235,11 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
epmetUserFeignClient.saveUserRole(userRole);
//存入党员注册关系表 用于统计客户网格的认证党员数
saveRegisterRelation(partyMemberInfoDTO);
ResiIdentityFormDTO identityParam = new ResiIdentityFormDTO();
identityParam.setUserId(partyMemberInfoDTO.getUserId());
identityParam.setPartyFlag(NumConstant.ONE_STR);
resiGroupFeignClient.updateWhenAuditedResiRole(identityParam);
}
//将自动认证结果存入党员认证自动审核表
@ -312,6 +321,11 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
saveRegisterRelation(ConvertUtils.sourceToTarget(partyMemberInfoEntity,
PartymemberInfoDTO.class));
auditMessageToResi(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_APPROVE_MSG);
ResiIdentityFormDTO identityParam = new ResiIdentityFormDTO();
identityParam.setUserId(partyMemberInfoEntity.getUserId());
identityParam.setPartyFlag(NumConstant.ONE_STR);
resiGroupFeignClient.updateWhenAuditedResiRole(identityParam);
} else {
auditMessageToResi(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_REJECT_MSG);
}

11
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java

@ -27,6 +27,7 @@ import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.PartyMemberConstant;
@ -41,6 +42,7 @@ import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.modules.feign.EpmetMessageFeignClient;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.feign.GovOrgFeignClient;
import com.epmet.modules.feign.ResiGroupFeignClient;
import com.epmet.modules.warmhearted.constant.ResiWarmUserMessageConstant;
import com.epmet.modules.warmhearted.constant.ResiWarmheartedConstant;
import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
@ -49,6 +51,7 @@ import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService;
import com.epmet.redis.ResiPartyMemberRedis;
import com.epmet.resi.partymember.dto.ResiIdentityFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.*;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiProcessingCountResultDTO;
@ -90,6 +93,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
private GovOrgFeignClient govOrgFeignClient;
@Autowired
private ResiPartyMemberRedis resiPartyMemberRedis;
@Autowired
private ResiGroupFeignClient resiGroupFeignClient;
@Override
public PageData<ResiWarmheartedApplyDTO> page(Map<String, Object> params) {
@ -401,6 +406,12 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
result = auditMessage(entity, ResiWarmUserMessageConstant.AUDIT_APPROVE_MSG);
//4:更新政府端:工作-基层治理-居民管理reddot
resiPartyMemberRedis.subtractWorkGrassrootsResiRedDotValue(entity.getGridId());
//5:更新这个人注册热心居民的网格下的所在的组的热心居民数信息
ResiIdentityFormDTO identityParam = new ResiIdentityFormDTO();
identityParam.setUserId(formDTO.getUserId());
identityParam.setGridId(entity.getGridId());
identityParam.setWarmFlag(NumConstant.ONE_STR);
resiGroupFeignClient.updateWhenAuditedResiRole(identityParam);
return result;
}
/**

5
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java

@ -20,6 +20,11 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
* */
private String currentCustomerId;
/**
* 当前客户名称
* */
//private String currentCustomerName;
/**
* 当前网格Id
* */

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.49
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.51
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.45
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.51
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.49</version>
<version>0.3.51</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId>

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save