统战部接口返回调整

src/main/java/com/zzsn/event/controller/common/StatisticalAnalysisController.java

@@ -393,8 +393,8 @@ public class StatisticalAnalysisController {
     public Result<?> singleCountryStatistic(@RequestParam String subjectId, @RequestParam String country,
                                             @RequestParam(required = false) String startTime,
                                             @RequestParam(required = false) String endTime) {
-        Map<String, Object> map = esService.singleCountryStatistic(subjectId, country, startTime, endTime);
-        return Result.OK(map);
+        List<Map<String, Object>> maps = esService.singleCountryStatistic(subjectId, country, startTime, endTime);
+        return Result.OK(maps);
     }
 
 

src/main/java/com/zzsn/event/es/EsService.java

@@ -2829,9 +2829,8 @@ public class EsService {
     }
 
 
-    public Map<String,Object> singleCountryStatistic(String subjectId,String country, String startTime, String endTime) {
-        Map<String, Object> map = new HashMap<>();
-
+    public List<Map<String,Object>> singleCountryStatistic(String subjectId,String country, String startTime, String endTime) {
+        List<Map<String,Object>> dataList = new ArrayList<>();
         //根据地区的id从ES查询相关的记录
         SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
@@ -2876,18 +2875,24 @@ public class EsService {
         try {
             SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
             long totalCount = searchResponse.getHits().getTotalHits().value;
+            Map<String, Object> countMap = new HashMap<>();
+            countMap.put("name", "风险事件");
+            countMap.put("value", totalCount);
+            dataList.add(countMap);
             Aggregations aggregations = searchResponse.getAggregations();
             ParsedNested labels = aggregations.get("labels");
             Aggregations labelsAggregations = labels.getAggregations();
             Terms groupCountry = labelsAggregations.get("group_risk");
             List<? extends Terms.Bucket> buckets = groupCountry.getBuckets();
             String mainRiskType = riskTypeMap.get(buckets.get(0).getKeyAsString());
-            map.put("mainRiskType", mainRiskType);
-            map.put("totalCount", totalCount);
+            Map<String, Object> riskMap = new HashMap<>();
+            riskMap.put("name", "主要风险");
+            riskMap.put("value", mainRiskType);
+            dataList.add(riskMap);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return map;
+        return dataList;
     }
 
     public List<CountVO> countryStatistic(String subjectId, String startTime, String endTime) {