From f61dc2d33639010a7b9505fad0cfbe9d36e1f83b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 24 九月 2024 11:19:44 +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/DmModuleServiceImpl.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/DmModuleServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/DmModuleServiceImpl.java
index 590cdf0..027832f 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/DmModuleServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/service/impl/DmModuleServiceImpl.java
@@ -2,6 +2,7 @@
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.page.PageData;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.service.impl.BaseServiceImpl;
@@ -10,33 +11,38 @@
import com.iailab.module.model.mcs.pre.service.DmModuleService;
import com.iailab.module.model.mcs.pre.vo.DmModulePageReqVO;
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 javax.annotation.Resource;
import java.util.*;
/**
* @author PanZhibao
* @date 2021年04月23日 8:36
*/
-@Service("dmModuleService")
-public class DmModuleServiceImpl extends BaseServiceImpl<DmModuleDao, DmModuleEntity> implements DmModuleService {
+@Service
+public class DmModuleServiceImpl extends ServiceImpl<DmModuleDao, DmModuleEntity> implements DmModuleService {
+
+ @Autowired
+ private DmModuleDao dmModuleDao;
@Override
public PageResult<DmModuleEntity> queryPage(DmModulePageReqVO reqVO) {
- return baseDao.selectPage(reqVO);
+ return dmModuleDao.selectPage(reqVO);
}
@Override
public List<DmModuleEntity> list(Map<String, Object> params) {
QueryWrapper<DmModuleEntity> wrapper = getWrapper(params);
wrapper.orderByDesc("CREATE_TIME");
- return baseDao.selectList(wrapper);
+ return dmModuleDao.selectList(wrapper);
}
@Override
- public DmModuleEntity get(String id) {
- return baseDao.selectById(id);
+ public DmModuleEntity info(String id) {
+ return dmModuleDao.selectById(id);
}
private QueryWrapper<DmModuleEntity> getWrapper(Map<String, Object> params) {
@@ -51,7 +57,6 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
public void saveModule(DmModuleEntity module) {
module.setId(UUID.randomUUID().toString());
Calendar calendar = Calendar.getInstance();
@@ -60,20 +65,18 @@
module.setPredicttime(calendar.getTime());
module.setCollecttime(calendar.getTime());
module.setUpdateTime(new Date());
- baseDao.insert(module);
+ dmModuleDao.insert(module);
}
@Override
- @Transactional(rollbackFor = Exception.class)
public void update(DmModuleEntity module) {
module.setUpdateTime(new Date());
- baseDao.updateById(module);
+ dmModuleDao.updateById(module);
}
@Override
- @Transactional(rollbackFor = Exception.class)
public void deleteBatch(String[] moduleIds) {
- baseDao.deleteBatchIds(Arrays.asList(moduleIds));
+ dmModuleDao.deleteBatchIds(Arrays.asList(moduleIds));
}
@Override
@@ -81,7 +84,7 @@
Map<String, Object> params = new HashMap<>(1);
params.put("moduletype", moduletype);
QueryWrapper<DmModuleEntity> wrapper = getWrapper(params);
- return baseDao.selectList(wrapper);
+ return dmModuleDao.selectList(wrapper);
}
@@ -93,7 +96,7 @@
moduleWrapper.ne(StringUtils.isNotBlank(id), "id", id);
moduleWrapper.and(wrapper -> wrapper.eq("modulename", modulename));
- List<DmModuleEntity> list = baseDao.selectList(moduleWrapper);
+ List<DmModuleEntity> list = dmModuleDao.selectList(moduleWrapper);
return list.size();
}
--
Gitblit v1.9.3