From 0c853d25757cbce6b6bffeee4c26510acb727a68 Mon Sep 17 00:00:00 2001 From: xjf <378266566@qq.com> Date: Sat, 6 Dec 2025 21:51:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=9B=A0=E6=95=B0=E6=8D=AE=E5=BA=93instant?= =?UTF-8?q?=5Fcfg=E6=9B=B4=E6=94=B9=E5=AD=97=E6=AE=B5=EF=BC=8Cgroup=5Fview?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=A1=A8=E5=90=8D=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/calcgroup/CalcGroupController.java | 2 +- .../admin/calcgroup/vo/CalcGroupRespVO.java | 2 +- .../admin/instant/vo/InstantPointRespVO.java | 2 +- .../admin/instant/vo/InstantRespVO.java | 4 ++-- .../admin/instant/vo/InstantSaveReqVO.java | 4 ++-- .../dal/dataobject/calcgroup/CalcGroupDO.java | 5 +++-- .../dal/dataobject/instant/InstantDO.java | 6 ++++-- .../dal/dataobject/instant/InstantTableDO.java | 6 ++++-- .../dal/mysql/calcgroup/CalcGroupMapper.java | 2 +- .../alert/dal/mysql/instant/InstantMapper.java | 2 +- .../service/instant/InstantServiceImpl.java | 18 +++++++++--------- 11 files changed, 29 insertions(+), 24 deletions(-) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/calcgroup/CalcGroupController.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/calcgroup/CalcGroupController.java index 6e1604f..e58d2c8 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/calcgroup/CalcGroupController.java +++ b/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> getCalcGroupList(CalcGroupPageReqVO ReqVO) { ReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = calcGroupService.getCalcGroupPage(ReqVO).getList(); - list.sort(Comparator.comparing(CalcGroupDO::getId)); + list.sort(Comparator.comparing(CalcGroupDO::getGroupId)); return success(BeanUtils.toBean(list, CalcGroupRespVO.class)); } } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/calcgroup/vo/CalcGroupRespVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/calcgroup/vo/CalcGroupRespVO.java index 59d2f99..fe7ad1e 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/calcgroup/vo/CalcGroupRespVO.java +++ b/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") diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantPointRespVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantPointRespVO.java index f45b4f1..11d6d38 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantPointRespVO.java +++ b/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; diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantRespVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantRespVO.java index 9e489d3..44aa585 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantRespVO.java +++ b/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) diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java index c7d54b3..fbe8ccb 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/controller/admin/instant/vo/InstantSaveReqVO.java +++ b/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") diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/calcgroup/CalcGroupDO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/calcgroup/CalcGroupDO.java index d95bfff..0feedd7 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/calcgroup/CalcGroupDO.java +++ b/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; /** * 计算组名称 diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/instant/InstantDO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/instant/InstantDO.java index ee1886b..a5d73b0 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/instant/InstantDO.java +++ b/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; diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/instant/InstantTableDO.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/instant/InstantTableDO.java index eacea32..615bcc8 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/dataobject/instant/InstantTableDO.java +++ b/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; diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/calcgroup/CalcGroupMapper.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/calcgroup/CalcGroupMapper.java index 6d74cf4..427bdd2 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/calcgroup/CalcGroupMapper.java +++ b/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 { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(CalcGroupDO::getUnitId, reqVO.getUnitId()) - .orderByAsc(CalcGroupDO::getId)); + .orderByAsc(CalcGroupDO::getGroupId)); } } diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/instant/InstantMapper.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/instant/InstantMapper.java index 1453fd2..5d2ac6a 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/instant/InstantMapper.java +++ b/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 { .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){ 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 0acce82..f0c87e6 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 @@ -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 resultList = new ArrayList(); - 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()); -- 2.30.2