|
|
|
@ -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);
|
|
|
|
|
if (CollectionUtils.isEmpty(zhangmenKidMessageDOList)){
|
|
|
|
|
String appId = zhangmenKidMessageDO.getAppId();
|
|
|
|
|
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 . ] ==========");
|
|
|
|
|