From 5a14e00f93b38e09609adf176c8966ba64b34d4a Mon Sep 17 00:00:00 2001 From: xjf <378266566@qq.com> Date: Tue, 30 Dec 2025 20:45:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:warn=5Fcfg=E8=A1=A8=E5=BD=95=E5=85=A5point?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/alert/dal/dataobject/warn/WarnTableDO.java | 1 + .../module/alert/service/instant/InstantServiceImpl.java | 4 ++-- .../yudao/module/alert/service/warn/WarnServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnTableDO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnTableDO.java index 60ce4a6..bab0273 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnTableDO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnTableDO.java @@ -32,6 +32,7 @@ public class WarnTableDO extends BaseDO { private String unit; private String equation; + private String pointOrModel; //报警类型 private String modelOrRule; 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 e783d75..09df181 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 @@ -277,7 +277,7 @@ public class InstantServiceImpl implements InstantService { // warn.setId(insertId); //设置实例id warnSaveReqVO.setMpId(instant.getMpId()); - warnSaveReqVO.setPointOrModel("point"); + warnSaveReqVO.setPointOrModel("POINT"); warnSaveReqVO.setPointId(createReqVO.getInputInfo().get(i)); warnSaveReqVO.setPointName(createReqVO.getInputName().get(i)); warnSaveReqVO.setGzpName(createReqVO.getInputName().get(i)); @@ -311,7 +311,7 @@ public class InstantServiceImpl implements InstantService { // warn.setId(insertId); //设置实例id warnSaveReqVO.setMpId(instant.getMpId()); - warnSaveReqVO.setPointOrModel("point"); + warnSaveReqVO.setPointOrModel("POINT"); warnSaveReqVO.setPointId(createReqVO.getInputInfo().get(reportObj.getAssess().get(j).getIndex())); warnSaveReqVO.setPointName(createReqVO.getInputName().get(reportObj.getAssess().get(j).getIndex())); diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java index d8937b4..1824759 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java @@ -184,7 +184,7 @@ public class WarnServiceImpl implements WarnService { @Override @Transactional(rollbackFor = Exception.class) - @LogRecord(type = SYSTEM_WARN_TYPE, subType = SYSTEM_WARN_CREATE_SUB_TYPE, bizNo = "{{#warn.id}}", success = SYSTEM_WARN_CREATE_SUCCESS) + @LogRecord(type = SYSTEM_WARN_TYPE, subType = SYSTEM_WARN_CREATE_SUB_TYPE, bizNo = "{{#warn.warnId}}", success = SYSTEM_WARN_CREATE_SUCCESS) public Long createWarn(WarnSaveReqVO createReqVO) { // 1.1 校验账户配合 // tenantService.handleTenantInfo(tenant -> {