From 16d10cef208de048f8b325facd143c54b7be9963 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 31 五月 2024 11:53:39 +0800
Subject: [PATCH] 重构：lombok、vo、mybatisplus、beanutils、包名
---
src/main/java/com/ycl/jxkg/service/impl/TaskExamServiceImpl.java | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/TaskExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/TaskExamServiceImpl.java
index 9388e70..308de43 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/TaskExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/TaskExamServiceImpl.java
@@ -5,32 +5,31 @@
import com.ycl.jxkg.domain.TextContent;
import com.ycl.jxkg.domain.User;
import com.ycl.jxkg.domain.task.TaskItemObject;
-import com.ycl.jxkg.repository.ExamPaperMapper;
-import com.ycl.jxkg.repository.TaskExamMapper;
+import com.ycl.jxkg.mapper.ExamPaperMapper;
+import com.ycl.jxkg.mapper.TaskExamMapper;
import com.ycl.jxkg.service.TaskExamService;
import com.ycl.jxkg.service.TextContentService;
import com.ycl.jxkg.service.enums.ActionEnum;
-import com.ycl.jxkg.utility.DateTimeUtil;
-import com.ycl.jxkg.utility.JsonUtil;
-import com.ycl.jxkg.utility.ModelMapperSingle;
-import com.ycl.jxkg.viewmodel.admin.exam.ExamResponseVM;
-import com.ycl.jxkg.viewmodel.admin.task.TaskPageRequestVM;
-import com.ycl.jxkg.viewmodel.admin.task.TaskRequestVM;
+import com.ycl.jxkg.utils.DateTimeUtil;
+import com.ycl.jxkg.utils.JsonUtil;
+import com.ycl.jxkg.vo.admin.exam.ExamResponseVO;
+import com.ycl.jxkg.vo.admin.task.TaskPageRequestVO;
+import com.ycl.jxkg.vo.admin.task.TaskRequestVO;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
-import org.modelmapper.ModelMapper;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
@Service
public class TaskExamServiceImpl extends BaseServiceImpl<TaskExam> implements TaskExamService {
- protected final static ModelMapper modelMapper = ModelMapperSingle.Instance();
private final TaskExamMapper taskExamMapper;
private final TextContentService textContentService;
private final ExamPaperMapper examPaperMapper;
@@ -44,7 +43,7 @@
}
@Override
- public PageInfo<TaskExam> page(TaskPageRequestVM requestVM) {
+ public PageInfo<TaskExam> page(TaskPageRequestVO requestVM) {
return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() ->
taskExamMapper.page(requestVM)
);
@@ -52,12 +51,13 @@
@Override
@Transactional
- public void edit(TaskRequestVM model, User user) {
+ public void edit(TaskRequestVO model, User user) {
ActionEnum actionEnum = (model.getId() == null) ? ActionEnum.ADD : ActionEnum.UPDATE;
- TaskExam taskExam = null;
+ TaskExam taskExam = new TaskExam();
+
if (actionEnum == ActionEnum.ADD) {
+ BeanUtils.copyProperties(model, taskExam);
Date now = new Date();
- taskExam = modelMapper.map(model, TaskExam.class);
taskExam.setCreateUser(user.getId());
taskExam.setCreateUserName(user.getUserName());
taskExam.setCreateTime(now);
@@ -75,9 +75,11 @@
taskExamMapper.insertSelective(taskExam);
} else {
- taskExam = taskExamMapper.selectByPrimaryKey(model.getId());
- modelMapper.map(model, taskExam);
-
+ TaskExam old = taskExamMapper.selectByPrimaryKey(model.getId());
+ if (Objects.isNull(old)) {
+ throw new RuntimeException("鏁版嵁涓嶅瓨鍦�");
+ }
+ BeanUtils.copyProperties(taskExam, old);
TextContent textContent = textContentService.selectById(taskExam.getFrameTextContentId());
//娓呯┖璇曞嵎浠诲姟鐨勮瘯鍗稩d锛屽悗闈細缁熶竴璁剧疆
List<Integer> paperIds = JsonUtil.toJsonListObject(textContent.getContent(), TaskItemObject.class)
@@ -94,7 +96,7 @@
return taskItemObject;
});
textContentService.updateByIdFilter(textContent);
- taskExamMapper.updateByPrimaryKeySelective(taskExam);
+ taskExamMapper.updateByPrimaryKeySelective(old);
}
//鏇存柊璇曞嵎鐨則askId
@@ -104,18 +106,20 @@
}
@Override
- public TaskRequestVM taskExamToVM(Integer id) {
+ public TaskRequestVO taskExamToVM(Integer id) {
TaskExam taskExam = taskExamMapper.selectByPrimaryKey(id);
- TaskRequestVM vm = modelMapper.map(taskExam, TaskRequestVM.class);
+ TaskRequestVO vo = new TaskRequestVO();
+ BeanUtils.copyProperties(taskExam, vo);
TextContent textContent = textContentService.selectById(taskExam.getFrameTextContentId());
- List<ExamResponseVM> examResponseVMS = JsonUtil.toJsonListObject(textContent.getContent(), TaskItemObject.class).stream().map(tk -> {
+ List<ExamResponseVO> examResponseVOS = JsonUtil.toJsonListObject(textContent.getContent(), TaskItemObject.class).stream().map(tk -> {
ExamPaper examPaper = examPaperMapper.selectByPrimaryKey(tk.getExamPaperId());
- ExamResponseVM examResponseVM = modelMapper.map(examPaper, ExamResponseVM.class);
- examResponseVM.setCreateTime(DateTimeUtil.dateFormat(examPaper.getCreateTime()));
- return examResponseVM;
+ ExamResponseVO examResponseVO = new ExamResponseVO();
+ BeanUtils.copyProperties(examPaper, examResponseVO);
+ examResponseVO.setCreateTime(DateTimeUtil.dateFormat(examPaper.getCreateTime()));
+ return examResponseVO;
}).collect(Collectors.toList());
- vm.setPaperItems(examResponseVMS);
- return vm;
+ vo.setPaperItems(examResponseVOS);
+ return vo;
}
@Override
--
Gitblit v1.8.0