AGC曲线偏差分析接口及修改矩阵故障分类bug

runeconomy-xk/src/main/java/com/gyee/runeconomy/feign/AdapterApi.java

@@ -1,6 +1,5 @@
 package com.gyee.runeconomy.feign;
 
-import com.gyee.common.model.PointData2;
 import com.gyee.runeconomy.model.PointData;
 import com.gyee.runeconomy.util.realtimesource.timeseries.DoubleStatData;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -53,7 +52,7 @@ public interface AdapterApi {
 //                                             @RequestParam("ts") long ts);
 
     @PostMapping("/history/section")
-    Map<String, PointData2> getHistorySection(URI baseUri, @RequestBody String tagNames,
+    Map<String, PointData> getHistorySection(URI baseUri, @RequestBody String tagNames,
                                               @RequestParam("ts") long ts);
 
     @GetMapping("/history/section2")

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/EarlyWarning/ApiClient.java

@@ -40,12 +40,12 @@ public class ApiClient {
     }
 
     public String getgzFromApi(String begin, String end, String alarmType,String stationid,String deviceid, String description,String modelId,
-                               String deviceType,String components, String alarmId, String isclose, String pageNum,String pageSize) {
+                               String deviceType,String components, String subcomponents,String alarmId, String isclose, String pageNum,String pageSize) {
         try {
             // 构建 URL
             String baseUrl = "http://10.220.1.5:6015/alarm/history/findAlarmlist";
             String charset = StandardCharsets.UTF_8.name();  // 获取字符集名称
-            String url = String.format("%s?begin=%s&end=%s&alarmType=%s&stationid=%s&deviceid=%s&description=%s&modelId=%s&deviceType=%s&components=%s&alarmId=%s&isclose=%s&pageNum=%s&pageSize=%s",
+            String url = String.format("%s?begin=%s&end=%s&alarmType=%s&stationid=%s&deviceid=%s&description=%s&modelId=%s&deviceType=%s&components=%s&subcomponents=%s&alarmId=%s&isclose=%s&pageNum=%s&pageSize=%s",
                     baseUrl,
                     URLEncoder.encode(begin, charset),
                     URLEncoder.encode(end, charset),
@@ -56,6 +56,7 @@ public class ApiClient {
                     URLEncoder.encode(modelId, charset),
                     URLEncoder.encode(deviceType, charset),
                     URLEncoder.encode(components, charset),
+                    URLEncoder.encode(subcomponents, charset),
                     URLEncoder.encode(alarmId, charset),
                     URLEncoder.encode(isclose, charset),
                     URLEncoder.encode(pageNum, charset),

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/IProEconAlarmTypeService.java

@@ -16,5 +16,5 @@ import java.util.List;
 public interface IProEconAlarmTypeService extends IService<ProEconAlarmType> {
 
     List<ProEconAlarmType> bylist (String wtid);
-    List<ProEconAlarmType> bylists ();
+    List<ProEconAlarmType> bylists (String model);
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/auto/impl/ProEconAlarmTypeServiceImpl.java

@@ -38,8 +38,10 @@ public class ProEconAlarmTypeServiceImpl extends ServiceImpl<ProEconAlarmTypeMap
     }
 
     @Override
-    public List<ProEconAlarmType> bylists() {
-        List<ProEconAlarmType> proEconAlarmTypes = baseMapper.selectList(null);
+    public List<ProEconAlarmType> bylists(String model) {
+        QueryWrapper<ProEconAlarmType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(ProEconAlarmType::getCategory,model);
+        List<ProEconAlarmType> proEconAlarmTypes = baseMapper.selectList(queryWrapper);
         return proEconAlarmTypes;
     }
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/AlarmService.java

@@ -25,7 +25,7 @@ public class AlarmService {
 
     ApiClient client = new ApiClient();
 
-    public  List<PoliceVo.AlarmDetails> Alarm(String type,String wtid) throws Exception {
+    public List<PoliceVo.AlarmDetails> Alarm(String type, String wtid) throws Exception {
 
         Map<String, Object> map = new HashMap<>();
         // 获取当天零点时间
@@ -67,6 +67,7 @@ public class AlarmService {
                 "",
                 modelId,
                 "windturbine",
+                "",
                 type,
                 "",
                 "",
@@ -88,7 +89,7 @@ public class AlarmService {
                     list.add(alarm1);
                 }
             }
-        } catch (IOException e){
+        } catch (IOException e) {
             e.printStackTrace();
         }
         return list;
@@ -125,73 +126,76 @@ public class AlarmService {
             station = equipments.get(0).getWindpowerstationId();
         }
 
-        String zsresult = client.getgzFromApi(
-                startTime,
-                endTime,
-                "windturbine",
-                station,
-                wtid,
-                "",
-                modelId,
-                "windturbine",
-                "",
-                "",
-                "",
-                "1",
-                "1000"
-        );
-        // 解析所有类别预警数据
-        try {
-            // 调用parseJson方法解析JSON
-            PoliceVo policeVo = parseJson(zsresult);
-
-            if (policeVo != null) {
-
-                // 输出解析后的对象，检查内容
-                List<PoliceVo.AlarmDetails> alarmList1 = policeVo.getData().getLs();
-                for (PoliceVo.AlarmDetails alarm1 : alarmList1) {
-                    zslist.add(alarm1);
+        for (ProEconAlarmType p : bylist) {
+
+            String zsresult = client.getgzFromApi(
+                    startTime,
+                    endTime,
+                    "windturbine",
+                    station,
+                    wtid,
+                    "",
+                    modelId,
+                    "windturbine",
+                    "",
+                    p.getNemCode(),
+                    "",
+                    "",
+                    "1",
+                    "1000"
+            );
+            // 解析所有类别预警数据
+            try {
+                // 调用parseJson方法解析JSON
+                PoliceVo policeVo = parseJson(zsresult);
+
+                if (policeVo != null) {
+
+                    // 输出解析后的对象，检查内容
+                    List<PoliceVo.AlarmDetails> alarmList1 = policeVo.getData().getLs();
+                    for (PoliceVo.AlarmDetails alarm1 : alarmList1) {
+                        zslist.add(alarm1);
+                    }
                 }
+            } catch (IOException e) {
+                e.printStackTrace();
             }
-        } catch (IOException e){
-            e.printStackTrace();
-        }
-
-        List<ProEconAlarmType> bylists = proEconAlarmTypeService.bylists();
 
+//            // 创建一个 name 到 nemcode 的映射
+//            Map<String, String> nameToNemcodeMap = bylists.stream()
+//                    .collect(Collectors.toMap(
+//                            ProEconAlarmType::getNemCode,
+//                            ProEconAlarmType::getName,
+//                            (existing, replacement) -> existing // 保留已存在的值（第一个）
+//                    ));
+//
+//            // 创建一个新的 Map 存储替换后的结果
+//            Map<String, Long> updatedComponentCountMap = new HashMap<>();
+//
+//
+//            // 遍历 componentCountMap
+//            componentCountMap.forEach((key, value) -> {
+//                // 检查是否能匹配到 nemcode
+//                if (nameToNemcodeMap.containsKey(key)) {
+//                    // 如果匹配，使用 nemcode 替换 key
+//                    updatedComponentCountMap.put(nameToNemcodeMap.get(key), value);
+//                } else {
+//                    // 如果未匹配，保留原来的 key
+//                    updatedComponentCountMap.put("QT", value);
+//                }
+//            });
+        }
         Map<String, Long> componentCountMap = zslist.stream()
                 .collect(Collectors.groupingBy(
-                        PoliceVo.AlarmDetails::getComponents, // 分组条件：按照 components 字段
+                        PoliceVo.AlarmDetails::getSubcomponents, // 分组条件：按照 components 字段
                         Collectors.counting()                // 统计数量
                 ));
+            Long zscount = (long) zslist.size();
+            componentCountMap.put("zs", zscount);
+            map.put("data", bylist);
+            map.put("count", componentCountMap);
 
-        // 创建一个 name 到 nemcode 的映射
-        Map<String, String> nameToNemcodeMap = bylists.stream()
-                .collect(Collectors.toMap(
-                        ProEconAlarmType::getName,
-                        ProEconAlarmType::getNemCode,
-                        (existing, replacement) -> existing // 保留已存在的值（第一个）
-                ));
 
-        // 创建一个新的 Map 存储替换后的结果
-        Map<String, Long> updatedComponentCountMap = new HashMap<>();
-
-
-        // 遍历 componentCountMap
-        componentCountMap.forEach((key, value) -> {
-            // 检查是否能匹配到 nemcode
-            if (nameToNemcodeMap.containsKey(key)) {
-                // 如果匹配，使用 nemcode 替换 key
-                updatedComponentCountMap.put(nameToNemcodeMap.get(key), value);
-            } else {
-                // 如果未匹配，保留原来的 key
-                updatedComponentCountMap.put(key, value);
-            }
-        });
-        Long zscount = (long) zslist.size();
-        updatedComponentCountMap.put("zs",zscount);
-        map.put("data",bylist);
-        map.put("count",updatedComponentCountMap);
         return map;
     }