|
@@ -254,6 +254,8 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
|
|
|
|
|
|
/**
|
|
/**
|
|
* 创建自定义创意
|
|
* 创建自定义创意
|
|
|
|
+
|
|
|
|
+
|
|
*
|
|
*
|
|
* @param strategy 账户配置信息
|
|
* @param strategy 账户配置信息
|
|
* @param createType 创意创建类型 1:素材上新 2:历史高质量 3:历史遗漏素材 4:历史打捞
|
|
* @param createType 创意创建类型 1:素材上新 2:历史高质量 3:历史遗漏素材 4:历史打捞
|
|
@@ -293,7 +295,7 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
|
|
List<KuaiShouVideoGet> newVideos = new ArrayList<>();
|
|
List<KuaiShouVideoGet> newVideos = new ArrayList<>();
|
|
for (KuaiShouVideoGet newVideo : newVideoList) {
|
|
for (KuaiShouVideoGet newVideo : newVideoList) {
|
|
if (!Check.isNull(newVideo.getPutEndTime()) && !Check.isNull(newVideo.getPutStartTime())) {
|
|
if (!Check.isNull(newVideo.getPutEndTime()) && !Check.isNull(newVideo.getPutStartTime())) {
|
|
- boolean b = DateUtils.checkTimeLimit(new Date(), DateUtils.parseDate(newVideo.getPutStartTime(), "yyyy-MM-dd"), DateUtils.parseDate(newVideo.getPutEndTime(), "yyyy-MM-dd"));
|
|
|
|
|
|
+ boolean b = DateUtils.checkTimeLimit(new Date(), DateUtils.parseDate(newVideo.getPutStartTime()+" 00:00:01", "yyyy-MM-dd HH:mm:ss"), DateUtils.parseDate(newVideo.getPutEndTime()+" 23:59:59", "yyyy-MM-dd HH:mm:ss"));
|
|
if (b) {
|
|
if (b) {
|
|
newVideos.add(newVideo);
|
|
newVideos.add(newVideo);
|
|
}
|
|
}
|
|
@@ -460,7 +462,7 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
|
|
List<KuaiShouVideoGet> allVideos = new ArrayList<>();
|
|
List<KuaiShouVideoGet> allVideos = new ArrayList<>();
|
|
for (KuaiShouVideoGet newVideo : allVideoList) {
|
|
for (KuaiShouVideoGet newVideo : allVideoList) {
|
|
if (!Check.isNull(newVideo.getPutEndTime()) && !Check.isNull(newVideo.getPutStartTime())) {
|
|
if (!Check.isNull(newVideo.getPutEndTime()) && !Check.isNull(newVideo.getPutStartTime())) {
|
|
- boolean b = DateUtils.checkTimeLimit(new Date(), DateUtils.parseDate(newVideo.getPutStartTime(), "yyyy-MM-dd"), DateUtils.parseDate(newVideo.getPutEndTime(), "yyyy-MM-dd"));
|
|
|
|
|
|
+ boolean b = DateUtils.checkTimeLimit(new Date(), DateUtils.parseDate(newVideo.getPutStartTime()+" 00:00:01", "yyyy-MM-dd HH:mm:ss"), DateUtils.parseDate(newVideo.getPutEndTime()+" 23:59:59", "yyyy-MM-dd HH:mm:ss"));
|
|
if (b) {
|
|
if (b) {
|
|
allVideos.add(newVideo);
|
|
allVideos.add(newVideo);
|
|
}
|
|
}
|
|
@@ -1225,11 +1227,19 @@ public class AiKuaishouProjectCreateCreativeServiceImpl implements IAiKuaishouPr
|
|
}
|
|
}
|
|
|
|
|
|
private boolean checkList(String videoTarget, String target) {
|
|
private boolean checkList(String videoTarget, String target) {
|
|
|
|
+ if (Check.isNull(videoTarget)) {
|
|
|
|
+ //素材是不限,直接返回true。
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
List videoList = JSONObject.parseObject(videoTarget, List.class);
|
|
List videoList = JSONObject.parseObject(videoTarget, List.class);
|
|
if (Check.isNull(videoList)) {
|
|
if (Check.isNull(videoList)) {
|
|
//素材是不限,直接返回true。
|
|
//素材是不限,直接返回true。
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
+ if (Check.isNull(target)) {
|
|
|
|
+ //计划定向是不限,素材非不限,直接返回false。
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
List list = JSONObject.parseObject(target, List.class);
|
|
List list = JSONObject.parseObject(target, List.class);
|
|
if (Check.isNull(list)) {
|
|
if (Check.isNull(list)) {
|
|
//计划定向是不限,素材非不限,直接返回false。
|
|
//计划定向是不限,素材非不限,直接返回false。
|