Merge pull request 'fix:ANN点号形式适配' (#78) from dev-xjf into master

Reviewed-on: http://120.26.116.243:3000/root/alert-backend/pulls/78

yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantInfoVO.java

@@ -16,6 +16,8 @@ public class InstantInfoVO  {
     private  List<String>       timePointInfo;
     private  List<String> biasPointInfo;
     private  List<String>       faultVariablePointInfo;
+    //表征点号类型的
+    private  List<Boolean>       type;
     private String model_state;
     private String model_status;
 }

yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantPointRespVO.java

@@ -27,6 +27,10 @@ public class InstantPointRespVO {
     @DiffLogField(name = "单位名称")
     private String unit;
 
+    @Schema(description = "点号类型",  requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
+//    @NotNull(message = "点号类型不能为空")
+    @DiffLogField(name = "点号类型")
+    private Boolean type;
 
     @Schema(description = "重构值点号",  requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
     @NotNull(message = "重构值点号不能为空")

yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java

@@ -339,30 +339,82 @@ public class InstantServiceImpl implements InstantService {
         }
 
     }
-
-
-    @Override
     public List<InstantPointRespVO> getInstantPoint(Long id) {
-        List<InstantPointRespVO> instantPointList = new ArrayList<>();
+        List<InstantPointRespVO> result = new ArrayList<>();
+
         InstantDO instant = instantMapper.selectById(id);
-        InstantInfoVO instantInfo = JsonUtils.parseObject(instant.getInstantInfo(), InstantInfoVO.class);
+        InstantInfoVO instantInfo =
+                JsonUtils.parseObject(instant.getInstantInfo(), InstantInfoVO.class);
+
+        List<Boolean> typeList = instantInfo.getType();
+
+        boolean noTypeControl = (typeList == null || typeList.isEmpty());
+        int trueIndex = 0;
+
         for (int i = 0; i < instantInfo.getInputInfo().size(); i++) {
-            InstantPointRespVO instantPointRespVO = new InstantPointRespVO();
-            instantPointRespVO.setId(Long.valueOf(i + 1));
-            instantPointRespVO.setInputInfo(instantInfo.getInputInfo().get(i));
-            instantPointRespVO.setInputName(instantInfo.getInputName().get(i));
-            instantPointRespVO.setUnit(instantInfo.getUnit().get(i));
-            instantPointRespVO.setOutPointInfo(instantInfo.getOutPointInfo().get(i));
-            instantPointRespVO.setBiasPointInfo(instantInfo.getBiasPointInfo().get(i));
-            instantPointRespVO.setFaultVariablePointInfo(instantInfo.getFaultVariablePointInfo().get(i));
-            instantPointList.add(instantPointRespVO);
-        }
+            InstantPointRespVO vo = new InstantPointRespVO();
+            vo.setId((long) (i + 1));
+            vo.setInputInfo(instantInfo.getInputInfo().get(i));
+            vo.setInputName(instantInfo.getInputName().get(i));
+            vo.setUnit(instantInfo.getUnit().get(i));
+
+            boolean isTypeTrue;
+
+            if (noTypeControl) {
+                // ⭐ 没有 type 参数：全部当 true
+                isTypeTrue = true;
+                vo.setType(null);
+            } else {
+                Boolean type = typeList.get(i);
+                isTypeTrue = Boolean.TRUE.equals(type);
+                vo.setType(type);
+            }
 
-        return instantPointList;
+            if (isTypeTrue) {
+                vo.setOutPointInfo(instantInfo.getOutPointInfo().get(trueIndex));
+                vo.setBiasPointInfo(instantInfo.getBiasPointInfo().get(trueIndex));
+                vo.setFaultVariablePointInfo(
+                        instantInfo.getFaultVariablePointInfo().get(trueIndex)
+                );
+                trueIndex++;
+            }
 
+            result.add(vo);
+        }
 
+        return result;
     }
 
+//旧版本
+//    @Override
+//    public List<InstantPointRespVO> getInstantPoint(Long id) {
+//        List<InstantPointRespVO> instantPointList = new ArrayList<>();
+//        InstantDO instant = instantMapper.selectById(id);
+//        InstantInfoVO instantInfo = JsonUtils.parseObject(instant.getInstantInfo(), InstantInfoVO.class);
+//        for (int i = 0; i < instantInfo.getInputInfo().size(); i++) {
+//            InstantPointRespVO instantPointRespVO = new InstantPointRespVO();
+//            instantPointRespVO.setId(Long.valueOf(i + 1));
+//            instantPointRespVO.setInputInfo(instantInfo.getInputInfo().get(i));
+//            instantPointRespVO.setInputName(instantInfo.getInputName().get(i));
+//            instantPointRespVO.setUnit(instantInfo.getUnit().get(i));
+//
+//            //表征点号类型的
+//            instantPointRespVO.setType(instantInfo.getType().get(i));
+//            if(instantInfo.getType().get(i)){
+//                //循环type
+//                instantPointRespVO.setOutPointInfo(instantInfo.getOutPointInfo().get(i));
+//                instantPointRespVO.setBiasPointInfo(instantInfo.getBiasPointInfo().get(i));
+//                instantPointRespVO.setFaultVariablePointInfo(instantInfo.getFaultVariablePointInfo().get(i));
+//            }
+//
+//            instantPointList.add(instantPointRespVO);
+//        }
+//
+//        return instantPointList;
+//
+//
+//    }
+
 
     @Override
     public List<InstantChartRespVO> getInstantChart(InstantChartReqVO instantChartReqVO) {