Merge remote-tracking branch 'origin/master'

 iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mcs/dto/SuggestOperationRecordReqVO.java

@@ -16,6 +16,9 @@
    @Schema(description = "操作（已采纳,取消采纳，已忽略等）")
    private String operate;

    @Schema(description = "原因")
    private String reason;

    @Schema(description = "处理人ID")
    private String handlerId;


 iailab-module-model/iailab-module-model-biz/db/增量SQL/2025.sql

@@ -73,4 +73,4 @@
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='调度建议快照记录表';

ALTER TABLE `iailab_expert_tenant_shasteel`.`t_st_suggest_operation_record`
    CHANGE COLUMN `handler_id` `reason` varchar(255) NULL COMMENT '原因' AFTER `operate`;
    ADD COLUMN `reason` varchar(255) NULL COMMENT '原因' AFTER `operate`;

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java

@@ -1013,6 +1013,7 @@
    public Boolean saveSuggestOperationRecord(SuggestOperationRecordReqVO reqVO) {
        StSuggestOperationRecordReqVO operationRecordVo = new StSuggestOperationRecordReqVO();
        operationRecordVo.setOperate(reqVO.getOperate());
        operationRecordVo.setReason(reqVO.getReason());
        operationRecordVo.setHandler(reqVO.getHandler());
        operationRecordVo.setHandlerId(reqVO.getHandlerId());
        //获取建议信息

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/common/enums/ScheduleSuggestStatusEnum.java

@@ -15,7 +15,8 @@
public enum ScheduleSuggestStatusEnum {

    S0(0, "未处理"),
    S1(1, "已采纳");
    S1(1, "已采纳"),
    S2(2, "已忽略");

    private Integer code;
    private String desc;

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StSuggestOperationRecordEntity.java

@@ -69,6 +69,11 @@
    private String operate;

    /**
     * 原因
     */
    private String reason;

    /**
     * 处理人ID
     */
    private String handlerId;

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/entity/StSuggestSnapshotConfDetEntity.java

@@ -24,7 +24,7 @@
    private String id;

    /**
     * 模型ID
     * 快照配置ID
     */
    private String confId;


 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StScheduleSuggestServiceImpl.java

@@ -8,10 +8,8 @@
import com.iailab.module.model.api.mcs.dto.ScheduleSuggestReqDTO;
import com.iailab.module.model.api.mcs.dto.ScheduleSuggestRespDTO;
import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestReqVO;
import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestRespVO;
import com.iailab.module.model.common.enums.ScheduleSuggestStatusEnum;
import com.iailab.module.model.mcs.sche.dao.StScheduleSuggestDao;
import com.iailab.module.model.mcs.sche.entity.StScheduleSchemeEntity;
import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity;
import com.iailab.module.model.mcs.sche.service.StScheduleSuggestService;
import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestPageReqVO;
@@ -109,7 +107,7 @@
    public Boolean ignoreSuggest(StAlarmAndSuggestReqVO reqVO) {
        StScheduleSuggestEntity entity = new StScheduleSuggestEntity();
        entity.setId(reqVO.getId());
        entity.setStatus(ScheduleSuggestStatusEnum.S0.getCode());
        entity.setStatus(ScheduleSuggestStatusEnum.S2.getCode());
        entity.setHandleTime(new Date());
        baseDao.updateById(entity);
        return true;

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/service/impl/StSuggestOperationRecordServiceImpl.java

@@ -10,6 +10,7 @@
import com.iailab.module.model.mcs.sche.vo.StSuggestOperationRecordReqVO;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.UUID;


@@ -29,6 +30,7 @@
    public void create(StSuggestOperationRecordReqVO reqVo) {
        StSuggestOperationRecordEntity entity = BeanUtils.toBean(reqVo, StSuggestOperationRecordEntity.class);
        entity.setId(UUID.randomUUID().toString());
        entity.setHandleTime(new Date());
        baseDao.insert(entity);
    }


 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestOperationRecordReqVO.java

@@ -45,6 +45,9 @@
    @Schema(description = "操作（已采纳,取消采纳，已忽略等）")
    private String operate;

    @Schema(description = "原因")
    private String reason;

    @Schema(description = "处理人ID")
    private String handlerId;


 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestOperationRecordResVO.java

@@ -47,6 +47,9 @@
    @Schema(description = "操作（已采纳,取消采纳，已忽略等）")
    private String operate;

    @Schema(description = "原因")
    private String reason;

    @Schema(description = "处理人ID")
    private String handlerId;


 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestSnapshotConfDetReqVO.java

@@ -14,7 +14,7 @@
    @Schema(description = "ID")
    private String id;

    @Schema(description = "模型ID")
    @Schema(description = "快照配置ID")
    private String confId;

    @Schema(description = "数据类型（DATAPOINT,IND,PLAN,PREDICTITEM）")