From 08923c6d95dc8f0f415de94e1d4e3230cdcf7a8e Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期四, 14 十一月 2024 15:42:58 +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/MmPredictModelServiceImpl.java | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictModelServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictModelServiceImpl.java index eb61a05..2922b37 100644 --- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictModelServiceImpl.java +++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/MmPredictModelServiceImpl.java @@ -1,10 +1,13 @@ package com.iailab.module.model.mcs.pre.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.iailab.framework.common.service.impl.BaseServiceImpl; +import com.iailab.module.model.mcs.pre.dao.MmPredictMergeItemDao; import com.iailab.module.model.mcs.pre.dao.MmPredictModelDao; import com.iailab.module.model.mcs.pre.entity.MmPredictModelEntity; import com.iailab.module.model.mcs.pre.service.MmPredictModelService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -17,13 +20,15 @@ * @author PanZhibao * @date 2021年04月27日 11:30 */ -@Service("mmPredictModelService") -public class MmPredictModelServiceImpl extends BaseServiceImpl<MmPredictModelDao, MmPredictModelEntity> implements MmPredictModelService { +@Service +public class MmPredictModelServiceImpl extends ServiceImpl<MmPredictModelDao, MmPredictModelEntity> implements MmPredictModelService { + @Autowired + private MmPredictModelDao mmPredictModelDao; @Override public void savePredictModel(MmPredictModelEntity predictModel) { predictModel.setId(UUID.randomUUID().toString()); - baseDao.insert(predictModel); + mmPredictModelDao.insert(predictModel); } @Override @@ -33,13 +38,13 @@ @Override public MmPredictModelEntity getInfo(String id) { - return baseDao.selectById(id); + return mmPredictModelDao.selectById(id); } @Override public BigDecimal getSampleLength(String id) { BigDecimal result = BigDecimal.ZERO; - List<MmPredictModelEntity> list = baseDao.getSampleLength(id); + List<MmPredictModelEntity> list = mmPredictModelDao.getSampleLength(id); if (CollectionUtils.isEmpty(list)) { return result; } @@ -51,13 +56,13 @@ public void deleteBatch(String[] itemIds) { QueryWrapper<MmPredictModelEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.in("itemid", itemIds); - baseDao.delete(queryWrapper); + mmPredictModelDao.delete(queryWrapper); } public MmPredictModelEntity getByItemid(String itemid) { QueryWrapper<MmPredictModelEntity> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("itemid", itemid); - List<MmPredictModelEntity> list = baseDao.selectList(queryWrapper); + List<MmPredictModelEntity> list = mmPredictModelDao.selectList(queryWrapper); if (CollectionUtils.isEmpty(list)) { return new MmPredictModelEntity(); } @@ -66,11 +71,11 @@ @Override public List<MmPredictModelEntity> getNoSettingmapPredictModel(Map<String, Object> params) { - return baseDao.getNoSettingmapPredictModel(params); + return mmPredictModelDao.getNoSettingmapPredictModel(params); } @Override public List<MmPredictModelEntity> getActiveModelByItemId(String itemId) { - return baseDao.getActiveModelByItemId(itemId); + return mmPredictModelDao.getActiveModelByItemId(itemId); } } -- Gitblit v1.9.3