From cccca05eff742336006c5858b7ca4cf7f5b950ac Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sat, 1 Mar 2025 16:08:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2npe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../extern/LyCompatibleController.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java
index f8efd94..918873c 100644
--- a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java
+++ b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java
@@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
@@ -200,6 +201,13 @@ public class LyCompatibleController {
Map<Integer, List<ContentPageVO>> collect = listApiResponse.stream()
.filter(contentPageVO -> contentPageVO.getLockType() < 0)
.collect(Collectors.groupingBy(ContentPageVO::getGoodsType));
+ R response = R.ok();
+ if (collect.get(0) == null) {
+ response.put("isgen", 1)
+ .put("newvideo", Collections.emptyList())
+ .put("newuservideo", Collections.emptyList());
+ return response;
+ }
List<Map<String, Object>> videoList = collect.get(0).stream().map(contentPageVO -> {
Map<String, Object> map = new HashMap<>();
VideoEntity videoRespVO = videoRepository.getVideo(contentPageVO.getContentId());
@@ -226,12 +234,12 @@ public class LyCompatibleController {
map.put("ossurldm", goodsDetailVO.getVideoUrl());
return map;
}).collect(Collectors.toList());
- R put = R.ok()
+ response
.put("isgen", taskStatusVO.getStatus() == 1 ? 0 : 1)
.put("newvideo", videoList)
.put("newuservideo", userVideoList);
- redisTemplate.opsForValue().set("ly:"+openId, JSON.toJSONString(put), 5, TimeUnit.SECONDS);
- log.info("> {}", put);
- return put;
+ redisTemplate.opsForValue().set("ly:"+openId, JSON.toJSONString(response), 5, TimeUnit.SECONDS);
+ log.info("> {}", response);
+ return response;
}
}