Browse Source

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

dev_shibei_match
wangchao 5 years ago
parent
commit
d9becf97e9
  1. 2
      epmet-auth/deploy/docker-compose-dev.yml
  2. 2
      epmet-auth/pom.xml
  3. 8
      epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java
  4. 15
      epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
  5. 6
      epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
  6. 2
      epmet-auth/src/main/resources/bootstrap.yml
  7. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
  8. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
  9. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
  10. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
  11. 1
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java
  12. 1
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActSignInFormDTO.java
  13. 10
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java
  14. 2
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActRegistrationResultDTO.java
  15. 2
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
  16. 2
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml
  17. 2
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  18. 14
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java
  19. 10
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java
  20. 24
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
  21. 4
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
  22. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
  23. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml
  24. 2
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
  25. 2
      epmet-module/epmet-job/epmet-job-server/pom.xml
  26. 2
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
  27. 2
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
  28. 2
      epmet-module/epmet-point/epmet-point-server/pom.xml
  29. 5
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java
  30. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
  31. 10
      epmet-module/epmet-third/epmet-third-server/pom.xml
  32. 7
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java
  33. 4
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PreAuthTokenDao.java
  34. 2
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java
  35. 75
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
  36. 11
      epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
  37. 8
      epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PreAuthTokenDao.xml
  38. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  39. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  40. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
  41. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
  42. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  43. 9
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java
  44. 26
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
  45. 12
      epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
  46. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
  47. 2
      epmet-module/resi-guide/resi-guide-server/pom.xml
  48. 3
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
  49. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
  50. 2
      epmet-module/resi-mine/resi-mine-server/pom.xml
  51. 3
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java

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

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

2
epmet-auth/pom.xml

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

8
epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java

@ -13,6 +13,7 @@ import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.redis.RedisKeys;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerAppDTO;
import com.epmet.dto.CustomerAppRedisDTO;
@ -115,7 +116,12 @@ public class CustomerAppWxServiceUtil implements ApplicationRunner {
maServices = maServicesNew;
if (appSet != null && result != null) {
for (CustomerAppDTO app : result) {
appSet.add(appKey, app);
CustomerAppRedisDTO appRedis = ConvertUtils.sourceToTarget(app, CustomerAppRedisDTO.class);
if(appRedis == null){
logger.warn("init CustomerAppRedis fail,convert return null,appDB:{}",JSON.toJSONString(app));
continue;
}
appSet.add(appKey, appRedis);
}
}
}

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

@ -71,6 +71,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_SAVEUSER, JSON.toJSONString(dto)).getData();
JSONObject toResult = JSON.parseObject(data);
Result result = ConvertUtils.mapToEntity(toResult, Result.class);
if (null != toResult.get("code")) {
result.setCode(((Integer) toResult.get("code")).intValue());
}
if (!result.success()) {
throw new RenException(PublicUserLoginConstant.SAVE_USER_EXCEPTION);
}
@ -165,6 +168,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER, JSON.toJSONString(dto)).getData();
JSONObject toResult = JSON.parseObject(data);
Result result = ConvertUtils.mapToEntity(toResult, Result.class);
if (null != toResult.get("code")) {
result.setCode(((Integer) toResult.get("code")).intValue());
}
if (!result.success()) {
logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getPhone(), result.getCode(), result.getMsg()));
throw new RenException(result.getCode());
@ -211,6 +217,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
String data = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSER_CHECKPAUSER, JSON.toJSONString(dto)).getData();
JSONObject toResult = JSON.parseObject(data);
Result result = ConvertUtils.mapToEntity(toResult, Result.class);
if (null != toResult.get("code")) {
result.setCode(((Integer) toResult.get("code")).intValue());
}
if (!result.success()) {
logger.error(String.format("手机验证码登录异常,手机号[%s],code[%s],msg[%s]", formDTO.getPhone(), result.getCode(), result.getMsg()));
throw new RenException(result.getCode());
@ -259,6 +268,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
String data1 = HttpClientManager.getInstance().sendPostByJSON(ThirdApiConstant.THIRD_PAUSERVISITED_SAVEUSERVISITED, JSON.toJSONString(visited)).getData();
JSONObject json = JSON.parseObject(data1);
Result visitedResult = ConvertUtils.mapToEntity(json, Result.class);
if (null != json.get("code")) {
visitedResult.setCode(((Integer) json.get("code")).intValue());
}
if (!visitedResult.success()) {
logger.error(PublicUserLoginConstant.SAVE_VISITED_EXCEPTION);
}
@ -281,6 +293,9 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.REGISTER_URL, JSON.toJSONString(formDTO)).getData();
JSONObject toResult = JSON.parseObject(data);
Result result = ConvertUtils.mapToEntity(toResult, Result.class);
if (null != toResult.get("code")) {
result.setCode(((Integer) toResult.get("code")).intValue());
}
if (!result.success()) {
logger.error(String.format("调用epmet_third服务初始化用户信息失败,数据来源[%s],手机号[%s],userId:[%S]", formDTO.getSource(), formDTO.getPhone(), formDTO.getUserId()));
throw new RenException(result.getCode());

6
epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@ -510,6 +510,9 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
logger.info("ThirdLoginServiceImpl.getCustomerInfo:httpclient->url:"+AuthHttpUrlConstant.CUSTOMER_MSG_URL+",结果->"+data);
JSONObject toResult = JSON.parseObject(data);
Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
if (null != toResult.get("code")) {
mapToResult.setCode(((Integer) toResult.get("code")).intValue());
}
if (!mapToResult.success()) {
logger.error(String.format("根据appId查询客户Id失败,对应appId->" + appId));
throw new RenException(mapToResult.getMsg());
@ -532,6 +535,9 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
logger.info("ThirdLoginServiceImpl.getUserWeChat:httpclient->url:"+AuthHttpUrlConstant.RESI_AND_WORK_LOGIN_URL+",结果->"+data);
JSONObject toResult = JSON.parseObject(data);
Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
if (null != toResult.get("code")) {
mapToResult.setCode(((Integer) toResult.get("code")).intValue());
}
if (!mapToResult.success()) {
logger.error("居民端小程序登陆,调用epmet_third服务获取数据失败");
throw new RenException(mapToResult.getCode());

2
epmet-auth/src/main/resources/bootstrap.yml

@ -10,7 +10,7 @@ spring:
allow-bean-definition-overriding: true
#环境 dev|test|prod
profiles:
active: dev
active: @spring.profiles.active@
messages:
encoding: UTF-8
basename: i18n/messages_common

2
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java

@ -73,4 +73,6 @@ public interface StrConstant {
* 空字符串
*/
String EPMETY_STR="";
String NULL_STR="null";
}

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

@ -86,6 +86,8 @@ public enum EpmetErrorCode {
// 活动报名失败,弹窗:志愿者认证
NON_CERTIFIED_VOLUNTEER(8511, "是否认证志愿者,完成报名"),
ACT_TIME_CONFLICT(8512, "报名失败。您本次报名活动时间与已报名活动时间间隔较短,为了不影响您已报名的活动,请选择其他时间的活动,谢谢。"),
SIGN_IN_TIME_NO(8513, "签到时间还未到~"),
SIGN_IN_TIME_END(8514, "签到时间已结束~"),
// 该错误不会提示给前端,只是后端传输错误信息用。
ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"),

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

@ -2,7 +2,7 @@ version: "3.7"
services:
data-statistical-server:
container_name: data-statistical-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.39
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.42
ports:
- "8108:8108"
network_mode: host # 使用现有网络

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

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

1
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java

@ -2,7 +2,6 @@ package com.epmet.dto.form.resi;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;

1
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActSignInFormDTO.java

@ -17,7 +17,6 @@
package com.epmet.dto.form.resi;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import javax.validation.constraints.Min;

10
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java

@ -142,4 +142,14 @@ public class ResiActDetailResultDTO implements Serializable {
* 用户是否已报名该活动 true用户已报名false用户未报名
*/
private Boolean isRegistration;
/**
* 打卡开始时间yyyy-MM-dd HH:mm
*/
private String signInStartTime;
/**
* 打卡截止时间yyyy-MM-dd HH:mm
*/
private String signInEndTime;
}

2
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActRegistrationResultDTO.java

@ -23,7 +23,7 @@ import java.io.Serializable;
/**
* 活动内容
* 活动-错误提示信息
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-07-19

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

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

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

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

2
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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.0.37</version>
<version>0.0.40</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-heart</artifactId>

14
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java

@ -317,4 +317,18 @@ public class ResiActListController {
ValidatorUtils.validateEntity(formDto, ResiActBaseFormDTO.AddUserInternalGroup.class);
return actInfoService.actLookBackAssembly(formDto);
}
/**
* 检查是否在 活动签到时间 范围内
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.resi.ResiActRegistrationResultDTO>
* @Author zhangyong
* @Date 15:03 2020-08-05
**/
@PostMapping("checksignintime")
public Result<ResiActRegistrationResultDTO> checkSignInTime(@RequestBody ResiActContentFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, ResiActContentFormDTO.AddUserInternalGroup.class);
return actInfoService.checkSignInTime(formDTO);
}
}

10
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java

@ -235,4 +235,14 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
* @Date 13:39 2020-07-21
**/
Result<List<ResiLookBackActResultDTO>> actLookBackAssembly(ResiLatestActFormDTO formDTO);
/**
* 检查是否在 活动签到时间 范围内
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.resi.ResiActRegistrationResultDTO>
* @Author zhangyong
* @Date 15:03 2020-08-05
**/
Result<ResiActRegistrationResultDTO> checkSignInTime(ResiActContentFormDTO formDTO);
}

24
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java

@ -23,7 +23,6 @@ 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;
@ -37,7 +36,6 @@ import com.epmet.dto.form.resi.*;
import com.epmet.dto.result.resi.*;
import com.epmet.entity.ActInfoEntity;
import com.epmet.entity.ActUserRelationEntity;
import com.epmet.redis.ActInfoRedis;
import com.epmet.service.ActInfoService;
import com.epmet.service.ActUserRelationService;
import com.epmet.utils.CaculateDistance;
@ -61,9 +59,6 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
private Logger logger = LogManager.getLogger(ActInfoServiceImpl.class);
@Autowired
private ActInfoRedis actInfoRedis;
@Autowired
private ActUserRelationService relationService;
@ -396,4 +391,23 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
List<ResiLookBackActResultDTO> lookBackAct = baseDao.selectListLookBackActAssembly(formDTO);
return new Result<List<ResiLookBackActResultDTO>>().ok(lookBackAct);
}
@Override
public Result<ResiActRegistrationResultDTO> checkSignInTime(ResiActContentFormDTO formDTO) {
ResiActRegistrationResultDTO resultDTO = new ResiActRegistrationResultDTO();
resultDTO.setFlag(NumConstant.ZERO);
Date currentTime = new Date();
// 查询 活动信息
ActInfoEntity entity = baseDao.selectById(formDTO.getActId());
if (currentTime.before(entity.getSignInStartTime())){
// 签到时间还未到~
resultDTO.setTip(EpmetErrorCode.SIGN_IN_TIME_NO.getMsg());
resultDTO.setFlag(EpmetErrorCode.SIGN_IN_TIME_NO.getCode());
} else if (currentTime.after(entity.getSignInEndTime())){
// 签到时间已结束~
resultDTO.setTip(EpmetErrorCode.SIGN_IN_TIME_END.getMsg());
resultDTO.setFlag(EpmetErrorCode.SIGN_IN_TIME_END.getCode());
}
return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);
}
}

4
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java

@ -342,7 +342,9 @@ public class WorkActUserServiceImpl implements WorkActUserService {
if (StringUtils.isNotBlank(userBaseInfo.getIdNum())) {
resultDTO.setIdNum(userBaseInfo.getIdNum());
}
resultDTO.setAddress(userBaseInfo.getStreet()+userBaseInfo.getDistrict()+userBaseInfo.getBuildingAddress());
String address = userBaseInfo.getStreet() + userBaseInfo.getDistrict() + userBaseInfo.getBuildingAddress();
address = address.replaceAll(StrConstant.NULL_STR, StrConstant.EPMETY_STR);
resultDTO.setAddress(address);
}
resultDTO.setSignUpTime(actUserRelationDTO.getCreatedTime());
/**

2
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@ -400,6 +400,8 @@
DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i') signUpEndTime,
DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime,
DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime,
DATE_FORMAT(i.SIGN_IN_START_TIME,'%Y-%m-%d %H:%i') signInStartTime,
DATE_FORMAT(i.SIGN_IN_END_TIME,'%Y-%m-%d %H:%i') signInEndTime,
i.ACT_ADDRESS actAddress,
i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型(true:固定名额(1) false: 不限制名额(0))
i.ACT_QUOTA actQuota,

2
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml

@ -75,7 +75,7 @@
FROM act_user_relation re
WHERE re.DEL_FLAG = '0'
AND re.ACT_ID = #{actId}
AND re.`STATUS` != 'refused' AND re.`STATUS` != 'cancele'
AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled'
</select>
<update id="updateUserRelationByActIdAndUserId" parameterType="com.epmet.dto.ActUserRelationDTO">

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

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

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

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

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

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

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

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

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

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

5
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java

@ -50,14 +50,13 @@ public class PointRuleController {
/**
* desc:根据功能id获取积分规则
*
* @param tokenDTO
* @param formDTO
* @return
*/
@PostMapping(value = "list")
@RequirePermission( requirePermission = RequirePermissionEnum.MORE_POINT_RULE_LIST)
public Result<List<PointRuleResultDTO>> list( @RequestBody PointRuleListFormDTO formDTO) {
formDTO.setCustomerId("3ef7e4bb195eb9e622d68b52509aa940");
public Result<List<PointRuleResultDTO>> list(@LoginUser TokenDto tokenDTO, @RequestBody PointRuleListFormDTO formDTO) {
formDTO.setCustomerId(tokenDTO.getCustomerId());
ValidatorUtils.validateEntity(formDTO);
return new Result<List<PointRuleResultDTO>>().ok(pointRuleService.list(formDTO));
}

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

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

10
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"
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>
<version>0.0.101</version>
<version>0.0.105</version>
<parent>
<groupId>com.epmet</groupId>
@ -147,6 +147,14 @@
<version>5.1.12.RELEASE</version>
<scope>compile</scope>
</dependency>
<!-- 钉钉机器人 -->
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>alibaba-dingtalk-service-sdk</artifactId>
<version>1.0.1</version>
</dependency>
</dependencies>
<build>

7
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java

@ -77,4 +77,11 @@ public interface PaCustomerDao extends BaseDao<PaCustomerEntity> {
* @Description 修改pa_customer表主键值
**/
int updateIdById(ModifyCustomerFormDTO formDTO);
/**
* @Description 查询客户名称
* @author zxc
* @date 2020/8/5 3:23 下午
*/
String selectCustomerName(@Param("customerId") String customerId);
}

4
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PreAuthTokenDao.java

@ -39,10 +39,10 @@ public interface PreAuthTokenDao extends BaseDao<PreAuthTokenEntity> {
void insertPreAuthToken(PreAuthTokenFormDTO formDTO);
/**
* @Description 逻辑 pre_auth_code
* @Description pre_auth_code
* @param
* @author zxc
*/
void updateOldPreAuthCode();
void deleteOldPreAuthCode();
}

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

@ -265,7 +265,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
formDTO.setPreAuthToken(preAuthCode);
formDTO.setExpiresInTime(expiresInTime);
//先逻辑删除,在插入DB
preAuthTokenDao.updateOldPreAuthCode();
preAuthTokenDao.deleteOldPreAuthCode();
preAuthTokenDao.insertPreAuthToken(formDTO);
//预授权码 放入缓存
redisThird.setPreAuthCode(preAuthCode);

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

@ -3,6 +3,10 @@ package com.epmet.service.impl;
import cn.hutool.json.JSONObject;
import com.alibaba.fastjson.JSON;
import com.alibaba.nacos.client.config.utils.IOUtils;
import com.dingtalk.api.DefaultDingTalkClient;
import com.dingtalk.api.DingTalkClient;
import com.dingtalk.api.request.OapiRobotSendRequest;
import com.dingtalk.api.response.OapiRobotSendResponse;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.HttpClientManager;
@ -24,6 +28,7 @@ import com.epmet.wxapi.constant.WxMaCodeConstant;
import com.fasterxml.jackson.core.JsonEncoding;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.taobao.api.ApiException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.dom4j.DocumentException;
@ -70,6 +75,8 @@ public class WarrantServiceImpl implements WarrantService {
private MessagePushTextDao messagePushTextDao;
@Autowired
private RedisThird redisThird;
@Autowired
private PaCustomerDao paCustomerDao;
/**
* @Description 1.保存代码审核结果 2.更新代码上传结果
@ -134,25 +141,32 @@ public class WarrantServiceImpl implements WarrantService {
codeAuditRecord.setCustomerId(customerId);
codeAuditRecord.setAuthAppId(authAppId);
codeAuditRecord.setTemplateId(templateId);
String customerName = paCustomerDao.selectCustomerName(customerId);
String client = this.getClient(clientType);
//插入 代码审核 记录
log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT, xml));
codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord);
// 修改 code_audit_result 中的代码审核结果
// String event = codeAuditRecord.getEvent();
String reason = codeAuditRecord.getReason();
String codeResult = null;
switch (event) {
case ModuleConstant.WEAPP_AUDIT_SUCCESS:
codeResult = ModuleConstant.AUDIT_SUCCESS;
this.dingDingRobot(reason,null,customerName,client);
break;
case ModuleConstant.WEAPP_AUDIT_FAIL:
codeResult = ModuleConstant.AUDIT_FAILED;
this.dingDingRobot(reason,codeResult,customerName,client);
break;
case ModuleConstant.WEAPP_AUDIT_DELAY:
codeResult = ModuleConstant.DELAY;
this.dingDingRobot(reason,codeResult,customerName,client);
break;
}
String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord);
codeAuditResultDao.updateAuditResult(customerId, codeCustomerId, codeResult);
log.info("消息与事件接收URL【代码审核结果】结束......");
}else {
this.replyEventMessage(request,response,event,toUserName,fromUserName);
}
@ -165,31 +179,62 @@ public class WarrantServiceImpl implements WarrantService {
// messagePushTextDao.insertMessageText(messagePushTextFormDTO);
String content = messagePushTextFormDTO.getContent();
log.info(String.format(ThirdRunTimeInfoConstant.CONTENT,content));
/**
* 测试公众号处理用户消息
* 模拟粉丝发送文本消息给专用测试公众号第三方平台方需根据文本消息的内容进行相应的响应
* 1微信模推送给第三方平台方文本消息其中 Content 字段的内容固定为TESTCOMPONENT_MSG_TYPE_TEXT
* 2第三方平台方立马回应文本消息并最终触达粉丝Content 必须固定为TESTCOMPONENT_MSG_TYPE_TEXT_callback
*/
/*if (content.equals(ModuleConstant.TESTCOMPONENT_MSG_TYPE_TEXT)){
}else if (content.startsWith(ModuleConstant.QUERY_AUTH_CODE)){
// 测试公众号使用客服消息接口处理用户消息
String contentBefore = content.substring(NumConstant.ZERO, content.indexOf(ThirdRedisKeyConstant.COLON));
//auth_code
String queryAuthCode = content.substring(contentBefore.length() + NumConstant.ONE, content.length());
}*/
this.processTextMessage(request,response,content,toUserName,fromUserName);
}
log.info("消息与事件接收URL【代码审核结果】结束......");
return ModuleConstant.SUCCESS;
}
/**
* @Description 钉钉机器人报警
* @author zxc
* @date 2020/8/5 4:33 下午
*/
public void dingDingRobot(String result,String event,String customerName,String clientType){
DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/robot/send?access_token=5b48fcbc3fde24b8ba4696aa062b7f8146479a9d3467dbb1f9cf132ec36b955a");
OapiRobotSendRequest request = new OapiRobotSendRequest();
request.setMsgtype("markdown");
OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown();
markdown.setTitle("代码审核结果");
switch (event){
case ModuleConstant.WEAPP_AUDIT_SUCCESS:
markdown.setText("代码审核结果: 审核成功\n"+
"> 客户名称:" + customerName +"\n\n"+
"> 客户端:"+clientType+"\n");
break;
case ModuleConstant.WEAPP_AUDIT_FAIL:
markdown.setText("代码审核结果: 审核不通过\n"+
"> 客户名称:" + customerName +"\n\n"+
"> 客户端:"+clientType+"\n\n"+
"> 不通过原因:"+result);
break;
case ModuleConstant.WEAPP_AUDIT_DELAY:
markdown.setText("代码审核结果: 审核延时\n"+
"> 客户名称:" + customerName +"\n\n"+
"> 客户端:"+clientType+"\n\n"+
"> 延时原因:"+result);
break;
}
request.setMarkdown(markdown);
try {
OapiRobotSendResponse response = client.execute(request);
} catch (ApiException e) {
log.error("机器人生病了......");
e.printStackTrace();
}
}
public String getClient(String clientType){
String result = clientType == "resi" ? "居民端" : "工作端";
return result;
}
/**
* 方法描述: 类型为enevt的时候拼接
* @param request
@ -242,7 +287,7 @@ public class WarrantServiceImpl implements WarrantService {
public void replyTextMessage(HttpServletRequest request, HttpServletResponse response,
String content,String toUserName, String fromUserName)
throws DocumentException, IOException {
Long createTime = System.currentTimeMillis() / 1000;
Long createTime = System.currentTimeMillis() / NumConstant.ONE_THOUSAND;
StringBuffer sb = new StringBuffer(512);
sb.append("<xml>");
sb.append("<ToUserName><![CDATA["+toUserName+"]]></ToUserName>");
@ -269,7 +314,7 @@ public class WarrantServiceImpl implements WarrantService {
// 得到微信授权成功的消息后,应该立刻进行处理!!相关信息只会在首次授权的时候推送过来
//第三方平台【component_access_token】
String componentAccessToken = redisThird.getComponentAccessToken();
com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject();
JSONObject jsonObject = new JSONObject();
jsonObject.put(ModuleConstant.COMPONENT_APPID, componentAppId);
jsonObject.put(ModuleConstant.AUTHORIZATION_CODE, auth_code);
String authInfo = HttpClientManager.getInstance().sendPostByJSON(WxMaCodeConstant.API_QUERY_AUTH_URL + componentAccessToken, JSON.toJSONString(jsonObject)).getData();

11
epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml

@ -71,6 +71,17 @@
</if>
</select>
<!-- 查询客户名称 -->
<select id="selectCustomerName" resultType="java.lang.String">
SELECT
customer_name AS customerName
FROM
pa_customer
WHERE
del_flag = 0
AND id = #{customerId}
</select>
<update id="updateCustomerById">
UPDATE pa_customer
SET is_initialize = #{isInitialize}

8
epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PreAuthTokenDao.xml

@ -30,9 +30,9 @@
)
</insert>
<!-- 逻辑删pre_auth_code -->
<update id="updateOldPreAuthCode">
update pre_auth_token set del_flag = 1
</update>
<!-- 删pre_auth_code -->
<delete id="deleteOldPreAuthCode">
delete from pre_auth_token where del_flag = 0
</delete>
</mapper>

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

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

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

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

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

@ -334,7 +334,7 @@ public class AgencyServiceImpl implements AgencyService {
//3.查询客户具有指定RoleKey的角色信息
CustomerRoleFormDTO customerRoleForm = new CustomerRoleFormDTO();
customerRoleForm.setCustomerId(agencyDTO.getCustomerId());
customerRoleForm.setRoleKey(RoleKeyConstants.ROLE_KEY_MANAGER);
customerRoleForm.setRoleKey(RoleKeyConstants.ROLE_KEY_ROOT_MANAGER);
Result<GovStaffRoleDTO> getRoleResult = epmetUserOpenFeignClient.getRoleOfCustomer(customerRoleForm);
if (!getRoleResult.success() || getRoleResult.getData() == null) {
log.error("查询客户具有指定RoleKey的角色信息失败:".concat(getRoleResult.toString()));

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

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

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

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

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

@ -68,15 +68,6 @@ public interface CustomerDao extends BaseDao<CustomerEntity> {
**/
List<CustomerResultDTO> selectCustomerList(@Param("customerName") String customerName);
/**
* @return int
* @param customerName
* @author yinzuomei
* @description 查询有效客户数据(不区分是否在有效期内)按名称模糊查询 - 总记录数
* @Date 2020/8/5 11:02
**/
int selectCountByCustomerName(@Param("customerName") String customerName);
/**
* desc获取未删除的所有用户
* @return

26
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.service.CustomerService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -383,12 +384,16 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
}
/**
* 获取客户的有效时长
* @return
* @Author sun
* @Description 获取客户的有效时长
*/
private Date getValidityTime() {
int life = 3600 * 1000 * 24 * 365 * 10;
return new Date(new Date().getTime() + Long.valueOf(life));
//获取当前日历日期
GregorianCalendar calendar = new GregorianCalendar();
//往后推3个月(不是三个自然月)
calendar.add(GregorianCalendar.MONTH,3);
return calendar.getTime();
}
/**
@ -400,12 +405,12 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
@Override
public PageData pageQuery(PageQueryFormDTO formDTO) {
//1:查询有效客户数据(不区分是否在有效期内)
PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
List<CustomerResultDTO> list = baseDao.selectCustomerList(formDTO.getCustomerName());
//PageInfo<CustomerResultDTO> pi = new PageInfo<>(list);
int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName());
PageData resultDTO = new PageData(list,total);
return resultDTO;
PageInfo<CustomerResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize())
.doSelectPageInfo(() -> baseDao.selectCustomerList(formDTO.getCustomerName()));
// List<CustomerResultDTO> list = baseDao.selectCustomerList(formDTO.getCustomerName());
// //PageInfo<CustomerResultDTO> pi = new PageInfo<>(list);
// int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName());
return new PageData(pageInfo.getList(),pageInfo.getTotal());
}
/**
@ -423,6 +428,9 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
String data = HttpClientManager.getInstance().sendPostByJSON(url, null).getData();
JSONObject toResult = JSON.parseObject(data);
Result thirdResult = ConvertUtils.mapToEntity(toResult, Result.class);
if (null != toResult.get("code")) {
thirdResult.setCode(((Integer) toResult.get("code")).intValue());
}
if (!thirdResult.success()) {
throw new RenException(thirdResult.getCode(), thirdResult.getInternalMsg());
}

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

@ -71,18 +71,6 @@
</if>
</select>
<select id="selectCountByCustomerName" parameterType="map" resultType="java.lang.Integer">
SELECT
count(id) as total
FROM
customer
WHERE
del_flag = '0'
<if test='customerName != "" and customerName != null'>
AND customer_name LIKE concat('%', trim(#{customerName}), '%')
</if>
</select>
<select id="getAllList" resultMap="customerMap">
SELECT
*

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

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

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

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

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

@ -313,6 +313,9 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
logger.info("ThirdLoginServiceImpl.getCustomerInfo:httpclient->url:" + GuideHttpUrlConstant.CUSTOMER_MSG_URL + ",结果->" + data);
JSONObject toResult = JSON.parseObject(data);
Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
if (null != toResult.get("code")) {
mapToResult.setCode(((Integer) toResult.get("code")).intValue());
}
if (!mapToResult.success()) {
logger.error(String.format("根据appId查询客户Id失败,对应appId->" + appId));
throw new RenException(mapToResult.getMsg());

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

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

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

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

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

@ -115,6 +115,9 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
logger.info("调用third服务,根据appId查询客户信息:httpclient->url:" + customerMsgUrl + ",结果->" + data);
JSONObject toResult = JSON.parseObject(data);
Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
if (null != toResult.get("code")) {
mapToResult.setCode(((Integer) toResult.get("code")).intValue());
}
if (!mapToResult.success()) {
logger.error(String.format("根据appId查询客户信息失败,对应appId->" + formDTO.getAppId()));
throw new RenException(mapToResult.getMsg());

Loading…
Cancel
Save