Merge pull request 'feat(alert): 更新模型信息结构并调整版本控制逻辑' (#43) from cjl-dev into master

Reviewed-on: http://120.26.116.243:3000/root/alert-backend/pulls/43

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<Point> pointInfo;
 
     @JsonProperty("rate")
-    private BigDecimal rate;
+    private String rate;
 
     @JsonProperty("outPointInfo")
     private List<Point> 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++;
+    }
+
 
 }

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

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

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