From b65f3d9074baa2ce32e07af720cc1cfd88e096f9 Mon Sep 17 00:00:00 2001
From: liulin <lin.liu@aliyun.com>
Date: 星期一, 05 八月 2024 14:25:24 +0800
Subject: [PATCH] demo代码修改
---
src/main/java/com/lunhan/xxx/service/TestInfoService.java | 65 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/lunhan/xxx/service/TestInfoService.java b/src/main/java/com/lunhan/xxx/service/TestInfoService.java
index 40b8a7a..e05a50c 100644
--- a/src/main/java/com/lunhan/xxx/service/TestInfoService.java
+++ b/src/main/java/com/lunhan/xxx/service/TestInfoService.java
@@ -2,6 +2,7 @@
import com.lunhan.xxx.common.ExecutedResult;
import com.lunhan.xxx.common.PagerResult;
+import com.lunhan.xxx.common.enums.EYesOrNo;
import com.lunhan.xxx.common.model.Tuple;
import com.lunhan.xxx.common.util.*;
import com.lunhan.xxx.entity.dto.search.SearchTestInfo;
@@ -10,10 +11,10 @@
import com.lunhan.xxx.entity.request.ReqSetSort;
import com.lunhan.xxx.entity.request.test.ReqCreateTestInfo;
import com.lunhan.xxx.entity.request.test.ReqModifyTestInfo;
-import com.lunhan.xxx.repository.dao.TestInfoDao;
+import com.lunhan.xxx.repository.impl.TestInfoMapperImpl;
import com.lunhan.xxx.repository.po.TestInfoPO;
import com.lunhan.xxx.repository.vo.TestInfoVO;
-import com.lunhan.xxx.service.convert.TestInfoMapper;
+import com.lunhan.xxx.service.convert.TestInfoConvert;
import org.apache.commons.lang3.BooleanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -27,19 +28,20 @@
@Service
public class TestInfoService extends BaseService {
@Autowired
- private TestInfoDao dao;
+ private TestInfoMapperImpl mapper;
public ExecutedResult<Long> create(ReqCreateTestInfo request) {
// 转换po
- TestInfoPO item = TestInfoMapper.INSTANCE.toCreate(request);
- item.setId(SnowFlakeUtil.getId());
+ TestInfoPO item = TestInfoConvert.INSTANCE.toCreate(request);
// 设置状态
item.setStatus(EState.NORMAL.getValue());
// 设置记录创建时间
item.setCreateTime(LocalDateTimeUtil.nowTimeStamp());
+ // 非逻辑删除
+ item.setIsDelete(EYesOrNo.NO.getValue());
- Boolean result = this.dao.addNotIncrement(item);
- if (BooleanUtils.isFalse(result)) {
+ int rowCount = mapper.insert(item);
+ if (rowCount != 1) {
return ExecutedResult.failed("创建[测试信息]失败。");
}
return ExecutedResult.success(item.getId());
@@ -53,10 +55,10 @@
}
// 转换po
- TestInfoPO item = TestInfoMapper.INSTANCE.toModify(request);
+ TestInfoPO item = TestInfoConvert.INSTANCE.toModify(request);
- Boolean result = this.dao.modify(item);
- if (BooleanUtils.isFalse(result)) {
+ int rowCount = mapper.updateById(item);
+ if (rowCount != 1) {
return ExecutedResult.failed("编辑[测试信息]失败。");
}
return ExecutedResult.success();
@@ -65,9 +67,9 @@
public ExecutedResult<TestInfoVO> get(Long id) {
TestInfoVO result = new TestInfoVO();
- TestInfoPO find = dao.getById(id);
+ TestInfoPO find = mapper.selectById(id);
if (null != find) {
- result = TestInfoMapper.INSTANCE.toVo(find);
+ result = TestInfoConvert.INSTANCE.toVo(find);
}
return ExecutedResult.success(result);
}
@@ -83,8 +85,8 @@
item.setId(id);
item.setStatus(EState.DISABLED.getValue());
- Boolean result = this.dao.modify(item);
- if (BooleanUtils.isFalse(result)) {
+ int rowCount = mapper.updateById(item);
+ if (rowCount != 1) {
return ExecutedResult.failed("停用[测试信息]失败。");
}
return ExecutedResult.success();
@@ -101,8 +103,8 @@
item.setId(id);
item.setStatus(EState.NORMAL.getValue());
- Boolean result = this.dao.modify(item);
- if (BooleanUtils.isFalse(result)) {
+ int rowCount = mapper.updateById(item);
+ if (rowCount != 1) {
return ExecutedResult.failed("启用[测试信息]失败。");
}
return ExecutedResult.success();
@@ -119,15 +121,15 @@
item.setId(request.getId());
item.setSort(request.getSort());
- Boolean result = this.dao.modify(item);
- if (BooleanUtils.isFalse(result)) {
+ int rowCount = mapper.updateById(item);
+ if (rowCount != 1) {
return ExecutedResult.failed("[测试信息]设置排序值失败。");
}
return ExecutedResult.success();
}
public ExecutedResult<String> listSetSort(ReqListSetSort request) {
- // 类别id列表
+ // id列表
List<Long> listId = request.getList().stream().map(ReqSetSort::getId).collect(Collectors.toList());
// 验证记录是否存在
ExecutedResult<List<TestInfoPO>> checkExists = this.check4Id(listId);
@@ -143,7 +145,7 @@
return item;
})
.collect(Collectors.toList());
- Boolean result = dao.modifyList(listUpdate);
+ Boolean result = mapper.modifyList(listUpdate);
if (result) {
return ExecutedResult.success();
}
@@ -157,7 +159,7 @@
return ExecutedResult.failed(checkExists.getMsg());
}
- Boolean result = this.dao.deleteLogic(id);
+ Boolean result = mapper.deleteLogic(id);
if (BooleanUtils.isFalse(result)) {
return ExecutedResult.failed("删除[测试信息]失败。");
}
@@ -171,7 +173,7 @@
return ExecutedResult.failed(checkExists.getMsg());
}
- Boolean result = this.dao.deleteLogic(listId);
+ Boolean result = mapper.deleteLogic(listId);
if (BooleanUtils.isFalse(result)) {
return ExecutedResult.failed("删除[测试信息]失败。");
}
@@ -181,7 +183,7 @@
public ExecutedResult<List<TestInfoVO>> getList(List<Long> listId) {
List<TestInfoVO> result = new ArrayList<>();
- List<TestInfoPO> list = this.dao.getListById(listId);
+ List<TestInfoPO> list = mapper.getList(listId);
if (ListUtil.isNotNullOrEmpty(list)) {
result = CopierUtil.mapTo(list, TestInfoVO.class);
}
@@ -198,13 +200,13 @@
search.setCreateTimeEnd(LocalDateTimeUtil.getTimeStamp(createTimeRange.getItem2()).getTime());
}
- PagerResult<TestInfoPO> pageList = dao.search(search);
+ PagerResult<TestInfoPO> pageList = mapper.search(search);
List<TestInfoVO> listVo = new ArrayList<>();
List<TestInfoPO> list = pageList.getList();
if (ListUtil.isNotNullOrEmpty(list)) {
pageList.setLastId(list.get(list.size() - 1).getId());
// 转换vo
- listVo = TestInfoMapper.INSTANCE.toVo(list);
+ listVo = TestInfoConvert.INSTANCE.toVo(list);
}
PagerResult<TestInfoVO> result = new PagerResult<>(pageList.getLimit(), pageList.getPage(), pageList.getTotal(), listVo);
result.setLastId(pageList.getLastId());
@@ -212,23 +214,23 @@
}
protected ExecutedResult<TestInfoPO> check4Id(Long id) {
- TestInfoPO exists = dao.getById(id);
+ TestInfoPO exists = mapper.get(id);
if (Objects.isNull(exists)) {
return ExecutedResult.failed("[测试信息]不存在：" + id);
}
return ExecutedResult.success(exists);
}
protected ExecutedResult<List<TestInfoPO>> check4Id(List<Long> listId) {
- // 从数据库查找类别
- List<TestInfoPO> list = dao.getListById(listId);
+ // 从数据库查找测试信息
+ List<TestInfoPO> list = mapper.getList(listId);
if (ListUtil.isNullOrEmpty(list)) {
return ExecutedResult.failed("[测试信息]不存在." + listId);
}
- // 数据库找到的类别id列表
+ // 数据库找到的id列表
List<Long> listIdFind = list.stream().map(TestInfoPO::getId).collect(Collectors.toList());
// 数量不一致
if (listId.size() != listIdFind.size()) {
- // 筛选数据库不存在的类别
+ // 筛选数据库不存在的测试信息
List<Long> listIdNotFound = listId.stream().filter(c -> !listIdFind.contains(c)).collect(Collectors.toList());
if (ListUtil.isNullOrEmpty(list)) {
return ExecutedResult.failed("[测试信息]不存在." + listIdNotFound);
@@ -236,8 +238,9 @@
}
return ExecutedResult.success(list);
}
+
protected Map<Long, TestInfoPO> getMap4Id(List<Long> listId) {
- List<TestInfoPO> list = this.dao.getListById(listId);
+ List<TestInfoPO> list = mapper.getList(listId);
if (ListUtil.isNullOrEmpty(list)) {
return new HashMap<>(0);
}
--
Gitblit v1.9.3