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 | 132 ++++++++++++++++++++++----------------------
1 files changed, 66 insertions(+), 66 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 810f29d..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,37 +1,36 @@
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.iailab.framework.common.page.PageData;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.iailab.framework.common.pojo.PageResult;
-import com.iailab.framework.common.service.impl.BaseServiceImpl;
+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.*;
import com.iailab.module.model.mcs.pre.enums.ItemIncreaseCodeEnum;
import com.iailab.module.model.mcs.pre.enums.ItemTypeEnum;
import com.iailab.module.model.mcs.pre.service.MmPredictItemService;
-import com.iailab.module.model.mcs.pre.service.SequenceNumService;
+import com.iailab.module.model.mcs.pre.service.MmSequenceNumService;
+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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.text.SimpleDateFormat;
import java.util.*;
/**
* @author PanZhibao
* @date 2021年04月26日 14:03
*/
-@Service("mmPredictItemService")
-public class MmPredictItemServiceImpl extends BaseServiceImpl<MmPredictItemDao, MmPredictItemEntity> implements MmPredictItemService {
+@Service
+public class MmPredictItemServiceImpl extends ServiceImpl<MmPredictItemDao, MmPredictItemEntity> implements MmPredictItemService {
@Autowired
private DmModuleItemServiceImpl dmModuleItemService;
@@ -55,41 +54,53 @@
private MmItemTypeImpl mmItemTypeImpl;
@Autowired
- private SequenceNumService sequenceNumService;
+ private MmSequenceNumService sequenceNumService;
+
+ @Autowired
+ private MmPredictItemDao mmPredictItemDao;
+
+ @Autowired
+ private DataPointApi dataPointApi;
@Override
- public PageResult<MmPredictItemRespVO> getPageList(Map<String, Object> params) {
- PageResult<MmPredictItemRespVO> result = new PageResult();
- IPage<MmPredictItemRespVO> page = baseDao.getPageList(
- getPage(params, "CREATE_TIME", false),
- params
- );
- result.setList(page.getRecords());
- result.setTotal(page.getTotal());
+ public PageResult<MmPredictItemRespVO> queryPage(MmPredictItemPageReqVO reqVO) {
+ IPage<MmPredictItemRespVO> page = mmPredictItemDao.selectPage(reqVO);
+
+ return new PageResult<MmPredictItemRespVO>(page.getRecords(), page.getTotal());
+ }
+
+ @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;
}
- private QueryWrapper<MmPredictItemEntity> getWrapper(Map<String, Object> params) {
- QueryWrapper<MmPredictItemEntity> wrapper = new QueryWrapper<>();
- return wrapper;
- }
-
+ @DSTransactional(rollbackFor = Exception.class)
@Override
- @Transactional(rollbackFor = Exception.class)
- public void savePredictItem(MmPredictItemDTO mmPredictItemDto) {
+ public void add(MmPredictItemDTO mmPredictItemDto) {
MmPredictItemEntity predictItem = mmPredictItemDto.getMmPredictItem();
predictItem.setId(UUID.randomUUID().toString());
predictItem.setCreateTime(new Date());
predictItem.setUpdateTime(new Date());
MmItemTypeEntity itemType = mmItemTypeImpl.getById(predictItem.getItemtypeid());
- if (ItemTypeEnum.NORMAL_ITEM.getName().equals(itemType.getItemtypename())) {
- SequenceNumEntity sequenceNumEntity = sequenceNumService.getAndIncreaseByCode(ItemIncreaseCodeEnum.IM.toString());
+ if (itemType != null && ItemTypeEnum.NORMAL_ITEM.getName().equals(itemType.getItemtypename())) {
+ MmSequenceNumEntity sequenceNumEntity = sequenceNumService.getAndIncreaseByCode(ItemIncreaseCodeEnum.IM.toString());
String str = String.format("%010d", sequenceNumEntity.getSequenceNum());
predictItem.setItemno(sequenceNumEntity.getPrefix() + str);
MmPredictModelEntity mmPredictModel = mmPredictItemDto.getMmPredictModel();
- SequenceNumEntity preMdlSequenceNumEntity = sequenceNumService.getAndIncreaseByCode(ItemIncreaseCodeEnum.PRE_MDL.toString());
+ MmSequenceNumEntity preMdlSequenceNumEntity = sequenceNumService.getAndIncreaseByCode(ItemIncreaseCodeEnum.PRE_MDL.toString());
String preMdlStr = String.format("%04d", preMdlSequenceNumEntity.getSequenceNum());
mmPredictModel.setModelno(preMdlSequenceNumEntity.getPrefix() + preMdlStr);
mmPredictModel.setItemid(predictItem.getId());
@@ -106,8 +117,8 @@
item.setModelid(mmPredictModel.getId());
});
mmModelParamService.saveList(mmModelParamList);
- } else if (ItemTypeEnum.MERGE_ITEM.getName().equals(itemType.getItemtypename())) {
- SequenceNumEntity sequenceNumEntity = sequenceNumService.getAndIncreaseByCode(ItemIncreaseCodeEnum.IC.toString());
+ } else if (itemType != null && ItemTypeEnum.MERGE_ITEM.getName().equals(itemType.getItemtypename())) {
+ MmSequenceNumEntity sequenceNumEntity = sequenceNumService.getAndIncreaseByCode(ItemIncreaseCodeEnum.IC.toString());
String str = String.format("%010d", sequenceNumEntity.getSequenceNum());
predictItem.setItemno(sequenceNumEntity.getPrefix() + str);
@@ -115,7 +126,7 @@
mMmPredictMergeItem.setItemid(predictItem.getId());
mmPredictMergeItemService.savePredictMergeItem(mMmPredictMergeItem);
}
- insert(predictItem);
+ mmPredictItemDao.insert(predictItem);
DmModuleItemEntity dmModuleItem = mmPredictItemDto.getDmModuleItem();
dmModuleItem.setItemid(predictItem.getId());
dmModuleItemService.saveModuleItem(dmModuleItem);
@@ -125,14 +136,14 @@
mmItemOutputService.saveMmItemOutput(mmItemOutput);
}
+ @DSTransactional(rollbackFor = Exception.class)
@Override
- @Transactional(rollbackFor = Exception.class)
public void update(MmPredictItemDTO mmPredictItemDto) {
MmPredictItemEntity predictItem = mmPredictItemDto.getMmPredictItem();
predictItem.setUpdateTime(new Date());
- this.updateById(predictItem);
+ mmPredictItemDao.updateById(predictItem);
MmItemTypeEntity itemType = mmItemTypeImpl.getById(predictItem.getItemtypeid());
- if (ItemTypeEnum.NORMAL_ITEM.getName().equals(itemType.getItemtypename())) {
+ if (itemType != null && ItemTypeEnum.NORMAL_ITEM.getName().equals(itemType.getItemtypename())) {
MmPredictModelEntity mmPredictModel = mmPredictItemDto.getMmPredictModel();
mmPredictModelService.update(mmPredictModel);
@@ -147,52 +158,47 @@
item.setModelid(mmPredictModel.getId());
});
mmModelParamService.saveList(mmModelParamList);
- } else if (ItemTypeEnum.MERGE_ITEM.getName().equals(itemType.getItemtypename())) {
+ } else if (itemType != null && ItemTypeEnum.MERGE_ITEM.getName().equals(itemType.getItemtypename())) {
MmPredictMergeItemEntity mMmPredictMergeItem = mmPredictItemDto.getMmPredictMergeItem();
mmPredictMergeItemService.update(mMmPredictMergeItem);
}
DmModuleItemEntity dmModuleItem = mmPredictItemDto.getDmModuleItem();
- dmModuleItemService.update(dmModuleItem);
-
+ if (!"".equals(dmModuleItem.getId()) && dmModuleItem.getId() != null) {
+ dmModuleItemService.update(dmModuleItem);
+ }
MmItemOutputEntity mmItemOutput = mmPredictItemDto.getMmItemOutput();
- mmItemOutputService.update(mmItemOutput);
+ if (!"".equals(mmItemOutput.getId()) && dmModuleItem.getId() != null) {
+ mmItemOutputService.update(mmItemOutput);
+ }
}
+ @DSTransactional(rollbackFor = Exception.class)
@Override
- @Transactional(rollbackFor = Exception.class)
public void deleteBatch(String[] itemIds) {
- deleteBatchIds(Arrays.asList(itemIds));
+ mmPredictItemDao.deleteBatchIds(Arrays.asList(itemIds));
mmPredictMergeItemService.deleteBatch(itemIds);
mmPredictModelService.deleteBatch(itemIds);
mmItemOutputService.deleteBatch(itemIds);
}
@Override
- public MmPredictItemDTO getDetailById(String id, Map<String, Object> params) {
- MmPredictItemDTO mmPredictItemDto = new MmPredictItemDTO();
- MmPredictItemEntity predictItem = selectById(id);
+ public MmPredictItemDTO info(String id) {
+ MmPredictItemEntity predictItem = mmPredictItemDao.selectById(id);
+ MmPredictItemDTO mmPredictItemDto = BeanUtils.toBean(predictItem, MmPredictItemDTO.class);
mmPredictItemDto.setMmPredictItem(predictItem);
mmPredictItemDto.setDmModuleItem(dmModuleItemService.getByItemid(id));
mmPredictItemDto.setMmItemOutput(mmItemOutputService.getByItemid(id));
MmItemTypeEntity itemType = mmItemTypeImpl.getById(predictItem.getItemtypeid());
- if (ItemTypeEnum.NORMAL_ITEM.getName().equals(itemType.getItemtypename())) {
+ if (itemType != null && ItemTypeEnum.NORMAL_ITEM.getName().equals(itemType.getItemtypename())) {
MmPredictModelEntity mmPredictModel = mmPredictModelService.getByItemid(id);
mmPredictItemDto.setMmPredictModel(mmPredictModel);
mmPredictItemDto.setMmModelArithSettingsList(mmModelArithSettingsService.getByModelid(mmPredictModel.getId()));
mmPredictItemDto.setMmModelParamList(mmModelParamService.getByModelid(mmPredictModel.getId()));
- } else if (ItemTypeEnum.MERGE_ITEM.getName().equals(itemType.getItemtypename())) {
+ mmPredictItemDto.setMmPredictMergeItem(new MmPredictMergeItemEntity());
+ } else if (itemType != null && ItemTypeEnum.MERGE_ITEM.getName().equals(itemType.getItemtypename())) {
mmPredictItemDto.setMmPredictMergeItem(mmPredictMergeItemService.getByItemid(id));
}
-
return mmPredictItemDto;
- }
-
- @Override
- public boolean exportItemResult(HttpServletResponse response, HttpServletRequest request, String id, Map<String, Object> params) {
- //MmPredictItemDTO mmPredictItemDto = this.getPredictValuesById(id, params);
- //List<MmItemResultEntity> itemResultList = mmPredictItemDto.getMmItemResultList();
-
- return true;
}
@Override
@@ -203,21 +209,15 @@
QueryWrapper<MmPredictItemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.ne(StringUtils.isNotBlank(id), "id", id);
queryWrapper.and(wrapper -> wrapper.eq("itemname", itemname).or().eq("itemno", itemno));
- List<MmPredictItemEntity> list = baseDao.selectList(queryWrapper);
+ List<MmPredictItemEntity> list = mmPredictItemDao.selectList(queryWrapper);
return list.size();
- }
-
- @Override
- public Long count() {
- QueryWrapper<MmPredictItemEntity> queryWrapper = new QueryWrapper<>();
- return baseDao.selectCount(queryWrapper);
}
@Override
public List<ItemVO> getByModuleId(String moduleId) {
Map<String, Object> params = new HashMap<>();
-
- return baseDao.getByModuleId(params);
+ params.put("MODULEID",moduleId);
+ return mmPredictItemDao.getByModuleId(params);
}
@Override
@@ -227,7 +227,7 @@
}
Map<String, Object> params = new HashMap(1);
params.put("ITEMNO", itemNo);
- List<ItemVO> list = baseDao.getItem(params);
+ List<ItemVO> list = mmPredictItemDao.getItem(params);
if (CollectionUtils.isEmpty(list)) {
return null;
}
@@ -241,7 +241,7 @@
}
Map<String, Object> params = new HashMap(1);
params.put("ITEMID", itemId);
- List<ItemVO> list = baseDao.getItem(params);
+ List<ItemVO> list = mmPredictItemDao.getItem(params);
if (CollectionUtils.isEmpty(list)) {
return null;
}
@@ -255,7 +255,7 @@
}
Map<String, Object> params = new HashMap(1);
params.put("ITEMID", itemId);
- List<MergeItemVO> list = baseDao.getMergeItemByItemId(params);
+ List<MergeItemVO> list = mmPredictItemDao.getMergeItemByItemId(params);
if (CollectionUtils.isEmpty(list)) {
return null;
}
--
Gitblit v1.9.3