From ba95c0f89ef99b8c319ecf46538277fa3765b685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=82=96=E6=99=8B=E9=A3=9E?= <378266566@qq.com> Date: Mon, 1 Dec 2025 11:21:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=A2=84=E8=AD=A6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/instant/vo/pointInfo.java | 16 ++++++++-------- .../controller/admin/warn/vo/WarnRespVO.java | 2 ++ .../admin/warn/vo/WarnSaveReqVO.java | 12 ++++++------ .../controller/admin/warn/warnController.java | 4 ++-- .../alert/dal/dataobject/report/Report.java | 6 ++++-- .../alert/dal/dataobject/warn/WarnDO.java | 3 ++- .../service/instant/InstantServiceImpl.java | 18 +++++++++--------- 7 files changed, 33 insertions(+), 28 deletions(-) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/pointInfo.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/pointInfo.java index a4b39d4..d150db6 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/pointInfo.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/pointInfo.java @@ -6,19 +6,19 @@ import lombok.Data; @Data public class pointInfo { - @JsonProperty(value="PointId") + @JsonProperty(value="pointId") @Schema(description = "点号", example = "id") - private String PointId; + private String pointId; - @JsonProperty(value="Description") + @JsonProperty(value="description") @Schema(description = "描述", example = "yudao") - private String Description; + private String description; - @JsonProperty(value="Unit") + @JsonProperty(value="unit") @Schema(description = "单位", example = "yudao") - private String Unit; + private String unit; - @JsonProperty(value="Type") + @JsonProperty(value="type") @Schema(description = "类型(输入-false;输出-true;ANN-空)", example = "yudao") - private Object Type; + private Object type; } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnRespVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnRespVO.java index 338b900..92171c1 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnRespVO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnRespVO.java @@ -30,6 +30,8 @@ public class WarnRespVO { private String mpName; + private String equation; + private String outputPoint; private String unit; diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnSaveReqVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnSaveReqVO.java index f3627c4..7c514f0 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnSaveReqVO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnSaveReqVO.java @@ -18,15 +18,15 @@ public class WarnSaveReqVO { private Long id; @Schema(description = "实例编号", example = "1") - @NotNull(message = "实例编号不能为空") +// @NotNull(message = "实例编号不能为空") private Long mpId; @Schema(description = "点号", example = "1") - @NotNull(message = "点号不能为空") +// @NotNull(message = "点号不能为空") private String pointId; @Schema(description = "点号", example = "1") - @NotNull(message = "点号不能为空") +// @NotNull(message = "点号不能为空") private String pointName; @Schema(description = "光子牌", example = "1") @@ -34,15 +34,15 @@ public class WarnSaveReqVO { private String gzpName; @Schema(description = "报警表达式", example = "1") - @NotNull(message = "报警表达式不能为空") +// @NotNull(message = "报警表达式不能为空") private String equation; @Schema(description = "输出点号", example = "1") - @NotNull(message = "输出点号不能为空") +// @NotNull(message = "输出点号不能为空") private String outputPoint; @Schema(description = "单位", example = "1") - @NotNull(message = "单位不能为空") +// @NotNull(message = "单位不能为空") private String unit; @Schema(description = "参与报警", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java index a4e5a3d..d42e3ca 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java @@ -36,7 +36,7 @@ public class warnController { @GetMapping("/page") @Operation(summary = "获得预警分页列表") @PreAuthorize("@ss.hasPermission('run:warn:query')") - public CommonResult> getInstantPage(@Valid WarnPageReqVO pageReqVO) { + public CommonResult> getWarnPage(@Valid WarnPageReqVO pageReqVO) { PageResult pageResult = warnService.getWarnPage(pageReqVO); return success(BeanUtils.toBean(pageResult, WarnRespVO.class)); } @@ -52,7 +52,7 @@ public class warnController { @PutMapping("/update") @Operation(summary = "修改预警") @PreAuthorize("@ss.hasPermission('run:warn:update')") - public CommonResult updateInstant(@Valid @RequestBody WarnSaveReqVO updateReqVO) { + public CommonResult updateWarn(@Valid @RequestBody WarnSaveReqVO updateReqVO) { warnService.updateWarn(updateReqVO); return success(true); } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/report/Report.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/report/Report.java index 81ca84b..c5c2693 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/report/Report.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/report/Report.java @@ -7,12 +7,14 @@ import java.util.List; @Data public class Report { - public List assess; + //相较于windows版本字段有变化 + + public List assessRows; @Data public static class point { - public String PointId; + public String pointId; public double amplitude; public int index; } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnDO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnDO.java index 63e369b..19dbaa1 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnDO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnDO.java @@ -28,7 +28,8 @@ public class WarnDO extends BaseDO { private String formula; private String unit; - + private String equation; + private String outputPoint; //报警类型-id private Long alarmLevel; //报警类型 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 b0f7c11..0acce82 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 @@ -244,7 +244,7 @@ public class InstantServiceImpl implements InstantService { Report reportObj = JsonUtils.parseObject(report.getReport(), Report.class); // 此处可根据业务需求处理解析后的Report对象（如后续预警逻辑） // 循环getInputInfo构建并插入预警记录 - for (int j = 0; j < reportObj.getAssess().size(); j++) { + for (int j = 0; j < reportObj.getAssessRows().size(); j++) { WarnSaveReqVO warnSaveReqVO = new WarnSaveReqVO(); @@ -252,14 +252,14 @@ public class InstantServiceImpl implements InstantService { // warn.setId(insertId); //设置实例id warnSaveReqVO.setMpId(instant.getId()); - warnSaveReqVO.setPointId(createReqVO.getInputInfo().get(reportObj.getAssess().get(j).getIndex())); - warnSaveReqVO.setPointName(createReqVO.getInputName().get(reportObj.getAssess().get(j).getIndex())); - warnSaveReqVO.setGzpName(createReqVO.getInputName().get(reportObj.getAssess().get(j).getIndex())); - warnSaveReqVO.setEquation("[" + createReqVO.getBiasPointInfo().get(reportObj.getAssess().get(j).getIndex()) + "]>UPLIMIT or [" + createReqVO.getBiasPointInfo().get(reportObj.getAssess().get(j).getIndex()) + "]UPLIMIT or [" + createReqVO.getBiasPointInfo().get(reportObj.getAssessRows().get(j).getIndex()) + "]