Merge remote-tracking branch 'origin/master'

 iailab-module-ai/iailab-module-ai-biz/src/main/java/com/iailab/module/ai/controller/admin/questiontemplate/QuestionTemplateController.java

@@ -64,6 +64,7 @@
    @PreAuthorize("@ss.hasPermission('ai:question-template:query')")
    public CommonResult<QuestionTemplateRespVO> getQuestionTemplate(@RequestParam("id") String id) {
        QuestionTemplateDO questionTemplate = questionTemplateService.getQuestionTemplate(id);
        questionTemplate.setModelName( aiModelService.getModel(Long.valueOf((questionTemplate.getModelId()))).getName());
        return success(BeanUtils.toBean(questionTemplate, QuestionTemplateRespVO.class));
    }


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

@@ -156,6 +156,10 @@
    @Operation(summary = "采纳建议")
    Boolean useSuggest(@RequestBody StAlarmAndSuggestReqVO reqVO);

    @PostMapping(PREFIX + "/schedule-suggest/cancel-use-suggest")
    @Operation(summary = "取消采纳建议")
    Boolean cancelUseSuggest(@RequestBody StAlarmAndSuggestReqVO reqVO);

    @PostMapping(PREFIX + "/schedule-suggest/ignore-suggest")
    @Operation(summary = "忽略建议")
    Boolean ignoreSuggest(StAlarmAndSuggestReqVO reqVO);

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

@@ -874,6 +874,11 @@
    }

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

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

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/controller/admin/McsApiController.java

@@ -340,6 +340,13 @@
        return success( true);
    }

    @PostMapping("/schedule-suggest/cancel-use-suggest")
    @Operation(summary = "取消采纳建议")
    public CommonResult<Boolean> cancelUseSuggest(@RequestBody StAlarmAndSuggestReqVO reqVO){
        mcsApi.cancelUseSuggest(reqVO);
        return success( true);
    }

    @PostMapping(value = "/schedule-suggest/operation_record/save",  consumes = MediaType.APPLICATION_JSON_VALUE)
    @Operation(summary = "保存建议操作记录")
    public CommonResult<Boolean> saveSuggestOperationRecord(@RequestBody SuggestOperationRecordReqVO reqVO){

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

@@ -5,7 +5,6 @@
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.mcs.sche.entity.StScheduleSuggestEntity;
import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestPageReqVO;
import com.iailab.module.model.mcs.sche.vo.StScheduleSuggestSaveReqVO;
@@ -41,6 +40,8 @@

    Boolean useSuggest(StAlarmAndSuggestReqVO reqVO);

    Boolean cancelUseSuggest(StAlarmAndSuggestReqVO reqVO);

    Boolean ignoreSuggest(StAlarmAndSuggestReqVO reqVO);

    List<ScheduleSuggestRespDTO> getLastSuggest(Map<String, Object> params);

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

@@ -106,6 +106,16 @@
    }

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

    @Override
    public Boolean ignoreSuggest(StAlarmAndSuggestReqVO reqVO) {
        StScheduleSuggestEntity entity = new StScheduleSuggestEntity();
        entity.setId(reqVO.getId());