q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

防npe

Browse Source
This commit is contained in:
Jerry Yan
2025-03-01 16:08:49 +08:00
parent 3ab5d95458
commit cccca05eff
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java vendored
View File

@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
@ -200,6 +201,13 @@ public class LyCompatibleController {
Map<Integer, List<ContentPageVO>> collect = listApiResponse.stream() Map<Integer, List<ContentPageVO>> collect = listApiResponse.stream()
.filter(contentPageVO -> contentPageVO.getLockType() < 0) .filter(contentPageVO -> contentPageVO.getLockType() < 0)
.collect(Collectors.groupingBy(ContentPageVO::getGoodsType)); .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 -> { List<Map<String, Object>> videoList = collect.get(0).stream().map(contentPageVO -> {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
VideoEntity videoRespVO = videoRepository.getVideo(contentPageVO.getContentId()); VideoEntity videoRespVO = videoRepository.getVideo(contentPageVO.getContentId());
@ -226,12 +234,12 @@ public class LyCompatibleController {
map.put("ossurldm", goodsDetailVO.getVideoUrl()); map.put("ossurldm", goodsDetailVO.getVideoUrl());
return map; return map;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
R put = R.ok() response
.put("isgen", taskStatusVO.getStatus() == 1 ? 0 : 1) .put("isgen", taskStatusVO.getStatus() == 1 ? 0 : 1)
.put("newvideo", videoList) .put("newvideo", videoList)
.put("newuservideo", userVideoList); .put("newuservideo", userVideoList);
redisTemplate.opsForValue().set("ly:"+openId, JSON.toJSONString(put), 5, TimeUnit.SECONDS); redisTemplate.opsForValue().set("ly:"+openId, JSON.toJSONString(response), 5, TimeUnit.SECONDS);
log.info("> {}", put); log.info("> {}", response);
return put; return response;
} }
} }