Browse Source

Merge remote-tracking branch 'origin/dev0.2' into dev0.2

# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
dev
wangchao 5 years ago
parent
commit
124c5b3e3d
  1. 2
      epmet-admin/epmet-admin-server/Dockerfile
  2. 9
      epmet-admin/epmet-admin-server/docker-compose.yml
  3. 2
      epmet-admin/epmet-admin-server/pom.xml
  4. 11
      epmet-auth/Dockerfile
  5. 13
      epmet-auth/docker-compose.yml
  6. 2
      epmet-auth/pom.xml
  7. 13
      epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java
  8. 19
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
  9. 139
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java
  10. 39
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java
  11. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java
  12. 34
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java
  13. 2
      epmet-gateway/Dockerfile
  14. 18
      epmet-gateway/docker-compose.yml
  15. 2
      epmet-gateway/pom.xml
  16. 11
      epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile
  17. 13
      epmet-module/epmet-activiti/epmet-activiti-server/docker-compose.yml
  18. 2
      epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
  19. 11
      epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java
  20. 8
      epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java
  21. 11
      epmet-module/epmet-job/epmet-job-server/Dockerfile
  22. 13
      epmet-module/epmet-job/epmet-job-server/docker-compose.yml
  23. 2
      epmet-module/epmet-job/epmet-job-server/pom.xml
  24. 11
      epmet-module/epmet-message/epmet-message-server/Dockerfile
  25. 13
      epmet-module/epmet-message/epmet-message-server/docker-compose.yml
  26. 2
      epmet-module/epmet-message/epmet-message-server/pom.xml
  27. 8
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java
  28. 2
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java
  29. 11
      epmet-module/epmet-oss/epmet-oss-server/Dockerfile
  30. 13
      epmet-module/epmet-oss/epmet-oss-server/docker-compose.yml
  31. 9
      epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java
  32. 11
      epmet-module/gov-org/gov-org-server/Dockerfile
  33. 13
      epmet-module/gov-org/gov-org-server/docker-compose.yml
  34. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  35. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
  36. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
  37. 11
      epmet-module/oper-access/oper-access-server/Dockerfile
  38. 13
      epmet-module/oper-access/oper-access-server/docker-compose.yml
  39. 2
      epmet-module/oper-access/oper-access-server/pom.xml
  40. 11
      epmet-module/oper-crm/oper-crm-server/Dockerfile
  41. 13
      epmet-module/oper-crm/oper-crm-server/docker-compose.yml
  42. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  43. 11
      epmet-module/oper-customize/oper-customize-server/Dockerfile
  44. 13
      epmet-module/oper-customize/oper-customize-server/docker-compose.yml
  45. 2
      epmet-module/oper-customize/oper-customize-server/pom.xml
  46. 11
      epmet-module/resi-group/resi-group-server/Dockerfile
  47. 13
      epmet-module/resi-group/resi-group-server/docker-compose.yml
  48. 2
      epmet-module/resi-group/resi-group-server/pom.xml
  49. 6
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java
  50. 16
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
  51. 29
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
  52. 18
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java
  53. 6
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
  54. 44
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
  55. 21
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
  56. 53
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
  57. 6
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
  58. 11
      epmet-module/resi-guide/resi-guide-server/Dockerfile
  59. 13
      epmet-module/resi-guide/resi-guide-server/docker-compose.yml
  60. 2
      epmet-module/resi-guide/resi-guide-server/pom.xml
  61. 6
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
  62. 11
      epmet-module/resi-mine/resi-mine-server/Dockerfile
  63. 13
      epmet-module/resi-mine/resi-mine-server/docker-compose.yml
  64. 2
      epmet-module/resi-mine/resi-mine-server/pom.xml
  65. 11
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
  66. 11
      epmet-module/resi-partymember/resi-partymember-server/Dockerfile
  67. 13
      epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml
  68. 2
      epmet-module/resi-partymember/resi-partymember-server/pom.xml
  69. 12
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java
  70. 10
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
  71. 2
      epmet-user/epmet-user-server/Dockerfile
  72. 4
      epmet-user/epmet-user-server/docker-compose.yml
  73. 2
      epmet-user/epmet-user-server/pom.xml
  74. 8
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
  75. 16
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java
  76. 16
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

2
epmet-admin/epmet-admin-server/Dockerfile

@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
EXPOSE 8082
ENTRYPOINT ["java","-jar","./app.jar"]
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

9
epmet-admin/epmet-admin-server/docker-compose.yml

@ -2,7 +2,12 @@ version: "3.7"
services:
epmet-admin-server:
container_name: epmet-admin-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-admin-server:2.0.1
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-admin-server:2.0.11
ports:
- "8082:8082"
network_mode: bridge # 不会创建新的网络
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-admin</artifactId>

11
epmet-auth/Dockerfile

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8081
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

13
epmet-auth/docker-compose.yml

@ -0,0 +1,13 @@
version: "3.7"
services:
epmet-auth-server:
container_name: epmet-auth-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-auth-server:2.0.11
ports:
- "8081:8081"
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>

13
epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java

@ -82,8 +82,10 @@ public class LoginServiceImpl implements LoginService {
UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO();
userTokenResultDTO.setToken(this.packagingUserToken(formDTO, userId, wxMaJscode2SessionResult));
return new Result<UserTokenResultDTO>().ok(userTokenResultDTO);
}else{
logger.error("登录失败userId为空");
throw new RenException("登录失败");
}
return new Result<UserTokenResultDTO>().error("登录失败");
}
/**
@ -267,7 +269,8 @@ public class LoginServiceImpl implements LoginService {
@Override
public Result<UserTokenResultDTO> loginByPassword(LoginByPassWordFormDTO formDTO) {
if(LoginConstant.APP_RESI.equals(formDTO.getApp())){
return new Result<UserTokenResultDTO>().error("居民端请使用微信登录");
logger.error("居民端请使用微信登录");
throw new RenException("居民端请使用微信登录");
}
//1、验证码是否正确
boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha());
@ -282,7 +285,8 @@ public class LoginServiceImpl implements LoginService {
Result<PasswordLoginUserInfoResultDTO> userInfoResult = epmetUserFeignClient.selectLoginUserInfoByPassword(passwordLoginUserInfoFormDTO);
logger.info(userInfoResult.getCode() + userInfoResult.getMsg());
if (!userInfoResult.success() || null == userInfoResult.getData()) {
return new Result<UserTokenResultDTO>().error("账号不存在");
logger.error("账号不存在");
throw new RenException("账号不存在");
}
//3、密码是否正确
//密码错误
@ -333,7 +337,8 @@ public class LoginServiceImpl implements LoginService {
//记录登出日志
//删除redis
if(null == tokenDto){
return new Result().error("当前用户信息获取失败!");
logger.error("账号不存在");
throw new RenException("当前用户信息获取失败");
}
cpUserDetailRedis.logout(tokenDto.getApp() , tokenDto.getClient() , tokenDto.getUserId());

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

@ -6,6 +6,7 @@ package com.epmet.commons.tools.exception;
* @Description:
*/
public enum EpmetErrorCode {
SERVER_ERROR(8000, "服务器开小差了..."),
CANNOT_JOIN_GROUP(8001, "只有认证党员和居民才可以加入小组,请选择您的身份"),
CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组,请选择您的身份"),
GROUP_ALREADY_EXISTED(8003,"您的组名已存在,请重新修改"),
@ -29,16 +30,26 @@ public enum EpmetErrorCode {
this.msg = msg;
}
public int getCode() {
return code;
public static String getMsg(Integer value) {
EpmetErrorCode[] businessModeEnums = values();
for (EpmetErrorCode epmetErrorCodeEnum : businessModeEnums) {
if (epmetErrorCodeEnum.getCode()==value) {
return epmetErrorCodeEnum.getMsg();
}
}
return null;
}
public int getCode(){
return this.code;
}
public void setCode(int code) {
this.code = code;
}
public String getMsg() {
return msg;
public String getMsg(){
return this.msg;
}
public void setMsg(String msg) {

139
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java

@ -1,8 +1,8 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
*
* <p>
* https://www.renren.io
*
* <p>
* 版权所有侵权必究
*/
@ -19,69 +19,82 @@ import org.apache.commons.lang3.StringUtils;
* @since 1.0.0
*/
public class RenException extends RuntimeException {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
private int code;
private String msg;
public RenException(int code) {
this.code = code;
this.msg = MessageUtils.getMessage(code);
}
public RenException(int code, String... params) {
this.code = code;
this.msg = MessageUtils.getMessage(code, params);
}
public RenException(int code, Throwable e) {
super(e);
this.code = code;
this.msg = MessageUtils.getMessage(code);
}
public RenException(int code, Throwable e, String... params) {
super(e);
this.code = code;
}
public RenException(int code, String msg){
this.code = code;
if(StringUtils.isBlank(msg)){
this.msg = MessageUtils.getMessage(code, msg);
}else{
this.msg = msg;
}
}
public RenException(String msg) {
super(msg);
this.code = ErrorCode.INTERNAL_SERVER_ERROR;
this.msg = msg;
}
private String msg;
public RenException(String msg, Throwable e) {
super(msg, e);
this.code = ErrorCode.INTERNAL_SERVER_ERROR;
this.msg = msg;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public int getCode() {
return code;
}
public RenException(int code) {
this.code = code;
this.msg = EpmetErrorCode.getMsg(code);
if (StringUtils.isBlank(this.msg)) {
this.msg = MessageUtils.getMessage(code);
}
}
public void setCode(int code) {
this.code = code;
}
public RenException(int code, String... params) {
this.code = code;
this.msg = EpmetErrorCode.getMsg(code);
if (StringUtils.isBlank(this.msg)) {
this.msg = MessageUtils.getMessage(code, params);
}
}
public RenException(int code, Throwable e) {
super(e);
this.code = code;
this.msg = EpmetErrorCode.getMsg(code);
if (StringUtils.isBlank(this.msg)) {
this.msg = MessageUtils.getMessage(code);
}
}
public RenException(int code, Throwable e, String... params) {
super(e);
this.code = code;
}
public RenException(int code, String msg) {
this.code = code;
if (StringUtils.isBlank(msg)) {
this.msg = EpmetErrorCode.getMsg(code);
if (StringUtils.isBlank(this.msg)) {
this.msg = MessageUtils.getMessage(code, msg);
}
} else {
this.msg = msg;
}
}
public RenException(String msg) {
super(msg);
// this.code = ErrorCode.INTERNAL_SERVER_ERROR;
this.code = EpmetErrorCode.SERVER_ERROR.getCode();
this.msg = msg;
}
public RenException(String msg, Throwable e) {
super(msg, e);
// this.code = ErrorCode.INTERNAL_SERVER_ERROR;
this.code = EpmetErrorCode.SERVER_ERROR.getCode();
this.msg = msg;
}
public String getMsg() {
return msg;
}
public void setMsg(String msg) {
this.msg = msg;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
}

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

@ -47,29 +47,46 @@ public class RenExceptionHandler {
/**
* 处理自定义异常
* "code": 8000,
* "msg": "服务器开小差了...",
*/
@ExceptionHandler(RenException.class)
public Result handleRRException(RenException ex){
Result result = new Result();
result.error(ex.getCode(), ex.getMsg());
logger.error(ExceptionUtils.getErrorStackTrace(ex));
return new Result().error();
}
return result;
/**
* 运行时异常拦截
* "code": 8000,
* "msg": "服务器开小差了...",
*/
@ExceptionHandler(RuntimeException.class)
public Result handleRuntimeException(RuntimeException ex){
logger.error(ExceptionUtils.getErrorStackTrace(ex));
return new Result().error();
}
/**
* 处理自定义异常
* "code": 10002,
* "msg": "数据库中已存在该记录",
*/
@ExceptionHandler(DuplicateKeyException.class)
public Result handleDuplicateKeyException(DuplicateKeyException ex){
Result result = new Result();
result.error(ErrorCode.DB_RECORD_EXISTS);
return result;
logger.error(ExceptionUtils.getErrorStackTrace(ex));
return new Result().error(ErrorCode.DB_RECORD_EXISTS);
}
/**
* 异常
* "code": 8000,
* "msg": "服务器开小差了...",
*/
@ExceptionHandler(Exception.class)
public Result handleException(Exception ex){
logger.error(ex.getMessage(), ex);
saveLog(ex);
logger.error(ExceptionUtils.getErrorStackTrace(ex));
// saveLog(ex);
return new Result().error();
}

2
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java

@ -37,7 +37,7 @@ public class ModuleUtils {
String errorMessage = "Failure to connect " + serverName;
String errorLog = errorMessage + "::[method]->{}::[params]->{}";
log.error(errorLog, methodName, JSON.toJSONString(params));
return new Result().error(errorMessage);
return new Result().error();
}
/**

34
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java

@ -8,9 +8,11 @@
package com.epmet.commons.tools.utils;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.ErrorCode;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
@ -48,24 +50,50 @@ public class Result<T> implements Serializable {
return code == 0 ? true : false;
}
/**
* 返回
* "code": 8000,
* "msg": "服务器开小差了...",
*/
public Result<T> error() {
this.code = ErrorCode.INTERNAL_SERVER_ERROR;
this.msg = com.epmet.commons.tools.utils.MessageUtils.getMessage(this.code);
this.code = EpmetErrorCode.SERVER_ERROR.getCode();
this.msg = EpmetErrorCode.getMsg(code);
if (StringUtils.isBlank(this.msg)) {
this.msg = com.epmet.commons.tools.utils.MessageUtils.getMessage(this.code);
}
return this;
}
/**
* 根据错误编码查询msg返回
*/
public Result<T> error(int code) {
this.code = code;
this.msg = com.epmet.commons.tools.utils.MessageUtils.getMessage(this.code);
this.msg = EpmetErrorCode.getMsg(code);
if (StringUtils.isBlank(this.msg)) {
this.msg = com.epmet.commons.tools.utils.MessageUtils.getMessage(this.code);
}
return this;
}
/**
* 传入错误编码+msg返回
*/
public Result<T> error(int code, String msg) {
this.code = code;
this.msg = msg;
return this;
}
/**
*
* @param msg
* @return 此方法废弃统一使用
* logger.error(XXXX);
* throw new RenException(XXXX);
* XXXX定义常量里
*/
@Deprecated
public Result<T> error(String msg) {
this.code = ErrorCode.INTERNAL_SERVER_ERROR;
this.msg = msg;

2
epmet-gateway/Dockerfile

@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
EXPOSE 8080
ENTRYPOINT ["java","-jar","./app.jar"]
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

18
epmet-gateway/docker-compose.yml

@ -1,13 +1,13 @@
version: "3.7"
services:
epmet-gateway: # 会自动生成容器名称: <当前所在目录>_epmet-gateway_1,依赖于所在目录,不稳定,所以使用container_name 完全手动指定
container_name: epmet-gateway-dev # 完全手动指定容器NAME
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-gateway:2.0.1
epmet-gateway-server:
container_name: epmet-gateway-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-gateway-server:2.0.11
ports:
- "8080:8080"
network_mode: bridge # 不会创建新的网络
# 定义新的网络
#networks:
# epmet-gateway: # 会自动生成容器网络名称: <当前所在目录>_epmet-gateway
# driver: bridge
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>

11
epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8086
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

13
epmet-module/epmet-activiti/epmet-activiti-server/docker-compose.yml

@ -0,0 +1,13 @@
version: "3.7"
services:
epmet-activiti-server:
container_name: epmet-activiti-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-activiti-server:2.0.11
ports:
- "8086:8086"
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

2
epmet-module/epmet-activiti/epmet-activiti-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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-activiti</artifactId>

11
epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java

@ -17,6 +17,7 @@
package com.epmet.controller;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.user.UserDetail;
import com.epmet.commons.tools.utils.ExcelUtils;
@ -34,6 +35,8 @@ import com.epmet.dto.result.ValidCustomerResultDTO;
import com.epmet.excel.DemoExcel;
import com.epmet.service.DemoService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -51,7 +54,7 @@ import java.util.Map;
@RestController
@RequestMapping("demo")
public class DemoController {
private static final Logger logger = LoggerFactory.getLogger(DemoController.class);
@Autowired
private DemoService demoService;
@ -124,7 +127,8 @@ public class DemoController {
@GetMapping("/queryCustomInfo/{customerId}")
public Result<CustomerDTO> queryCustomInfo(@PathVariable("customerId") String customerId) {
if (StringUtils.isBlank(customerId)) {
return new Result<CustomerDTO>().error("customerId不能为空");
logger.error("账号不存在");
throw new RenException("customerId不能为空");
}
return demoService.queryCustomerInfo(customerId);
}
@ -139,7 +143,8 @@ public class DemoController {
@GetMapping("/queryCustomInfoByCustomerId")
public Result<CustomerDTO> queryCustomInfoByCustomerId(@RequestParam("customerId") String customerId) {
if (StringUtils.isBlank(customerId)) {
return new Result<CustomerDTO>().error("customerId不能为空");
logger.error("customerId不能为空");
throw new RenException("customerId不能为空");
}
return demoService.queryCustomInfoByCustomerId(customerId);
}

8
epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java

@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.user.UserDetail;
import com.epmet.commons.tools.utils.ConvertUtils;
@ -39,6 +40,8 @@ import com.epmet.feign.OperCrmFeignClient;
import com.epmet.redis.DemoRedis;
import com.epmet.service.DemoService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -57,7 +60,7 @@ import java.util.Map;
*/
@Service
public class DemoServiceImpl extends BaseServiceImpl<DemoDao, DemoEntity> implements DemoService {
private static final Logger logger = LoggerFactory.getLogger(DemoServiceImpl.class);
@Autowired
private DemoRedis demoRedis;
@Autowired
@ -183,7 +186,8 @@ public class DemoServiceImpl extends BaseServiceImpl<DemoDao, DemoEntity> implem
@Override
public Result sendSmsCaptcha(String mobile) {
if(StringUtils.isBlank(mobile)){
return new Result().error("手机号不能为空");
logger.error("手机号不能为空");
throw new RenException("手机号不能为空");
}
return messageFeignClient.sendSmsCaptcha(mobile);
}

11
epmet-module/epmet-job/epmet-job-server/Dockerfile

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8084
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

13
epmet-module/epmet-job/epmet-job-server/docker-compose.yml

@ -0,0 +1,13 @@
version: "3.7"
services:
epmet-job-server:
container_name: epmet-job-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-job-server:2.0.11
ports:
- "8084:8084"
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-job</artifactId>

11
epmet-module/epmet-message/epmet-message-server/Dockerfile

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8085
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

13
epmet-module/epmet-message/epmet-message-server/docker-compose.yml

@ -0,0 +1,13 @@
version: "3.7"
services:
epmet-message-server:
container_name: epmet-message-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-message-server:2.0.11
ports:
- "8085:8085"
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-message</artifactId>

8
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java

@ -11,6 +11,7 @@ package com.epmet.controller;
import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.annotation.LogOperation;
import com.epmet.commons.tools.constant.Constant;
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;
@ -26,6 +27,8 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@ -43,6 +46,7 @@ import java.util.Map;
@RequestMapping("mailtemplate")
@Api(tags="邮件模板")
public class MailTemplateController {
private static final Logger logger = LoggerFactory.getLogger(MailTemplateController.class);
@Autowired
private SysMailTemplateService sysMailTemplateService;
@Autowired
@ -134,8 +138,8 @@ public class MailTemplateController {
if(flag){
return new Result();
}
return new Result().error("邮件发送失败");
logger.error("邮件发送失败");
throw new RenException("邮件发送失败");
}
}

2
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java

@ -137,6 +137,6 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
e.printStackTrace();
logger.error(String.format("短信验证码发送失败,手机号:%s。errorMessage:%s", mobile, e.getMessage()));
}
return new Result().error(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getCode(), EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getMsg());
return new Result().error(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getCode());
}
}

11
epmet-module/epmet-oss/epmet-oss-server/Dockerfile

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8083
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

13
epmet-module/epmet-oss/epmet-oss-server/docker-compose.yml

@ -0,0 +1,13 @@
version: "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:2.0.10
ports:
- "8083:8083"
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

9
epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java

@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.cloud.OssFactory;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.OssDao;
@ -21,6 +22,8 @@ import com.epmet.entity.OssEntity;
import com.epmet.exception.ModuleErrorCode;
import com.epmet.service.OssService;
import org.apache.commons.io.FilenameUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@ -29,7 +32,7 @@ import java.util.Map;
@Service
public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implements OssService {
private static final Logger logger = LoggerFactory.getLogger(OssServiceImpl.class);
@Override
public PageData<OssEntity> page(Map<String, Object> params) {
IPage<OssEntity> page = baseDao.selectPage(
@ -56,8 +59,8 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
url = OssFactory.build().uploadSuffix(file.getBytes(), extension);
} catch (IOException e) {
e.printStackTrace();
return new Result<UploadImgResultDTO>().error("图片上传异常");
logger.error("图片上传异常");
throw new RenException("图片上传异常");
}
//保存文件信息

11
epmet-module/gov-org/gov-org-server/Dockerfile

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8092
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

13
epmet-module/gov-org/gov-org-server/docker-compose.yml

@ -0,0 +1,13 @@
version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:2.0.11
ports:
- "8092:8092"
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId>

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java

@ -13,8 +13,4 @@ import com.epmet.commons.tools.exception.ErrorCode;
*/
public interface ModuleErrorCode extends ErrorCode {
int ARGS_NOT_ALLOW_NULL_ERROR = 100019001;
int NOT_STANDARD_AREA_CODE_ERROR = 100019002;
}

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java

@ -23,6 +23,7 @@ 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.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;
@ -36,6 +37,8 @@ import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormD
import com.epmet.service.CustomerStaffGridService;
import com.epmet.util.ModuleConstant;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -52,7 +55,7 @@ import java.util.Map;
*/
@Service
public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffGridDao, CustomerStaffGridEntity> implements CustomerStaffGridService {
private static final Logger logger = LoggerFactory.getLogger(CustomerStaffGridServiceImpl.class);
@Autowired
private CustomerStaffGridRedis customerStaffGridRedis;
@Autowired
@ -118,7 +121,8 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
@Override
public Result manageAudit(TokenDto tokenDTO, ResiWarmheartedAuditFormDTO formDTO) {
if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
return new Result().error(ModuleConstant.USER_NOT_NULL);
logger.error(ModuleConstant.USER_NOT_NULL);
throw new RenException(ModuleConstant.USER_NOT_NULL);
}
formDTO.setUserId(tokenDTO.getUserId());
return resiPartymemberFeignClient.manageAudit(formDTO);

11
epmet-module/oper-access/oper-access-server/Dockerfile

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8093
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

13
epmet-module/oper-access/oper-access-server/docker-compose.yml

@ -0,0 +1,13 @@
version: "3.7"
services:
oper-access-server:
container_name: oper-access-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-access-server:2.0.11
ports:
- "8093:8093"
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

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

@ -8,7 +8,7 @@
<version>2.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>2.0.11</version>
<artifactId>oper-access-server</artifactId>
<packaging>jar</packaging>

11
epmet-module/oper-crm/oper-crm-server/Dockerfile

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8090
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

13
epmet-module/oper-crm/oper-crm-server/docker-compose.yml

@ -0,0 +1,13 @@
version: "3.7"
services:
oper-crm-server:
container_name: oper-crm-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-crm-server:2.0.11
ports:
- "8090:8090"
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId>

11
epmet-module/oper-customize/oper-customize-server/Dockerfile

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8089
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

13
epmet-module/oper-customize/oper-customize-server/docker-compose.yml

@ -0,0 +1,13 @@
version: "3.7"
services:
oper-customize-server:
container_name: oper-customize-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-customize-server:2.0.11
ports:
- "8089:8089"
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-customize</artifactId>

11
epmet-module/resi-group/resi-group-server/Dockerfile

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8095
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

13
epmet-module/resi-group/resi-group-server/docker-compose.yml

@ -0,0 +1,13 @@
version: "3.7"
services:
resi-group-server:
container_name: resi-group-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:2.0.11
ports:
- "8095:8095"
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-group</artifactId>

6
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java

@ -22,10 +22,4 @@ import com.epmet.commons.tools.exception.ErrorCode;
*/
public interface ModuleErrorCode extends ErrorCode {
String DATA_ACQUISITION_FAILED = "数据库数据获取失败";
String DELETE_FAILED = "组成员删除失败";
String SLIENT_FAILED = "组成员禁言失败";
}

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

@ -18,6 +18,7 @@
package com.epmet.modules.group.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -29,6 +30,8 @@ import com.epmet.resi.group.dto.group.result.CreatedResultDTO;
import com.epmet.resi.group.dto.group.result.GroupSummarizeResultDTO;
import com.epmet.resi.group.dto.group.result.MyGroupResultDTO;
import com.epmet.resi.group.dto.group.result.RecommendGroupResultDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -44,10 +47,15 @@ import java.util.List;
@RestController
@RequestMapping("group")
public class ResiGroupController {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private ResiGroupService resiGroupService;
@GetMapping("test/{test}")
public Result test(@PathVariable("test")String test){
int result=1/0;
return new Result().ok("请求成功啦❤");
}
/**
* @param tokenDto
* @param myGroupFormDTO
@ -155,7 +163,8 @@ public class ResiGroupController {
public Result initApplyGroup(@LoginUser TokenDto tokenDto,
@RequestBody InitApplyGroupFormDTO initApplyGroupFormDTO) {
if (null == tokenDto) {
return new Result().error(ModuleConstant.USER_NOT_NULL);
logger.error(ModuleConstant.USER_NOT_NULL);
throw new RenException(ModuleConstant.USER_NOT_NULL);
}
initApplyGroupFormDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(initApplyGroupFormDTO);
@ -174,7 +183,8 @@ public class ResiGroupController {
public Result initApplyCreatedGroup(@LoginUser TokenDto tokenDto,
@RequestBody InitApplyCreatedGroupFormDTO initApplyCreatedGroupFormDTO) {
if (null == tokenDto) {
return new Result().error(ModuleConstant.USER_NOT_NULL);
logger.error(ModuleConstant.USER_NOT_NULL);
throw new RenException(ModuleConstant.USER_NOT_NULL);
}
initApplyCreatedGroupFormDTO.setUserId(tokenDto.getUserId());
initApplyCreatedGroupFormDTO.setApp(tokenDto.getApp());

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

@ -24,6 +24,7 @@ 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;
import com.epmet.commons.tools.utils.DateUtils;
@ -32,6 +33,7 @@ import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.dto.form.UserRoleFormDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.dto.result.UserRoleResultDTO;
import com.epmet.modules.exception.ModuleErrorCode;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.group.dao.ResiGroupDao;
import com.epmet.modules.group.dao.ResiGroupOperationDao;
@ -224,7 +226,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
//校验是否是群主
ResiGroupMemberDTO groupMemberDTO = resiGroupMemberService.getResiGroupMember(modifyGroupFormDTO.getGroupId(), modifyGroupFormDTO.getUserId());
if (null == groupMemberDTO || ModuleConstant.GROUP_MEMBER.equals(groupMemberDTO.getGroupLeaderFlag())) {
return new Result().error(ModuleConstant.REJECT_MODIFYGROUPINFO);
logger.error(ModuleConstant.REJECT_MODIFYGROUPINFO);
return new Result().error();
}
if (StringUtils.isBlank(modifyGroupFormDTO.getGroupHeadPhoto())
&& StringUtils.isBlank(modifyGroupFormDTO.getGroupName())
@ -235,7 +238,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
if (1 == updatedRows) {
return new Result().ok(ModuleConstant.UPDATE_SUCCESS);
}
return new Result().error(ModuleConstant.UPDATE_FAILED);
logger.error(ModuleConstant.UPDATE_FAILED);
throw new RenException(ModuleConstant.UPDATE_FAILED);
}
/**
@ -249,7 +253,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
public Result<GroupSummarizeResultDTO> getGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO) {
GroupSummarizeResultDTO groupSummarizeResultDTO = baseDao.selectGroupSummarize(groupSummarizeFormDTO);
if (null == groupSummarizeResultDTO) {
return new Result<GroupSummarizeResultDTO>().error(ModuleConstant.GETGROUPSUMMARIZE_FAILED);
logger.error(ModuleConstant.GETGROUPSUMMARIZE_FAILED);
return new Result<GroupSummarizeResultDTO>().error();
}
//获取组长信息
Result<UserResiInfoResultDTO> groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId());
@ -297,7 +302,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
//1、校验是否同名
List<ResiGroupEntity> resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO);
if (null != resiGroupEntityList && resiGroupEntityList.size() > 0) {
return new Result().error(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode(),EpmetErrorCode.GROUP_ALREADY_EXISTED.getMsg());
return new Result().error(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode());
}
//2、插入一条待审核的组信息
ResiGroupEntity resiGroupEntity = this.structureResiGroupEntity(applyCreateGroupFormDTO);
@ -371,10 +376,12 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
@Override
public Result initApplyGroup(InitApplyGroupFormDTO initApplyGroupFormDTO) {
if (StringUtils.isBlank(initApplyGroupFormDTO.getCustomerId())) {
return new Result().error(ModuleConstant.CUSTOMERID_NOT_NULL);
logger.error(ModuleConstant.CUSTOMERID_NOT_NULL);
throw new RenException(ModuleConstant.CUSTOMERID_NOT_NULL);
}
if (StringUtils.isBlank(initApplyGroupFormDTO.getUserId())) {
return new Result().error(ModuleConstant.USER_NOT_NULL);
logger.error(ModuleConstant.USER_NOT_NULL);
throw new RenException(ModuleConstant.USER_NOT_NULL);
}
UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();
resiUserInfoFormDTO.setUserId(initApplyGroupFormDTO.getUserId());
@ -382,7 +389,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
Result<UserResiInfoResultDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) {
logger.info("居民注册信息查询失败");
return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg());
return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
}
return new Result();
}
@ -409,17 +416,19 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
@Override
public Result initApplyCreatedGroup(InitApplyCreatedGroupFormDTO initApplyCreatedGroupFormDTO) {
if (StringUtils.isBlank(initApplyCreatedGroupFormDTO.getCustomerId())) {
return new Result().error(ModuleConstant.CUSTOMERID_NOT_NULL);
logger.error(ModuleConstant.CUSTOMERID_NOT_NULL);
throw new RenException(ModuleConstant.CUSTOMERID_NOT_NULL);
}
if (StringUtils.isBlank(initApplyCreatedGroupFormDTO.getUserId())) {
return new Result().error(ModuleConstant.USER_NOT_NULL);
logger.error(ModuleConstant.USER_NOT_NULL);
throw new RenException(ModuleConstant.USER_NOT_NULL);
}
UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(initApplyCreatedGroupFormDTO.getApp(),
initApplyCreatedGroupFormDTO.getUserId(),
initApplyCreatedGroupFormDTO.getCustomerId(),
initApplyCreatedGroupFormDTO.getGridId());
if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) {
return new Result().error(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode(),EpmetErrorCode.CANNOT_CREATE_GROUP.getMsg());
return new Result().error(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode());
}
return new Result();
}

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

@ -23,6 +23,7 @@ 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.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
@ -36,9 +37,12 @@ import com.epmet.modules.group.entity.ResiGroupEntity;
import com.epmet.modules.group.entity.ResiGroupStatisticalEntity;
import com.epmet.modules.group.service.ResiGroupStatisticalService;
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.member.form.RemoveMemberFormDTO;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -55,7 +59,7 @@ import java.util.Map;
*/
@Service
public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupStatisticalDao, ResiGroupStatisticalEntity> implements ResiGroupStatisticalService {
private static final Logger logger = LoggerFactory.getLogger(ResiGroupStatisticalServiceImpl.class);
@Autowired
private ResiGroupServiceImpl resiGroupServiceImpl;
@Autowired
@ -125,8 +129,8 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
Result result = new Result();
ResiGroupStatisticalEntity entity = baseDao.selectByResiGroupId(resiGroupMemberEntity.getResiGroupId());
if (null == entity) {
result.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
return result;
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
throw new RenException(ModuleConstant.DATA_ACQUISITION_FAILED);
}
//成员总数
entity.setTotalMembers(entity.getTotalMembers() - NumConstant.ONE);
@ -135,8 +139,8 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
//1:根据组Id查询客户Id
ResiGroupEntity resiGroupEntity = resiGroupServiceImpl.selectById(entity.getResiGroupId());
if (null == resiGroupEntity) {
result.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
return result;
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
throw new RenException(ModuleConstant.DATA_ACQUISITION_FAILED);
}
//2:根据客户Id、用户Id查询被删除成员角色
UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO();
@ -145,8 +149,8 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
userRoleFormDTO.setUserId(resiGroupMemberEntity.getCustomerUserId());
Result<List<UserRoleResultDTO>> resultList = epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO);
if (!resultList.success()) {
result.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
return result;
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
throw new RenException(ModuleConstant.DATA_ACQUISITION_FAILED);
}
for (UserRoleResultDTO userRole : resultList.getData()) {
if (EpmetRoleKeyConstant.WARMHEARTED.equals(userRole.getRoleKey())) {

6
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.Constant;
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;
import com.epmet.commons.tools.utils.Result;
@ -164,7 +165,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
//2、审核通过(讨论中)的群才可以分享邀请连接
ResiGroupDTO resiGroupDTO = resiGroupService.get(formDTO.getGroupId());
if (!GroupStateConstant.GROUP_APPROVED.equals(resiGroupDTO.getState())) {
return new Result<CreateGroupInvitationResultDTO>().error(ModuleConstant.CANNOT_SHARED);
logger.error(ModuleConstant.CANNOT_SHARED);
throw new RenException(ModuleConstant.CANNOT_SHARED);
}
//3、插入一条邀请记录
GroupInvitationEntity groupInvitationEntity = new GroupInvitationEntity();
@ -317,7 +319,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
resiGroupDTO.getCustomerId(),
resiGroupDTO.getGridId());
if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(), EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg());
return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
}
}
//3、新增一条邀请入群、直接审核通过的入群记录

44
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@ -24,6 +24,7 @@ import com.epmet.commons.tools.constant.AppClientConstant;
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;
import com.epmet.commons.tools.utils.Result;
@ -196,16 +197,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
resiGroupDTO.getCustomerId(),
resiGroupDTO.getGridId());
if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg());
return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
}
}
//查看用户最新一条成员处理记录,避免重复申请
GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationLatest(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId());
if(null!=groupMember&&MemberStateConstant.UNDER_AUDITTING.equals(groupMember.getOperateStatus())){
return new Result().error(EpmetErrorCode.ALREADY_APPLIED_GROUP.getCode(),EpmetErrorCode.ALREADY_APPLIED_GROUP.getMsg());
return new Result().error(EpmetErrorCode.ALREADY_APPLIED_GROUP.getCode());
}
if(null!=groupMember&&MemberStateConstant.APPROVED.equals(groupMember.getOperateStatus())){
return new Result().error(ModuleConstant.ALREADY_IN_GROUP);
logger.error(ModuleConstant.ALREADY_IN_GROUP);
throw new RenException(ModuleConstant.ALREADY_IN_GROUP);
}
//插入一条待审核的记录
GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO();
@ -304,12 +306,14 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(agreeApplyFormDTO.getApplyId());
//1、当前申请单是否是待审核
if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
return new Result().error(ModuleConstant.APPLY_NOEXISTS);
logger.error(ModuleConstant.APPLY_NOEXISTS);
throw new RenException(ModuleConstant.APPLY_NOEXISTS);
}
//2、只有群主才可以审批入群申请
ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), agreeApplyFormDTO.getUserId());
if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
return new Result().error(ModuleConstant.CANNOT_AUDIT_APPLY);
logger.error(ModuleConstant.CANNOT_AUDIT_APPLY);
throw new RenException(ModuleConstant.CANNOT_AUDIT_APPLY);
}
//3、修改操作状态
groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
@ -383,12 +387,14 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(disagreeApplyFormDTO.getApplyId());
//1、当前申请单是否是待审核
if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
return new Result().error(ModuleConstant.APPLY_NOEXISTS);
logger.error(ModuleConstant.APPLY_NOEXISTS);
throw new RenException(ModuleConstant.APPLY_NOEXISTS);
}
//2、只有群主才可以审批入群申请
ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), disagreeApplyFormDTO.getUserId());
if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
return new Result().error(ModuleConstant.CANNOT_AUDIT_APPLY);
logger.error(ModuleConstant.CANNOT_AUDIT_APPLY);
throw new RenException(ModuleConstant.CANNOT_AUDIT_APPLY);
}
//3、修改操作状态
groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.REJECTED);
@ -453,17 +459,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
//2、group_member_operation新增一条记录
ResiGroupMemberEntity resiGroupMemberEntity = baseDao.selectById(removeMemberFormDTO.getMemberId());
if (null == resiGroupMemberEntity) {
logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
result.error(ModuleErrorCode.DELETE_FAILED);
return result;
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
logger.error(ModuleConstant.DELETE_FAILED);
throw new RenException(ModuleConstant.DELETE_FAILED);
}
groupMemeberOperationService.saveMemberOperation(removeMemberFormDTO.getUserId(), MemberStateConstant.REMOVED, resiGroupMemberEntity);
//3、修改resi_group_statistical表数据:成员总数-1,普通居民总数-1,热心居民或者党员数根据被删除的用户身份来判断
result = resiGroupStatisticalService.upGroupStatistical(removeMemberFormDTO, resiGroupMemberEntity);
if (!result.success()) {
logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
result.error(ModuleErrorCode.DELETE_FAILED);
return result;
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
logger.error(ModuleConstant.DELETE_FAILED);
throw new RenException(ModuleConstant.DELETE_FAILED);
}
//4、之前这个人发布的话题根据前端传过来的屏蔽标志更新话题状态(移除一条话题在话题操作日志表添加一条日志)
if (removeMemberFormDTO.getHideFlag().equals(NumConstant.ONE_STR)) {
@ -492,17 +498,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
//2:组成员出入群记录(group_memeber_operation)表新增记录
ResiGroupMemberEntity resiGroupMemberEntity = baseDao.selectById(slientMemberFormDTO.getMemberId());
if (null == resiGroupMemberEntity) {
logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
result.error(ModuleErrorCode.SLIENT_FAILED);
return result;
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
logger.error(ModuleConstant.SLIENT_FAILED);
throw new RenException(ModuleConstant.SLIENT_FAILED);
}
groupMemeberOperationService.saveMemberOperation(slientMemberFormDTO.getUserId(), MemberStateConstant.SILENT, resiGroupMemberEntity);
//3:用户消息(user_message)表新增消息数据
ResiGroupEntity resiGroupEntity = resiGroupService.selectById(resiGroupMemberEntity.getResiGroupId());
if (null == resiGroupEntity) {
logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
result.error(ModuleErrorCode.SLIENT_FAILED);
return result;
logger.error(ModuleConstant.DATA_ACQUISITION_FAILED);
logger.error(ModuleConstant.SLIENT_FAILED);
throw new RenException(ModuleConstant.SLIENT_FAILED);
}
UserMessageFormDTO userMessageFormDTO = new UserMessageFormDTO();
userMessageFormDTO.setCustomerId(resiGroupEntity.getCustomerId());

21
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java

@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
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.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
@ -142,8 +143,8 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
//1.判断当前用户是否被禁言
ResiTopicDTO topic = resiTopicService.get(resiCommentFormDTO.getTopicId());
if(null == topic){
logger.warn(ModuleConstant.NO_SUCH_TOPIC);
return new Result().error(ModuleConstant.NO_SUCH_TOPIC);
logger.error(ModuleConstant.NO_SUCH_TOPIC);
throw new RenException(ModuleConstant.NO_SUCH_TOPIC);
}
ResiGroupMemberDTO resiGroupMemberDTO =
@ -152,23 +153,23 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
if(null != resiGroupMemberDTO){
if(MemberStateConstant.SILENT.equals(resiGroupMemberDTO.getStatus())){
//当前用户被禁言
logger.warn(ModuleConstant.SLIENT_MEMBER);
return new Result().error(ModuleConstant.SLIENT_MEMBER);
logger.error(ModuleConstant.SLIENT_MEMBER);
throw new RenException(ModuleConstant.SLIENT_MEMBER);
}else if(MemberStateConstant.REMOVED.equals(resiGroupMemberDTO.getStatus())){
//当前用户已被移出群
logger.warn(ModuleConstant.REMOVED_MEMBER);
return new Result().error(ModuleConstant.REMOVED_MEMBER);
logger.error(ModuleConstant.REMOVED_MEMBER);
throw new RenException(ModuleConstant.REMOVED_MEMBER);
}
}else{
//当前用户非组内成员
logger.warn(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
return new Result().error(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
logger.error(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
throw new RenException(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
}
if(resiCommentFormDTO.getCommentContent().length() > TopicConstant.MAX_NUMBER_OF_COMMENT){
logger.warn(ModuleConstant.COMMENT_NUMBER_OF_WORDS_EXCEEDED);
return new Result().error(ModuleConstant.COMMENT_NUMBER_OF_WORDS_EXCEEDED);
logger.error(ModuleConstant.COMMENT_NUMBER_OF_WORDS_EXCEEDED);
throw new RenException(ModuleConstant.COMMENT_NUMBER_OF_WORDS_EXCEEDED);
}
ResiTopicCommentEntity comment = ConvertUtils.sourceToTarget(resiCommentFormDTO,ResiTopicCommentEntity.class);
comment.setStatus(TopicConstant.PUBLISHMENT);

53
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
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.redis.RedisKeys;
import com.epmet.commons.tools.security.dto.TokenDto;
@ -175,7 +176,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
@Override
public Result createTopic(TokenDto tokenDto, ResiTopicPublishFormDTO resiTopicPublishFormDTO) {
if (null == tokenDto) {
return new Result().error(ModuleConstant.USER_NOT_NULL);
logger.error(ModuleConstant.USER_NOT_NULL);
throw new RenException(ModuleConstant.USER_NOT_NULL);
}
//1.身份校验,查看当前用户是否是组内成员,当前用户是否被禁言
@ -192,7 +194,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
//2.创建话题
if(resiTopicPublishFormDTO.getTopicContent().length() > TopicConstant.MAX_NUMBER_OF_CONTENT){
//内容超过最大限制
return new Result().error(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED);
logger.error(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED);
throw new RenException(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED);
}
ResiTopicEntity topic = ConvertUtils.sourceToTarget(resiTopicPublishFormDTO,ResiTopicEntity.class);
topic.setCreatedBy(tokenDto.getUserId());
@ -200,8 +203,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
baseDao.insertOne(topic);
if(StringUtils.isBlank(topic.getId())){
//没有返回主键
logger.warn(ModuleConstant.NO_PRIMARY_KEY_RETURNED);
return new Result().error(ModuleConstant.NO_PRIMARY_KEY_RETURNED);
logger.error(ModuleConstant.NO_PRIMARY_KEY_RETURNED);
throw new RenException(ModuleConstant.NO_PRIMARY_KEY_RETURNED);
}
if(null != resiTopicPublishFormDTO.getAttachmentList() && resiTopicPublishFormDTO.getAttachmentList().size() > 0){
ResiTopicAttachmentEntity attachment = new ResiTopicAttachmentEntity();
@ -230,8 +233,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
List<ResiGroupStatisticalEntity> statistical = resiGroupStatisticalDao.selectList(wrapper);
if(null != statistical && statistical.size() >= NumConstant.ONE){
if(statistical.size() != NumConstant.ONE){
logger.warn(ModuleConstant.GROUP_STASTICAL_NOT_SINGLE);
return new Result().error(ModuleConstant.GROUP_STASTICAL_NOT_SINGLE);
logger.error(ModuleConstant.GROUP_STASTICAL_NOT_SINGLE);
throw new RenException(ModuleConstant.GROUP_STASTICAL_NOT_SINGLE);
}else{
ResiGroupStatisticalEntity statistical2Update = new ResiGroupStatisticalEntity();
statistical2Update.setId(statistical.get(NumConstant.ZERO).getId());
@ -241,8 +244,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
resiGroupStatisticalDao.updateById(statistical2Update);
}
}else{
logger.warn(ModuleConstant.NO_SUCH_GROUP_STASTICAL_INFO);
return new Result().error(ModuleConstant.NO_SUCH_GROUP_STASTICAL_INFO);
logger.error(ModuleConstant.NO_SUCH_GROUP_STASTICAL_INFO);
throw new RenException(ModuleConstant.NO_SUCH_GROUP_STASTICAL_INFO);
}
@ -265,7 +268,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
@Override
public Result<List<ResiTopicInfoResultDTO>> getLatestTopics(TokenDto tokenDto, String groupId) {
if (null == tokenDto) {
return new Result().error(ModuleConstant.USER_NOT_NULL);
logger.error(ModuleConstant.USER_NOT_NULL);
throw new RenException(ModuleConstant.USER_NOT_NULL);
}
if (StringUtils.isBlank(groupId)) {
return new Result<List<ResiTopicInfoResultDTO>>().error();
@ -305,7 +309,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
@Override
public Result<List<ResiTopicInfoResultDTO>> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) {
if (null == tokenDto) {
return new Result().error(ModuleConstant.USER_NOT_NULL);
logger.error(ModuleConstant.USER_NOT_NULL);
throw new RenException(ModuleConstant.USER_NOT_NULL);
}
//1.查询历史话题列表
@ -350,7 +355,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
@Override
public Result hideTopic(TokenDto tokenDto, ResiTopicOperationFormDTO hiddenFormDTO) {
if (null == tokenDto) {
return new Result().error(ModuleConstant.USER_NOT_NULL);
logger.error(ModuleConstant.USER_NOT_NULL);
throw new RenException(ModuleConstant.USER_NOT_NULL);
}
//1.1拿到组Id
@ -405,7 +411,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
public Result cancelHiddenTopics(TokenDto tokenDto, List<String> topicIds) {
if(null == topicIds || topicIds.size() <= 0){
return new Result().error(ModuleConstant.TOPIC_ID_LIST_NOT_NULL);
logger.error(ModuleConstant.TOPIC_ID_LIST_NOT_NULL);
throw new RenException(ModuleConstant.TOPIC_ID_LIST_NOT_NULL);
}
//1.1拿到组Id
@ -494,8 +501,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
//1.获取话题基本信息
ResiTopicEntity topicDetail = baseDao.selectById(topicId);
if(null == topicDetail || !StringUtils.equals(topicDetail.getId(),topicId)){
logger.warn(ModuleConstant.NO_SUCH_TOPIC);
return new Result().error(ModuleConstant.NO_SUCH_TOPIC);
logger.error(ModuleConstant.NO_SUCH_TOPIC);
throw new RenException(ModuleConstant.NO_SUCH_TOPIC);
}
ResiTopicDetailResultDTO resultDTO = new ResiTopicDetailResultDTO();
resultDTO.setTopicId(topicId);
@ -615,18 +622,18 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
if(MemberStateConstant.SILENT.equals(resiGroupMemberDTO.getStatus())){
//当前用户被禁言
logger.error(ModuleConstant.SLIENT_MEMBER);
return new Result().error(ModuleConstant.SLIENT_MEMBER);
throw new RenException(ModuleConstant.SLIENT_MEMBER);
}else if(MemberStateConstant.REMOVED.equals(resiGroupMemberDTO.getStatus())){
//当前用户已被移出群
logger.error(ModuleConstant.REMOVED_MEMBER);
return new Result().error(ModuleConstant.REMOVED_MEMBER);
throw new RenException(ModuleConstant.REMOVED_MEMBER);
}else{
return new Result();
}
}else{
//当前用户非组内成员
logger.error(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
return new Result().error(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
throw new RenException(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
}
}
@ -644,21 +651,21 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
//1.2判断是否是组长
if(!StringUtils.equals(leaderVerify.getCustomerUserId(),userId)){
//非组长,无权限进行操作
logger.warn(ModuleConstant.NO_TEAMLEADER_AUTH);
return new Result().error(ModuleConstant.NO_TEAMLEADER_AUTH);
logger.error(ModuleConstant.NO_TEAMLEADER_AUTH);
throw new RenException(ModuleConstant.NO_TEAMLEADER_AUTH);
}else{
//是组长
return new Result();
}
}else{
//未找到当前用户的成员信息
logger.warn(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
return new Result().error(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
logger.error(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
throw new RenException(ModuleConstant.NOT_BELONG_TO_CURRENT_GROUP);
}
}else{
//未能识别该话题基本信息
logger.warn(ModuleConstant.NO_SUCH_TOPIC);
return new Result().error(ModuleConstant.NO_SUCH_TOPIC);
logger.error(ModuleConstant.NO_SUCH_TOPIC);
throw new RenException(ModuleConstant.NO_SUCH_TOPIC);
}
}

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

@ -153,6 +153,12 @@ public interface ModuleConstant extends Constant {
* */
String USER_INFO_LIST_NOT_FOUND = "没有找到用户列表信息";
String DATA_ACQUISITION_FAILED = "数据库数据获取失败";
String DELETE_FAILED = "组成员删除失败";
String SLIENT_FAILED = "组成员禁言失败";
/**
* 缺失组成员缓存信息
* */

11
epmet-module/resi-guide/resi-guide-server/Dockerfile

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8091
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

13
epmet-module/resi-guide/resi-guide-server/docker-compose.yml

@ -0,0 +1,13 @@
version: "3.7"
services:
resi-guide-server:
container_name: resi-guide-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-guide-server:2.0.11
ports:
- "8091:8091"
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-guide</artifactId>

6
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java

@ -7,6 +7,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.AppClientConstant;
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.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
@ -41,7 +42,7 @@ import java.util.*;
@Service
public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAccessRecordDao, StrangerAccessRecordEntity> implements StrangerAccessRecordService {
private static final Logger log = LoggerFactory.getLogger(StrangerAccessRecordServiceImpl.class);
private static final Logger logger = LoggerFactory.getLogger(StrangerAccessRecordServiceImpl.class);
@Autowired
private StrangerAccessRecordDao strangerAccessRecordDao;
@Autowired
@ -205,7 +206,8 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
//1.先判断参数
//居民端 所以参数必须是居民端的参数 否则就是参数错误
if (!AppClientConstant.APP_RESI.equals(tokenDTO.getApp())) {
return new Result<HomeDesignByCustomerResultDTO>().error(StrangerResiGuideConstant.PARAMETER_EXCEPTION);
logger.error(StrangerResiGuideConstant.PARAMETER_EXCEPTION);
throw new RenException(StrangerResiGuideConstant.PARAMETER_EXCEPTION);
}
//token里边有所属端 userId这些参数 前台传递customerID和gridId
/*//2:调用epmet-user服务查询数据 新建网格记录数据

11
epmet-module/resi-mine/resi-mine-server/Dockerfile

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8094
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

13
epmet-module/resi-mine/resi-mine-server/docker-compose.yml

@ -0,0 +1,13 @@
version: "3.7"
services:
resi-mine-server:
container_name: resi-mine-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:2.0.11
ports:
- "8094:8094"
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-mine</artifactId>

11
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java

@ -1,6 +1,7 @@
package com.epmet.modules.grid.service.impl;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.result.LatestGridInfoResultDTO;
@ -8,6 +9,8 @@ import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.grid.service.ResiMineGridService;
import com.epmet.modules.utils.ModuleConstant;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -18,7 +21,7 @@ import org.springframework.stereotype.Service;
*/
@Service
public class ResiMineGridServiceImpl implements ResiMineGridService {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private EpmetUserFeignClient epmetUserFeignClient;
@ -32,10 +35,12 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
@Override
public Result<LatestGridInfoResultDTO> getLatestGridInfo(TokenDto tokenDto) {
if (null == tokenDto || StringUtils.isBlank(tokenDto.getUserId())) {
return new Result<LatestGridInfoResultDTO>().error(ModuleConstant.USER_NOT_NULL);
logger.error(ModuleConstant.USER_NOT_NULL);
throw new RenException(ModuleConstant.USER_NOT_NULL);
}
if(!AppClientConstant.APP_RESI.equals(tokenDto.getApp())){
return new Result<LatestGridInfoResultDTO>().error(ModuleConstant.FOR_RESI_CALL);
logger.error(ModuleConstant.FOR_RESI_CALL);
throw new RenException(ModuleConstant.FOR_RESI_CALL);
}
return epmetUserFeignClient.getLatestGridInfoByUserId(tokenDto.getUserId());
}

11
epmet-module/resi-partymember/resi-partymember-server/Dockerfile

@ -0,0 +1,11 @@
FROM java:8
RUN export LANG="zh_CN.UTF-8"
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' > /etc/timezone
COPY ./target/*.jar ./app.jar
EXPOSE 8096
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

13
epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml

@ -0,0 +1,13 @@
version: "3.7"
services:
resi-partymember-server:
container_name: resi-partymember-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:2.0.11
ports:
- "8096:8096"
network_mode: host # 使用现有网络
deploy:
resources:
limits:
cpus: '0.1'
memory: 250M

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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-partymember</artifactId>

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

@ -110,17 +110,13 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
partyMemberInfoParam.setCustomerId(fromDTO.getCustomerId());
PartymemberInfoDTO partyMemberInfoResult = partymemberInfoService.getPartyMemberInfoByMobile(partyMemberInfoParam);
if (null != partyMemberInfoResult) {
result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getMsg());
return result;
return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
}
//生成短信验证码
Map<String, String> message = (Map<String, String>) messageFeignClient.sendSmsCaptcha(fromDTO.getMobile()).getData();
if (null == message) {
result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode());
result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getMsg());
return result;
return new Result().error(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode());
}
//删除旧验证码
partyMemberInfoRedis.deleteUserMobileCodeByPattern(fromDTO.getUserId(), fromDTO.getMobile());
@ -146,9 +142,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
if (null == code) {
saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null,
PartyMemberConstant.OPERATE_AUTO_FAILED);
result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getMsg());
return result;
return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
}
//获取党员基本信息

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

@ -26,6 +26,7 @@ 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;
import com.epmet.commons.tools.utils.Result;
@ -34,6 +35,7 @@ import com.epmet.dto.UserRoleDTO;
import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.utils.ModuleConstant;
import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
import com.epmet.modules.warmhearted.dao.ResiWarmheartedApplyDao;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
@ -67,7 +69,7 @@ import org.slf4j.LoggerFactory;
@Service
public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmheartedApplyDao, ResiWarmheartedApplyEntity> implements ResiWarmheartedApplyService {
private static final Logger log = LoggerFactory.getLogger(ResiWarmheartedApplyServiceImpl.class);
private static final Logger logger = LoggerFactory.getLogger(ResiWarmheartedApplyServiceImpl.class);
@Autowired
private ResiWarmheartedApplyRedis resiWarmheartedApplyRedis;
@Autowired
@ -146,7 +148,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
//1:热心居民申请行为记录表新增数据
result = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO);
if (!result.success()) {
log.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
logger.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
}
ResiWarmheartedResultDTO resiWarmheartedResultDTO = result.getData();
//2:查询是否已申请热心居民(不查询审核未通过的)
@ -172,8 +174,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
ResiWarmheartedFormDTO.setAuditStatus(ResiWarmheartedVisitConstant.REJECTED);
ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = resiWarmheartedApplyDao.selectResiWarmheartedApply(ResiWarmheartedFormDTO);
if (null != resiWarmheartedApplyDTO) {
result.error(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION);
return result;
logger.error(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION);
throw new RenException(ResiWarmheartedVisitConstant.REPEAT_EXCEPTION);
}else{
//1:将申请记录存入热心居民申请表中
saveResiWarmApply(formDTO);

2
epmet-user/epmet-user-server/Dockerfile

@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar
EXPOSE 8087
ENTRYPOINT ["java","-jar","./app.jar"]
ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"]

4
epmet-user/epmet-user-server/docker-compose.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-user-server:
container_name: epmet-user-server-dev
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-user-server:2.0.0
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:2.0.11
ports:
- "8087:8087"
network_mode: bridge # 不会创建新的网络
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>2.0.11</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId>

8
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java

@ -21,6 +21,7 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
@ -35,6 +36,8 @@ import com.epmet.entity.GridLatestEntity;
import com.epmet.redis.GridLatestRedis;
import com.epmet.service.GridLatestService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -52,7 +55,7 @@ import java.util.Map;
*/
@Service
public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLatestEntity> implements GridLatestService {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private GridLatestRedis gridLatestRedis;
@Autowired
@ -147,7 +150,8 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
@Override
public Result<LatestGridInfoResultDTO> getLatestGridInfoByUserId(String userId) {
if(StringUtils.isBlank(userId)){
return new Result<LatestGridInfoResultDTO>().error(GridVisitedConstant.USER_ID_NOTNULL);
logger.error(GridVisitedConstant.USER_ID_NOTNULL);
throw new RenException(GridVisitedConstant.USER_ID_NOTNULL);
}
LatestGridInfoResultDTO latestGridInfoResultDTO = baseDao.selectLatestGridInfoByUserId(userId);
if (null == latestGridInfoResultDTO) {

16
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java

@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
@ -54,8 +55,7 @@ import java.util.Map;
*/
@Service
public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, GridVisitedEntity> implements GridVisitedService {
private static final Logger log = LoggerFactory.getLogger(GridVisitedServiceImpl.class);
private static final Logger logger = LoggerFactory.getLogger(GridVisitedServiceImpl.class);
@Autowired
private GovOrgFeignClient govOrgFeignClient;
@Autowired
@ -131,19 +131,19 @@ public class GridVisitedServiceImpl extends BaseServiceImpl<GridVisitedDao, Grid
dto.setGridId(visitedFormDTO.getGridId());
Result<CustomerGridDTO> gridDTO = govOrgFeignClient.getCustomerGridByGridId(dto);
if (!gridDTO.success()) {
log.warn(GridVisitedConstant.QUERY_EXCEPTION);
result.error(GridVisitedConstant.QUERY_EXCEPTION);
logger.error(GridVisitedConstant.QUERY_EXCEPTION);
throw new RenException(GridVisitedConstant.QUERY_EXCEPTION);
}
CustomerGridDTO customerGridDTO = gridDTO.getData();
//2:网格访问记录表新增数据
if (!saveGridVisited(visitedFormDTO, customerGridDTO)) {
log.warn(GridVisitedConstant.SAVE_VISITED);
result.error(GridVisitedConstant.SAVE_VISITED);
logger.error(GridVisitedConstant.SAVE_VISITED);
throw new RenException(GridVisitedConstant.SAVE_VISITED);
}
//3:最近访问网格表新增数据
if (!gridLatestService.saveGridLatest(visitedFormDTO, customerGridDTO)) {
log.warn(GridVisitedConstant.SAVE_LATEST);
result.error(GridVisitedConstant.SAVE_LATEST);
logger.error(GridVisitedConstant.SAVE_LATEST);
throw new RenException(GridVisitedConstant.SAVE_LATEST);
}
return result;
}

16
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@ -152,17 +152,13 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
if(null == verificationCode || StringUtils.isBlank(verificationCode)){
//验证码校验失败则更新行为记录表数据 返回前台结果
userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getMsg());
return result;
return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
}
//2:再次判断手机号是否可用
if (!getResiInfoByMobile(userResiInfoDTO.getRegMobile())) {
//手机号验证失败则更新行为记录表数据 返回前台结果
userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getMsg());
return result;
return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
}
//3:校验成功 数据存入居民注册表 更新行为记录表数据
saveUserResiInfo(userResiInfoDTO);
@ -205,17 +201,13 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
userResiRegisterVisitService.updateResiVisitOperate(verificationCodeFormDTO);
//2:判断手机号是否可用
if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile())) {
result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getMsg());
return result;
return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
}
//3:调用短信服务 生成验证码发送短信
result = messageFeignClient.sendSmsCaptcha(verificationCodeFormDTO.getMobile());
Map<String,Object> map = (Map<String, Object>) result.getData();
if (null == map || null == map.get("code")) {
result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode());
result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getMsg());
return result;
return new Result().error(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode());
}
//4:删除缓存中可能存在的旧验证码
userResiInfoRedis.deleteOldUserMobileCode(verificationCodeFormDTO.getUserId(), verificationCodeFormDTO.getMobile());

Loading…
Cancel
Save