diff --git a/src/main/java/com/yuyou/openapi/openapi/dao/ZhangmenKidMessageRepository.java b/src/main/java/com/yuyou/openapi/openapi/dao/ZhangmenKidMessageRepository.java index b98dace..60d3d0c 100644 --- a/src/main/java/com/yuyou/openapi/openapi/dao/ZhangmenKidMessageRepository.java +++ b/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 findByRecId(Long recId); + /** + * 根据RecId和AppId进行查询 + * + * @param recId + * @param appId + * @return + */ + List findByRecIdAndAppId(Long recId, String appId); + } diff --git a/src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java b/src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java index cc72b16..818518f 100644 --- a/src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java +++ b/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 zhangmenMessageDOList = zhangmenMessageRepository.findByRecId(recId); + String appId = zhangmenMessageDO.getAppId(); + if (StringUtils.isEmpty(appId)){ + return Boolean.FALSE; + } + List zhangmenMessageDOList = zhangmenMessageRepository.findByRecIdAndAppId(recId, appId); + // modify by 2020-10-19 判断规则改成 通过appId和recId一起来判别 +// List 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 zhangmenKidMessageDOList = zhangmenKidMessageRepository.findByRecId(recId); - if (CollectionUtils.isEmpty(zhangmenKidMessageDOList)){ + String appId = zhangmenKidMessageDO.getAppId(); + if (StringUtils.isEmpty(appId)){ + return Boolean.FALSE; + } + List zhangmenKidMessageDOList = zhangmenMessageRepository.findByRecIdAndAppId(recId, appId); + // modify by 2020-10-19 判断规则改成 通过appId和recId一起来判别 +// List 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 . ] =========="); diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 2a6fb61..77e8fb7 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -6,7 +6,7 @@ - true + %highlight([%-5level]) %cyan(%d{yyyy-MM-dd#HH:mm:ss.SSS}) %yellow([Thread:%thread]) %magenta([Logger:%logger]) -> %msg%n utf-8 diff --git a/src/test/java/com/yuyou/openapi/openapi/SimpleTest.java b/src/test/java/com/yuyou/openapi/openapi/SimpleTest.java index 220335f..07d64f0 100644 --- a/src/test/java/com/yuyou/openapi/openapi/SimpleTest.java +++ b/src/test/java/com/yuyou/openapi/openapi/SimpleTest.java @@ -47,4 +47,7 @@ public class SimpleTest { } ); } + + + }