浏览代码

调整页面报错相关问题

wukai 10 月之前
父节点
当前提交
45fcc106ba

+ 1 - 1
jjt-biz/src/main/java/com/jjt/biz/controller/BizModelController.java

@@ -69,7 +69,7 @@ public class BizModelController extends BaseController {
     @GetMapping("/time/history")
     public List<ScoreVO> timeHistory() {
         List<ScoreVO> result = new ArrayList<>();
-        LocalDateTime endTime = LocalDateTime.now().withMinute(0).withSecond(0).withNano(0);
+        LocalDateTime endTime = LocalDateTime.now().plusHours(1).withMinute(0).withSecond(0).withNano(0);
         LocalDateTime beginTime = endTime.minusHours(24);
         HlScore search = new HlScore();
         search.setHlType("1");

+ 5 - 1
jjt-biz/src/main/java/com/jjt/biz/controller/IndexController.java

@@ -128,7 +128,11 @@ public class IndexController extends BaseController {
             scoreList = scoreList.stream().sorted(Comparator.comparing(HlScore::getHlDate)).collect(Collectors.toList());
             scoreList.forEach(hs -> {
                 times.add(DateUtils.parseDateToStr("HH:mm", hs.getHlDate()));
-                scores.add(hs.getHlScore().floatValue());
+                if (hs.getHlScore() != null) {
+                    scores.add(hs.getHlScore().floatValue());
+                } else {
+                    scores.add(100f);
+                }
             });
             map.put("time", times);
             map.put("score", scores);