解决多环境问题

src/main/java/com/yuyou/openapi/openapi/dao/ZhangmenKidMessageRepository.java

@@ -1,7 +1,6 @@
 package com.yuyou.openapi.openapi.dao;
 
 import com.yuyou.openapi.openapi.model.dataobject.ZhangmenKidMessageDO;
-import com.yuyou.openapi.openapi.model.dataobject.ZhangmenMessageDO;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -18,4 +17,13 @@ public interface ZhangmenKidMessageRepository extends JpaRepository<ZhangmenKidM
      */
     List<ZhangmenKidMessageDO> findByRecId(Long recId);
 
+    /**
+     * 根据RecId和AppId进行查询
+     *
+     * @param recId
+     * @param appId
+     * @return
+     */
+    List<ZhangmenKidMessageDO> findByRecIdAndAppId(Long recId, String appId);
+
 }

src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java

@@ -1,6 +1,5 @@
 package com.yuyou.openapi.openapi.service.impl;
 
-import cn.hutool.core.util.StrUtil;
 import com.yuyou.openapi.openapi.dao.*;
 import com.yuyou.openapi.openapi.model.convert.*;
 import com.yuyou.openapi.openapi.model.dataobject.*;
@@ -11,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -142,7 +142,13 @@ public class ABClientServiceImpl implements ABClientService {
         }
 
         // 增加前先进行校验在数据库中是否存在
-        List<ZhangmenMessageDO> zhangmenMessageDOList = zhangmenMessageRepository.findByRecId(recId);
+        String appId = zhangmenMessageDO.getAppId();
+        if (StringUtils.isEmpty(appId)){
+            return Boolean.FALSE;
+        }
+        List<ZhangmenMessageDO> zhangmenMessageDOList = zhangmenMessageRepository.findByRecIdAndAppId(recId, appId);
+        // modify by 2020-10-19 判断规则改成 通过appId和recId一起来判别
+//        List<ZhangmenMessageDO> zhangmenMessageDOList = zhangmenMessageRepository.findByRecId(recId);
         if (CollectionUtils.isEmpty(zhangmenMessageDOList)){
             ZhangmenMessageDO result = zhangmenMessageRepository.save(zhangmenMessageDO);
             if (result == null) {
@@ -235,8 +241,14 @@ public class ABClientServiceImpl implements ABClientService {
             return Boolean.FALSE;
         }
         // 增加前先进行校验在数据库中是否存在
-        List<ZhangmenKidMessageDO> zhangmenKidMessageDOList = zhangmenKidMessageRepository.findByRecId(recId);
+        String appId = zhangmenKidMessageDO.getAppId();
-        if (CollectionUtils.isEmpty(zhangmenKidMessageDOList)){
+        if (StringUtils.isEmpty(appId)){
+            return Boolean.FALSE;
+        }
+        List<ZhangmenMessageDO> zhangmenKidMessageDOList = zhangmenMessageRepository.findByRecIdAndAppId(recId, appId);
+        // modify by 2020-10-19 判断规则改成 通过appId和recId一起来判别
+//        List<ZhangmenKidMessageDO> zhangmenKidMessageDOList = zhangmenKidMessageRepository.findByRecId(recId);
+        if (!CollectionUtils.isEmpty(zhangmenKidMessageDOList)){
             ZhangmenKidMessageDO result = zhangmenKidMessageRepository.save(zhangmenKidMessageDO);
             if (result == null) {
                 log.error("========== [insert ZM_Kid data error , please check . ] ==========");

src/main/resources/logback.xml

@@ -6,7 +6,7 @@
     <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss:SS} %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{50}) - %cyan(%msg%n)" />
 
     <appender name="stdAppender" class="ch.qos.logback.core.ConsoleAppender">
-        <withJansi>true</withJansi> <!-- 如果是UTF-8的环境这句要注释掉 -->
+        <!--<withJansi>true</withJansi> &lt;!&ndash; 如果是UTF-8的环境这句要注释掉 &ndash;&gt;-->
         <encoder>
             <pattern>%highlight([%-5level]) %cyan(%d{yyyy-MM-dd#HH:mm:ss.SSS}) %yellow([Thread:%thread]) %magenta([Logger:%logger]) -> %msg%n</pattern>
             <charset>utf-8</charset>

src/test/java/com/yuyou/openapi/openapi/SimpleTest.java

@@ -47,4 +47,7 @@ public class SimpleTest {
                 }
         );
     }
+
+
+
 }