From ed4f78cccbb2cf672d6b3230069979288232ab4a Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 04 十一月 2024 08:25:28 +0800
Subject: [PATCH] 计划数据

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictItemServiceImpl.java |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 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 18395b1..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
@@ -1,10 +1,12 @@
 package com.iailab.module.model.mcs.pre.service.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.*;
@@ -57,18 +59,33 @@
     @Autowired
     private MmPredictItemDao mmPredictItemDao;
 
+    @Autowired
+    private DataPointApi dataPointApi;
+
     @Override
     public PageResult<MmPredictItemRespVO> queryPage(MmPredictItemPageReqVO reqVO) {
         IPage<MmPredictItemRespVO> page = mmPredictItemDao.selectPage(reqVO);
 
-        return  new PageResult<MmPredictItemRespVO>(page.getRecords(), page.getTotal());
+        return new PageResult<MmPredictItemRespVO>(page.getRecords(), page.getTotal());
     }
 
     @Override
-    public List<MmPredictItemEntity> list() {
-        return mmPredictItemDao.selectList(new QueryWrapper<>());
+    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)
     @Override
     public void add(MmPredictItemDTO mmPredictItemDto) {
         MmPredictItemEntity predictItem = mmPredictItemDto.getMmPredictItem();
@@ -119,6 +136,7 @@
         mmItemOutputService.saveMmItemOutput(mmItemOutput);
     }
 
+    @DSTransactional(rollbackFor = Exception.class)
     @Override
     public void update(MmPredictItemDTO mmPredictItemDto) {
         MmPredictItemEntity predictItem = mmPredictItemDto.getMmPredictItem();
@@ -145,15 +163,16 @@
             mmPredictMergeItemService.update(mMmPredictMergeItem);
         }
         DmModuleItemEntity dmModuleItem = mmPredictItemDto.getDmModuleItem();
-        if(!"".equals(dmModuleItem.getId()) && dmModuleItem.getId() != null){
+        if (!"".equals(dmModuleItem.getId()) && dmModuleItem.getId() != null) {
             dmModuleItemService.update(dmModuleItem);
         }
         MmItemOutputEntity mmItemOutput = mmPredictItemDto.getMmItemOutput();
-        if(!"".equals(mmItemOutput.getId()) && dmModuleItem.getId() != null){
+        if (!"".equals(mmItemOutput.getId()) && dmModuleItem.getId() != null) {
             mmItemOutputService.update(mmItemOutput);
         }
     }
 
+    @DSTransactional(rollbackFor = Exception.class)
     @Override
     public void deleteBatch(String[] itemIds) {
         mmPredictItemDao.deleteBatchIds(Arrays.asList(itemIds));
@@ -175,6 +194,7 @@
             mmPredictItemDto.setMmPredictModel(mmPredictModel);
             mmPredictItemDto.setMmModelArithSettingsList(mmModelArithSettingsService.getByModelid(mmPredictModel.getId()));
             mmPredictItemDto.setMmModelParamList(mmModelParamService.getByModelid(mmPredictModel.getId()));
+            mmPredictItemDto.setMmPredictMergeItem(new MmPredictMergeItemEntity());
         } else if (itemType != null && ItemTypeEnum.MERGE_ITEM.getName().equals(itemType.getItemtypename())) {
             mmPredictItemDto.setMmPredictMergeItem(mmPredictMergeItemService.getByItemid(id));
         }
@@ -196,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