Browse Source

fix:warn_cfg表录入point字段丢失

pull/68/head
xjf 2 weeks ago
parent
commit
5a14e00f93
  1. 1
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnTableDO.java
  2. 4
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java
  3. 2
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java

1
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;

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

2
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 -> {

Loading…
Cancel
Save