From 042be316746210a681a21c3ecca6b7a44e793db0 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期日, 09 三月 2025 23:31:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/db/mysql.sql | 2 +-
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/db/mysql.sql b/iailab-module-model/iailab-module-model-biz/db/mysql.sql
index 282b553..3e73a65 100644
--- a/iailab-module-model/iailab-module-model-biz/db/mysql.sql
+++ b/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);
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
index ba11c8b..e4ba98b 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mdk/sample/SampleInfoConstructor.java
+++ b/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:
--
Gitblit v1.9.3