From 8e612488ba431b65a0ac903feb3ebaa12476853e Mon Sep 17 00:00:00 2001 From: CJL6015 <1253368419@qq.com> Date: Sun, 7 Dec 2025 19:09:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(alert):=20=E6=9B=B4=E6=96=B0=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E4=BF=A1=E6=81=AF=E7=BB=93=E6=9E=84=E5=B9=B6=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=89=88=E6=9C=AC=E6=8E=A7=E5=88=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 ModelInfo 中的 id 类型从 Integer 改为 String - 修改 rate 字段类型从 BigDecimal 为 String - 为 version 字段设置默认值 "v-test" 并新增 version1 字段 - 设置 versionNumber 默认值为 0 并增加自增方法 incrementVersionNumber - 在 ModelInfoVO 中移除 systemId 字段并在 ModelInitVO 中添加 unit 字段 - 调整 ModelServiceImpl 中 id 的转换逻辑及模型保存时的数据处理 - 模型完成时自动更新版本号和版本字符串，并同步修改时间等元数据 --- .../admin/model/model/ModelInfo.java | 19 +++++++++++++------ .../admin/model/vo/ModelInfoVO.java | 19 +++++-------------- .../admin/model/vo/ModelInitVO.java | 4 +++- .../service/model/impl/ModelServiceImpl.java | 8 ++++++-- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/model/ModelInfo.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/model/ModelInfo.java index 2ff67c2..d5a923b 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/model/ModelInfo.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/model/ModelInfo.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.*; -import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -23,7 +22,7 @@ import java.util.List; @AllArgsConstructor public class ModelInfo { @JsonProperty("id") - private Integer id; + private String id; @JsonProperty("name") private String name; @@ -64,7 +63,7 @@ public class ModelInfo { private List pointInfo; @JsonProperty("rate") - private BigDecimal rate; + private String rate; @JsonProperty("outPointInfo") private List outPointInfo; @@ -79,7 +78,10 @@ public class ModelInfo { private String btmState; @JsonProperty("version") - private String version; + private String version = "v-test"; + + @JsonProperty("version1") + private String version1; @JsonProperty("online") private Integer online; @@ -88,8 +90,7 @@ public class ModelInfo { private String unit; @JsonProperty("versionNumber") - - private Integer versionNumber; + private Integer versionNumber = 0; @JsonProperty("alarmmodelset") @@ -105,6 +106,8 @@ public class ModelInfo { @JsonProperty("precision") private String precision; + private Integer systemId; + @Data @AllArgsConstructor @@ -121,5 +124,9 @@ public class ModelInfo { } } + public void incrementVersionNumber() { + this.versionNumber++; + } + } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelInfoVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelInfoVO.java index 90e3a4e..8a2ac8e 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelInfoVO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelInfoVO.java @@ -1,13 +1,10 @@ package cn.iocoder.yudao.module.alert.controller.admin.model.vo; import cn.iocoder.yudao.module.alert.controller.admin.model.model.ModelInfo; -import cn.iocoder.yudao.module.alert.controller.admin.model.model.Point; -import cn.iocoder.yudao.module.alert.controller.admin.model.model.TrainTime; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.*; - -import java.util.Date; -import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; /** * @author chenjiale @@ -19,11 +16,5 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class ModelInfoVO extends ModelInfo { - - - - private Integer systemId; - - - + private String vo; } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelInitVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelInitVO.java index 3d9c100..a068366 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelInitVO.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelInitVO.java @@ -36,6 +36,8 @@ public class ModelInitVO { */ private String condition; + private String unit; + /** * 名称 */ @@ -54,5 +56,5 @@ public class ModelInitVO { private Integer sampling; - private BigDecimal rate; + private String rate; } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/impl/ModelServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/impl/ModelServiceImpl.java index de6a0ad..08dfad7 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/impl/ModelServiceImpl.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/impl/ModelServiceImpl.java @@ -138,7 +138,9 @@ public class ModelServiceImpl implements ModelService { .build(); modelCfgService.save(modelCfg); Integer modelId = modelCfg.getId(); - info.setId(modelId); + info.setId(String.valueOf(modelId)); + info.setSystemId(model.getSystemId()); + info.setUnit(model.getUnit()); info.setAlgorithm(model.getAlgorithm()); info.setFounder(modelCfg.getCreator()); info.setCreateTime(modelCfg.getCreateTime()); @@ -162,7 +164,7 @@ public class ModelServiceImpl implements ModelService { modelInfo.setModifier(SecurityFrameworkUtils.getLoginUserNickname()); modelInfo.setModifiedTime(new Date()); ModelCfg modelCfg = ModelCfg.builder() - .id(modelInfo.getId()) + .id(Integer.parseInt(modelInfo.getId())) .modelInfo(JsonUtils.toJsonString(modelInfo)) .updateTime(new Date()) .build(); @@ -255,8 +257,10 @@ public class ModelServiceImpl implements ModelService { modelInfo.setBtmState(ModelStatus.FINISH.desc); modelInfo.setVersion("v-" + DateUtil.now()); + modelInfo.setVersion1(modelInfo.getVersion()); modelInfo.setModifier(SecurityFrameworkUtils.getLoginUserNickname()); modelInfo.setModifiedTime(new Date()); + modelInfo.incrementVersionNumber(); modelCfg.setModelInfo(JsonUtils.toJsonString(modelInfo)); modelCfg.setUpdateTime(new Date()); modelCfg.setStatus(ModelStatus.FINISH.code);