Browse Source

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

dev_shibei_match
yinzuomei 5 years ago
parent
commit
0569b80bcc
  1. 7
      epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
  2. 10
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java
  3. 2
      epmet-gateway/deploy/docker-compose-dev.yml
  4. 2
      epmet-gateway/deploy/docker-compose-test.yml
  5. 2
      epmet-gateway/pom.xml
  6. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
  7. 2
      epmet-module/data-statistical/data-statistical-server/pom.xml
  8. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java
  9. 6
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
  10. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java
  11. 9
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java
  12. 2
      epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
  13. 2
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml
  14. 2
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
  15. 2
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml
  16. 7
      epmet-module/epmet-common-service/common-service-server/pom.xml
  17. 2
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
  18. 2
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml
  19. 18
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  20. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml
  21. 2
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
  22. 2
      epmet-module/epmet-job/epmet-job-server/pom.xml
  23. 2
      epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
  24. 2
      epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
  25. 2
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
  26. 2
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
  27. 18
      epmet-module/epmet-point/epmet-point-server/pom.xml
  28. 2
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java
  29. 2
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java
  30. 7
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
  31. 5
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java
  32. 2
      epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml
  33. 2
      epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml
  34. 2
      epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml
  35. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
  36. 2
      epmet-module/epmet-third/epmet-third-server/pom.xml
  37. 3
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
  38. 2
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java
  39. 7
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
  40. 30
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
  41. 2
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
  42. 2
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
  43. 2
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
  44. 2
      epmet-module/gov-voice/gov-voice-server/pom.xml
  45. 13
      epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__addAutoPublish.sql
  46. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
  47. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
  48. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  49. 12
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
  50. 1
      epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
  51. 2
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
  52. 2
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
  53. 2
      epmet-module/oper-customize/oper-customize-server/pom.xml
  54. 2
      epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
  55. 2
      epmet-user/epmet-user-server/deploy/docker-compose-test.yml
  56. 2
      epmet-user/epmet-user-server/pom.xml
  57. 35
      epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java

7
epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java

@ -221,8 +221,6 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
//2.用户不存在时不允许登陆 //2.用户不存在时不允许登陆
Map<String,Object> map1 = (Map)jsonObject.get("paUserResult"); Map<String,Object> map1 = (Map)jsonObject.get("paUserResult");
PaUserDTO userDTO = ConvertUtils.mapToEntity(map1, PaUserDTO.class); PaUserDTO userDTO = ConvertUtils.mapToEntity(map1, PaUserDTO.class);
logger.info("map1的值:"+map1);
logger.info("userDTO的值:"+userDTO);
if (null == userDTO || StringUtils.isBlank(userDTO.getId())) { if (null == userDTO || StringUtils.isBlank(userDTO.getId())) {
throw new RenException(EpmetErrorCode.PUBLIC_NOT_EXISTS.getCode()); throw new RenException(EpmetErrorCode.PUBLIC_NOT_EXISTS.getCode());
} }
@ -240,7 +238,6 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
String token = this.generateGovWxmpToken(userDTO.getId()); String token = this.generateGovWxmpToken(userDTO.getId());
//4-2.判断是否存在信息,给customerId赋值 //4-2.判断是否存在信息,给customerId赋值
Map<String,Object> map2 = (Map)jsonObject.get("paCustomerResult"); Map<String,Object> map2 = (Map)jsonObject.get("paCustomerResult");
logger.info("map2的值:"+map2);
PaCustomerDTO customerDTO = ConvertUtils.mapToEntity(map2, PaCustomerDTO.class); PaCustomerDTO customerDTO = ConvertUtils.mapToEntity(map2, PaCustomerDTO.class);
String customerId = ""; String customerId = "";
if (null != customerDTO && !StringUtils.isBlank(customerDTO.getId())) { if (null != customerDTO && !StringUtils.isBlank(customerDTO.getId())) {
@ -248,7 +245,6 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
} }
//4-3.token存入redis //4-3.token存入redis
Map<String,Object> map3 = (Map)jsonObject.get("paUserWechatResult"); Map<String,Object> map3 = (Map)jsonObject.get("paUserWechatResult");
logger.info("map3的值:"+map3);
PaUserWechatDTO wechatDTO = ConvertUtils.mapToEntity(map3, PaUserWechatDTO.class); PaUserWechatDTO wechatDTO = ConvertUtils.mapToEntity(map3, PaUserWechatDTO.class);
String openid = wechatDTO.getWxOpenId(); String openid = wechatDTO.getWxOpenId();
String unionId = (null == wechatDTO.getUnionId() ? "" : wechatDTO.getUnionId()); String unionId = (null == wechatDTO.getUnionId() ? "" : wechatDTO.getUnionId());
@ -283,16 +279,13 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
public UserTokenResultDTO register(RegisterFormDTO formDTO) { public UserTokenResultDTO register(RegisterFormDTO formDTO) {
//1.调用epmet-third服务,完成信息注册 //1.调用epmet-third服务,完成信息注册
String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.REGISTER_URL, JSON.toJSONString(formDTO)).getData(); String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.REGISTER_URL, JSON.toJSONString(formDTO)).getData();
logger.info("data数据为:"+data);
JSONObject toResult = JSON.parseObject(data); JSONObject toResult = JSON.parseObject(data);
Result result = ConvertUtils.mapToEntity(toResult, Result.class); Result result = ConvertUtils.mapToEntity(toResult, Result.class);
logger.info("转换的result结果为:"+result);
if (!result.success()) { if (!result.success()) {
logger.error(String.format("调用epmet_third服务初始化用户信息失败,数据来源[%s],手机号[%s],userId:[%S]", formDTO.getSource(), formDTO.getPhone(), formDTO.getUserId())); logger.error(String.format("调用epmet_third服务初始化用户信息失败,数据来源[%s],手机号[%s],userId:[%S]", formDTO.getSource(), formDTO.getPhone(), formDTO.getUserId()));
throw new RenException(result.getCode()); throw new RenException(result.getCode());
} }
Object RegisterResult = result.getData(); Object RegisterResult = result.getData();
logger.info("getData()数据为:"+RegisterResult);
JSONObject jsonObject = JSON.parseObject(RegisterResult.toString()); JSONObject jsonObject = JSON.parseObject(RegisterResult.toString());
RegisterResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, RegisterResultDTO.class); RegisterResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, RegisterResultDTO.class);

10
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java

@ -93,13 +93,18 @@ public class LogMsgSendFilter extends LevelFilter {
/** /**
* desc:获取服务 ip及profile信息 * desc:获取服务 ip及profile信息
*
*/ */
private void getServerInfo() { private void getServerInfo() {
try {
if (serverIp == null) { if (serverIp == null) {
InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class); InetUtils inetUtils = SpringContextUtils.getBean(InetUtils.class);
serverIp = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(); serverIp = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
} }
} catch (Exception e) {
logger.warn("getServerInfo get bean InetUtils exception", e);
return;
}
try {
if (activeEnv == null) { if (activeEnv == null) {
Environment environment = SpringContextUtils.getBean(Environment.class); Environment environment = SpringContextUtils.getBean(Environment.class);
String[] activeProfiles = environment.getActiveProfiles(); String[] activeProfiles = environment.getActiveProfiles();
@ -108,6 +113,9 @@ public class LogMsgSendFilter extends LevelFilter {
activeEnv = activeProfiles[0]; activeEnv = activeProfiles[0];
} }
} }
} catch (Exception e) {
logger.warn("getServerInfo get bean Environment exception", e);
}
} }
private void apendStackInfo(StringBuilder stringBuilder, IThrowableProxy throwableProxy) { private void apendStackInfo(StringBuilder stringBuilder, IThrowableProxy throwableProxy) {

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

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

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

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

2
epmet-gateway/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.29</version> <version>0.3.30</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId> <artifactId>epmet-cloud</artifactId>

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

@ -2,7 +2,7 @@ version: "3.7"
services: services:
data-statistical-server: data-statistical-server:
container_name: data-statistical-server-dev container_name: data-statistical-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.41 image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.42
ports: ports:
- "8108:8108" - "8108:8108"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/data-statistical/data-statistical-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.41</version> <version>0.3.42</version>
<parent> <parent>
<artifactId>data-statistical</artifactId> <artifactId>data-statistical</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

8
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java

@ -23,6 +23,7 @@ import com.epmet.entity.voice.ArticleEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -45,11 +46,12 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
List<ArticleGridPublishedSummaryDTO> getAllPublishedCount(@Param("customerId") String customerId, @Param("publishDate") String publishDate, @Param("publisherType") String publisherType); List<ArticleGridPublishedSummaryDTO> getAllPublishedCount(@Param("customerId") String customerId, @Param("publishDate") String publishDate, @Param("publisherType") String publisherType);
/** /**
* desc:根据客户Id 发布时间 获取文章数据 * desc:根据客户Id 创建时间 获取文章数据
* *
* @param customerId * @param customerId
* @param publishDate * @param startTime
* @param endTime
* @return * @return
*/ */
List<ArticleEntity> getPublishedArticleByDay(@Param("customerId") String customerId, @Param("publishDate") String publishDate); List<ArticleEntity> getPublishedArticleByDay(@Param("customerId") String customerId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
} }

6
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java

@ -598,14 +598,14 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
//转换为 需要插入的Entity //转换为 需要插入的Entity
Map<String, DimAgencyEntity> dimAgencyEntityMap = agencyDTOList.stream().collect(Collectors.toMap(DimAgencyEntity::getId, o -> o)); Map<String, DimAgencyEntity> dimAgencyEntityMap = agencyDTOList.stream().collect(Collectors.toMap(DimAgencyEntity::getId, o -> o));
Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, NumConstant.ONE), DateUtils.DATE_PATTERN);
//获取当天的业务数据 //获取当天的业务数据
//1获取文章及机关id,网格Id //1获取文章及机关id,网格Id
List<ArticleEntity> publishedArticleList = articleService.getPublishedArticleByPublishTime(customerId, DateUtils.format(statsDate)); List<ArticleEntity> publishedArticleList = articleService.getPublishedArticleByCreateTime(customerId, startTime, endTime);
if (!CollectionUtils.isEmpty(publishedArticleList)) { if (!CollectionUtils.isEmpty(publishedArticleList)) {
//KEY 文章Id //KEY 文章Id
Map<String, ArticleEntity> articleMap = publishedArticleList.stream().collect(Collectors.toMap(ArticleEntity::getId, o -> o)); Map<String, ArticleEntity> articleMap = publishedArticleList.stream().collect(Collectors.toMap(ArticleEntity::getId, o -> o));
Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, NumConstant.ONE), DateUtils.DATE_PATTERN);
//2 获取文章标签 //2 获取文章标签
List<ArticleTagsEntity> articleTagsList = articleTagsService.getArticleTagsByCreateTime(customerId, startTime, endTime); List<ArticleTagsEntity> articleTagsList = articleTagsService.getArticleTagsByCreateTime(customerId, startTime, endTime);
if (!CollectionUtils.isEmpty(articleTagsList)) { if (!CollectionUtils.isEmpty(articleTagsList)) {

8
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java

@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.dto.voice.ArticleGridPublishedSummaryDTO; import com.epmet.dto.voice.ArticleGridPublishedSummaryDTO;
import com.epmet.entity.voice.ArticleEntity; import com.epmet.entity.voice.ArticleEntity;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -56,12 +57,13 @@ public interface ArticleService extends BaseService<ArticleEntity> {
List<ArticleGridPublishedSummaryDTO> getAllGridPublishedCount(String customerId, String publishDate); List<ArticleGridPublishedSummaryDTO> getAllGridPublishedCount(String customerId, String publishDate);
/** /**
* desc根据客户id发布时间 获取文章数据 * desc根据客户id创建时间 获取文章数据因为存在当天可以发布之前时间点的数据 所以采用创建时间
* @param customerId * @param customerId
* @param publishDate * @param startTime
* @param endTime
* @return * @return
*/ */
List<ArticleEntity> getPublishedArticleByPublishTime(String customerId, String publishDate); List<ArticleEntity> getPublishedArticleByCreateTime(String customerId, Date startTime, Date endTime);
ArticleEntity selectArticleById(String articleId); ArticleEntity selectArticleById(String articleId);
} }

9
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java

@ -30,6 +30,7 @@ import com.epmet.service.voice.ArticleService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -63,9 +64,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
@Override @Override
public List<ArticleEntity> getPublishedArticleByPublishTime(String customerId, String publishDate) { public List<ArticleEntity> getPublishedArticleByCreateTime(String customerId, Date startTime, Date endTime) {
checkParam(customerId, publishDate); if (StringUtils.isBlank(customerId) || startTime == null || endTime == null) {
return baseDao.getPublishedArticleByDay(customerId,publishDate); throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
}
return baseDao.getPublishedArticleByDay(customerId, startTime, endTime);
} }
@Override @Override

2
epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml

@ -10,7 +10,7 @@ spring:
name: data-statistical-server name: data-statistical-server
#环境 dev|test|prod #环境 dev|test|prod
profiles: profiles:
active: dev active: @spring.profiles.active@
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss

2
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml

@ -65,7 +65,7 @@
FROM FROM
article article
WHERE WHERE
PUBLISH_DATE = #{publishDate,jdbcType=VARCHAR} CREATED_TIME BETWEEN #{startTime,jdbcType=TIMESTAMP} AND #{endTime,jdbcType=TIMESTAMP}
AND DEL_FLAG = 0 AND DEL_FLAG = 0
AND TAGS IS NOT NULL AND TAGS IS NOT NULL
AND CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} AND CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}

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

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

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

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

7
epmet-module/epmet-common-service/common-service-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.6</version> <version>0.3.7</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-common-service</artifactId> <artifactId>epmet-common-service</artifactId>
@ -153,6 +153,11 @@
<nacos.ip/> <nacos.ip/>
<spring.flyway.enabled>true</spring.flyway.enabled> <spring.flyway.enabled>true</spring.flyway.enabled>
<!--亿联云消息网关配置-->
<elink.mq.host>https://epmet-dev.elinkservice.cn/estos/</elink.mq.host>
<elink.mq.sendMsgPath>producerService/producer/sendMsg</elink.mq.sendMsgPath>
<elink.mq.appId>20200804181646184507453a2e9aab76edc550405f80920af</elink.mq.appId>
<elink.mq.token>96d788191a10ff57a125157183413004</elink.mq.token>
</properties> </properties>
</profile> </profile>
<profile> <profile>

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

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-heart-server: epmet-heart-server:
container_name: epmet-heart-server-dev container_name: epmet-heart-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.35 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.37
ports: ports:
- "8111:8111" - "8111:8111"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

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

18
epmet-module/epmet-heart/epmet-heart-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.0.35</version> <version>0.0.37</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-heart</artifactId> <artifactId>epmet-heart</artifactId>
@ -159,11 +159,11 @@
<spring.profiles.active>test</spring.profiles.active> <spring.profiles.active>test</spring.profiles.active>
<!-- 数据库配置--> <!-- 数据库配置-->
<spring.datasource.druid.url> <datasource.druid.url>
<![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]> <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url> </datasource.druid.url>
<spring.datasource.druid.username>epmet</spring.datasource.druid.username> <datasource.druid.username>epmet</datasource.druid.username>
<spring.datasource.druid.password>elink@833066</spring.datasource.druid.password> <datasource.druid.password>elink@833066</datasource.druid.password>
<!-- redis配置 --> <!-- redis配置 -->
<spring.redis.index>0</spring.redis.index> <spring.redis.index>0</spring.redis.index>
<spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host> <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
@ -200,11 +200,11 @@
<spring.profiles.active>test</spring.profiles.active> <spring.profiles.active>test</spring.profiles.active>
<!-- 数据库配置--> <!-- 数据库配置-->
<spring.datasource.druid.url> <datasource.druid.url>
<![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]> <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url> </datasource.druid.url>
<spring.datasource.druid.username>epmet_heart_user</spring.datasource.druid.username> <datasource.druid.username>epmet_heart_user</datasource.druid.username>
<spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password> <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
<!-- redis配置 --> <!-- redis配置 -->
<spring.redis.index>0</spring.redis.index> <spring.redis.index>0</spring.redis.index>
<spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host> <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>

2
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml

@ -10,7 +10,7 @@ spring:
name: epmet-heart-server name: epmet-heart-server
#环境 dev|test|prod #环境 dev|test|prod
profiles: profiles:
active: dev active: @spring.profiles.active@
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss

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

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

2
epmet-module/epmet-job/epmet-job-server/pom.xml

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

2
epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml

@ -10,7 +10,7 @@ spring:
name: epmet-job-server name: epmet-job-server
#环境 dev|test|prod #环境 dev|test|prod
profiles: profiles:
active: dev active: @spring.profiles.active@
messages: messages:
encoding: UTF-8 encoding: UTF-8
basename: i18n/messages,i18n/messages_common basename: i18n/messages,i18n/messages_common

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

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

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

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-point-server: epmet-point-server:
container_name: epmet-point-server-dev container_name: epmet-point-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.28 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.32
ports: ports:
- "8112:8112" - "8112:8112"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

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

18
epmet-module/epmet-point/epmet-point-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.0.28</version> <version>0.0.32</version>
<parent> <parent>
<artifactId>epmet-point</artifactId> <artifactId>epmet-point</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
@ -158,11 +158,11 @@
<spring.profiles.active>test</spring.profiles.active> <spring.profiles.active>test</spring.profiles.active>
<!-- 数据库配置--> <!-- 数据库配置-->
<spring.datasource.druid.url> <datasource.druid.url>
<![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]> <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url> </datasource.druid.url>
<spring.datasource.druid.username>epmet</spring.datasource.druid.username> <datasource.druid.username>epmet</datasource.druid.username>
<spring.datasource.druid.password>elink@833066</spring.datasource.druid.password> <datasource.druid.password>elink@833066</datasource.druid.password>
<!-- redis配置 --> <!-- redis配置 -->
<spring.redis.index>0</spring.redis.index> <spring.redis.index>0</spring.redis.index>
<spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host> <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
@ -193,11 +193,11 @@
<spring.profiles.active>test</spring.profiles.active> <spring.profiles.active>test</spring.profiles.active>
<!-- 数据库配置--> <!-- 数据库配置-->
<spring.datasource.druid.url> <datasource.druid.url>
<![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]> <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url> </datasource.druid.url>
<spring.datasource.druid.username>epmet_point_user</spring.datasource.druid.username> <datasource.druid.username>epmet_point_user</datasource.druid.username>
<spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password> <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
<!-- redis配置 --> <!-- redis配置 -->
<spring.redis.index>0</spring.redis.index> <spring.redis.index>0</spring.redis.index>
<spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host> <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>

2
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java

@ -77,7 +77,7 @@ public class MqPointCallbackController {
try { try {
//TODO 调用调整积分方法去给用户加减积分 userPointActionLogService. //TODO 调用调整积分方法去给用户加减积分 userPointActionLogService.
formList.forEach(obj -> { formList.forEach(obj -> {
userPointActionLogService.grantPointByEvent(EventEnum.ACTIVE_INSERT_LIVE.getEventTag(),obj); userPointActionLogService.grantPointByEvent(EventEnum.REGISTER_VOLUNTEER.getEventTag(),obj);
}); });

2
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java

@ -355,7 +355,7 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
String userNickname = ModuleConstant.EMPTY_STR; String userNickname = ModuleConstant.EMPTY_STR;
if(userResult.success() && null != userResult.getData() && !userResult.getData().isEmpty()){ if(userResult.success() && null != userResult.getData() && !userResult.getData().isEmpty()){
userHeadPhoto = userResult.getData().get(NumConstant.ZERO).getHeadImgUrl(); userHeadPhoto = userResult.getData().get(NumConstant.ZERO).getHeadImgUrl();
userNickname = userResult.getData().get(NumConstant.ZERO).getShowName(); userNickname = StringUtils.isBlank(userResult.getData().get(NumConstant.ZERO).getShowName()) ? StringUtils.isBlank(userResult.getData().get(NumConstant.ZERO).getRealName()) ? userResult.getData().get(NumConstant.ZERO).getNickname() : userResult.getData().get(NumConstant.ZERO).getRealName(): userResult.getData().get(NumConstant.ZERO).getShowName();
} }
result.setUserHeadPhoto(userHeadPhoto); result.setUserHeadPhoto(userHeadPhoto);
result.setUserNickname(userNickname); result.setUserNickname(userNickname);

7
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java

@ -333,8 +333,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
}else{ }else{
log.error(String.format("未检测到该用户下有效的积分规则,消息体->【%s】", JSON.toJSON(event))); log.warn(String.format("未检测到该用户下有效的积分规则,消息体->【%s】", JSON.toJSON(event)));
throw new RenException("未检测到该用户下有效的积分规则");
} }
@ -361,8 +360,8 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
action.setCustomerId(grantPoint.getCustomerId()); action.setCustomerId(grantPoint.getCustomerId());
action.setPoint(grantPoint.getPoint()); action.setPoint(grantPoint.getPoint());
action.setEventStatement(grantPoint.getRemark()); action.setEventStatement(grantPoint.getRemark());
action.setEventName(EventEnum.ACTIVE_SEND_POINT.getEventDesc()); action.setEventName(ModuleConstant.EVENT_NAME_PARTICIPATED_ACT);
action.setEventId(ModuleConstant.COMMON_EVENT_ID); action.setEventId(EventEnum.ACTIVE_SEND_POINT.getEventTag());
action.setActionFlag(grantPoint.getActionFlag()); action.setActionFlag(grantPoint.getActionFlag());
action.setUserId(grantPoint.getUserId()); action.setUserId(grantPoint.getUserId());
action.setCreatedBy(grantPoint.getOperatorId()); action.setCreatedBy(grantPoint.getOperatorId());

5
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java

@ -121,8 +121,5 @@ public interface ModuleConstant extends Constant {
String EVENT_NAME_ADD_LIVE = "添加活动实况"; String EVENT_NAME_ADD_LIVE = "添加活动实况";
/**
* 通用事件不走规则但也是事件所以在用户积分行为记录表中的eventId中要有值与积分调整积分兑换分开
* */
String COMMON_EVENT_ID = "COMMON";
} }

2
epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml

@ -10,7 +10,7 @@ spring:
name: epmet-point-server name: epmet-point-server
#环境 dev|test|prod #环境 dev|test|prod
profiles: profiles:
active: dev active: @spring.profiles.active@
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss

2
epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml

@ -26,7 +26,7 @@
<select id="selectPointActionLogList" resultType="com.epmet.dto.result.ResiPointLogPeriodResultDTO"> <select id="selectPointActionLogList" resultType="com.epmet.dto.result.ResiPointLogPeriodResultDTO">
SELECT SELECT
EVENT_NAME AS TITLE, EVENT_NAME AS TITLE,
EVENT_STATEMENT AS REMARK, IFNULL(EVENT_STATEMENT,'') AS REMARK,
CASE ACTION_FLAG WHEN 'plus' THEN concat('+',POINT) ELSE POINT END AS point, CASE ACTION_FLAG WHEN 'plus' THEN concat('+',POINT) ELSE POINT END AS point,
DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') AS DATE, DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') AS DATE,
DATE_FORMAT(CREATED_TIME,'%H:%i') AS TIME DATE_FORMAT(CREATED_TIME,'%H:%i') AS TIME

2
epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml

@ -40,7 +40,7 @@
point.total_point, point.total_point,
@point := point.total_point @point := point.total_point
FROM FROM
( SELECT * FROM user_point_total ORDER BY total_point DESC ) point, ( SELECT * FROM user_point_total WHERE CUSTOMER_ID = #{customerId} ORDER BY total_point DESC ) point,
( SELECT @point := NULL, @rank := 1 ) a ( SELECT @point := NULL, @rank := 1 ) a
</select> </select>

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

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-third-server: epmet-third-server:
container_name: epmet-third-server-dev container_name: epmet-third-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.100 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.101
ports: ports:
- "8110:8110" - "8110:8110"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-third/epmet-third-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.0.100</version> <version>0.0.101</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

3
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java

@ -91,6 +91,9 @@ public interface ModuleConstant {
String FROM_CALLBACK = "from_callback"; String FROM_CALLBACK = "from_callback";
String APPLICATION_JSON = "application/json"; String APPLICATION_JSON = "application/json";
String _FROM_API = "_from_api"; String _FROM_API = "_from_api";
String WE_APP_AUDIT = "we_app_audit";
String TO_USER_NAME = "ToUserName";
String FROM_USER_NAME = "FromUserName";
/** /**
* 微信模推送给第三方平台方 Content固定格式 * 微信模推送给第三方平台方 Content固定格式

2
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java

@ -109,4 +109,6 @@ public interface ThirdRunTimeInfoConstant {
String SEND_MESSAGE_XML = "要发送的xml内容为:%s"; String SEND_MESSAGE_XML = "要发送的xml内容为:%s";
String CONTENT = "content为:%s"; String CONTENT = "content为:%s";
String MSG_TYPE = "消息类型为:%s";
} }

7
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java

@ -417,23 +417,17 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
String authAppId = authorizationInfoResultDTO.getAuthorizer_appid(); String authAppId = authorizationInfoResultDTO.getAuthorizer_appid();
List<FixationAppIdResultDTO> fixationAppIdResultDTOS = fixationAppIdDao.selectFixationInfos(); List<FixationAppIdResultDTO> fixationAppIdResultDTOS = fixationAppIdDao.selectFixationInfos();
String finalCustomerId = customerId;// String finalCustomerId = customerId;//
log.info("新customerId为:"+customerId);
log.info("新finalCustomerId为:"+finalCustomerId);
fixationAppIdResultDTOS.forEach(fixationAppId -> { fixationAppIdResultDTOS.forEach(fixationAppId -> {
if (fixationAppId.getAppId().equals(authAppId)){ if (fixationAppId.getAppId().equals(authAppId)){
// TODO 是城阳项目或者党群e事通 // TODO 是城阳项目或者党群e事通
// crm表中的customerId【原customerId】 // crm表中的customerId【原customerId】
String masterCustomerId = fixationAppId.getMasterCustomerId(); String masterCustomerId = fixationAppId.getMasterCustomerId();
log.info("老customerId为:"+masterCustomerId);
formDTO.setCustomerId(masterCustomerId); formDTO.setCustomerId(masterCustomerId);
authCodeDao.deleteCustomerAuthCode(finalCustomerId,clientType); authCodeDao.deleteCustomerAuthCode(finalCustomerId,clientType);
authCodeDao.insertRedirectAuthCode(formDTO); authCodeDao.insertRedirectAuthCode(formDTO);
//authCode存缓存 //authCode存缓存
redisThird.setAuthCode(formDTO); redisThird.setAuthCode(formDTO);
this.authInfoByAuthCode(authCode, masterCustomerId, clientType); this.authInfoByAuthCode(authCode, masterCustomerId, clientType);
log.info("=======================公众号的客户id为:"+finalCustomerId);
ModifyCustomerFormDTO modifyCustomer = new ModifyCustomerFormDTO(); ModifyCustomerFormDTO modifyCustomer = new ModifyCustomerFormDTO();
modifyCustomer.setOldCustomerId(finalCustomerId); modifyCustomer.setOldCustomerId(finalCustomerId);
modifyCustomer.setNewCustomerId(masterCustomerId); modifyCustomer.setNewCustomerId(masterCustomerId);
@ -441,7 +435,6 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
// 管理员授权 // 管理员授权
CustomerManagerFormDTO customerManager = paUserDao.selectManagerInfo(userId); CustomerManagerFormDTO customerManager = paUserDao.selectManagerInfo(userId);
log.info("=======================公众号的客户id为:"+finalCustomerId);
customerManager.setCustomerId(finalCustomerId); customerManager.setCustomerId(finalCustomerId);
operCrmOpenFeignClient.addManager(customerManager); operCrmOpenFeignClient.addManager(customerManager);
} }

30
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java

@ -106,12 +106,24 @@ public class WarrantServiceImpl implements WarrantService {
// 将xml转为map // 将xml转为map
Map<String, Object> result = WXXmlToMapUtil.multilayerXmlToMap(msg); Map<String, Object> result = WXXmlToMapUtil.multilayerXmlToMap(msg);
Map<String,Object> xml = (Map<String, Object>) result.get(ModuleConstant.XML); Map<String,Object> xml = (Map<String, Object>) result.get(ModuleConstant.XML);
if (xml.get(ModuleConstant.MSG_TYPE).equals(ModuleConstant.EVENT_LOW)) { String msgType = xml.get(ModuleConstant.MSG_TYPE).toString();
log.info(String.format(ThirdRunTimeInfoConstant.MSG_TYPE,msgType));
String toUserName = null;
String fromUserName = null;
if (msgType.equals(ModuleConstant.EVENT_LOW)) {
String event = xml.get(ModuleConstant.EVENT).toString();
if (xml.containsKey(ModuleConstant.TO_USER_NAME)){
toUserName = xml.get(ModuleConstant.TO_USER_NAME).toString();
}
if (xml.containsKey(ModuleConstant.FROM_USER_NAME)){
fromUserName = xml.get(ModuleConstant.FROM_USER_NAME).toString();
}
if (event.startsWith(ModuleConstant.WE_APP_AUDIT)) {
// TODO 目前来看,msgType = ‘event’ 的是代码审核结果 // TODO 目前来看,msgType = ‘event’ 的是代码审核结果
Long createTime = Long.valueOf(xml.get(ModuleConstant.CREATE_TIME).toString()); Long createTime = Long.valueOf(xml.get(ModuleConstant.CREATE_TIME).toString());
CodeAuditRecordFormDTO codeAuditRecord = ConvertUtils.mapToEntity(xml, CodeAuditRecordFormDTO.class); CodeAuditRecordFormDTO codeAuditRecord = ConvertUtils.mapToEntity(xml, CodeAuditRecordFormDTO.class);
codeAuditRecord.setWechatCreateTime(componentVerifyTicketServiceImpl.sToDate(createTime.toString())); codeAuditRecord.setWechatCreateTime(componentVerifyTicketServiceImpl.sToDate(createTime.toString()));
String toUserName = codeAuditRecord.getToUserName();//小程序原始ID // String toUserName = codeAuditRecord.getToUserName();//小程序原始ID
CustomerIdAndClientResultDTO customerIdAndClientResultDTO = miniInfoDao.selectCustomerIdAndClientByToUserName(toUserName); CustomerIdAndClientResultDTO customerIdAndClientResultDTO = miniInfoDao.selectCustomerIdAndClientByToUserName(toUserName);
String clientType = customerIdAndClientResultDTO.getClientType(); String clientType = customerIdAndClientResultDTO.getClientType();
String customerId = customerIdAndClientResultDTO.getCustomerId(); String customerId = customerIdAndClientResultDTO.getCustomerId();
@ -126,7 +138,7 @@ public class WarrantServiceImpl implements WarrantService {
log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT, xml)); log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT, xml));
codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord); codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord);
// 修改 code_audit_result 中的代码审核结果 // 修改 code_audit_result 中的代码审核结果
String event = codeAuditRecord.getEvent(); // String event = codeAuditRecord.getEvent();
String codeResult = null; String codeResult = null;
switch (event) { switch (event) {
case ModuleConstant.WEAPP_AUDIT_SUCCESS: case ModuleConstant.WEAPP_AUDIT_SUCCESS:
@ -141,7 +153,10 @@ public class WarrantServiceImpl implements WarrantService {
} }
String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord); String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord);
codeAuditResultDao.updateAuditResult(customerId, codeCustomerId, codeResult); codeAuditResultDao.updateAuditResult(customerId, codeCustomerId, codeResult);
}else if (xml.get(ModuleConstant.MSG_TYPE).equals(ModuleConstant.TEXT)){ }else {
this.replyEventMessage(request,response,event,toUserName,fromUserName);
}
}else if (msgType.equals(ModuleConstant.TEXT)){
// TODO 公众号回复消息 // TODO 公众号回复消息
MessagePushTextFormDTO messagePushTextFormDTO = ConvertUtils.mapToEntity(xml, MessagePushTextFormDTO.class); MessagePushTextFormDTO messagePushTextFormDTO = ConvertUtils.mapToEntity(xml, MessagePushTextFormDTO.class);
Object createTime = xml.get(ModuleConstant.CREATE_TIME); Object createTime = xml.get(ModuleConstant.CREATE_TIME);
@ -157,7 +172,7 @@ public class WarrantServiceImpl implements WarrantService {
* 1微信模推送给第三方平台方文本消息其中 Content 字段的内容固定为TESTCOMPONENT_MSG_TYPE_TEXT * 1微信模推送给第三方平台方文本消息其中 Content 字段的内容固定为TESTCOMPONENT_MSG_TYPE_TEXT
* 2第三方平台方立马回应文本消息并最终触达粉丝Content 必须固定为TESTCOMPONENT_MSG_TYPE_TEXT_callback * 2第三方平台方立马回应文本消息并最终触达粉丝Content 必须固定为TESTCOMPONENT_MSG_TYPE_TEXT_callback
*/ */
if (content.equals(ModuleConstant.TESTCOMPONENT_MSG_TYPE_TEXT)){ /*if (content.equals(ModuleConstant.TESTCOMPONENT_MSG_TYPE_TEXT)){
}else if (content.startsWith(ModuleConstant.QUERY_AUTH_CODE)){ }else if (content.startsWith(ModuleConstant.QUERY_AUTH_CODE)){
@ -166,7 +181,10 @@ public class WarrantServiceImpl implements WarrantService {
//auth_code //auth_code
String queryAuthCode = content.substring(contentBefore.length() + NumConstant.ONE, content.length()); String queryAuthCode = content.substring(contentBefore.length() + NumConstant.ONE, content.length());
} }*/
this.processTextMessage(request,response,content,toUserName,fromUserName);
} }
log.info("消息与事件接收URL【代码审核结果】结束......"); log.info("消息与事件接收URL【代码审核结果】结束......");
return ModuleConstant.SUCCESS; return ModuleConstant.SUCCESS;

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

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

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

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-voice-server: gov-voice-server:
container_name: gov-voice-server-dev container_name: gov-voice-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.64 image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.67
ports: ports:
- "8105:8105" - "8105:8105"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

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

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

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.64</version> <version>0.3.67</version>
<parent> <parent>
<artifactId>gov-voice</artifactId> <artifactId>gov-voice</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

13
epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__addAutoPublish.sql

@ -1,6 +1,7 @@
ALTER TABLE `epmet_gov_voice`.`article` -- ALTER TABLE `epmet_gov_voice`.`article`
ADD COLUMN `PUBLISH_WAY` varchar(16) NOT NULL DEFAULT 'autoAudit' COMMENT '发布方式 自动审核后发布:autoAudit;人工确认无误发布(不审核):manualNoAudit' AFTER `TAGS`; -- ADD COLUMN `PUBLISH_WAY` varchar(16) NOT NULL DEFAULT 'autoAudit' COMMENT '发布方式 自动审核后发布:autoAudit;人工确认无误发布(不审核):manualNoAudit' AFTER `TAGS`;
ALTER TABLE `epmet_gov_voice`.`draft` -- ALTER TABLE `epmet_gov_voice`.`draft`
ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass;失败:fail;审核中:auditing' AFTER `TITLE`; -- ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass;失败:fail;审核中:auditing' AFTER `TITLE`;
ALTER TABLE `epmet_gov_voice`.`article` -- ALTER TABLE `epmet_gov_voice`.`article`
ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass;失败:fail;审核中:auditing' AFTER `TITLE`; -- ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass;失败:fail;审核中:auditing' AFTER `TITLE`;
select 0;

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

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

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

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

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

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.62</version> <version>0.3.63</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId> <artifactId>oper-crm</artifactId>

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

@ -44,6 +44,7 @@ import com.epmet.feign.OperCustomizeFeignClient;
import com.epmet.redis.CustomerRedis; import com.epmet.redis.CustomerRedis;
import com.epmet.service.CustomerService; import com.epmet.service.CustomerService;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -400,11 +401,12 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
@Override @Override
public PageData pageQuery(PageQueryFormDTO formDTO) { public PageData pageQuery(PageQueryFormDTO formDTO) {
//1:查询有效客户数据(不区分是否在有效期内) //1:查询有效客户数据(不区分是否在有效期内)
PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize()); PageInfo<CustomerResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize())
List<CustomerResultDTO> list = baseDao.selectCustomerList(formDTO.getCustomerName()); .doSelectPageInfo(() -> baseDao.selectCustomerList(formDTO.getCustomerName()));
//PageInfo<CustomerResultDTO> pi = new PageInfo<>(list); // List<CustomerResultDTO> list = baseDao.selectCustomerList(formDTO.getCustomerName());
PageData resultDTO = new PageData(list,list.size()); // //PageInfo<CustomerResultDTO> pi = new PageInfo<>(list);
return resultDTO; // int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName());
return new PageData(pageInfo.getList(),pageInfo.getTotal());
} }
/** /**

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

@ -70,6 +70,7 @@
AND customer_name LIKE concat('%', trim(#{customerName}), '%') AND customer_name LIKE concat('%', trim(#{customerName}), '%')
</if> </if>
</select> </select>
<select id="getAllList" resultMap="customerMap"> <select id="getAllList" resultMap="customerMap">
SELECT SELECT
* *

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

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

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

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

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

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

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

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-user-server: epmet-user-server:
container_name: epmet-user-server-test container_name: epmet-user-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.106 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.108
ports: ports:
- "8087:8087" - "8087:8087"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

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

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.106</version> <version>0.3.108</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId> <artifactId>epmet-user</artifactId>

35
epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java

@ -26,12 +26,14 @@ import com.epmet.constant.UserRedisKeys;
import com.epmet.dao.GridLatestDao; import com.epmet.dao.GridLatestDao;
import com.epmet.dao.RegisterRelationDao; import com.epmet.dao.RegisterRelationDao;
import com.epmet.dao.UserBaseInfoDao; import com.epmet.dao.UserBaseInfoDao;
import com.epmet.dao.UserWechatDao;
import com.epmet.dto.form.BelongGridNameFormDTO; import com.epmet.dto.form.BelongGridNameFormDTO;
import com.epmet.dto.result.BelongGridNameResultDTO; import com.epmet.dto.result.BelongGridNameResultDTO;
import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO;
import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO;
import com.epmet.entity.RegisterRelationEntity; import com.epmet.entity.RegisterRelationEntity;
import com.epmet.entity.UserBaseInfoEntity; import com.epmet.entity.UserBaseInfoEntity;
import com.epmet.entity.UserWechatEntity;
import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient;
import com.epmet.util.ModuleConstant; import com.epmet.util.ModuleConstant;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -39,6 +41,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.List;
import java.util.Map; import java.util.Map;
import static com.epmet.commons.tools.redis.RedisUtils.NOT_EXPIRE; import static com.epmet.commons.tools.redis.RedisUtils.NOT_EXPIRE;
@ -61,6 +64,8 @@ public class UserBaseInfoRedis {
private GovOrgOpenFeignClient govOrgOpenFeignClient; private GovOrgOpenFeignClient govOrgOpenFeignClient;
@Autowired @Autowired
private GridLatestDao gridLatestDao; private GridLatestDao gridLatestDao;
@Autowired
private UserWechatDao userWechatDao;
public void delete(Object[] ids) { public void delete(Object[] ids) {
@ -102,9 +107,11 @@ public class UserBaseInfoRedis {
} }
//缓存中没有数据,先查数据库,放入缓存后再返回 //缓存中没有数据,先查数据库,放入缓存后再返回
UserBaseInfoResultDTO baseInfo = userBaseInfoDao.selectListByUserIdList(userId); UserBaseInfoResultDTO baseInfo = userBaseInfoDao.selectListByUserIdList(userId);
if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){ if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(userId);
//如果没有首次注册网格,则没有网格名称(xx机关-xx网格)、显示昵称(xx网格-x先生/女士) //如果没有首次注册网格,则没有网格名称(xx机关-xx网格)、显示昵称(xx网格-x先生/女士)
RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(userId);
if(null != relation && StringUtils.isNotBlank(relation.getGridId())){ if(null != relation && StringUtils.isNotBlank(relation.getGridId())){
baseInfo.setCustomerId(relation.getCustomerId()); baseInfo.setCustomerId(relation.getCustomerId());
BelongGridNameFormDTO gridParam = new BelongGridNameFormDTO(); BelongGridNameFormDTO gridParam = new BelongGridNameFormDTO();
@ -140,8 +147,34 @@ public class UserBaseInfoRedis {
} }
set(baseInfo); set(baseInfo);
return baseInfo; return baseInfo;
}else{
//如果没有,说明这里是陌生人
//陌生人不放入缓存,也不更新用户基础信息表
baseInfo = new UserBaseInfoResultDTO();
baseInfo.setUserId(userId);
List<UserWechatEntity> wechatInfo = userWechatDao.selectByUserId(userId);
if(null != wechatInfo && !wechatInfo.isEmpty()){
baseInfo.setNickname(wechatInfo.get(NumConstant.ZERO).getNickname());
if(StringUtils.isBlank(baseInfo.getNickname())){
baseInfo.setNickname(ModuleConstant.EMPTY_STR);
}
}else{
return null;
}
RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(userId);
if(null != relation && StringUtils.isNotBlank(relation.getGridId())){
baseInfo.setCustomerId(relation.getCustomerId());
}else{
LatestGridInfoResultDTO gridLatest =
gridLatestDao.selectLatestGridInfoByUserId(userId);
if(null != gridLatest){
baseInfo.setCustomerId(gridLatest.getCustomerId());
}
}
} }
return baseInfo;
} }
return null; return null;

Loading…
Cancel
Save