Merge remote-tracking branch 'origin/dev_thirdplatform' into dev

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

@@ -78,6 +78,11 @@ public class CodeCustomerDTO implements Serializable {
      */
 	private String userDesc;
 
+	/**
+	 * 数据来源(dev:开发 test:体验 prod:生产)
+	 */
+	private String source;
+
     /**
      * 状态 未审核:unaudited，审核中:auditing，审核成功audit_success，审核被拒绝audit_failed，已撤回:withdrawn，审核延后:delay，发布成功release_success, 发布失败release_failed
      */

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

@@ -43,4 +43,8 @@ public class UploadListFormDTO implements Serializable {
 	 * 页面条数
 	 */
 	private Integer pageSize;
+	/**
+	 * 数据来源(dev:开发 test:体验 prod:生产)
+	 */
+	private String source;
 }

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

@@ -76,9 +76,9 @@ public interface CodeCustomerDao extends BaseDao<CodeCustomerEntity> {
      * 获取审核中代码列表
      * @author zhaoqifeng
      * @date 2020/7/15 18:17
-     * @param
+     * @param source
      * @return java.util.List<com.epmet.dto.CodeCustomerDTO>
      */
-    List<CodeCustomerDTO> selectAuditingCodeList();
+    List<CodeCustomerDTO> selectAuditingCodeList(@Param("source") String source);
 
 }

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

@@ -78,6 +78,11 @@ public class CodeCustomerEntity extends BaseEpmetEntity {
      */
 	private String userDesc;
 
+	/**
+	 * 数据来源(dev:开发 test:体验 prod:生产)
+	 */
+	private String source;
+
     /**
      * 状态 未审核:unaudited，审核中:auditing，审核成功audit_success，审核被拒绝audit_failed，已撤回:withdrawn，审核延后:delay，发布成功release_success, 发布失败release_failed
      */

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

@@ -110,7 +110,7 @@ public interface CodeCustomerService extends BaseService<CodeCustomerEntity> {
      * @param
      * @return java.util.List<com.epmet.dto.CodeCustomerDTO>
      */
-    List<CodeCustomerDTO> getAuditingCodeList();
+    List<CodeCustomerDTO> getAuditingCodeList(String source);
 
     /**
      * 删除旧代码记录

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

@@ -115,8 +115,8 @@ public class CodeCustomerServiceImpl extends BaseServiceImpl<CodeCustomerDao, Co
     }
 
     @Override
-    public List<CodeCustomerDTO> getAuditingCodeList() {
-        return baseDao.selectAuditingCodeList();
+    public List<CodeCustomerDTO> getAuditingCodeList(String source) {
+        return baseDao.selectAuditingCodeList(source);
     }
 
     @Override

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

@@ -152,6 +152,7 @@ public class CodeServiceImpl implements CodeService {
 		//将上传信息存入表中
 		CodeCustomerDTO codeCustomerDTO = ConvertUtils.sourceToTarget(formDTO, CodeCustomerDTO.class);
 		codeCustomerDTO.setCustomerName(paCustomerDTO.getCustomerName());
+		codeCustomerDTO.setSource(paCustomerDTO.getSource());
 		codeCustomerDTO.setExtJson(extJson);
 		codeCustomerDTO.setAppId(authInfo.getAuthorizerAppid());
 		codeCustomerDTO.setStatus(CodeConstant.UNAUDITED);
@@ -162,7 +163,7 @@ public class CodeServiceImpl implements CodeService {
 
 	@Override
 	public PageData uploadList(UploadListFormDTO formDTO) {
-		List<CodeCustomerDTO> auditingList = codeCustomerService.getAuditingCodeList();
+		List<CodeCustomerDTO> auditingList = codeCustomerService.getAuditingCodeList(formDTO.getSource());
 		if (null != auditingList && auditingList.size() > NumConstant.ZERO) {
 			auditingList.forEach(code -> {
 				//获取小程序调用令牌

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

@@ -125,7 +125,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
             switch (infotype){
                 case ModuleConstant.TICKET_UNDERLINE_KEY:   //接收票据 【component_verify_ticket】
                     String ComponentVerifyTicket = result.get(ModuleConstant.TICKET_KEY);
-                    log.info(String.format(COMPONENT_VERIFY_TICKET));
+                    log.info(String.format(COMPONENT_VERIFY_TICKET,ComponentVerifyTicket));
                     // 缓存 ticket
                     redisThird.setComponentVerifyTicket(ComponentVerifyTicket);
                     // 存数据库

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

@@ -38,6 +38,7 @@
         LEFT JOIN code_audit_result car ON cc.ID = car.CODE_ID AND car.DEL_FLAG = '0'
         WHERE
             cc.DEL_FLAG = '0'
+          AND cc.SOURCE = #{source}
         <if test="customerId != null and customerId.trim() != ''">
             AND cc.CUSTOMER_ID = #{customerId}
         </if>
@@ -85,7 +86,7 @@
             AND template_id = #{templateId}
     </select>
     <select id="selectAuditingCodeList" resultType="com.epmet.dto.CodeCustomerDTO">
-        select * FROM code_customer WHERE DEL_FLAG = '0' AND STATUS = 'auditing'
+        select * FROM code_customer WHERE DEL_FLAG = '0' AND STATUS = 'auditing' AND SOURCE = #{source}
     </select>
     <update id="deleteCode">
         UPDATE code_customer