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/impl/MmPredictItemServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java
index 344df0c..7c2a365 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.object.BeanUtils;
+import com.iailab.module.data.api.point.DataPointApi;
import com.iailab.module.model.mcs.pre.dao.MmPredictItemDao;
import com.iailab.module.model.mcs.pre.dto.MmPredictItemDTO;
import com.iailab.module.model.mcs.pre.entity.*;
@@ -58,6 +59,9 @@
@Autowired
private MmPredictItemDao mmPredictItemDao;
+ @Autowired
+ private DataPointApi dataPointApi;
+
@Override
public PageResult<MmPredictItemRespVO> queryPage(MmPredictItemPageReqVO reqVO) {
IPage<MmPredictItemRespVO> page = mmPredictItemDao.selectPage(reqVO);
@@ -68,6 +72,17 @@
@Override
public List<MmPredictItemRespVO> list(Map<String, Object> params) {
return mmPredictItemDao.queryList(params);
+ }
+
+ @Override
+ public MmPredictItemEntity getById(String id) {
+ return mmPredictItemDao.selectById(id);
+ }
+
+ @Override
+ public List<Object[]> getHisData(String itemId, Date startTime, Date endTime) {
+ List<Object[]> result = new ArrayList<>();
+ return result;
}
@DSTransactional(rollbackFor = Exception.class)
@@ -201,7 +216,7 @@
@Override
public List<ItemVO> getByModuleId(String moduleId) {
Map<String, Object> params = new HashMap<>();
-
+ params.put("MODULEID",moduleId);
return mmPredictItemDao.getByModuleId(params);
}
--
Gitblit v1.9.3