From 3d9106399d9a2b9c8ba7d2dea621f54fd71d2ca7 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期二, 12 十一月 2024 10:56:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java
index 1a5dd19..ef80336 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/MmPredictItemService.java
@@ -4,10 +4,13 @@
import com.iailab.module.model.mcs.pre.dto.MmPredictItemDTO;
import com.iailab.module.model.mcs.pre.entity.MmPredictItemEntity;
import com.iailab.module.model.mcs.pre.vo.MmPredictItemPageReqVO;
+import com.iailab.module.model.mcs.pre.vo.MmPredictItemRespVO;
import com.iailab.module.model.mdk.vo.ItemVO;
import com.iailab.module.model.mdk.vo.MergeItemVO;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @author PanZhibao
@@ -29,11 +32,15 @@
MergeItemVO getMergeItemByItemId(String itemId);
- PageResult<MmPredictItemEntity> queryPage(MmPredictItemPageReqVO reqVO);
+ PageResult<MmPredictItemRespVO> queryPage(MmPredictItemPageReqVO reqVO);
void add(MmPredictItemDTO mmPredictItemDto);
void update(MmPredictItemDTO mmPredictItemDTO);
- List<MmPredictItemEntity> list();
+ List<MmPredictItemRespVO> list(Map<String, Object> params);
+
+ MmPredictItemEntity getById(String id);
+
+ List<Object[]> getHisData(String itemId, Date startTime, Date endTime);
}
--
Gitblit v1.9.3