From ceca52fd3721edb762b212bc4b975ee13dd2c276 Mon Sep 17 00:00:00 2001
From: xjf <378266566@qq.com>
Date: Fri, 12 Dec 2025 11:07:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=B5=8B=E7=82=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alert/controller/admin/instant/vo/InstantSaveReqVO.java   | 3 +++
 .../module/alert/controller/admin/warn/vo/WarnSaveReqVO.java  | 4 ++++
 .../module/alert/service/instant/InstantServiceImpl.java      | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java
index fbe8ccb..c61c480 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java
@@ -73,4 +73,7 @@ public class InstantSaveReqVO extends InstantInfoVO {
     @DiffLogField(name = "版本编号")
     private String modelVersion;
 
+
+
+
 }
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 790f186..c275594 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
@@ -49,6 +49,10 @@ public class WarnSaveReqVO {
     @DiffLogField(name = "参与报警")
     private Long warnStatus;
 
+    @Schema(description = "规则点号还是模型点号", example = "1")
+//    @NotNull(message = "单位不能为空")
+    private String pointOrModel;
+
     private Long timeDurationThreshold;
 
     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 fcb4bf0..bc12f90 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
@@ -170,6 +170,7 @@ try{
 
 
            createReqVO.setMpId(insertId);
+
            createReqVO.setInstantStatus(instant.getInstantStatus());
            createReqVO.setVisible(instant.getVisible());
            createReqVO.setInputInfo(inputInfoList);
@@ -259,6 +260,8 @@ try{
                 // warn.setId(insertId);
                 //设置实例id
                 warnSaveReqVO.setMpId(instant.getMpId());
+                warnSaveReqVO.setPointOrModel("model");
+
                 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()));