Browse Source

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

master
wangchao 5 years ago
parent
commit
643d7e6212
  1. 2
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml
  2. 2
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  3. 18
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java
  4. 9
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java
  5. 9
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java
  6. 16
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java
  7. 5
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java
  8. 4
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java
  9. 4
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
  10. 13
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml
  11. 2
      epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml
  12. 2
      epmet-module/epmet-point/epmet-point-server/pom.xml
  13. 5
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java
  14. 129
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AccountBasicInfoResultDTO.java
  15. 69
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/GetCategoryResultDTO.java
  16. 2
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/SupportVersionResultDTO.java
  17. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
  18. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
  19. 2
      epmet-module/epmet-third/epmet-third-server/pom.xml
  20. 12
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java
  21. 30
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
  22. 10
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PublicAccountCallBackController.java
  23. 9
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java
  24. 9
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java
  25. 18
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
  26. 44
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
  27. 39
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
  28. 13
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
  29. 21
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxMaSpeedUpAuditReq.java
  30. 66
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxBasicInfoResult.java
  31. 44
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxOpenGetCategoryResult.java
  32. 2
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxSupportVersionResult.java
  33. 30
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java
  34. 59
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java
  35. 8
      epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml
  36. 2
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
  37. 2
      epmet-module/gov-voice/gov-voice-server/pom.xml
  38. 11
      epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml
  39. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
  40. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  41. 8
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

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.42
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.43
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.42</version>
<version>0.0.43</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-heart</artifactId>

18
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java

@ -25,13 +25,13 @@ public class WorkActUserController {
@Autowired
private WorkActUserService workActUserService;
/**
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.work.AuditingActUserResultDTO>>
* @param formDTO
* @author yinzuomei
* @description 报名审核-待审核列表
* @Date 2020/7/21 22:24
* @Date 2020/7/21 22:24
**/
@PostMapping("auditinglist")
public Result<List<AuditingActUserResultDTO>> getAuditingList(@RequestBody ActIdFormDTO formDTO){
@ -45,7 +45,7 @@ public class WorkActUserController {
* @param formDTO
* @author yinzuomei
* @description 报名审核-已通过列表
* @Date 2020/7/22 15:16
* @Date 2020/7/22 15:16
**/
@PostMapping("passedlist")
public Result<List<PassedActUserResultDTO>> getPassedList(@RequestBody ActIdFormDTO formDTO){
@ -58,7 +58,7 @@ public class WorkActUserController {
* @param formDTO
* @author yinzuomei
* @description 报名审核-已拒绝列表
* @Date 2020/7/22 15:49
* @Date 2020/7/22 15:49
**/
@PostMapping("rejectedlist")
public Result<List<RejectedActUserResultDTO>> getRejectedlist(@RequestBody ActIdFormDTO formDTO){
@ -123,7 +123,7 @@ public class WorkActUserController {
* @param formDTO
* @author yinzuomei
* @description 报名审核-审核通过
* @Date 2020/7/23 17:31
* @Date 2020/7/23 17:31
**/
@PostMapping("auditpass")
public Result auditPass(@RequestBody AuditUserFormDTO formDTO){
@ -137,7 +137,7 @@ public class WorkActUserController {
* @param formDTO
* @author yinzuomei
* @description 报名审核-拒绝报名
* @Date 2020/7/23 18:08
* @Date 2020/7/23 18:08
**/
@PostMapping("auditrefuse")
public Result auditrefuse(@RequestBody AuditUserFormDTO formDTO){
@ -150,8 +150,8 @@ public class WorkActUserController {
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.work.JoinedUserResultDTO>>
* @param formDTO
* @author yinzuomei
* @description 已结束-已参加人员列表
* @Date 2020/7/24 10:17
* @description 已结束-已参加人员列表(审核中审核通过)
* @Date 2020/7/24 10:17
**/
@PostMapping("joinuserlist")
public Result<List<JoinedUserResultDTO>> queryJoinUserList(@RequestBody ActIdFormDTO formDTO){
@ -164,7 +164,7 @@ public class WorkActUserController {
* @param formDTO
* @author yinzuomei
* @description 已结束-已取消报名人员列表
* @Date 2020/7/24 10:53
* @Date 2020/7/24 10:53
**/
@PostMapping("canceleduserlist")
public Result<List<CanceledUserResultDTO>> queryCanceledUserList(@RequestBody ActIdFormDTO formDTO){

9
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java

@ -218,4 +218,13 @@ public interface ActUserRelationDao extends BaseDao<ActUserRelationEntity> {
* @Date 15:59 2020-07-30
**/
String selectUserStatusByActIdAndUserId(@Param("actId") String actId, @Param("userId")String userId);
/**
* @return java.util.List<java.lang.String>
* @param actId
* @author zhangyong
* @description 根据活动id查询活动已报名人员,返回(已报名/待审核auditing审核通过passed)用户id集合
* @Date 2020/7/21 22:44
**/
List<String> getSignUpUserIdList(@Param("actId") String actId);
}

9
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java

@ -151,4 +151,13 @@ public interface ActUserRelationService extends BaseService<ActUserRelationEntit
* @Date 17:14 2020-07-30
**/
Result<ResiActRegistrationResultDTO> registration(TokenDto tokenDto, ResiActRegistrationFormDTO formDTO);
/**
* @return java.util.List<java.lang.String>
* @param actId
* @author zhangyong
* @description 根据活动id查询活动已报名人员,返回(已报名/待审核auditing审核通过passed)用户id集合
* @Date 2020/7/21 22:44
**/
List<String> getSignUpUserIdList(@Param("actId") String actId);
}

16
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java

@ -38,15 +38,12 @@ import com.epmet.dao.ActSignInRecDao;
import com.epmet.dao.ActUserRelationDao;
import com.epmet.dto.ActSignInRecDTO;
import com.epmet.dto.ActUserRelationDTO;
import com.epmet.dto.HeartUserInfoDTO;
import com.epmet.dto.form.resi.ResiActInsertLiveFormDTO;
import com.epmet.dto.form.resi.ResiActSignInFormDTO;
import com.epmet.entity.ActSignInPicEntity;
import com.epmet.entity.ActSignInRecEntity;
import com.epmet.redis.ActSignInRecRedis;
import com.epmet.service.ActLiveRecService;
import com.epmet.service.ActSignInRecService;
import com.epmet.service.HeartUserInfoService;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@ -66,9 +63,6 @@ import java.util.UUID;
@Service
public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, ActSignInRecEntity> implements ActSignInRecService {
@Autowired
private ActSignInRecRedis actSignInRecRedis;
@Autowired
private ActUserRelationDao actUserRelationDao;
@ -78,9 +72,6 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, Ac
@Autowired
private ActLiveRecService actLiveRecService;
// @Autowired
// private HeartUserInfoService heartUserInfoService;
private Logger logger = LogManager.getLogger(ActSignInRecServiceImpl.class);
@Value("${openapi.scan.server.url}")
private String scanApiUrl;
@ -129,13 +120,6 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, Ac
actSignInPicDao.insert(actLivePicEntity);
}
}
// 用户信息表,实际参与活动个数(签到+1)
// 暂时注释掉,将(实际参与活动个数)字段,放在活动结束后进行统计
// HeartUserInfoDTO heartUserInfoDTO = new HeartUserInfoDTO();
// heartUserInfoDTO.setUserId(formDTO.getUserId());
// heartUserInfoDTO.setParticipationNum(NumConstant.ONE);
// heartUserInfoService.updateHeartUserInfoByUserId(heartUserInfoDTO);
return new Result();
}

5
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java

@ -238,6 +238,11 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
return new Result();
}
@Override
public List<String> getSignUpUserIdList(String actId) {
return baseDao.getSignUpUserIdList(actId);
}
/**
* 开始报名活动
*

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

@ -529,8 +529,8 @@ public class WorkActUserServiceImpl implements WorkActUserService {
}
List<JoinedUserResultDTO> list=actInfoDao.queryJoinUserList(formDTO.getActId());
if(null!=list&&list.size()>0){
//查询已通过审核的人员id集合
List<String> userIdList=actUserRelationService.getUserIdList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_PASSED);
//查询已报名(审核中、审核通过)的人员id集合
List<String> userIdList=actUserRelationService.getSignUpUserIdList(formDTO.getActId());
//根据已通过的人员集合,查询出用户基本信息
List<UserBaseInfoResultDTO> userInfoList=this.queryUserBaseInfoList(userIdList);
for(JoinedUserResultDTO joinedUserResultDTO:list){

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

@ -145,7 +145,7 @@
IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
FROM act_info i
LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' AND u.USER_ID = #{userId}
LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
WHERE i.DEL_FLAG = '0'
-- 活动开始时间 &lt;= 当前时间 进行中
AND <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> NOW()
@ -171,7 +171,7 @@
IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag
FROM act_info i
LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' AND u.USER_ID = #{userId}
LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
WHERE i.DEL_FLAG = '0'
AND i.ACT_STATUS = 'finished'
AND i.CUSTOMER_ID = #{customerId}

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

@ -319,4 +319,17 @@
AND aur.USER_ID = #{userId}
AND aur.ACT_ID = #{actId}
</select>
<!-- 根据活动id,当前状态(已报名/待审核auditing,审核通过passed)返回用户id集合 -->
<select id="getSignUpUserIdList" parameterType="java.lang.String" resultType="java.lang.String">
SELECT
distinct aur.USER_ID as userIds
FROM
act_user_relation aur
WHERE
aur.DEL_FLAG = '0'
AND ( aur.STATUS = 'auditing' OR aur.`STATUS` = 'passed' )
AND aur.ACT_ID = #{actId}
order by aur.CREATED_TIME desc
</select>
</mapper>

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.36
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.37
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.36</version>
<version>0.0.37</version>
<parent>
<artifactId>epmet-point</artifactId>
<groupId>com.epmet</groupId>

5
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java

@ -20,6 +20,11 @@ public class SubmitAuditFormDTO implements Serializable {
*/
private String codeId;
/**
* 是否加急
*/
private Boolean isSpeed;
/**
* 小程序版本说明和功能解释
*/

129
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AccountBasicInfoResultDTO.java

@ -0,0 +1,129 @@
package com.epmet.dto.result;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/8/6 10:50
*/
@NoArgsConstructor
@Data
public class AccountBasicInfoResultDTO implements Serializable {
private static final long serialVersionUID = -5111203845293330004L;
/**
* 帐号 appid
*/
@SerializedName("appid")
private String appid;
/**
* 帐号类型1订阅号2服务号3小程序
*/
@SerializedName("account_type")
private Integer accountType;
/**
* 主体类型 0.个人 1.企业 2.媒体 3.政府 4.其他组织
*/
@SerializedName("principal_type")
private Integer principalType;
/**
* 主体名称
*/
@SerializedName("principal_name")
private String principalName;
/**
* 实名验证状态 1.实名验证成功 2.实名验证中 3.实名验证失败
*/
@SerializedName("realname_status")
private Integer realnameStatus;
/**
* 微信认证信息
*/
@SerializedName("wx_verify_info")
private WxVerifyInfoBean wxVerifyInfo;
/**
* 功能介绍信息
*/
@SerializedName("signature_info")
private SignatureInfoBean signatureInfo;
/**
* 头像信息
*/
@SerializedName("head_image_info")
private HeadImageInfoBean headImageInfo;
@NoArgsConstructor
@Data
public static class WxVerifyInfoBean {
/**
* 是否资质认证若是拥有微信认证相关的权限
*/
@SerializedName("qualification_verify")
private Boolean qualificationVerify;
/**
* 是否名称认证
*/
@SerializedName("naming_verify")
private Boolean namingVerify;
/**
* 是否需要年审qualification_verify == true 时才有该字段
*/
@SerializedName("annual_review")
private Boolean annualReview;
/**
* 年审开始时间时间戳qualification_verify == true 时才有该字段
*/
@SerializedName("annual_review_begin_time")
private String annualReviewBeginTime;
/**
* 年审截止时间时间戳qualification_verify == true 时才有该字段
*/
@SerializedName("annual_review_end_time")
private String annualReviewEndTime;
}
@NoArgsConstructor
@Data
public static class SignatureInfoBean {
/**
* 功能介绍
*/
@SerializedName("signature")
private String signature;
/**
* 功能介绍已使用修改次数本月
*/
@SerializedName("modify_used_count")
private Integer modifyUsedCount;
/**
* 功能介绍修改次数总额度本月
*/
@SerializedName("modify_quota")
private Integer modifyQuota;
}
@NoArgsConstructor
@Data
public static class HeadImageInfoBean {
/**
* 头像 url
*/
@SerializedName("head_image_url")
private String headImageUrl;
/**
* 头像已使用修改次数本月
*/
@SerializedName("modify_used_count")
private Integer modifyUsedCount;
/**
* 头像修改次数总额度本月
*/
@SerializedName("modify_quota")
private Integer modifyQuota;
}
}

69
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/GetCategoryResultDTO.java

@ -0,0 +1,69 @@
package com.epmet.dto.result;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/8/6 10:03
*/
@NoArgsConstructor
@Data
public class GetCategoryResultDTO implements Serializable {
private static final long serialVersionUID = -6803569581887971887L;
/**
* 一个更改周期内可以添加类目的次数
*/
private Integer limit;
/**
* 本更改周期内还可以添加类目的次数
*/
private Integer quota;
/**
* 最多可以设置的类目数量
*/
private Integer categoryLimit;
/**
* 已设置的类目信息列表
*/
private List<CategoriesBean> categories;
@NoArgsConstructor
@Data
public static class CategoriesBean {
/**
* 一级类目 ID
*/
private Integer first;
/**
* 一级类目名称
*/
@SerializedName("first_name")
private String firstName;
/**
* 二级类目 ID
*/
private Integer second;
/**
* 二级类目名称
*/
@SerializedName("second_name")
private String secondName;
/**
* 审核状态1 审核中 2 审核不通过 3 审核通过
*/
@SerializedName("audit_status")
private Integer auditStatus;
/**
* 审核不通过的原因
*/
@SerializedName("audit_reason")
private String auditReason;
}
}

2
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/SupportVersionResultDTO.java

@ -31,7 +31,7 @@ public class SupportVersionResultDTO implements Serializable {
/**
* 百分比
*/
private int percentage;
private Integer percentage;
/**
* 基础库版本号
*/

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.106
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.108
ports:
- "8110:8110"
network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-third-server:
container_name: epmet-third-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.105
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.108
ports:
- "8110:8110"
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"
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.106</version>
<version>0.0.108</version>
<parent>
<groupId>com.epmet</groupId>

12
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java

@ -6,10 +6,8 @@ import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.service.CodeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@ -203,4 +201,10 @@ public class CodeController {
List<CategoryResultDTO> result = codeService.getCategory(formDTO);
return new Result<List<CategoryResultDTO>>().ok(result);
}
@PostMapping("setdomain/{customerId}")
public Result setDomain(@PathVariable("customerId") String customerId) {
codeService.setDomain(customerId);
return new Result<>();
}
}

30
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java

@ -137,7 +137,7 @@ public class PaCustomerController {
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.SupportVersionResultDTO>
*/
@PostMapping(value = "getweappsupportversion")
public Result<SupportVersionResultDTO> getSupportVersion( @RequestBody CustomerClientFormDTO formDTO) {
public Result<SupportVersionResultDTO> getSupportVersion(@RequestBody CustomerClientFormDTO formDTO) {
return new Result<SupportVersionResultDTO>().ok( paCustomerService.getSupportVersion(formDTO));
}
@ -149,9 +149,35 @@ public class PaCustomerController {
* @return com.epmet.commons.tools.utils.Result
*/
@PostMapping(value = "setweappsupportversion")
public Result setSupportVersion( @RequestBody CustomerClientFormDTO formDTO) {
public Result setSupportVersion(@RequestBody CustomerClientFormDTO formDTO) {
paCustomerService.getSupportVersion(formDTO);
return new Result();
}
/**
* 获取已设置的所有类目
* @author zhaoqifeng
* @date 2020/8/6 14:36
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.GetCategoryResultDTO>
*/
@PostMapping(value = "getcategory")
public Result<GetCategoryResultDTO> getSetCategory(@RequestBody CustomerClientFormDTO formDTO) {
return new Result<GetCategoryResultDTO>().ok(paCustomerService.getSetCategory(formDTO));
}
/**
* 获取基本信息
* @author zhaoqifeng
* @date 2020/8/6 14:36
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.AccountBasicInfoResultDTO>
*/
@PostMapping(value = "getaccountbasicinfo")
public Result<AccountBasicInfoResultDTO> getAccountBasicInfo(@RequestBody CustomerClientFormDTO formDTO) {
return new Result<AccountBasicInfoResultDTO>().ok(paCustomerService.getAccountBasicInfo(formDTO));
}
}

10
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PublicAccountCallBackController.java

@ -5,10 +5,7 @@ import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Collections;
@ -58,6 +55,11 @@ public class PublicAccountCallBackController {
}
}
@PostMapping(value = "/callback")
public String wxServerValdation() {
return "";
}
@GetMapping(value = "test")
public Result test(){
return new Result<>().ok("test");

9
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java

@ -90,4 +90,13 @@ public interface AuthorizationInfoDao extends BaseDao<AuthorizationInfoEntity> {
*/
AuthCodeResultDTO selectCustomerIdByAuthAppId(@Param("authAppId")String authAppId);
/**
* 根据客户ID客户端类型获取授权信息
* @author zhaoqifeng
* @date 2020/8/6 15:36
* @param customerId
* @return java.util.List<com.epmet.dto.AuthorizationInfoDTO>
*/
List<AuthorizationInfoDTO> getAuthInfoByCustomerId(@Param("customerId") String customerId);
}

9
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java

@ -139,4 +139,13 @@ public interface CodeService {
*/
List<CategoryResultDTO> getCategory(CodeCommonFormDTO formDTO);
/**
* 设置服务器域名和业务域名
* @author zhaoqifeng
* @date 2020/8/6 15:34
* @param customerId
* @return int
*/
void setDomain(String customerId);
}

18
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java

@ -186,4 +186,22 @@ public interface PaCustomerService extends BaseService<PaCustomerEntity> {
* @return void
*/
void setSupportVersion(CustomerClientFormDTO formDTO);
/**
* 获取已设置的所有类目
* @author zhaoqifeng
* @date 2020/8/6 14:36
* @param formDTO
* @return com.epmet.dto.result.GetCategoryResultDTO
*/
GetCategoryResultDTO getSetCategory(CustomerClientFormDTO formDTO);
/**
* 获取基本信息
* @author zhaoqifeng
* @date 2020/8/6 14:36
* @param formDTO
* @return com.epmet.dto.result.AccountBasicInfoResultDTO
*/
AccountBasicInfoResultDTO getAccountBasicInfo(CustomerClientFormDTO formDTO);
}

44
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@ -166,19 +166,6 @@ public class CodeServiceImpl implements CodeService {
codeCustomerDTO.setStatus(CodeConstant.UNAUDITED);
String codeId = codeCustomerService.save(codeCustomerDTO);
//设置服务器域名
wxResult = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken());
if (!wxResult.success()) {
saveOperation(formDTO.getCustomerId(), null, formDTO.getUserVersion(), CodeConstant.OPER_UPLOAD, wxResult.getErrorMsg());
throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
}
//设置业务域名
wxResult = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken());
if (!wxResult.success()) {
saveOperation(formDTO.getCustomerId(), null, formDTO.getUserVersion(), CodeConstant.OPER_UPLOAD, wxResult.getErrorMsg());
throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
}
saveOperation(formDTO.getCustomerId(), codeId, formDTO.getUserVersion(), CodeConstant.OPER_UPLOAD, "上传成功");
}
@ -250,6 +237,17 @@ public class CodeServiceImpl implements CodeService {
wxResult.getErrorMsg());
throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
}
if(formDTO.getIsSpeed()) {
//调用微信API 加急审核
WxMaSpeedUpAuditReq speedRequest = new WxMaSpeedUpAuditReq();
speedRequest.setAuditId(wxResult.getData());
WxResult wxSpeedResult = wxMaCodeService.speedUpAudit(authInfo.getAuthorizerAccessToken(), speedRequest);
if (!wxSpeedResult.success()) {
saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT,
wxSpeedResult.getErrorMsg());
throw new RenException(wxSpeedResult.getErrorCode(), wxSpeedResult.getErrorMsg());
}
}
//获取审核结果信息
CodeAuditResultDTO codeAuditResultDTO = codeAuditResultService.getAuditResultByCodeId(formDTO.getCodeId());
if (null == codeAuditResultDTO) {
@ -504,6 +502,26 @@ public class CodeServiceImpl implements CodeService {
return ConvertUtils.sourceToTarget(wxResult.getData(), CategoryResultDTO.class);
}
@Override
public void setDomain(String customerId) {
List<AuthorizationInfoDTO> authInfoList = authorizationInfoDao.getAuthInfoByCustomerId(customerId);
if (null == authInfoList || authInfoList.size() == NumConstant.ZERO) {
throw new RenException("没有有效的Access Token");
}
authInfoList.forEach(authInfo -> {
//设置服务器域名
WxResult wxResult = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken());
if (!wxResult.success()) {
throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
}
//设置业务域名
wxResult = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken());
if (!wxResult.success()) {
throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
}
});
}
private void saveOperation(String customerId, String codeId, String version, String operation, String describe) {
CodeOperationHistoryDTO operationDTO = new CodeOperationHistoryDTO();
operationDTO.setCustomerId(customerId);

39
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java

@ -31,7 +31,6 @@ import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.CpUserDetailRedis;
import com.epmet.constant.CodeConstant;
import com.epmet.constant.PaConstant;
import com.epmet.dao.*;
import com.epmet.dto.*;
@ -44,6 +43,8 @@ import com.epmet.service.PaCustomerAgencyService;
import com.epmet.service.PaCustomerService;
import com.epmet.service.PaCustomerUserAgencyService;
import com.epmet.wxapi.param.WxSetWeAppSupportVersionReq;
import com.epmet.wxapi.result.WxBasicInfoResult;
import com.epmet.wxapi.result.WxOpenGetCategoryResult;
import com.epmet.wxapi.result.WxResult;
import com.epmet.wxapi.result.WxSupportVersionResult;
import com.epmet.wxapi.service.WxMaCodeService;
@ -596,4 +597,40 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
}
}
@Override
public GetCategoryResultDTO getSetCategory(CustomerClientFormDTO formDTO) {
//获取小程序调用令牌
GetCategoryResultDTO result;
AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
if (null == authInfo) {
throw new RenException("未授权");
}
//调用微信API
WxResult<WxOpenGetCategoryResult> wxResult = wxMaCodeService.getSetCategory(authInfo.getAuthorizerAccessToken());
if (!wxResult.success()) {
throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
}
WxOpenGetCategoryResult categoryResult = wxResult.getData();
result = ConvertUtils.sourceToTarget(categoryResult, GetCategoryResultDTO.class);
return result;
}
@Override
public AccountBasicInfoResultDTO getAccountBasicInfo(CustomerClientFormDTO formDTO) {
//获取小程序调用令牌
AccountBasicInfoResultDTO result;
AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
if (null == authInfo) {
throw new RenException("未授权");
}
//调用微信API
WxResult<WxBasicInfoResult> wxResult = wxMaCodeService.getAccountBasicInfo(authInfo.getAuthorizerAccessToken());
if (!wxResult.success()) {
throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
}
WxBasicInfoResult basicInfoResult = wxResult.getData();
result = ConvertUtils.sourceToTarget(basicInfoResult, AccountBasicInfoResultDTO.class);
return result;
}
}

13
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java

@ -171,5 +171,18 @@ public interface WxMaCodeConstant {
*/
String GET_TEMPLATE_URL = "https://api.weixin.qq.com/wxa/gettemplatelist";
/**
* 获取基本信息
*/
String GET_BASIC_INFO_URL = "https://api.weixin.qq.com/cgi-bin/account/getaccountbasicinfo";
/**
* 获取已设置的所有类目
*/
String GET_SET_CATEGORY_URL = "https://api.weixin.qq.com/cgi-bin/wxopen/getcategory";
/**
* 加急审核申请
*/
String SPEED_UP_AUDIT_URL = "https://api.weixin.qq.com/wxa/speedupaudit";
}

21
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxMaSpeedUpAuditReq.java

@ -0,0 +1,21 @@
package com.epmet.wxapi.param;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/8/6 15:10
*/
@Data
public class WxMaSpeedUpAuditReq implements Serializable {
private static final long serialVersionUID = 3042725610534211385L;
/**
* 审核单ID
*/
@SerializedName("auditid")
private String auditId;
}

66
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxBasicInfoResult.java

@ -0,0 +1,66 @@
package com.epmet.wxapi.result;
import com.epmet.dto.result.AccountBasicInfoResultDTO;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/8/6 14:05
*/
@Data
public class WxBasicInfoResult implements Serializable {
private static final long serialVersionUID = -9027187315142350899L;
/**
* 返回码
*/
private Integer errcode;
/**
* 错误信息
*/
private String errmsg;
/**
* 帐号 appid
*/
@SerializedName("appid")
private String appid;
/**
* 帐号类型1订阅号2服务号3小程序
*/
@SerializedName("account_type")
private Integer accountType;
/**
* 主体类型 0.个人 1.企业 2.媒体 3.政府 4.其他组织
*/
@SerializedName("principal_type")
private Integer principalType;
/**
* 主体名称
*/
@SerializedName("principal_name")
private String principalName;
/**
* 实名验证状态 1.实名验证成功 2.实名验证中 3.实名验证失败
*/
@SerializedName("realname_status")
private Integer realnameStatus;
/**
* 微信认证信息
*/
@SerializedName("wx_verify_info")
private AccountBasicInfoResultDTO.WxVerifyInfoBean wxVerifyInfo;
/**
* 功能介绍信息
*/
@SerializedName("signature_info")
private AccountBasicInfoResultDTO.SignatureInfoBean signatureInfo;
/**
* 头像信息
*/
@SerializedName("head_image_info")
private AccountBasicInfoResultDTO.HeadImageInfoBean headImageInfo;
}

44
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxOpenGetCategoryResult.java

@ -0,0 +1,44 @@
package com.epmet.wxapi.result;
import com.epmet.dto.result.GetCategoryResultDTO;
import com.google.gson.annotations.SerializedName;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/8/6 10:11
*/
@NoArgsConstructor
@Data
public class WxOpenGetCategoryResult {
/**
* 返回码
*/
private Integer errcode;
/**
* 错误信息
*/
private String errmsg;
/**
* 一个更改周期内可以添加类目的次数
*/
private Integer limit;
/**
* 本更改周期内还可以添加类目的次数
*/
private Integer quota;
/**
* 最多可以设置的类目数量类目信息说明
*/
@SerializedName("category_limit")
private Integer categoryLimit;
/**
* 已设置的类目信息列表
*/
private List<GetCategoryResultDTO.CategoriesBean> categories;
}

2
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxSupportVersionResult.java

@ -48,7 +48,7 @@ public class WxSupportVersionResult implements Serializable {
/**
* 百分比
*/
private int percentage;
private Integer percentage;
/**
* 基础库版本号
*/

30
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java

@ -72,6 +72,16 @@ public interface WxMaCodeService {
*/
WxResult<String> submitAudit(String accessToken, WxMaCodeSubmitAuditRequest auditRequest);
/**
* 加急审核申请
* @author zhaoqifeng
* @date 2020/8/6 15:11
* @param accessToken
* @param request
* @return com.epmet.wxapi.result.WxResult
*/
WxResult speedUpAudit(String accessToken, WxMaSpeedUpAuditReq request);
/**
* 查询指定版本审核状态仅供第三方代小程序调用.
*
@ -161,4 +171,24 @@ public interface WxMaCodeService {
* @date 2020/8/5 16:06
*/
WxResult setWeAppSupportVersion(String accessToken, WxSetWeAppSupportVersionReq request);
/**
* 获取已设置的所有类目
*
* @param accessToken
* @return com.epmet.wxapi.result.WxResult<com.epmet.wxapi.result.WxOpenGetCategoryResult>
* @author zhaoqifeng
* @date 2020/8/6 10:47
*/
WxResult<WxOpenGetCategoryResult> getSetCategory(String accessToken);
/**
* 获取基本信息
*
* @param accessToken
* @return com.epmet.wxapi.result.WxResult<com.epmet.wxapi.result.WxBasicInfoResult>
* @author zhaoqifeng
* @date 2020/8/6 14:07
*/
WxResult<WxBasicInfoResult> getAccountBasicInfo(String accessToken);
}

59
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java

@ -1,6 +1,7 @@
package com.epmet.wxapi.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.utils.HttpClientManager;
import com.epmet.commons.tools.utils.Result;
import com.epmet.wxapi.constant.WxMaCodeConstant;
@ -147,6 +148,22 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
return result;
}
@Override
public WxResult speedUpAudit(String accessToken, WxMaSpeedUpAuditReq request) {
WxResult result = new WxResult();
String url = WxMaCodeConstant.SPEED_UP_AUDIT_URL + "?" + "access_token=" + accessToken;
Result<String> submitResult = HttpClientManager.getInstance().sendPostByJSON(url, toJson(request));
if (!submitResult.success()) {
result.setErrorCode(submitResult.getCode());
result.setErrorMsg(submitResult.getMsg());
return result;
}
JSONObject jsonObject = JSONObject.parseObject(submitResult.getData());
result.setErrorCode(jsonObject.getInteger(ERR_CODE));
result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE)));
return result;
}
@Override
public WxResult<WxMaAuditStatusResult> getAuditStatus(String accessToken, WxMaCodeAuditStatusReq request) {
WxResult<WxMaAuditStatusResult> result = new WxResult<>();
@ -308,6 +325,48 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
return result;
}
@Override
public WxResult<WxOpenGetCategoryResult> getSetCategory(String accessToken) {
WxResult<WxOpenGetCategoryResult> result = new WxResult<>();
String url = WxMaCodeConstant.GET_SET_CATEGORY_URL + "?" + "access_token=" + accessToken;
Result<String> statusResult = HttpClientManager.getInstance().sendGet(url, null);
if (!statusResult.success()) {
result.setErrorCode(statusResult.getCode());
result.setErrorMsg(statusResult.getMsg());
return result;
}
Gson gson = new Gson();
WxOpenGetCategoryResult categoryResult = gson.fromJson(statusResult.getData(), WxOpenGetCategoryResult.class);
if (categoryResult.getErrcode() != NumConstant.ZERO) {
result.setErrorCode(categoryResult.getErrcode());
result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(categoryResult.getErrcode()));
return result;
}
result.ok(categoryResult);
return result;
}
@Override
public WxResult<WxBasicInfoResult> getAccountBasicInfo(String accessToken) {
WxResult<WxBasicInfoResult> result = new WxResult<>();
String url = WxMaCodeConstant.GET_BASIC_INFO_URL + "?" + "access_token=" + accessToken;
Result<String> statusResult = HttpClientManager.getInstance().sendGet(url, null);
if (!statusResult.success()) {
result.setErrorCode(statusResult.getCode());
result.setErrorMsg(statusResult.getMsg());
return result;
}
Gson gson = new Gson();
WxBasicInfoResult basicInfoResult = gson.fromJson(statusResult.getData(), WxBasicInfoResult.class);
if (basicInfoResult.getErrcode() != NumConstant.ZERO) {
result.setErrorCode(basicInfoResult.getErrcode());
result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(basicInfoResult.getErrcode()));
return result;
}
result.ok(basicInfoResult);
return result;
}
private String toJson(Object object) {
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.setPrettyPrinting();

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

@ -90,5 +90,13 @@
del_flag = 0
AND authorizer_appid = #{authAppId}
</select>
<select id="getAuthInfoByCustomerId" resultType="com.epmet.dto.AuthorizationInfoDTO">
SELECT AUTHORIZER_APPID,
AUTHORIZER_ACCESS_TOKEN
FROM authorization_info
WHERE CUSTOMER_ID = #{customerId}
AND DEL_FLAG = 0
AND EXPIRES_IN_TIME > NOW()
</select>
</mapper>

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

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-voice-server:
container_name: gov-voice-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.67
image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.68
ports:
- "8105:8105"
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"
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>
<artifactId>gov-voice</artifactId>
<groupId>com.epmet</groupId>

11
epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml

@ -35,15 +35,13 @@
WHEN DC.AUDIT_STATUS="null" then ""
else dc.AUDIT_STATUS
end ) as AUDIT_STATUS,
dc.AUDIT_STATUS as "AUDIT_STATUS原来的值",
(
CASE WHEN dc.AUDIT_REASON IS NULL THEN ""
WHEN dc.AUDIT_REASON&lt;=1 THEN ""
WHEN dc.AUDIT_REASON="null" then ""
else dc.AUDIT_REASON
end
)as AUDIT_REASON,
dc.AUDIT_REASON as "AUDIT_REASON原来的值"
)as AUDIT_REASON
FROM
draft_content dc
WHERE
@ -65,7 +63,6 @@
ELSE PUBLISHER_ID
END
) AS PUBLISHER,
PUBLISHER_ID as "PUBLISHER_ID原来的值",
(
case when PUBLISHER_NAME is NULL THEN ""
when LENGTH(PUBLISHER_NAME)&lt;=1 THEN ""
@ -73,7 +70,6 @@
ELSE PUBLISHER_NAME
END
)as PUBLISHER_NAME,
PUBLISHER_NAME as "PUBLISHER_NAME原来的值",
(CASE
WHEN PUBLISH_DATE IS NULL THEN CURDATE()
ELSE PUBLISH_DATE
@ -86,7 +82,6 @@
ELSE PUBLISH_RANGE_DESC
END
)AS PUBLISH_RANGE_DESC,
PUBLISH_RANGE_DESC as "PUBLISH_RANGE_DESC原来的值",
(
CASE WHEN PUBLISHER_TYPE IS NULL THEN ""
WHEN LENGTH(PUBLISHER_TYPE) &lt;=1 THEN ""
@ -94,15 +89,13 @@
ELSE PUBLISHER_TYPE
END
)AS PUBLISHER_TYPE,
PUBLISHER_TYPE as "PUBLISHER_TYPE原来的值",
(
CASE when TAGS IS NULL THEN ""
WHEN LENGTH(TAGS)&lt;=1 THEN ""
when TAGS="null" then ""
ELSE TAGS
END
)TAGS,
TAGS as "TAGS原来的值"
)TAGS
FROM
draft
WHERE

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.64
image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.65
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.64</version>
<version>0.3.65</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId>

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

@ -526,6 +526,14 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
throw new RenException(customerResult.getCode(), customerResult.getInternalMsg());
}
//7.设置服务器域名,业务域名
String domainUrl = "https://epmet-cloud.elinkservice.cn/api/third/code/setdomain/" + formDTO.getCustomerId();
String domainData = HttpClientManager.getInstance().sendPostByJSON(domainUrl, null).getData();
JSONObject domainObject = JSON.parseObject(domainData);
Result domainResult = ConvertUtils.mapToEntity(domainObject, Result.class);
if (!domainResult.success()) {
throw new RenException(domainResult.getCode(), domainResult.getInternalMsg());
}
}

Loading…
Cancel
Save