Browse Source

fix:修改instant部分字段

pull/66/head
肖晋飞 2 weeks ago
parent
commit
ae09fef49c
  1. 2
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantRespVO.java
  2. 5
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java
  3. 2
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/instant/InstantTableDO.java
  4. 8
      yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java

2
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantRespVO.java

@ -35,7 +35,7 @@ public class InstantRespVO {
private Integer visible; private Integer visible;
@Schema(description = "状态", example = "1") @Schema(description = "状态", example = "1")
private Integer status; private Integer instantStatus;
@Schema(description = "创建时间", example = "2022-07-01 00:00:00") @Schema(description = "创建时间", example = "2022-07-01 00:00:00")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

5
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java

@ -22,9 +22,8 @@ public class InstantSaveReqVO extends InstantInfoVO {
private Long mpId; private Long mpId;
@Schema(description = "实例编号---和mpId一样,为了适配instant_info字符串", example = "1") @Schema(description = "实例编号---和mpId一样,为了适配instant_info字符串", example = "1")
@NotNull(message = "实例编号不能为空")
private Long id; private Long id;
@Schema(description = "模型编号", requiredMode = Schema.RequiredMode.REQUIRED,example = "1") @Schema(description = "模型编号", requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
@DiffLogField(name = "模型编号") @DiffLogField(name = "模型编号")
private Long modelId; private Long modelId;
@ -59,7 +58,7 @@ public class InstantSaveReqVO extends InstantInfoVO {
@Schema(description = "是否可见", requiredMode = Schema.RequiredMode.REQUIRED,example = "1") @Schema(description = "是否可见", requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
@DiffLogField(name = "是否可见") @DiffLogField(name = "是否可见")
private Long visible; private Integer visible;
@Schema(description = "状态可见", requiredMode = Schema.RequiredMode.REQUIRED,example = "1") @Schema(description = "状态可见", requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
@DiffLogField(name = "状态") @DiffLogField(name = "状态")

2
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/instant/InstantTableDO.java

@ -31,7 +31,7 @@ public class InstantTableDO extends BaseDO {
private Long hisSto; private Long hisSto;
private Long visible; private Integer visible;
private Long status; private Long status;

8
yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java

@ -101,7 +101,7 @@ public class InstantServiceImpl implements InstantService {
.setCalcGroup(createReqVO.getGroup()) .setCalcGroup(createReqVO.getGroup())
.setModelVersion(createReqVO.getVersion()) .setModelVersion(createReqVO.getVersion())
.setStatus(ObjUtil.defaultIfNull(createReqVO.getStatus(), 1L)) .setStatus(ObjUtil.defaultIfNull(createReqVO.getStatus(), 1L))
.setVisible(ObjUtil.defaultIfNull(createReqVO.getVisible(), 1L)); .setVisible(ObjUtil.defaultIfNull(createReqVO.getVisible(), 1));
instantTableMapper.insert(instant); instantTableMapper.insert(instant);
@ -523,6 +523,12 @@ public class InstantServiceImpl implements InstantService {
InstantDO instant = validateInstantExists(id); InstantDO instant = validateInstantExists(id);
// 2.1 删除实例 // 2.1 删除实例
instantTableMapper.deleteById(id); instantTableMapper.deleteById(id);
//这一步本来不应该有,但是为了适配以前的程序,把visible变成0
InstantTableDO updateObj = new InstantTableDO();
updateObj.setMpId(id);
updateObj.setVisible(0);
instantTableMapper.updateById(updateObj);
// 2.2删除warn_online_cfg表该实例相关数据 // 2.2删除warn_online_cfg表该实例相关数据
warnTableMapper.deleteByMpId(id); warnTableMapper.deleteByMpId(id);
// 3. 记录操作日志上下文 // 3. 记录操作日志上下文

Loading…
Cancel
Save