保存建议操作记录的同时保存调度建议快照记录表

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

@@ -34,8 +34,8 @@
import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity;
import com.iailab.module.model.mcs.sche.service.*;
import com.iailab.module.model.mcs.sche.vo.StScheduleRecordRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestOperationRecordReqVO;
import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestSaveReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestOperationRecordReqVO;
import com.iailab.module.model.mdk.vo.ItemVO;
import com.iailab.module.model.mpk.service.ChartParamService;
import com.iailab.module.model.mpk.service.ChartService;
@@ -1012,6 +1012,7 @@
    @Override
    public Boolean saveSuggestOperationRecord(SuggestOperationRecordReqVO reqVO) {
        StSuggestOperationRecordReqVO operationRecordVo = new StSuggestOperationRecordReqVO();
        operationRecordVo.setSuggestId(reqVO.getId());
        operationRecordVo.setOperate(reqVO.getOperate());
        operationRecordVo.setReason(reqVO.getReason());
        operationRecordVo.setHandler(reqVO.getHandler());
@@ -1035,7 +1036,6 @@
        stSuggestOperationRecordService.create(operationRecordVo);
        return true;
    }

    private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
        Date[] result = new Date[3];
        Date predictTime = predictItem.getLastTime();

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

@@ -51,6 +51,11 @@
    /**
     * 开始时间
     */
    private Date scheduleTime;

    /**
     * 开始时间
     */
    private Date startTime;

    /**

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

@@ -3,13 +3,9 @@
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.service.BaseService;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfDetEntity;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfDetEntity;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetPageReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetSaveReqVO;

import java.util.List;
import java.util.Map;


/**
@@ -23,4 +19,6 @@
    void update(StSuggestSnapshotConfDetSaveReqVO createReqVO);

    void delete(String id);

    StSuggestSnapshotConfDetRespVO getByConfId(String confId);
}

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

@@ -18,4 +18,6 @@
    void update(StSuggestSnapshotConfMainSaveReqVO createReqVO);

    void delete(String id);

    StSuggestSnapshotConfMainRespVO getByModelIdAndScheduleObj(String modelId,  String scheduleObj);
}

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

@@ -6,10 +6,15 @@
import com.iailab.module.model.mcs.sche.dao.StSuggestOperationRecordDao;
import com.iailab.module.model.mcs.sche.entity.StSuggestOperationRecordEntity;
import com.iailab.module.model.mcs.sche.service.StSuggestOperationRecordService;
import com.iailab.module.model.mcs.sche.vo.StSuggestOperationRecordPageReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestOperationRecordReqVO;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfDetService;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfMainService;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotRecordService;
import com.iailab.module.model.mcs.sche.vo.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
import java.util.UUID;

@@ -20,6 +25,15 @@
@Service
public class StSuggestOperationRecordServiceImpl extends BaseServiceImpl<StSuggestOperationRecordDao, StSuggestOperationRecordEntity>
        implements StSuggestOperationRecordService {

    @Autowired
    private StSuggestSnapshotConfMainService stSuggestSnapshotConfMainService;

    @Autowired
    private StSuggestSnapshotConfDetService stSuggestSnapshotConfDetService;

    @Autowired
    private StSuggestSnapshotRecordService stSuggestSnapshotRecordService;

    @Override
    public PageResult<StSuggestOperationRecordEntity> page(StSuggestOperationRecordPageReqVO reqVO) {
@@ -32,6 +46,26 @@
        entity.setId(UUID.randomUUID().toString());
        entity.setHandleTime(new Date());
        baseDao.insert(entity);

        //获取调度建议快照配置表信息
        StSuggestSnapshotConfMainRespVO confMain = stSuggestSnapshotConfMainService.getByModelIdAndScheduleObj(reqVo.getModelId(), reqVo.getSuggestId());
        if (confMain != null){
            StSuggestSnapshotRecordSaveReqVO snapshotRecordSaveReqVO = new StSuggestSnapshotRecordSaveReqVO();
            snapshotRecordSaveReqVO.setModelId(entity.getModelId());
            StSuggestSnapshotConfDetRespVO confDet = stSuggestSnapshotConfDetService.getByConfId(confMain.getId());
            snapshotRecordSaveReqVO.setDataNo(confDet.getDataNo());
            snapshotRecordSaveReqVO.setDataType(confDet.getDataType());
            snapshotRecordSaveReqVO.setScheduleTime(entity.getScheduleTime());
            //计算开始时间,开始时间为当前调度时间减去快照配置表配置的左侧时间长度
            LocalDateTime localStartDateTime =  entity.getScheduleTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().minusMinutes(confDet.getLeftLength());
            Date startTime = Date.from(localStartDateTime.atZone(ZoneId.systemDefault()).toInstant());
            snapshotRecordSaveReqVO.setStartTime(startTime);
            //计算结束时间,结束时间为当前调度时间加上快照配置表配置的右侧时间长度
            LocalDateTime localEndDateTime =  entity.getScheduleTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().plusMinutes(confDet.getRightLength());
            Date endTime = Date.from(localEndDateTime.atZone(ZoneId.systemDefault()).toInstant());
            snapshotRecordSaveReqVO.setEndTime(endTime);
            stSuggestSnapshotRecordService.create(snapshotRecordSaveReqVO);
        }
    }

}

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

@@ -1,24 +1,20 @@
package com.iailab.module.model.mcs.sche.service.impl;

import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.service.impl.BaseServiceImpl;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.model.mcs.sche.dao.StSuggestSnapshotConfDetDao;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfDetEntity;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfDetService;
import com.iailab.module.model.mcs.sche.vo.StScheduleModelRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetPageReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetSaveReqVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.UUID;

import static com.iailab.framework.common.pojo.CommonResult.success;


/**
@@ -57,4 +53,9 @@
    public void delete(String id) {
        baseDao.deleteById(id);
    }

    @Override
    public StSuggestSnapshotConfDetRespVO getByConfId(String confId) {
        return ConvertUtils.sourceToTarget(baseDao.selectOne("conf_id", confId), StSuggestSnapshotConfDetRespVO.class);
    }
}

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

@@ -1,24 +1,19 @@
package com.iailab.module.model.mcs.sche.service.impl;

import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.service.impl.BaseServiceImpl;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.model.mcs.sche.dao.StSuggestSnapshotConfMainDao;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotConfMainEntity;
import com.iailab.module.model.mcs.sche.service.StSuggestSnapshotConfMainService;
import com.iailab.module.model.mcs.sche.vo.StScheduleModelRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainPageReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainSaveReqVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.UUID;

import static com.iailab.framework.common.pojo.CommonResult.success;


/**
@@ -53,4 +48,9 @@
    public void delete(String id) {
        baseDao.deleteById(id);
    }

    @Override
    public StSuggestSnapshotConfMainRespVO getByModelIdAndScheduleObj(String modelId,  String scheduleObj) {
        return ConvertUtils.sourceToTarget( baseDao.selectOne("model_id", modelId,  "schedule_obj", scheduleObj), StSuggestSnapshotConfMainRespVO.class);
    }
}

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

@@ -60,4 +60,7 @@
    @Schema(description = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;

    @Schema(description = "建议ID")
    private String suggestId;
}

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

@@ -32,6 +32,10 @@
    @Schema(description = "数据编号")
    private String dataNo;

    @Schema(description = "调度时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date scheduleTime;

    @Schema(description = "开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date startTime;