解决分析结果展示的一些问题

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

@@ -1,6 +1,8 @@
 package com.test;
 
-import java.time.LocalDate;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.jjt.common.utils.http.HttpUtils;
 
 /**
  * Test$
@@ -10,7 +12,42 @@ import java.time.LocalDate;
  */
 public class Test {
     public static void main(String[] args) {
-        LocalDate localDate = LocalDate.of(2024, 2, 1);
-        System.err.println(localDate);
+        String url = "http://192.168.188.188:18000/api/sas/diff";
+//        jsonObject.put("data", );
+        String params = "{\n" +
+                "  \"data\": [\n" +
+                "    55,\n" +
+                "    98,\n" +
+                "    67,\n" +
+                "    20,\n" +
+                "    29,\n" +
+                "    27,\n" +
+                "    59,\n" +
+                "    98,\n" +
+                "    88,\n" +
+                "    27,\n" +
+                "    90,\n" +
+                "    90,\n" +
+                "    94,\n" +
+                "    29,\n" +
+                "    81,\n" +
+                "    77,\n" +
+                "    46,\n" +
+                "    65,\n" +
+                "    35\n" +
+                "    ]\n" +
+                "}";
+        JSONObject jsonObject = JSONObject.parseObject(params);
+//        String result = HttpUtils.dataPost(url, jsonObject);
+
+        JSONObject obj = new JSONObject();
+        JSONArray array = new JSONArray();
+        array.add(1);
+        array.add(3);
+        array.add(5);
+        array.add(7);
+        array.add(123);
+        obj.put("data", array);
+        System.err.println(obj);
     }
 }

jjt-biz/src/main/java/com/jjt/risk/controller/RiskOtherController.java

@@ -22,6 +22,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 风险分析结果Controller
@@ -73,6 +74,17 @@ public class RiskOtherController extends BaseController {
                 }
                 dataList.add(dataMap);
             }
+            if ("2".equals(config.getRankingBased())) {
+                dataList = dataList.stream().sorted(
+                        (o1, o2) -> -Integer.compare(Integer.parseInt(o1.get("alarms").toString()), Integer.parseInt(o2.get("alarms").toString()))
+                ).collect(Collectors.toList());
+            } else {
+
+                dataList = dataList.stream().sorted(
+                        (o1, o2) -> -Integer.compare(Integer.parseInt(o1.get("value").toString()), Integer.parseInt(o2.get("value").toString()))
+                ).collect(Collectors.toList());
+            }
+
             map.put("data", dataList);
             result.add(map);
         }

jjt-biz/src/main/java/com/jjt/risk/domain/RiskAnalysis.java

@@ -98,7 +98,7 @@ public class RiskAnalysis extends BaseEntity {
      * 分析时间
      */
     @ApiModelProperty("分析时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
     @Excel(name = "分析时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date analyseTime;