Merge pull request 'dev-xjf' (#38) from dev-xjf into master

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

yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/calcgroup/CalcGroupController.java

@@ -34,7 +34,7 @@ public class CalcGroupController {
     public CommonResult<List<CalcGroupRespVO>> getCalcGroupList(CalcGroupPageReqVO ReqVO) {
         ReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
         List<CalcGroupDO> list = calcGroupService.getCalcGroupPage(ReqVO).getList();
-        list.sort(Comparator.comparing(CalcGroupDO::getId));
+        list.sort(Comparator.comparing(CalcGroupDO::getGroupId));
         return success(BeanUtils.toBean(list, CalcGroupRespVO.class));
     }
 }

yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/calcgroup/vo/CalcGroupRespVO.java

@@ -9,7 +9,7 @@ import lombok.Data;
 @ExcelIgnoreUnannotated
 public class CalcGroupRespVO {
     @Schema(description = "版本id", example = "id")
-    private Long id;
+    private Long groupId;
 
     @Schema(description = "机组id", example = "id")
 

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

@@ -8,7 +8,7 @@ import lombok.Data;
 @Schema(description = "运行中心 - 模型实例所用测点 Req VO")
 @Data
 public class InstantPointRespVO {
-    @Schema(description = "实例编号,后端手动生成--直接用", example = "1")
+    @Schema(description = "点号编号,后端手动生成--直接用", example = "1")
     private Long id;
 
 

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

@@ -14,7 +14,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ExcelIgnoreUnannotated
 public class InstantRespVO {
     @Schema(description = "实例id", example = "id")
-    private Long id;
+    private Long mpId;
 
     @Schema(description = "模型id", example = "yudao")
     private Long modelId;
@@ -35,7 +35,7 @@ public class InstantRespVO {
     private Integer visible;
 
     @Schema(description = "状态", example = "1")
-    private Integer status;
+    private Integer instantStatus;
 
     @Schema(description = "创建时间", example = "2022-07-01 00:00:00")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

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

@@ -19,7 +19,7 @@ public class InstantSaveReqVO extends InstantInfoVO {
     @Schema(description = "实例编号", example = "1")
     @NotNull(message = "实例编号不能为空")
 
-    private Long id;
+    private Long mpId;
 
 
     @Schema(description = "模型编号",  requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
@@ -51,7 +51,7 @@ public class InstantSaveReqVO extends InstantInfoVO {
 
     @Schema(description = "状态可见",  requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
     @DiffLogField(name = "状态")
-    private Long status;
+    private Long instantStatus;
 
 
     @Schema(description = "是否存历史-是(存)，否(不存)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/calcgroup/CalcGroupDO.java

@@ -6,12 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-@TableName(value = "group_view", autoResultMap = true)
+@TableName(value = "Calc_group_view", autoResultMap = true)
 @KeySequence("system_role_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class CalcGroupDO extends BaseDO {
-    private String id;
+
+    private String groupId;
 
      /**
      * 计算组名称

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

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.alert.dal.dataobject.instant;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.alert.controller.admin.instant.vo.InstantInfoVO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,7 +17,8 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class InstantDO extends BaseDO {
 
-    private Long id;
+    @TableId(value="mp_id")
+    private Long mpId;
 
     private Long modelId;
 
@@ -34,7 +36,7 @@ public class InstantDO extends BaseDO {
 
     private Long visible;
 
-    private Long status;
+    private Long instantStatus;
 
 
     private LocalDateTime setupTime;

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

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.alert.dal.dataobject.instant;
 
 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;
@@ -13,7 +14,8 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class InstantTableDO extends BaseDO {
-    private Long id;
+    @TableId(value="mp_id")
+    private Long mpId;
 
     private Long modelId;
 
@@ -31,7 +33,7 @@ public class InstantTableDO extends BaseDO {
 
     private Long visible;
 
-    private Long status;
+    private Long instantStatus;
 
 
     private LocalDateTime setupTime;

yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/calcgroup/CalcGroupMapper.java

@@ -16,7 +16,7 @@ public interface CalcGroupMapper extends BaseMapperX<CalcGroupDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<CalcGroupDO>()
                 .eqIfPresent(CalcGroupDO::getUnitId, reqVO.getUnitId())
 
-                .orderByAsc(CalcGroupDO::getId));
+                .orderByAsc(CalcGroupDO::getGroupId));
     }
 
 }

yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/instant/InstantMapper.java

@@ -20,7 +20,7 @@ public interface InstantMapper extends BaseMapperX<InstantDO> {
                 .eqIfPresent(InstantDO::getUnitId,reqVO.getUnit())
                 .eqIfPresent(InstantDO::getSystemTypeId,reqVO.getType())
                 .eqIfPresent(InstantDO::getSystemId,reqVO.getSystem())
-                .orderByAsc(InstantDO::getId));
+                .orderByAsc(InstantDO::getMpId));
     }
 
 default  Long selectCountByRunningLog(String runningLog){

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

@@ -85,7 +85,7 @@ public class InstantServiceImpl implements InstantService {
         //插入除instantInfo外的所有数据，获取到id
         // 2. 插入到数据库-status、visible默认值
         InstantTableDO instant = BeanUtils.toBean(createReqVO, InstantTableDO.class)
-                .setStatus(ObjUtil.defaultIfNull(createReqVO.getStatus(), 1L))
+                .setInstantStatus(ObjUtil.defaultIfNull(createReqVO.getInstantStatus(), 1L))
                 .setVisible(ObjUtil.defaultIfNull(createReqVO.getVisible(), 1L));
 
         instantTableMapper.insert(instant);
@@ -93,7 +93,7 @@ public class InstantServiceImpl implements InstantService {
         // 3. 记录操作日志上下文
         LogRecordContext.putVariable("instant", instant);
 
-        Long insertId = instant.getId();
+        Long insertId = instant.getMpId();
 
         //处理数据
 //        inputInfo 各种转换
@@ -169,8 +169,8 @@ public class InstantServiceImpl implements InstantService {
         }
 
 
-        createReqVO.setId(insertId);
-        createReqVO.setStatus(instant.getStatus());
+        createReqVO.setMpId(insertId);
+        createReqVO.setInstantStatus(instant.getInstantStatus());
         createReqVO.setVisible(instant.getVisible());
         createReqVO.setInputInfo(inputInfoList);
         createReqVO.setInputName(inputNameList);
@@ -206,13 +206,13 @@ public class InstantServiceImpl implements InstantService {
 
 //更新instantInfo字段
         InstantSaveReqVO updateReqVO = new InstantSaveReqVO();
-        updateReqVO.setId(instant.getId());
+        updateReqVO.setMpId(instant.getMpId());
         updateReqVO.setInstantInfo(JsonUtils.toJsonString(createReqVO));
 
         updateInstant(updateReqVO);
         List<String> resultList = new ArrayList<String>();
 
-        resultList.add(instant.getId().toString());
+        resultList.add(instant.getMpId().toString());
 
 
         for (Point item : InstantPointList) {
@@ -251,7 +251,7 @@ public class InstantServiceImpl implements InstantService {
                 // 设置预警ID（假设insertId为当前预警主记录ID）
                 // warn.setId(insertId);
                 //设置实例id
-                warnSaveReqVO.setMpId(instant.getId());
+                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()));
@@ -361,13 +361,13 @@ public class InstantServiceImpl implements InstantService {
     }
 
     @Override
-    @CacheEvict(value = RedisKeyConstants.INSTANT, key = "#updateReqVO.id")
+    @CacheEvict(value = RedisKeyConstants.INSTANT, key = "#updateReqVO.mpId")
     @LogRecord(type = SYSTEM_INSTANT_TYPE, subType = SYSTEM_INSTANT_UPDATE_SUB_TYPE, bizNo = "{{#updateReqVO.id}}",
             success = SYSTEM_INSTANT_UPDATE_SUCCESS)
     public void updateInstant(InstantSaveReqVO updateReqVO) {
         //为简单--省去检验步骤，之后根据情况增加
         // 1.1 校验是否可以更新
-        InstantDO instant = validateRoleForUpdate(updateReqVO.getId());
+        InstantDO instant = validateRoleForUpdate(updateReqVO.getMpId());
         // 1.2 校验角色的唯一字段是否重复
 //        validateRoleDuplicate(updateReqVO.getName(), updateReqVO.getCode(), updateReqVO.getId());