防npe
This commit is contained in:
parent
3ab5d95458
commit
cccca05eff
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user