From 1e772c38dd7d42b48bf64c97c94dc38c9e3a6ef0 Mon Sep 17 00:00:00 2001 From: xiaojinfei <378266566@qq.com> Date: Fri, 9 Jan 2026 17:37:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:ANN=E7=82=B9=E5=8F=B7=E5=BD=A2=E5=BC=8F?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/instant/vo/InstantInfoVO.java | 2 + .../admin/instant/vo/InstantPointRespVO.java | 4 + .../service/instant/InstantServiceImpl.java | 84 +++++++++++++++---- 3 files changed, 74 insertions(+), 16 deletions(-) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantInfoVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantInfoVO.java index a000ea3..eeb2040 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantInfoVO.java +++ b/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 timePointInfo; private List biasPointInfo; private List faultVariablePointInfo; + //表征点号类型的 + private List type; private String model_state; private String model_status; } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantPointRespVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantPointRespVO.java index 11d6d38..f27b397 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantPointRespVO.java +++ b/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 = "重构值点号不能为空") diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java index 337a18b..33b9518 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java +++ b/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 getInstantPoint(Long id) { - List instantPointList = new ArrayList<>(); + List 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 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 getInstantPoint(Long id) { +// List 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 getInstantChart(InstantChartReqVO instantChartReqVO) { -- 2.30.2