已修改7个文件
23 ■■■■ 文件已修改
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/MeasureHandle.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mdk/dto/MdkScheduleRespDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/schedule/impl/ScheduleModelHandlerImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/vo/ScheduleResultVO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StScheduleSchemeDao.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/collection/handler/MeasureHandle.java
@@ -257,6 +257,7 @@
                } else {
                    log.info("没有匹配的TagNo=" + item.getTagNo());
                }
                log.info("TagNo=" + item.getTagNo() + ",value=" + value.toString());
                if (!PointDataTypeEnum.BOOLEAN.getCode().equals(item.getDataType())) {
                    BigDecimal coefficient = item.getUnittransfactor() == null ? BigDecimal.ONE : item.getUnittransfactor();
@@ -266,6 +267,11 @@
                    } else if (PointDataTypeEnum.INT.getCode().equals(item.getDataType())) {
                        decValue = decValue.setScale(0, BigDecimal.ROUND_HALF_UP);
                    }
                    if (item.getMaxValue() != null && decValue.compareTo(item.getMaxValue()) > 0) {
                        decValue = item.getMaxValue();
                    } else if (item.getMinValue() != null && decValue.compareTo(item.getMinValue()) < 0) {
                        decValue = item.getMinValue();
                    }
                    data.put(item.getPointNo(), decValue);
                } else {
                    data.put(item.getPointNo(), value);
iailab-module-model/iailab-module-model-api/src/main/java/com/iailab/module/model/api/mdk/dto/MdkScheduleRespDTO.java
@@ -23,5 +23,7 @@
    private String statusCode;
    private Integer adjustRate;
    private Map<String, Object> result;
}
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -310,7 +310,7 @@
        }
        if (!CollectionUtils.isEmpty(realDataMap)) {
            Object curReal = realDataMap.get(DateUtils.format(predictTime, timeFormat)) == null ?
                    dataView.getRealData().get(dataView.getRealData().size() - 1) : realDataMap.get(DateUtils.format(predictTime, timeFormat));
                    dataView.getRealData().get(dataView.getRealData().size() - 1)[1] : realDataMap.get(DateUtils.format(predictTime, timeFormat));
            // 当前值T0 + 当前预测值 20250409
            dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat, decimalPlaces, true, curReal));
        } else {
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java
@@ -292,6 +292,7 @@
                    reqDTO.getDynamicDataLength(), reqDTO.getDynamicSettings());
            resp.setStatusCode(scheduleResult.getResultCode());
            resp.setResult(scheduleResult.getResult());
            resp.setAdjustRate(scheduleResult.getAdjustRate());
            stScheduleRecordService.create(scheduleResult);
            stScheduleSchemeService.updateTime(scheduleResult.getSchemeId(), scheduleResult.getScheduleTime(), scheduleResult.getResultCode());
            log.info("调度计算结束: " + System.currentTimeMillis());
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/schedule/impl/ScheduleModelHandlerImpl.java
@@ -56,6 +56,7 @@
                                       Map<String, String> dynamicSettings) throws ModelInvokeException {
        ScheduleResultVO scheduleResult = new ScheduleResultVO();
        StScheduleSchemeEntity scheduleScheme = stScheduleSchemeService.getByCode(schemeCode);
        scheduleResult.setAdjustRate(scheduleScheme.getAdjustRate());
        StScheduleModelEntity scheduleModel = stScheduleModelService.get(scheduleScheme.getModelId());
        if (scheduleModel == null) {
            throw new ModelInvokeException(MessageFormat.format("{0},modelId={1}",
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/vo/ScheduleResultVO.java
@@ -51,4 +51,9 @@
     */
    private Map<String, Object> result;
    /**
     * 调整速率
     */
    private Integer adjustRate;
}
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mcs/StScheduleSchemeDao.xml
@@ -13,10 +13,10 @@
        t.status,
        t.sort
        from (
                 select id,'alarm' type, t1.title, t1.content, t1.alarm_time `time`, t1.alarm_obj obj,0 status, 0 sort
                 select id,'alarm' type, t1.title, t1.content, t1.alarm_time `time`, t1.alarm_obj obj,0 status, 0 sort,t1.create_time
                 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,t2.sort
                 select id,'suggest' type, t2.title, t2.content, t2.schedule_time `time`, t2.schedule_obj obj,t2.status,t2.sort,t2.create_time
                 from t_st_schedule_suggest t2
        ) t
        <where>
@@ -53,7 +53,7 @@
            </if>
        </where>
        order by t.time desc, t.sort ASC
        order by t.time desc, t.sort ASC,t.create_time
    </select>
</mapper>