Merge remote-tracking branch 'origin/master'

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

@@ -153,8 +153,8 @@
    @Operation(summary = "获取")
    List<Object[]> getItemResultLastPoint(@RequestBody PreItemResultReqVO reqVO);

    @PostMapping(PREFIX + "/schedule-suggest/update-status")
    @Operation(summary = "修改调度建议状态")
    Boolean updateSuggestStatus(@RequestBody StAlarmAndSuggestReqVO reqVO);
    @PostMapping(PREFIX + "/schedule-suggest/use-suggest")
    @Operation(summary = "采纳建议")
    Boolean useSuggest(@RequestBody StAlarmAndSuggestReqVO reqVO);

}

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

@@ -886,8 +886,8 @@
    }

    @Override
    public Boolean updateSuggestStatus(StAlarmAndSuggestReqVO reqVO) {
        return stScheduleSuggestService.updateSuggestStatus(reqVO);
    public Boolean useSuggest(StAlarmAndSuggestReqVO reqVO) {
        return stScheduleSuggestService.useSuggest(reqVO);
    }

    private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {

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

@@ -39,5 +39,5 @@

    List<StScheduleSuggestEntity> getList(List<String> scheduleObjList, Date predictTime);

    Boolean updateSuggestStatus(StAlarmAndSuggestReqVO reqVO);
    Boolean useSuggest(StAlarmAndSuggestReqVO reqVO);
}

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

@@ -96,10 +96,11 @@
    }

    @Override
    public Boolean updateSuggestStatus(StAlarmAndSuggestReqVO reqVO) {
    public Boolean useSuggest(StAlarmAndSuggestReqVO reqVO) {
        StScheduleSuggestEntity entity = new StScheduleSuggestEntity();
        entity.setId(reqVO.getId());
        entity.setStatus(reqVO.getStatus());
        entity.setStatus(ScheduleSuggestStatusEnum.S1.getCode());
        entity.setHandleTime(new Date());
        baseDao.updateById(entity);
        return true;
    }

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java

@@ -78,7 +78,8 @@
        Date dateTime = new Date();
        switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
            case DATAPOINT:
                dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), columnItem.getGranularity());
                dateTime = calculateTime(originalTime, true,
                        columnItem.getDataLength() > 1 ? (columnItem.getDataLength() - 1) : columnItem.getDataLength(), columnItem.getGranularity());
                break;
            case PLAN:
                dateTime = originalTime;
@@ -111,7 +112,7 @@
        calendar.setTime(originalTime);
        switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
            case DATAPOINT:
                dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
                dateTime = calculateTime(originalTime, true, 0, columnItem.getGranularity());
                break;
            case PLAN:
                dateTime = calculateTime(originalTime, false, columnItem.getDataLength()-1, columnItem.getGranularity());