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> 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> videoList = collect.get(0).stream().map(contentPageVO -> { Map 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; } }