|
@@ -93,6 +93,7 @@ public class KuaiShouMaterialControer {
|
|
throw new Exception("未获取账号授权信息");
|
|
throw new Exception("未获取账号授权信息");
|
|
}
|
|
}
|
|
String appVersion = requestJson.getString("appVersion");
|
|
String appVersion = requestJson.getString("appVersion");
|
|
|
|
+ Integer channelType = requestJson.getInteger("channelType");
|
|
KuaiShouVideoLastTime videoLastTime = lastTimeService.getById(accountId);
|
|
KuaiShouVideoLastTime videoLastTime = lastTimeService.getById(accountId);
|
|
Date startTime;
|
|
Date startTime;
|
|
Date endDate = new Date();
|
|
Date endDate = new Date();
|
|
@@ -108,6 +109,9 @@ public class KuaiShouMaterialControer {
|
|
if (!Check.isNull(appVersion)) {
|
|
if (!Check.isNull(appVersion)) {
|
|
requestMap.put("appVersion", appVersion);
|
|
requestMap.put("appVersion", appVersion);
|
|
}
|
|
}
|
|
|
|
+ if (!Check.isNull(channelType)) {
|
|
|
|
+ requestMap.put("channelType", channelType);
|
|
|
|
+ }
|
|
List<JSONObject> materialList = videoGetService.getVideoListByMap(requestMap);
|
|
List<JSONObject> materialList = videoGetService.getVideoListByMap(requestMap);
|
|
if (!Check.isNull(materialList)) {
|
|
if (!Check.isNull(materialList)) {
|
|
for (int i = 0; i < materialList.size(); i++) {
|
|
for (int i = 0; i < materialList.size(); i++) {
|
|
@@ -171,6 +175,7 @@ public class KuaiShouMaterialControer {
|
|
throw new Exception("请输入查询条数");
|
|
throw new Exception("请输入查询条数");
|
|
}
|
|
}
|
|
String appVersion = requestJson.getString("appVersion");
|
|
String appVersion = requestJson.getString("appVersion");
|
|
|
|
+ Integer channelType = requestJson.getInteger("channelType");
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
requestMap.put("startTime", startDate);
|
|
requestMap.put("startTime", startDate);
|
|
requestMap.put("endTime", endDate);
|
|
requestMap.put("endTime", endDate);
|
|
@@ -180,6 +185,9 @@ public class KuaiShouMaterialControer {
|
|
if (!Check.isNull(appVersion)) {
|
|
if (!Check.isNull(appVersion)) {
|
|
requestMap.put("appVersion", appVersion);
|
|
requestMap.put("appVersion", appVersion);
|
|
}
|
|
}
|
|
|
|
+ if (!Check.isNull(channelType)) {
|
|
|
|
+ requestMap.put("channelType", channelType);
|
|
|
|
+ }
|
|
List<JSONObject> materialList = relateCreativesService.getVideoListByMap(requestMap);
|
|
List<JSONObject> materialList = relateCreativesService.getVideoListByMap(requestMap);
|
|
if (!Check.isNull(materialList)) {
|
|
if (!Check.isNull(materialList)) {
|
|
materialList = videoGetService.getVideoInfoAndImageList(materialList);
|
|
materialList = videoGetService.getVideoInfoAndImageList(materialList);
|
|
@@ -234,10 +242,14 @@ public class KuaiShouMaterialControer {
|
|
requestMap.put("startDate", startDate);
|
|
requestMap.put("startDate", startDate);
|
|
requestMap.put("endDate", endDate);
|
|
requestMap.put("endDate", endDate);
|
|
requestMap.put("accountId", accountId);
|
|
requestMap.put("accountId", accountId);
|
|
|
|
+ Integer channelType = requestJson.getInteger("channelType");
|
|
requestMap.put("num", num);
|
|
requestMap.put("num", num);
|
|
if (!Check.isNull(appVersion)) {
|
|
if (!Check.isNull(appVersion)) {
|
|
requestMap.put("appVersion", appVersion);
|
|
requestMap.put("appVersion", appVersion);
|
|
}
|
|
}
|
|
|
|
+ if (!Check.isNull(channelType)) {
|
|
|
|
+ requestMap.put("channelType", channelType);
|
|
|
|
+ }
|
|
List<JSONObject> materialList = relateCreativesService.getHistoryTopVideoList(requestMap);
|
|
List<JSONObject> materialList = relateCreativesService.getHistoryTopVideoList(requestMap);
|
|
if (!Check.isNull(materialList)) {
|
|
if (!Check.isNull(materialList)) {
|
|
materialList = videoGetService.getVideoInfoAndImageList(materialList);
|
|
materialList = videoGetService.getVideoInfoAndImageList(materialList);
|
|
@@ -289,6 +301,7 @@ public class KuaiShouMaterialControer {
|
|
throw new Exception("请输入查询结束时间");
|
|
throw new Exception("请输入查询结束时间");
|
|
}
|
|
}
|
|
String appVersion = requestJson.getString("appVersion");
|
|
String appVersion = requestJson.getString("appVersion");
|
|
|
|
+ Integer channelType = requestJson.getInteger("channelType");
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
Map<String, Object> requestMap = new HashMap<>();
|
|
requestMap.put("startTime", startTime);
|
|
requestMap.put("startTime", startTime);
|
|
requestMap.put("endTime", endTime);
|
|
requestMap.put("endTime", endTime);
|
|
@@ -297,6 +310,9 @@ public class KuaiShouMaterialControer {
|
|
if (!Check.isNull(appVersion)) {
|
|
if (!Check.isNull(appVersion)) {
|
|
requestMap.put("appVersion", appVersion);
|
|
requestMap.put("appVersion", appVersion);
|
|
}
|
|
}
|
|
|
|
+ if (!Check.isNull(channelType)) {
|
|
|
|
+ requestMap.put("channelType", channelType);
|
|
|
|
+ }
|
|
List<JSONObject> materialList = relateCreativesService.getVideoZeroListByMap(requestMap);
|
|
List<JSONObject> materialList = relateCreativesService.getVideoZeroListByMap(requestMap);
|
|
if (!Check.isNull(materialList)) {
|
|
if (!Check.isNull(materialList)) {
|
|
materialList = videoGetService.getVideoInfoAndImageList(materialList);
|
|
materialList = videoGetService.getVideoInfoAndImageList(materialList);
|