潘志宝
3 天以前 042be316746210a681a21c3ecca6b7a44e793db0
Merge remote-tracking branch 'origin/master'
已修改2个文件
8 ■■■■■ 文件已修改
iailab-module-model/iailab-module-model-biz/db/mysql.sql 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iailab-module-model/iailab-module-model-biz/db/mysql.sql
@@ -1010,4 +1010,4 @@
-- t_st_schedule_record 创建复合索引
CREATE INDEX idx_scheme_id_create_time ON t_st_schedule_record (scheme_id, create_time DESC);
CREATE INDEX idx_st_schedule_record_scheme_result_time ON t_st_schedule_record (scheme_id, result_code, schedule_time DESC, create_time DESC);
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
@@ -85,7 +85,7 @@
                break;
            case IND:
            case IND_ASCII:
                dateTime = calculateTime(originalTime, true, columnItem.getDataLength(), columnItem.getGranularity());
                dateTime = calculateTime(originalTime, true, columnItem.getDataLength() - 1, columnItem.getGranularity());
                break;
            case NORMALITEM:
            case MERGEITEM:
@@ -112,9 +112,11 @@
        switch (ModelParamType.getEumByCode(columnItem.getParamType())) {
            case DATAPOINT:
            case PLAN:
                dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
                break;
            case IND:
            case IND_ASCII:
                dateTime = calculateTime(originalTime, true, 1, columnItem.getGranularity());
                dateTime = originalTime;
                break;
            case NORMALITEM:
            case MERGEITEM: