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

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:25
  */
-@FeignClient(name = ServiceConstant.EPMET_POINT_SERVER, fallback = EpmetHeartOpenFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPMET_HEART_SERVER, fallback = EpmetHeartOpenFeignClientFallback.class)
 public interface EpmetHeartOpenFeignClient {
 
     /**

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.49
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.51
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

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.49</version>
+    <version>0.0.51</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

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

@@ -343,22 +343,34 @@
     <select id="selectListLookBackAct" parameterType="com.epmet.dto.form.resi.ResiActBaseFormDTO"
             resultType="com.epmet.dto.result.resi.ResiLookBackActResultDTO">
         SELECT
-            i.ID actId,
+            a.actId,
-            i.TITLE title,
+            a.title,
-            i.COVER_PIC coverPic,
+            a.coverPic,
-            DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime,
+            a.actStartTime,
-            DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime,
+            a.actEndTime,
-            i.ACT_ADDRESS actAddress,
+            a.actAddress,
-            'finished' actCurrentState
+            a.actCurrentState
-        FROM act_info i
+         FROM(
-        LEFT JOIN act_live_rec r ON r.ACT_ID = i.ID AND r.DEL_FLAG = '0'
+             SELECT
-        WHERE i.DEL_FLAG = '0'
+                i.ID actId,
-        AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL
+                i.CUSTOMER_ID,
-        AND i.CUSTOMER_ID = #{customerId}
+                i.TITLE title,
-        AND i.ACT_STATUS = 'finished'
+                i.COVER_PIC coverPic,
-        GROUP BY i.ID
+                DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime,
-        ORDER BY i.CREATED_TIME DESC
+                DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime,
-        LIMIT #{pageNo}, #{pageSize}
+                i.ACT_ADDRESS actAddress,
+                'finished' actCurrentState,
+                i.CREATED_TIME
+            FROM act_info i
+            LEFT JOIN act_live_rec r ON r.ACT_ID = i.ID AND r.DEL_FLAG = '0'
+            WHERE i.DEL_FLAG = '0'
+            AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL
+            AND i.ACT_STATUS = 'finished'
+            GROUP BY i.ID
+		  ) a
+		  WHERE a.CUSTOMER_ID = #{customerId}
+          ORDER BY a.CREATED_TIME DESC
+		  LIMIT #{pageNo}, #{pageSize}
     </select>
 
     <select id="queryActAccordingToActIdAndUserId" resultType="com.epmet.dto.ActInfoDTO">
@@ -717,21 +729,33 @@
     <select id="selectListLookBackActAssembly" parameterType="com.epmet.dto.form.resi.ResiLatestActFormDTO"
             resultType="com.epmet.dto.result.resi.ResiLookBackActResultDTO">
         SELECT
-            i.ID actId,
+            a.actId,
-            i.TITLE title,
+            a.title,
-            i.COVER_PIC coverPic,
+            a.coverPic,
-            DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime,
+            a.actStartTime,
-            DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime,
+            a.actEndTime,
-            i.ACT_ADDRESS actAddress,
+            a.actAddress,
-            'finished' actCurrentState
+            a.actCurrentState
-        FROM act_info i
+         FROM(
-        LEFT JOIN act_live_rec r ON r.ACT_ID = i.ID AND r.DEL_FLAG = '0'
+             SELECT
-        WHERE i.DEL_FLAG = '0'
+                i.ID actId,
-        AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL
+                i.CUSTOMER_ID,
-        AND i.CUSTOMER_ID = #{customerId}
+                i.TITLE title,
-        AND i.ACT_STATUS = 'finished'
+                i.COVER_PIC coverPic,
-        GROUP BY i.ID
+                DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime,
-        ORDER BY i.CREATED_TIME DESC
+                DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime,
-        LIMIT 0, #{num}
+                i.ACT_ADDRESS actAddress,
+                'finished' actCurrentState,
+                i.CREATED_TIME
+            FROM act_info i
+            LEFT JOIN act_live_rec r ON r.ACT_ID = i.ID AND r.DEL_FLAG = '0'
+            WHERE i.DEL_FLAG = '0'
+            AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL
+            AND i.ACT_STATUS = 'finished'
+            GROUP BY i.ID
+          ) a
+          WHERE a.CUSTOMER_ID = #{customerId}
+          ORDER BY a.CREATED_TIME DESC
+          LIMIT 0, #{num}
     </select>
 </mapper>

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java

@@ -68,9 +68,23 @@ public class CodeAuditResultDTO implements Serializable {
 	 */
 	private String screenShot;
 
+	/**
+	 * 素材地址
+	 */
 	private String screenShotUrl;
 
-    /**
+	/**
+	 * 反馈内容
+	 */
+	private String feedbackInfo;
+
+	/**
+	 * 反馈素材
+	 */
+	private String feedbackStuff;
+
+
+	/**
      * 乐观锁
      */
 	private Integer revision;

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

@@ -20,6 +20,7 @@ public class CodeCommonFormDTO implements Serializable {
 	 * 代码ID
 	 */
 	private String codeId;
+	private String clientType;
 	private String grayPercentage;
 	private String path;
 	private Integer page = 1;

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

@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/8/13 16:02
+ */
+@Data
+public class DomainResultDTO implements Serializable {
+	private static final long serialVersionUID = -2534293858061449973L;
+	private List<String> requestDomain;
+	private List<String> wsRequestDomain;
+	private List<String> uploadDomain;
+	private List<String> downloadDomain;
+	private List<String> webViewDomain;
+}

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

@@ -23,6 +23,14 @@ public class ReasonResultDTO implements Serializable {
 	 * 失败的小程序截图url
 	 */
 	private List<String> screenshotUrl;
+	/**
+	 * 反馈内容，至多 200 字
+	 */
+	private String feedbackInfo;
+	/**
+	 * 反馈素材
+	 */
+	private String feedbackStuff;
 	/**
 	 * 提交审核时间
 	 */

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

@@ -27,6 +27,10 @@ public class UploadListResultDTO implements Serializable {
 	 * 客户名
 	 */
 	private String customerName;
+	/**
+	 * 小程序名
+	 */
+	private String miniName;
 	/**
 	 * 居民端resi 工作端work
 	 */

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

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.124</version>
+    <version>0.0.128</version>
 
     <parent>
         <groupId>com.epmet</groupId>

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

@@ -208,6 +208,18 @@ public class CodeController {
 		return new Result<>();
 	}
 
+	@PostMapping("setdomains")
+	public Result setDomains(@RequestBody CodeCommonFormDTO formDTO) {
+		codeService.setDomains(formDTO);
+		return new Result<>();
+	}
+
+	@PostMapping("getdomain")
+	public Result<DomainResultDTO> getDomains(@RequestBody CodeCommonFormDTO formDTO) {
+		DomainResultDTO result = codeService.getDomains(formDTO);
+		return new Result<DomainResultDTO>().ok(result);
+	}
+
 	@PostMapping("customers")
 	public Result<PageData> getCustomerList(@RequestBody UploadListFormDTO formDTO) {
 		PageData pageData = codeService.getCustomerList(formDTO);
@@ -220,11 +232,24 @@ public class CodeController {
 		return new Result<CodeVersionInfoResultDTO>().ok(result);
 	}
 
+	/**
+	 * 版本回退
+	 * @author zhaoqifeng
+	 * @date 2020/8/13 16:51
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 */
 	@PostMapping("speedupaudit")
 	public Result speedUpAudit(@RequestBody CodeCommonFormDTO formDTO) {
 		codeService.speedUpAudit(formDTO);
 		return new Result<>();
 	}
 
+	@PostMapping("revertcoderelease")
+	public Result revertCodeRelease(@RequestBody CodeCommonFormDTO formDTO) {
+		codeService.revertCodeRelease(formDTO);
+		return new Result<>();
+	}
+
 
 }

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

@@ -46,10 +46,11 @@ public interface CodeAuditResultDao extends BaseDao<CodeAuditResultEntity> {
 	 * 获取审核失败列表
 	 * @author zhaoqifeng
 	 * @date 2020/8/5 11:11
-	 * @param codeId
+	 * @param customerId
+	 * @param clientType
 	 * @return java.util.List<com.epmet.dto.CodeAuditResultDTO>
 	 */
-	List<CodeAuditResultDTO> selectAuditFailedList(@Param("codeId") String codeId);
+	List<CodeAuditResultDTO> selectAuditFailedList(@Param("customerId") String customerId, @Param("clientType") String clientType);
 
     /**
      * @Description  更新 代码审核结果中的审核状态

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java

@@ -70,5 +70,15 @@ public class CodeAuditResultEntity extends BaseEpmetEntity {
 
 	private String screenShotUrl;
 
+	/**
+	 * 反馈内容
+	 */
+	private String feedbackInfo;
+
+	/**
+	 * 反馈素材
+	 */
+	private String feedbackStuff;
+
 
 }

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

@@ -106,10 +106,11 @@ public interface CodeAuditResultService extends BaseService<CodeAuditResultEntit
     /**
      * 获取审核失败列表
      *
-     * @param codeId
+     * @param customerId
+     * @param clientType
      * @return com.epmet.dto.CodeAuditResultDTO
      * @author zhaoqifeng
      * @date 2020/7/15 17:13
      */
-    List<CodeAuditResultDTO> getAuditFailedList(String codeId);
+    List<CodeAuditResultDTO> getAuditFailedList(String customerId, String clientType);
 }

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

@@ -154,6 +154,24 @@ public interface CodeService {
 	 */
 	void setDomain(String customerId);
 
+	/**
+	 * 设置服务器域名和业务域名
+	 * @author zhaoqifeng
+	 * @date 2020/8/6 15:34
+	 * @param formDTO
+	 * @return int
+	 */
+	void setDomains(CodeCommonFormDTO formDTO);
+
+	/**
+	 * 获取服务器域名和业务域名
+	 * @author zhaoqifeng
+	 * @date 2020/8/6 15:34
+	 * @param formDTO
+	 * @return DomainResultDTO
+	 */
+	DomainResultDTO getDomains(CodeCommonFormDTO formDTO);
+
 	/**
 	 * 已初始化客户列表
 	 * @author zhaoqifeng

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

@@ -107,8 +107,8 @@ public class CodeAuditResultServiceImpl extends BaseServiceImpl<CodeAuditResultD
     }
 
     @Override
-    public List<CodeAuditResultDTO> getAuditFailedList(String codeId) {
+    public List<CodeAuditResultDTO> getAuditFailedList(String customerId, String clientType) {
-        return baseDao.selectAuditFailedList(codeId);
+        return baseDao.selectAuditFailedList(customerId, clientType);
     }
 
 }

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

@@ -269,12 +269,14 @@ public class CodeServiceImpl implements CodeService {
 		}
 		//调用微信API上提交审核
 		WxMaCodeSubmitAuditRequest request = new WxMaCodeSubmitAuditRequest();
-		request.setVersionDesc(formDTO.getVersionDesc());
+		if(StringUtils.isBlank(formDTO.getFeedbackInfo())) {
+			request.setVersionDesc(formDTO.getVersionDesc());
+			request.setItemList(formDTO.getItemList());
+			request.setPreviewInfo(formDTO.getPreviewInfo());
+			request.setUgcDeclare(formDTO.getUgcDeclare());
+		}
 		request.setFeedbackInfo(formDTO.getFeedbackInfo());
 		request.setFeedbackStuff(formDTO.getFeedbackStuff());
-		request.setItemList(formDTO.getItemList());
-		request.setPreviewInfo(formDTO.getPreviewInfo());
-		request.setUgcDeclare(formDTO.getUgcDeclare());
 		WxResult<String> wxResult = wxMaCodeService.submitAudit(authInfo.getAuthorizerAccessToken(), request);
 		if (!wxResult.success()) {
 			saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(),
@@ -303,6 +305,9 @@ public class CodeServiceImpl implements CodeService {
 			codeAuditResultDTO.setResult(CodeConstant.AUDITING);
 			codeAuditResultService.save(codeAuditResultDTO);
 		} else {
+			codeAuditResultDTO.setFeedbackInfo(formDTO.getFeedbackInfo());
+			codeAuditResultDTO.setFeedbackStuff(formDTO.getFeedbackStuff());
+			codeAuditResultService.update(codeAuditResultDTO);
 			codeAuditResultService.deleteById(codeAuditResultDTO.getId());
 			codeAuditResultDTO = new CodeAuditResultDTO();
 			codeAuditResultDTO.setCustomerId(codeCustomerDTO.getCustomerId());
@@ -388,7 +393,7 @@ public class CodeServiceImpl implements CodeService {
 			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
 		}
 		//将之前上传信息删除
-		codeCustomerService.deleteCode(formDTO.getCustomerId(), codeCustomerDTO.getClientType());
+		codeCustomerService.deleteCode(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType());
 
 		//更新代码表状态
 		codeCustomerDTO.setStatus(CodeConstant.RELEASE_SUCCESS);
@@ -415,7 +420,8 @@ public class CodeServiceImpl implements CodeService {
 			throw new RenException("未授权");
 		}
 		//获取审核结果信息
-		List<CodeAuditResultDTO> codeAuditResultList = codeAuditResultService.getAuditFailedList(formDTO.getCodeId());
+		List<CodeAuditResultDTO> codeAuditResultList = codeAuditResultService.getAuditFailedList(codeCustomerDTO.getCustomerId(),
+				codeCustomerDTO.getClientType());
 		codeAuditResultList.forEach(dto -> {
 			ReasonResultDTO result = new ReasonResultDTO();
 			result.setReason(dto.getReason());
@@ -447,6 +453,8 @@ public class CodeServiceImpl implements CodeService {
 					codeAuditResultService.update(dto);
 				}
 				result.setScreenshotUrl(urlList);
+				result.setFeedbackInfo(dto.getFeedbackInfo());
+				result.setFeedbackStuff(dto.getFeedbackStuff());
 			} else {
 				String[] url = dto.getScreenShotUrl().split("[|]");
 				List<String> urlList = new ArrayList<>(url.length);
@@ -562,18 +570,64 @@ public class CodeServiceImpl implements CodeService {
 		}
 		authInfoList.forEach(authInfo -> {
 			//设置服务器域名
-			WxResult wxResult = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken());
+			WxResult<WxMaModifyDomainResult> modifyDomain = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "set");
-			if (!wxResult.success()) {
+			if (!modifyDomain.success()) {
-				throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+				throw new RenException(modifyDomain.getErrorCode(), modifyDomain.getErrorMsg());
 			}
 			//设置业务域名
-			wxResult = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken());
+			WxResult<WxMaSetWebviewDomainResult> setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "set");
-			if (!wxResult.success()) {
+			if (!setWebviewDomain.success()) {
-				throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+				throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg());
 			}
 		});
 	}
 
+	@Override
+	public void setDomains(CodeCommonFormDTO formDTO) {
+		//获取小程序调用令牌
+		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
+		if (null == authInfo) {
+			throw new RenException("未授权");
+		}
+		//设置服务器域名
+		WxResult<WxMaModifyDomainResult> wxResult = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "set");
+		if (!wxResult.success()) {
+			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+		}
+		//设置业务域名
+		WxResult<WxMaSetWebviewDomainResult> setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "set");
+		if (!setWebviewDomain.success()) {
+			throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg());
+		}
+	}
+
+	@Override
+	public DomainResultDTO getDomains(CodeCommonFormDTO formDTO) {
+		DomainResultDTO resultDTO = new DomainResultDTO();
+		//获取小程序调用令牌
+		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
+		if (null == authInfo) {
+			throw new RenException("未授权");
+		}
+		//设置服务器域名
+		WxResult<WxMaModifyDomainResult> wxResult = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "get");
+		if (!wxResult.success()) {
+			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+		}
+		resultDTO.setDownloadDomain(wxResult.getData().getDownloadDomain());
+		resultDTO.setRequestDomain(wxResult.getData().getRequestDomain());
+		resultDTO.setUploadDomain(wxResult.getData().getUploadDomain());
+		resultDTO.setWsRequestDomain(wxResult.getData().getWsRequestDomain());
+
+		//设置业务域名
+		WxResult<WxMaSetWebviewDomainResult> setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "get");
+		if (!setWebviewDomain.success()) {
+			throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg());
+		}
+		resultDTO.setWebViewDomain(setWebviewDomain.getData().getWebViewDomain());
+		return resultDTO;
+	}
+
 	@Override
 	public PageData getCustomerList(UploadListFormDTO formDTO) {
 		return paCustomerService.getCustomerList(formDTO);

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

@@ -0,0 +1,33 @@
+package com.epmet.wxapi.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/13 15:46
+ */
+@NoArgsConstructor
+@Data
+public class WxMaModifyDomainResult implements Serializable {
+
+	private static final long serialVersionUID = 8602059705480008729L;
+	/**
+	 * errcode : 0
+	 */
+	private Integer errcode;
+	private String errmsg;
+	@SerializedName("requestdomain")
+	private List<String> requestDomain;
+	@SerializedName("wsrequestdomain")
+	private List<String> wsRequestDomain;
+	@SerializedName("uploaddomain")
+	private List<String> uploadDomain;
+	@SerializedName("downloaddomain")
+	private List<String> downloadDomain;
+}

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

@@ -0,0 +1,27 @@
+package com.epmet.wxapi.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/13 15:53
+ */
+@NoArgsConstructor
+@Data
+public class WxMaSetWebviewDomainResult implements Serializable {
+
+	private static final long serialVersionUID = -5871654910653283111L;
+	/**
+	 * errcode : 0
+	 */
+	private Integer errcode;
+	private String errmsg;
+	@SerializedName("webviewdomain")
+	private List<String> webViewDomain;
+}

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

@@ -123,21 +123,23 @@ public interface WxMaCodeService {
 	 * 设置服务器域名
 	 *
 	 * @param accessToken
+	 * @param action
 	 * @return com.epmet.wxapi.result.WxResult
 	 * @author zhaoqifeng
 	 * @date 2020/7/16 17:21
 	 */
-	WxResult modifyDomain(String accessToken);
+	WxResult<WxMaModifyDomainResult> modifyDomain(String accessToken, String action);
 
 	/**
 	 * 设置业务域名
 	 *
 	 * @param accessToken
+	 * @param action
 	 * @return com.epmet.wxapi.result.WxResult
 	 * @author zhaoqifeng
 	 * @date 2020/7/16 17:22
 	 */
-	WxResult setWebviewDomain(String accessToken);
+	WxResult<WxMaSetWebviewDomainResult> setWebviewDomain(String accessToken, String action);
 
 	/**
 	 * 上传临时素材

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

@@ -231,11 +231,11 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 	}
 
 	@Override
-	public WxResult modifyDomain(String accessToken) {
+	public WxResult<WxMaModifyDomainResult> modifyDomain(String accessToken, String action) {
-		WxResult result = new WxResult();
+		WxResult<WxMaModifyDomainResult> result = new WxResult<>();
 		String url = WxMaCodeConstant.MODIFY_DOMAIN_URL + "?" + "access_token=" + accessToken;
 		WxMaModifyDomainReq request = new WxMaModifyDomainReq();
-		request.setAction("set");
+		request.setAction(action);
 		request.setRequestDomain(wxMaDomainDTO.getRequestDomain());
 		request.setUploadDomain(wxMaDomainDTO.getUploadDomain());
 		request.setWsRequestDomain(wxMaDomainDTO.getWsRequestDomain());
@@ -246,18 +246,20 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 			result.setErrorMsg(modifyResult.getMsg());
 			return result;
 		}
-		JSONObject jsonObject = JSONObject.parseObject(modifyResult.getData());
+		Gson gson = new Gson();
-		result.setErrorCode(jsonObject.getInteger(ERR_CODE));
+		WxMaModifyDomainResult domainResult = gson.fromJson(modifyResult.getData(), WxMaModifyDomainResult.class);
-		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE)));
+		result.setErrorCode(domainResult.getErrcode());
+		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(domainResult.getErrcode()));
+		result.setData(domainResult);
 		return result;
 	}
 
 	@Override
-	public WxResult setWebviewDomain(String accessToken) {
+	public WxResult<WxMaSetWebviewDomainResult> setWebviewDomain(String accessToken, String action) {
-		WxResult result = new WxResult();
+		WxResult<WxMaSetWebviewDomainResult> result = new WxResult<>();
 		String url = WxMaCodeConstant.SET_WEBVIEW_DOMAIN_URL + "?" + "access_token=" + accessToken;
 		WxMaSetWebviewDomainReq request = new WxMaSetWebviewDomainReq();
-		request.setAction("set");
+		request.setAction(action);
 		request.setWebViewDomain(wxMaDomainDTO.getWebviewDomain());
 		Result<String> modifyResult = HttpClientManager.getInstance().sendPostByJSON(url, toJson(request));
 		if (!modifyResult.success()) {
@@ -265,9 +267,11 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 			result.setErrorMsg(modifyResult.getMsg());
 			return result;
 		}
-		JSONObject jsonObject = JSONObject.parseObject(modifyResult.getData());
+		Gson gson = new Gson();
-		result.setErrorCode(jsonObject.getInteger(ERR_CODE));
+		WxMaSetWebviewDomainResult domainResult = gson.fromJson(modifyResult.getData(), WxMaSetWebviewDomainResult.class);
-		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE)));
+		result.setErrorCode(domainResult.getErrcode());
+		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(domainResult.getErrcode()));
+		result.setData(domainResult);
 		return result;
 	}
 

epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.8__thirdUpdate.sql

@@ -0,0 +1,5 @@
+alter table code_audit_result add FEEDBACK_INFO varchar(255) NULL  comment '反馈内容' after SCREEN_SHOT_URL;
+alter table code_audit_result add FEEDBACK_STUFF tinytext NULL  comment '反馈素材' after FEEDBACK_INFO;
+
+
+

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

@@ -22,10 +22,17 @@
         ORDER BY CREATED_TIME DESC
     </select>
     <select id="selectAuditFailedList" resultType="com.epmet.dto.CodeAuditResultDTO">
-        SELECT * FROM code_audit_result
+        SELECT
-        WHERE CODE_ID = #{codeId}
+            car.*
-                  AND (RESULT = 'audit_failed' OR RESULT = 'delay')
+        FROM
-        ORDER BY CREATED_TIME DESC
+            code_audit_result car
+                INNER JOIN code_customer cc ON car.CODE_ID = cc.ID
+                AND cc.CUSTOMER_ID = #{customerId}
+                AND cc.CLIENT_TYPE = #{clientType}
+        WHERE
+            ( car.RESULT = 'audit_failed' OR car.RESULT = 'delay' )
+        ORDER BY
+            car.CREATED_TIME DESC
     </select>
     <!-- 更新 代码审核结果中的审核状态 -->
     <update id="updateAuditResult">

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

@@ -83,11 +83,15 @@
     </select>
     <select id="selectInitCustomerList" resultType="com.epmet.dto.result.UploadListResultDTO" parameterType="com.epmet.dto.form.UploadListFormDTO">
         SELECT pc.ID AS "customerId",
+               mi.NICK_NAME AS "miniName",
                pc.CUSTOMER_NAME,
                ai.CLIENT_TYPE,
                ai.AUTHORIZER_APPID AS "appId"
         FROM pa_customer pc
         INNER JOIN authorization_info ai ON pc.ID = ai.CUSTOMER_ID AND ai.DEL_FLAG = 0
+        INNER JOIN mini_info mi ON ai.CUSTOMER_ID = mi.CUSTOMER_ID
+        AND ai.CLIENT_TYPE = mi.CLIENT_TYPE
+        AND mi.DEL_FLAG = 0
         WHERE pc.DEL_FLAG = 0
             AND pc.SOURCE = #{source}
             AND pc.IS_INITIALIZE = 1

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

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

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

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

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

@@ -190,12 +190,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
      **/
     @Override
     public List<CustomerUser4PointResultDTO> getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) {
-
-        List<String> userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId());
         List<CustomerUser4PointResultDTO> allData = new LinkedList<>();
-        if(null == userIds || userIds.isEmpty()){
+        List<String> userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId());
-            return allData;
+        if(null == userIds) userIds = new LinkedList<>();
-        }
         CommonCustomerFormDTO customerParam = new CommonCustomerFormDTO();
         customerParam.setCustomerId(customerUserFormDTO.getCustomerId());
         Result<List<String>> volunteer = epmetHeartOpenFeignClient.volunteerUserIds(customerParam);
@@ -203,6 +200,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
             userIds.addAll(volunteer.getData());
             userIds = userIds.stream().distinct().collect(Collectors.toList());
         }
+        if(null == userIds || userIds.isEmpty()){
+            return allData;
+        }
         PageHelper.startPage(customerUserFormDTO.getPageNo(),customerUserFormDTO.getPageSize());
         allData = userWechatDao.selectResiAndStrangerInfo(userIds,customerUserFormDTO.getName());
         if(null == allData || allData.isEmpty()){

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

@@ -193,6 +193,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) {
         //1:注册信息表新增数据
 		baseDao.insert(ConvertUtils.sourceToTarget(userResiInfoDTO, UserResiInfoEntity.class));
+		//更新该用户在该客户下的注册状态
+		userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
         //2:角色表新增角色数据
         UserRoleDTO userRoleDTO = new UserRoleDTO();
         userRoleDTO.setCustomerId(userResiInfoDTO.getCustomerId());

epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml

@@ -85,13 +85,13 @@
 
     <!-- 查询一个客户下的居民和陌生人 传参 : 客户Id -->
     <select id="selectAllUserByCustomerId" resultType="string">
-        SELECT
+       SELECT
-            *
+		USER_ID
-        FROM
+		FROM
-            USER_CUSTOMER
+			REGISTER_RELATION
-        WHERE
+		WHERE
-            DEL_FLAG = '0'
+			DEL_FLAG ='0'
-            AND IS_REGISTER = '1'
+			AND REGISTER = '1'
             AND CUSTOMER_ID = #{customerId}
     </select>