小问题调整

jjt-admin/src/test/java/com/test/HlTest.java

@@ -2,11 +2,9 @@ package com.test;
 
 import com.jjt.JjtApplication;
 import com.jjt.hl.service.IHlScoreService;
-import com.jjt.quartz.config.ScheduleConfig;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
 
 import javax.annotation.Resource;
 

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

@@ -91,7 +91,11 @@ public class BizModelController extends BaseController {
             scoreList = scoreList.stream().sorted(Comparator.comparing(HlScore::getHlDate)).collect(Collectors.toList());
             scoreList.forEach(hs -> {
                 xData.add(DateUtils.parseDateToStr("HH:mm", hs.getHlDate()));
-                scores.add(hs.getHlScore().floatValue());
+                if (hs.getHlScore() == null) {
+                    scores.add(100f);
+                } else {
+                    scores.add(hs.getHlScore().floatValue());
+                }
             });
             vo.setScores(scores);
             vo.setXData(xData);

jjt-biz/src/main/java/com/jjt/biz/service/impl/BizObjMetricsServiceImpl.java

@@ -383,6 +383,7 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
                     BizObjMetricsData data = new BizObjMetricsData();
                     data.setObjMetricsId(om.getObjMetricsId());
                     data.setdValue(om.getDValue());
+                    data.setCreateTime(date);
                     dataList.add(data);
                     metricsToUpdate.add(om);
                     //处理告警
@@ -432,7 +433,10 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
 
         Random random = new Random();
         mList.stream().forEach(om -> {
-            double oldV = om.getDValue().floatValue();
+            double oldV=100d;
+            if (om.getDValue() != null) {
+                oldV = om.getDValue().floatValue();
+            }
             double modifier = oldV * 0.1;
             double randomValue = random.nextDouble() * 2 - 1; // 生成-1到1之间的随机数
 
@@ -677,6 +681,7 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
                     updateBizObjMetrics(om);
                     BizObjMetricsData data = new BizObjMetricsData();
                     data.setObjMetricsId(om.getObjMetricsId());
+                    data.setCreateTime(date);
                     data.setdValue(om.getDValue());
                     dataList.add(data);
                     //处理告警

jjt-biz/src/main/java/com/jjt/task/DataTask.java

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.CountDownLatch;
 
 /**
  * 定时任务调度测试
@@ -33,8 +33,8 @@ public class DataTask {
     public void metrics() {
         Date date = new Date();
         objService.selectBizObjList(new BizObj()).forEach(obj -> {
-            metricsService.pinpointMetricsValue(obj.getObjId(),date);
-            metricsService.prometheusMetricsValue(obj.getObjId(),date);
+            metricsService.pinpointMetricsValue(obj.getObjId(), date);
+            metricsService.prometheusMetricsValue(obj.getObjId(), date);
         });
     }
 
@@ -59,29 +59,36 @@ public class DataTask {
      * 模拟一次数据
      */
     public void imitateOne() {
-        try {
-            ExecutorService threadPool = new ThreadPoolExecutor(
-                    10,
-                    20,
-                    3,
-                    TimeUnit.SECONDS,
-                    new LinkedBlockingDeque<>(3),
-                    Executors.defaultThreadFactory(),
-                    new ThreadPoolExecutor.DiscardOldestPolicy());
-            LocalDateTime ed = LocalDateTime.now();
-            Date date = Date.from(ed.atZone(ZoneId.systemDefault()).toInstant());
-            List<BizObj> list = objService.selectBizObjList(new BizObj());
-            CountDownLatch latch = new CountDownLatch(list.size());
-            list.forEach(obj -> threadPool.submit(() -> {
-                metricsService.imitate(obj.getObjId(), date);
-                latch.countDown();
-            }));
-            // Wait for all threads to finish
-            latch.await();
-            threadPool.shutdown();
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+        LocalDateTime ed = LocalDateTime.now();
+        Date date = Date.from(ed.atZone(ZoneId.systemDefault()).toInstant());
+        List<BizObj> list = objService.selectBizObjList(new BizObj());
+        list.forEach(obj -> {
+            metricsService.imitate(obj.getObjId(), date);
+        });
+        // Wait for all threads to finish
+//        try {
+//            ExecutorService threadPool = new ThreadPoolExecutor(
+//                    10,
+//                    20,
+//                    3,
+//                    TimeUnit.SECONDS,
+//                    new LinkedBlockingDeque<>(3),
+//                    Executors.defaultThreadFactory(),
+//                    new ThreadPoolExecutor.DiscardOldestPolicy());
+//            LocalDateTime ed = LocalDateTime.now();
+//            Date date = Date.from(ed.atZone(ZoneId.systemDefault()).toInstant());
+//            List<BizObj> list = objService.selectBizObjList(new BizObj());
+//            CountDownLatch latch = new CountDownLatch(list.size());
+//            list.forEach(obj -> threadPool.submit(() -> {
+//                metricsService.imitate(obj.getObjId(), date);
+//                latch.countDown();
+//            }));
+//            // Wait for all threads to finish
+//            latch.await();
+//            threadPool.shutdown();
+//        } catch (InterruptedException e) {
+//            throw new RuntimeException(e);
+//        }
     }
 
 }