数据处理

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

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
  *
  */
 @SpringBootTest(classes = JjtApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ActiveProfiles("test")
+@ActiveProfiles("tt")
 public class ModelAlarmConfigTest {
     @Resource
     private IBizObjMetricsService objMetricsService;

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

@@ -156,9 +156,9 @@ public class IndexController extends BaseController {
             map.put("metricsName", metricsName);
             String status = "1";
 //            if (flag) {
-                //风险
-                num++;
-                status = "2";
+            //风险
+            num++;
+            status = "2";
 //            }
             map.put("status", status);
             list.add(map);
@@ -207,27 +207,11 @@ public class IndexController extends BaseController {
         String start = beginTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         String end = endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         List<BizTypeVO> list = alarmRecordService.listBizObj(null, start, end);
-        List<Map<String, Object>> alarmList = new ArrayList<>();
-
-        list.forEach(vo -> {
-            Map<String, Object> map = new HashMap<>(16);
-            map.put("name", vo.getName());
-            map.put("alarm", vo.getNum());
-            alarmList.add(map);
-        });
-
+        list = list.stream().sorted(Comparator.comparing(BizTypeVO::getNum).reversed()).collect(Collectors.toList());
         AlarmRecord q = new AlarmRecord();
         q.setAlarmType("1");
         List<AlarmRecord> al = alarmRecordService.selectAlarmRecordList(q);
-//        String[] names = {"市场服务node-1", "市场出清后台应用", "市场合规cluster1", "市场合规cluster2", "信息发布cluster1"};
         result.put("curr", al.size());
-//        Random random = new Random();
-//        for (int i = 0; i < names.length; i++) {
-//            Map<String, Object> map = new HashMap<>(16);
-//            map.put("name", names[i]);
-//            map.put("alarm", random.nextInt(500) + 500);
-//            list.add(map);
-//        }
         result.put("data", list);
         return success(result);
     }

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

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -426,11 +427,37 @@ public class BizObjMetricsServiceImpl implements IBizObjMetricsService {
         //查询当前对象未结束事件列表
         Map<Long, HlEvent> eventMap = eventService.selectHlEventListCurr(objId);
 
+        Random random = new Random();
         mList.stream().forEach(om -> {
-            Random random = new Random();
-            int xxx = (int) (om.getObjMetricsId() % 70);
-            float value = (float) random.nextInt(100 - xxx) + xxx;
-            om.setDValue(BigDecimal.valueOf(value));
+            double oldV = om.getDValue().floatValue();
+            double modifier = oldV * 0.1;
+            double randomValue = random.nextDouble() * 2 - 1; // 生成-1到1之间的随机数
+
+            double value = oldV + modifier * randomValue;
+            BigDecimal dv = BigDecimal.valueOf(value).setScale(2, RoundingMode.HALF_UP);
+//            int xxx = (int) (om.getObjMetricsId() % 70);
+//            float value = (float) random.nextInt(100 - xxx) + xxx;
+
+
+            if (dv.doubleValue() < 10) {
+                dv = dv.add(BigDecimal.valueOf(10));
+            }
+
+            if ("1".equals(om.getMetricsDef().getMetricsType())) {
+                dv = dv.setScale(0, RoundingMode.HALF_UP);
+            }
+            if (om.getMetricsCode().endsWith("pp.tot")) {
+                if (dv.doubleValue() < 50) {
+                    dv = dv.add(BigDecimal.valueOf(50));
+                }
+            }
+
+            if (om.getMetricsCode().endsWith("pp.error")) {
+                if (dv.doubleValue() > 50) {
+                    dv = dv.subtract(BigDecimal.valueOf(50));
+                }
+            }
+            om.setDValue(dv);
             BizObjMetricsData data = new BizObjMetricsData();
             data.setObjMetricsId(om.getObjMetricsId());
             data.setdValue(om.getDValue());

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

@@ -47,14 +47,11 @@ public class DataTask {
         //如果之前没数据，补一个月，如果有，则补至当前
         LocalDateTime ed = LocalDateTime.now();
         LocalDateTime st = ed.minusDays(30);
-        if (localDateTime != null) {
-            st = localDateTime;
-        }
         do {
             Date date = Date.from(st.atZone(ZoneId.systemDefault()).toInstant());
             List<BizObj> list = objService.selectBizObjList(new BizObj());
             list.forEach(obj -> metricsService.imitate(obj.getObjId(), date));
-            st = st.plusMinutes(5);
+            st = st.plusMinutes(15);
         } while (!st.isAfter(ed));
     }