Browse Source

fix:增加模型规则测点字段

pull/50/head
xjf 1 month ago
parent
commit
ceca52fd37
  1. 3
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java
  2. 4
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnSaveReqVO.java
  3. 3
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java

3
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 = "版本编号") @DiffLogField(name = "版本编号")
private String modelVersion; private String modelVersion;
} }

4
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 = "参与报警") @DiffLogField(name = "参与报警")
private Long warnStatus; private Long warnStatus;
@Schema(description = "规则点号还是模型点号", example = "1")
// @NotNull(message = "单位不能为空")
private String pointOrModel;
private Long timeDurationThreshold; private Long timeDurationThreshold;
private Long alarmLevel; private Long alarmLevel;

3
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.setMpId(insertId);
createReqVO.setInstantStatus(instant.getInstantStatus()); createReqVO.setInstantStatus(instant.getInstantStatus());
createReqVO.setVisible(instant.getVisible()); createReqVO.setVisible(instant.getVisible());
createReqVO.setInputInfo(inputInfoList); createReqVO.setInputInfo(inputInfoList);
@ -259,6 +260,8 @@ try{
// warn.setId(insertId); // warn.setId(insertId);
//设置实例id //设置实例id
warnSaveReqVO.setMpId(instant.getMpId()); warnSaveReqVO.setMpId(instant.getMpId());
warnSaveReqVO.setPointOrModel("model");
warnSaveReqVO.setPointId(createReqVO.getInputInfo().get(reportObj.getAssess().get(j).getIndex())); warnSaveReqVO.setPointId(createReqVO.getInputInfo().get(reportObj.getAssess().get(j).getIndex()));
warnSaveReqVO.setPointName(createReqVO.getInputName().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.setGzpName(createReqVO.getInputName().get(reportObj.getAssess().get(j).getIndex()));

Loading…
Cancel
Save