Compare commits

...

2 Commits

Author SHA1 Message Date
xiaojinfei 29e1140830 fix:pointormodel增加默认值,简化代码 2 days ago
xiaojinfei 3885a4ec3a fix:增加新增预警接口 2 days ago
  1. 4
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnSaveReqVO.java
  2. 10
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java
  3. 4
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java

4
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnSaveReqVO.java

@ -14,7 +14,7 @@ import java.util.List;
@Data
public class WarnSaveReqVO {
@Schema(description = "预警编号", example = "1")
@NotNull(message = "预警编号不能为空")
// @NotNull(message = "预警编号不能为空")
private Long warnId;
@Schema(description = "实例编号", example = "1")
@ -51,7 +51,7 @@ public class WarnSaveReqVO {
@Schema(description = "规则点号还是模型点号", example = "1")
// @NotNull(message = "单位不能为空")
private String pointOrModel;
private String pointOrModel="POINT";
private Long timeDurationThreshold;

10
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/warnController.java

@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.alert.dal.dataobject.warn.AlarmLevelDO;
import cn.iocoder.yudao.module.alert.dal.dataobject.warn.WarnDO;
import cn.iocoder.yudao.module.alert.service.instant.InstantService;
import cn.iocoder.yudao.module.alert.service.warn.WarnService;
import cn.iocoder.yudao.module.system.controller.admin.notice.vo.NoticeSaveReqVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
@ -60,6 +61,15 @@ public class warnController {
return success(BeanUtils.toBean(warn, WarnRespVO.class));
}
@PostMapping("/create")
@Operation(summary = "创建预警")
// @PreAuthorize("@ss.hasPermission('system:notice:create')")
public CommonResult<Long> createWarn(@Valid @RequestBody WarnSaveReqVO createReqVO) {
Long warnId = warnService.createWarn(createReqVO);
return success(warnId);
}
@PutMapping("/update")
@Operation(summary = "修改预警")
// @PreAuthorize("@ss.hasPermission('run:warn:update')")

4
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()));

Loading…
Cancel
Save