iailab-module-ai/iailab-module-ai-api/src/main/java/com/iailab/module/ai/api/questionTemplate/QuestiontemplateApi.java

@@ -21,7 +21,7 @@
public interface QuestiontemplateApi {
    String PREFIX = RpcConstants.RPC_API_PREFIX +  "/ai/questiontemplate";

    @PostMapping(PREFIX + "/modelList")
    @GetMapping(PREFIX + "/modelList")
    @Operation(summary = "Ai大模型级联问题模版")
    List<AiModelDto> queryModelList();
}

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

@@ -1,5 +1,7 @@
package com.iailab.module.ai.controller.admin.questiontemplate;

import com.iailab.module.ai.api.questionTemplate.dto.AiModelDto;
import com.iailab.module.ai.api.questionTemplate.dto.QuestionTemplateDto;
import com.iailab.module.ai.service.model.AiModelService;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +23,8 @@
import com.iailab.module.ai.controller.admin.questiontemplate.vo.*;
import com.iailab.module.ai.dal.dataobject.questiontemplate.QuestionTemplateDO;
import com.iailab.module.ai.service.questiontemplate.QuestionTemplateService;

import java.util.List;

@Tag(name = "管理后台 - 大模型问题模板")
@RestController
@@ -81,4 +85,14 @@
        return success(BeanUtils.toBean(pageResult, QuestionTemplateRespVO.class));
    }

    @GetMapping( "/modelList")
    @Operation(summary = "Ai大模型级联问题模版")
    List<AiModelDto> queryModelList(){
        List<AiModelDto> list = BeanUtils.toBean(aiModelService.getModelListByStatusAndType(0, 1, null), AiModelDto.class);
        list.forEach(item->{
            item.setChildren(
                    BeanUtils.toBean(questionTemplateService.getQuestionTemplateList(item.getId()), QuestionTemplateDto.class));
        });
        return list;
    }
}

 iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/DataPointApi.java

@@ -33,7 +33,7 @@

    @PostMapping(PREFIX + "/info/ids")
    @Operation(summary = "根据多个测点ID查询测点信息")
    List<ApiPointDTO> getInfoByIds(@RequestParam("pointNos") Set<String> pointIds);
    List<ApiPointDTO> getInfoByIds(@RequestBody Set<String> pointIds);

    @PostMapping(PREFIX + "/query-points/real-value")
    @Operation(summary = "查询多个测点当前值")

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

@@ -184,4 +184,8 @@
    @Operation(summary = "根据建议id获取建议快照全部图表数据")
    List<StSuggestSnapshotRecordRespVO> getSuggestSnapshotAllChartData(@RequestParam("suggestId") String suggestId);

    @PostMapping(PREFIX + "/suggest/snapshot/conf-det/update-by-ext1")
    @Operation(summary = "根据ext1修改快照配置上下限")
    Boolean updateSuggestSnapshotConfDetByExt1(@RequestBody StSuggestSnapshotConfDetSaveReqVO updateReqVO);

}

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

@@ -39,4 +39,7 @@

    @Schema(description = "状态（0未处理 1已采纳 2已忽略）")
    private Integer status;

    @Schema(description = "排序")
    private Integer sort;
}

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

文件名从 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/vo/StSuggestSnapshotConfDetSaveReqVO.java 修改
@@ -1,7 +1,9 @@
package com.iailab.module.model.mcs.sche.vo;
package com.iailab.module.model.api.mcs.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.math.BigDecimal;


/**
@@ -32,6 +34,12 @@
    @Schema(description = "右侧侧长度(min)")
    private Integer rightLength;

    @Schema(description = "上限")
    private BigDecimal limitH;

    @Schema(description = "下限")
    private BigDecimal limitL;

    @Schema(description = "排序")
    private Integer sort;


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

@@ -4,6 +4,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@@ -57,4 +58,20 @@
    @Schema(description = "数据列表")
    List<Object[]> dataList;

    @Schema(description = "上限")
    private BigDecimal limitH;

    @Schema(description = "下限")
    private BigDecimal limitL;

    @Schema(description = "越界时间")
    private List<String> overLimitTimes;

    @Schema(description = "建议状态（0未处理 1已采纳 2已忽略）")
    private Integer status;

    @Schema(description = "建议处理时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date handleTime;

}

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

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

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

alter table t_st_suggest_snapshot_conf_det add column `limit_h` decimal(10,4) DEFAULT NULL COMMENT '上限';
alter table t_st_suggest_snapshot_conf_det add column `limit_l` decimal(10,4) DEFAULT NULL COMMENT '下限';
alter table t_st_suggest_snapshot_record add column `limit_h` decimal(10,4) DEFAULT NULL COMMENT '上限';
alter table t_st_suggest_snapshot_record add column `limit_l` decimal(10,4) DEFAULT NULL COMMENT '下限';

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/ModelServiceApplication.java

@@ -24,6 +24,8 @@

    @Value("${mpk.bak-file-path}")
    private String mpkBakFilePath;
    @Value("${mpk.mdk-init-path}")
    private String mdkInitPath;
    @Value("${matlab.bak-file-path}")
    private String matlabBakFilePath;

@@ -31,10 +33,6 @@
    void init() {
        //加载动态链接库
        try {
            Properties properties = new Properties();
            InputStream in = ModelServiceApplication.class.getClassLoader().getResourceAsStream("iailmdk.properties");
            properties.load(in);
            String mdkInitPath = properties.getProperty("mdk-init-path");
            log.info("mdkInitPath=" + mdkInitPath);
            File file = new File(mdkInitPath + File.separator + "IAIL.MDK.Mid.Windows.dll");
            if (!file.exists()) {

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

@@ -133,6 +133,9 @@
    @Autowired
    private StSuggestOperationRecordService stSuggestOperationRecordService;

    @Autowired
    private StSuggestSnapshotConfDetService stSuggestSnapshotConfDetService;

    @Override
    public List<PredictItemTreeDTO> getPredictItemTree() {
        List<PredictItemTreeDTO> result = new ArrayList<>();
@@ -929,6 +932,11 @@
        return stSuggestSnapshotRecordService.getAllChartData(suggestId);
    }

    @Override
    public Boolean updateSuggestSnapshotConfDetByExt1(StSuggestSnapshotConfDetSaveReqVO updateReqVO) {
        return stSuggestSnapshotConfDetService.updateByExt1(updateReqVO);
    }

    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/api/controller/admin/McsApiController.java

@@ -366,4 +366,10 @@
    public CommonResult<List<StSuggestSnapshotRecordRespVO>> getSuggestSnapshotAllChartData(@RequestParam("suggestId") String suggestId){
        return success( mcsApi.getSuggestSnapshotAllChartData(suggestId));
    }

    @PostMapping("/suggest/snapshot/conf-det/update-by-ext1")
    @Operation(summary = "根据ext1修改快照配置上下限")
    public CommonResult<Boolean> updateSuggestSnapshotConfDetByExt1(@RequestBody StSuggestSnapshotConfDetSaveReqVO updateReqVO) {
        return success(mcsApi.updateSuggestSnapshotConfDetByExt1(updateReqVO));
    }
}

 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/controller/admin/StSuggestSnapshotConfDetController.java

@@ -3,6 +3,7 @@
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.module.model.api.mcs.dto.StSuggestSnapshotConfDetSaveReqVO;
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.*;
@@ -13,7 +14,6 @@
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.util.List;

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


 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StSuggestSnapshotConfDetDao.java

@@ -16,6 +16,6 @@
public interface StSuggestSnapshotConfDetDao extends BaseMapperX<StSuggestSnapshotConfDetEntity> {
    default PageResult<StSuggestSnapshotConfDetEntity> selectPage(StSuggestSnapshotConfDetPageReqVO reqVO) {
        return selectPage(reqVO,new LambdaQueryWrapperX<StSuggestSnapshotConfDetEntity>()
                .likeIfPresent(StSuggestSnapshotConfDetEntity::getConfId,reqVO.getConfId()));
                .likeIfPresent(StSuggestSnapshotConfDetEntity::getConfId,reqVO.getConfId()).orderByAsc(StSuggestSnapshotConfDetEntity::getSort));
    }
}

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

@@ -1,11 +1,10 @@
package com.iailab.module.model.mcs.sche.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * @author Jay
@@ -53,6 +52,18 @@
    private Integer rightLength;

    /**
     * 上限
     */
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private BigDecimal limitH;

    /**
     * 下限
     */
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private BigDecimal limitL;

    /**
     * 排序
     */
    private Integer sort;

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

@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
@@ -77,4 +79,14 @@
     * 排序
     */
    private Integer sort;

    /**
     * 上限
     */
    private BigDecimal limitH;

    /**
     * 下限
     */
    private BigDecimal limitL;
}

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

@@ -5,7 +5,7 @@
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 com.iailab.module.model.api.mcs.dto.StSuggestSnapshotConfDetSaveReqVO;

import java.util.List;

@@ -25,4 +25,6 @@
    List<StSuggestSnapshotConfDetRespVO> getByConfId(String confId);

    StSuggestSnapshotConfDetRespVO get(String id);

    Boolean updateByExt1(StSuggestSnapshotConfDetSaveReqVO updateReqVO);
}

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

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

import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.api.mcs.dto.StSuggestSnapshotConfDetSaveReqVO;
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.StSuggestSnapshotConfDetPageReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetRespVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfDetSaveReqVO;
import com.iailab.module.model.mcs.sche.vo.StSuggestSnapshotConfMainRespVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -25,10 +25,6 @@
@Service
public class StSuggestSnapshotConfDetServiceImpl extends BaseServiceImpl<StSuggestSnapshotConfDetDao, StSuggestSnapshotConfDetEntity>
        implements StSuggestSnapshotConfDetService {


    @Autowired
    private StSuggestSnapshotConfDetService stSuggestSnapshotConfDetService;

    @Override
    public PageResult<StSuggestSnapshotConfDetEntity> page(StSuggestSnapshotConfDetPageReqVO reqVO) {
@@ -65,4 +61,15 @@
    public StSuggestSnapshotConfDetRespVO get(String id) {
        return ConvertUtils.sourceToTarget( baseDao.selectById(id), StSuggestSnapshotConfDetRespVO.class);
    }

    @Override
    public Boolean updateByExt1(StSuggestSnapshotConfDetSaveReqVO updateReqVO) {
        if (StringUtils.isBlank(updateReqVO.getExt1())) {
            return false;
        }
        QueryWrapper<StSuggestSnapshotConfDetEntity> updateWrapper = new QueryWrapper<>();
        updateWrapper.eq("ext1",updateReqVO.getExt1());
        baseDao.update(BeanUtils.toBean(updateReqVO, StSuggestSnapshotConfDetEntity.class),updateWrapper);
        return true;
    }
}

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

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

import com.baomidou.dynamic.datasource.annotation.DSTransactional;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iailab.framework.common.service.impl.BaseServiceImpl;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
@@ -20,7 +21,9 @@
import com.iailab.module.model.common.utils.DateUtils;
import com.iailab.module.model.mcs.pre.service.MmItemResultService;
import com.iailab.module.model.mcs.sche.dao.StSuggestSnapshotRecordDao;
import com.iailab.module.model.mcs.sche.entity.StScheduleSuggestEntity;
import com.iailab.module.model.mcs.sche.entity.StSuggestSnapshotRecordEntity;
import com.iailab.module.model.mcs.sche.service.StScheduleSuggestService;
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;
@@ -34,10 +37,7 @@

import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import java.util.*;

import static com.iailab.module.model.common.utils.DateUtils.DATE_TIME_PATTERN;

@@ -60,13 +60,14 @@
    @Autowired
    private MmItemResultService mmItemResultService;



    @Autowired
    private StSuggestSnapshotConfMainService stSuggestSnapshotConfMainService;

    @Autowired
    private StSuggestSnapshotConfDetService stSuggestSnapshotConfDetService;

    @Autowired
    private StScheduleSuggestService stScheduleSuggestService;

    @Override
    @DSTransactional(rollbackFor = Exception.class)
@@ -91,7 +92,10 @@

    @Override
    public List<StSuggestSnapshotRecordRespVO> getListBySuggestId(String suggestId) {
        return ConvertUtils.sourceToTarget(baseDao.selectList("suggest_id",  suggestId), StSuggestSnapshotRecordRespVO.class);
        QueryWrapper<StSuggestSnapshotRecordEntity> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("suggest_id",  suggestId);
        queryWrapper.orderByAsc("sort");
        return ConvertUtils.sourceToTarget(baseDao.selectList(queryWrapper), StSuggestSnapshotRecordRespVO.class);
    }

    @Override
@@ -119,12 +123,16 @@
            snapshotRecordSaveReqVO.setDataType(confDet.getDataType());
            snapshotRecordSaveReqVO.setDataName(confDet.getDataName());
            snapshotRecordSaveReqVO.setScheduleTime(scheduleTime);
            snapshotRecordSaveReqVO.setSort(confDet.getSort());
            snapshotRecordSaveReqVO.setLimitH(confDet.getLimitH());
            snapshotRecordSaveReqVO.setLimitL(confDet.getLimitL());
            snapshotRecordSaveReqVO.setSort(confDet.getSort());
            //计算开始时间,开始时间为当前调度时间减去快照配置表配置的左侧时间长度
            LocalDateTime localStartDateTime =  scheduleTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().minusMinutes(confDet.getLeftLength() ==  null ? 60 : confDet.getLeftLength());
            Date startTime = Date.from(localStartDateTime.atZone(ZoneId.systemDefault()).toInstant());
            snapshotRecordSaveReqVO.setStartTime(startTime);
            //计算结束时间,结束时间为当前调度时间加上快照配置表配置的右侧时间长度
            LocalDateTime localEndDateTime =  scheduleTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().plusMinutes(confDet.getRightLength() ==  null ? 60 : confDet.getLeftLength());
            LocalDateTime localEndDateTime =  scheduleTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().plusMinutes(confDet.getRightLength() ==  null ? 60 : confDet.getRightLength());
            Date endTime = Date.from(localEndDateTime.atZone(ZoneId.systemDefault()).toInstant());
            snapshotRecordSaveReqVO.setEndTime(endTime);
            this.create(snapshotRecordSaveReqVO);
@@ -133,6 +141,7 @@

    @Override
    public List<StSuggestSnapshotRecordRespVO> getChartData(List<StSuggestSnapshotRecordRespVO> reqList) {
        Map<String,StScheduleSuggestEntity> suggestInfos = new HashMap<>(reqList.size());
        reqList.forEach(item -> {
            List<Object[]> dataList = new ArrayList<>();
            if(DataCategoryEnum.DATAPOINT.getCode().equals(item.getDataType())){
@@ -186,6 +195,29 @@
            }
            item.setDataList(dataList);

//             越界时间
//            if (!CollectionUtils.isEmpty(dataList)) {
//                List<String> overLimitTimes = new ArrayList<>();
//                dataList.forEach(data -> {
//                    BigDecimal value = new BigDecimal(data[1].toString());
//                    if ((item.getLimitH() != null &&value.compareTo(item.getLimitH()) >= 0) || (item.getLimitL() != null && value.compareTo(item.getLimitL()) <= 0)) {
//                        overLimitTimes.add(data[0].toString());
//                    }
//                });
//                item.setOverLimitTimes(overLimitTimes);
//            }

            // 建议处理时间
            String suggestId = item.getSuggestId();
            StScheduleSuggestEntity suggestInfo;
            if (suggestInfos.containsKey(suggestId)) {
                suggestInfo = suggestInfos.get(suggestId);
            }else {
                suggestInfo = stScheduleSuggestService.getInfo(suggestId);
                suggestInfos.put(suggestId,suggestInfo);
            }
            item.setStatus(suggestInfo.getStatus());
            item.setHandleTime(suggestInfo.getHandleTime());
        });
        return reqList;
    }

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

@@ -3,6 +3,8 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.math.BigDecimal;


/**
 * @author Jay
@@ -32,6 +34,12 @@
    @Schema(description = "右侧侧长度(min)")
    private Integer rightLength;

    @Schema(description = "上限")
    private BigDecimal limitH;

    @Schema(description = "下限")
    private BigDecimal limitL;

    @Schema(description = "排序")
    private Integer sort;


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

@@ -3,6 +3,8 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.math.BigDecimal;


/**
 * @author Jay
@@ -32,6 +34,12 @@
    @Schema(description = "右侧侧长度(min)")
    private Integer rightLength;

    @Schema(description = "上限")
    private BigDecimal limitH;

    @Schema(description = "下限")
    private BigDecimal limitL;

    @Schema(description = "排序")
    private Integer sort;


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

@@ -4,6 +4,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;


@@ -53,5 +54,10 @@
    @Schema(description = "排序")
    private Integer sort;

    @Schema(description = "上限")
    private BigDecimal limitH;

    @Schema(description = "下限")
    private BigDecimal limitL;

}

 iailab-module-model/iailab-module-model-biz/src/main/resources/application-dev.yaml

@@ -53,6 +53,7 @@
  delete-bak-file-cache: true # 是否删除多余备份pyd文件
  bak-resources: D:\DLUT\mpkResources
  model-file-path: D:\DLUT\MDK\Model\miail\
  mdk-init-path: D:\DLUT\mpkResources\libs
matlab:
  bak-file-path: D:\DLUT\matlabBakFile


 iailab-module-model/iailab-module-model-biz/src/main/resources/iailmdk.properties

文件已删除

 iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StScheduleSchemeDao.xml

@@ -10,12 +10,13 @@
        t.content,
        t.time,
        t.obj,
        t.status
        t.status,
        t.sort
        from (
                 select id,'alarm' type, t1.title, t1.content, t1.alarm_time `time`, t1.alarm_obj obj,0 status
                 select id,'alarm' type, t1.title, t1.content, t1.alarm_time `time`, t1.alarm_obj obj,0 status, 0 sort
                 from t_mm_predict_alarm_message t1
                 UNION
                 select id,'suggest' type, t2.title, t2.content, t2.schedule_time `time`, t2.schedule_obj obj,t2.status
                 select id,'suggest' type, t2.title, t2.content, t2.schedule_time `time`, t2.schedule_obj obj,t2.status,t2.sort
                 from t_st_schedule_suggest t2
        ) t
        <where>
@@ -52,7 +53,7 @@
            </if>

        </where>
        order by t.time desc
        order by t.time desc, t.sort ASC

    </select>
</mapper>