diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/pointInfo.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/pointInfo.java
index d150db6..5429e73 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/pointInfo.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/pointInfo.java
@@ -6,15 +6,15 @@ import lombok.Data;
 
 @Data
 public class pointInfo {
-    @JsonProperty(value="pointId")
+    @JsonProperty(value="PointId")
     @Schema(description = "点号", example = "id")
     private String pointId;
 
-    @JsonProperty(value="description")
+    @JsonProperty(value="Description")
     @Schema(description = "描述", example = "yudao")
     private String description;
 
-    @JsonProperty(value="unit")
+    @JsonProperty(value="Unit")
     @Schema(description = "单位", example = "yudao")
     private String unit;
 
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelRespVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelRespVO.java
index 97060ef..5ae42fe 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelRespVO.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelRespVO.java
@@ -14,7 +14,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ExcelIgnoreUnannotated
 public class ModelRespVO {
     @Schema(description = "模型id", example = "id")
-    private String id;
+    private String modelId;
 
 
     @Schema(description = "模型名称", example = "yudao")
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelVersionRespVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelVersionRespVO.java
index b1756c5..87d8880 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelVersionRespVO.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/model/vo/ModelVersionRespVO.java
@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 @ExcelIgnoreUnannotated
 public class ModelVersionRespVO {
     @Schema(description = "版本id", example = "id")
-    private Long id;
+    private Long versionId;
 
     @Schema(description = "所属模型id", example = "id")
 
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnRespVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnRespVO.java
index 92171c1..f6339e1 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnRespVO.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnRespVO.java
@@ -14,7 +14,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ExcelIgnoreUnannotated
 public class WarnRespVO {
     @Schema(description = "预警id", example = "id")
-    private Long id;
+    private Long warnId;
 
     @Schema(description = "实例id", example = "id")
 
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnSaveReqVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnSaveReqVO.java
index 7c514f0..790f186 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnSaveReqVO.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/warn/vo/WarnSaveReqVO.java
@@ -15,7 +15,7 @@ import java.util.List;
 public class WarnSaveReqVO {
     @Schema(description = "预警编号", example = "1")
     @NotNull(message = "预警编号不能为空")
-    private Long id;
+    private Long warnId;
 
     @Schema(description = "实例编号", example = "1")
 //    @NotNull(message = "实例编号不能为空")
@@ -60,7 +60,6 @@ public class WarnSaveReqVO {
     private Long gzpOnOff=1L;
 
     private Long warnKey=1L;
-    private Long warnId=1L;
 
     //推送诊断
     private Long copyToDiagOnOff;
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java
index 7738d10..3d4da70 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelDO.java
@@ -13,7 +13,8 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ModelDO extends BaseDO {
-    private String id;
+
+    private String modelId;
 
      /**
      * 专业名称
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelVersionDO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelVersionDO.java
index d7c54d9..2bb89aa 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelVersionDO.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/model/ModelVersionDO.java
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.alert.dal.dataobject.model;
 import cn.hutool.core.date.DateTime;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -15,7 +16,8 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ModelVersionDO extends BaseDO {
-    private String id;
+    @TableId(value="version_id")
+    private String versionId;
 
     private String modelId;
 
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/report/Report.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/report/Report.java
index c5c2693..b93bca1 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/report/Report.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/report/Report.java
@@ -9,7 +9,7 @@ public class Report {
 
     //相较于windows版本字段有变化
 
-        public List<point> assessRows;
+        public List<point> assess;
 
         @Data
         public static class point
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnDO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnDO.java
index 19dbaa1..96eb219 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnDO.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnDO.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.alert.dal.dataobject.warn;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,7 +15,8 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class WarnDO extends BaseDO {
 
-    private Long id;
+    @TableId(value="warn_id")
+    private Long warnId;
 
     private Long mpId;
 
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnTableDO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnTableDO.java
index 8e5a42a..60ce4a6 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnTableDO.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/warn/WarnTableDO.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.alert.dal.dataobject.warn;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,7 +15,8 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class WarnTableDO extends BaseDO {
 
-    private Long id;
+    @TableId(value="warn_id")
+    private Long warnId;
 
     private Long mpId;
 
@@ -54,7 +56,6 @@ public class WarnTableDO extends BaseDO {
 
 
     private Long warnKey;
-    private Long warnId;
 
     private Double uplimit;
 
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java
index f65d686..e6738b7 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelMapper.java
@@ -15,7 +15,7 @@ public interface ModelMapper extends BaseMapperX<ModelDO> {
                 .likeIfPresent(ModelDO::getModelName, reqVO.getModelName())
                 .eqIfPresent(ModelDO::getStatus, reqVO.getStatus())
 
-                .orderByAsc(ModelDO::getId));
+                .orderByAsc(ModelDO::getModelId));
     }
 
 
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/VersionMapper.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/VersionMapper.java
index 798eb57..2ba9f87 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/VersionMapper.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/VersionMapper.java
@@ -20,7 +20,7 @@ public interface VersionMapper extends BaseMapperX<ModelVersionDO> {
                 .eqIfPresent(ModelVersionDO::getModelId, reqVO.getModelId())
                 .likeIfPresent(ModelVersionDO::getModelName, reqVO.getModelName())
                 .orderByAsc(ModelVersionDO::getUpdateTime)
-                .orderByAsc(ModelVersionDO::getId));
+                .orderByAsc(ModelVersionDO::getVersionId));
     }
     default ModelVersionDO selectByModelId(ModelVersionPageReqVO reqVO) {
 
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/warn/WarnMapper.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/warn/WarnMapper.java
index 943aa7c..f5a97b7 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/warn/WarnMapper.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/warn/WarnMapper.java
@@ -14,7 +14,7 @@ public interface WarnMapper extends BaseMapperX<WarnDO> {
     default PageResult<WarnDO> selectPage(WarnPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<WarnDO>()
                 .likeIfPresent(WarnDO::getMpId, reqVO.getMpId().toString())
-                .orderByAsc(WarnDO::getId));
+                .orderByAsc(WarnDO::getWarnId));
     }
 
 }
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java
index 85b111f..fcb4bf0 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/instant/InstantServiceImpl.java
@@ -251,7 +251,7 @@ try{
             Report reportObj = JsonUtils.parseObject(report.getReport(), Report.class);
             // 此处可根据业务需求处理解析后的Report对象（如后续预警逻辑）
             // 循环getInputInfo构建并插入预警记录
-            for (int j = 0; j < reportObj.getAssessRows().size(); j++) {
+            for (int j = 0; j < reportObj.getAssess().size(); j++) {
 
 
                 WarnSaveReqVO warnSaveReqVO = new WarnSaveReqVO();
@@ -259,14 +259,14 @@ try{
                 // warn.setId(insertId);
                 //设置实例id
                 warnSaveReqVO.setMpId(instant.getMpId());
-                warnSaveReqVO.setPointId(createReqVO.getInputInfo().get(reportObj.getAssessRows().get(j).getIndex()));
-                warnSaveReqVO.setPointName(createReqVO.getInputName().get(reportObj.getAssessRows().get(j).getIndex()));
-                warnSaveReqVO.setGzpName(createReqVO.getInputName().get(reportObj.getAssessRows().get(j).getIndex()));
-                warnSaveReqVO.setEquation("[" + createReqVO.getBiasPointInfo().get(reportObj.getAssessRows().get(j).getIndex()) + "]>UPLIMIT or [" + createReqVO.getBiasPointInfo().get(reportObj.getAssessRows().get(j).getIndex()) + "]<LOWLIMIT");
-                warnSaveReqVO.setUplimit(reportObj.getAssessRows().get(j).getAmplitude());
-                warnSaveReqVO.setLowlimit(-reportObj.getAssessRows().get(j).getAmplitude());
-                warnSaveReqVO.setOutputPoint(createReqVO.getOutPointInfo().get(reportObj.getAssessRows().get(j).getIndex()));
-                warnSaveReqVO.setUnit(createReqVO.getUnit().get(reportObj.getAssessRows().get(j).getIndex()));
+                warnSaveReqVO.setPointId(createReqVO.getInputInfo().get(reportObj.getAssess().get(j).getIndex()));
+                warnSaveReqVO.setPointName(createReqVO.getInputName().get(reportObj.getAssess().get(j).getIndex()));
+                warnSaveReqVO.setGzpName(createReqVO.getInputName().get(reportObj.getAssess().get(j).getIndex()));
+                warnSaveReqVO.setEquation("[" + createReqVO.getBiasPointInfo().get(reportObj.getAssess().get(j).getIndex()) + "]>UPLIMIT or [" + createReqVO.getBiasPointInfo().get(reportObj.getAssess().get(j).getIndex()) + "]<LOWLIMIT");
+                warnSaveReqVO.setUplimit(reportObj.getAssess().get(j).getAmplitude());
+                warnSaveReqVO.setLowlimit(-reportObj.getAssess().get(j).getAmplitude());
+                warnSaveReqVO.setOutputPoint(createReqVO.getOutPointInfo().get(reportObj.getAssess().get(j).getIndex()));
+                warnSaveReqVO.setUnit(createReqVO.getUnit().get(reportObj.getAssess().get(j).getIndex()));
                 // 设置其他必要字段（根据实际业务补充）
                 warnSaveReqVO.setWarnStatus(1L); // 示例：设置初始状态
 
diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java
index 0ec9f7a..e818297 100644
--- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java
+++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/warn/WarnServiceImpl.java
@@ -68,7 +68,7 @@ public class WarnServiceImpl implements WarnService {
 
         // 3. 记录操作日志上下文
         LogRecordContext.putVariable("warn", warn);
-        return warn.getId();
+        return warn.getWarnId();
     }
 
 
@@ -79,13 +79,13 @@ public class WarnServiceImpl implements WarnService {
         return warnMapper.selectById(id);
     }
     @Override
-    @CacheEvict(value = RedisKeyConstants.WARN, key = "#updateReqVO.id")
+    @CacheEvict(value = RedisKeyConstants.WARN, key = "#updateReqVO.warnId")
     @LogRecord(type = SYSTEM_WARN_TYPE, subType = SYSTEM_WARN_UPDATE_SUB_TYPE, bizNo = "{{#updateReqVO.id}}",
             success = SYSTEM_WARN_UPDATE_SUCCESS)
     public void updateWarn(WarnSaveReqVO updateReqVO) {
         //为简单--省去检验步骤，之后根据情况增加
         // 1.1 校验是否可以更新
-        WarnDO warn = validateWarnForUpdate(updateReqVO.getId());
+        WarnDO warn = validateWarnForUpdate(updateReqVO.getWarnId());
         // 1.2 校验角色的唯一字段是否重复
 //        validateRoleDuplicate(updateReqVO.getName(), updateReqVO.getCode(), updateReqVO.getId());