From 528b1892d8e929b199dddc96f3a43f9b8039c8c8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 06 六月 2024 18:00:42 +0800
Subject: [PATCH] 模板接口打通
---
src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java
index 5ebc5cb..20bea45 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamTemplateServiceImpl.java
@@ -1,20 +1,19 @@
package com.ycl.jxkg.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Assert;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageInfo;
-import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.entity.ExamTemplate;
-import com.ycl.jxkg.domain.form.ExamTemplateForm;
-import com.ycl.jxkg.domain.query.ExamTemplateQuery;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamTemplateVO;
import com.ycl.jxkg.mapper.ExamTemplateMapper;
import com.ycl.jxkg.service.ExamTemplateService;
-import com.ycl.jxkg.utils.PageUtil;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
+import com.ycl.jxkg.base.Result;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.jxkg.domain.form.ExamTemplateForm;
+import com.ycl.jxkg.domain.vo.ExamTemplateVO;
+import com.ycl.jxkg.domain.query.ExamTemplateQuery;
import org.springframework.stereotype.Service;
+import lombok.RequiredArgsConstructor;
+import com.ycl.jxkg.utils.PageUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.Assert;
import java.util.List;
import java.util.stream.Collectors;
@@ -22,8 +21,8 @@
/**
* 闅忔満璇曞嵎妯℃澘 鏈嶅姟瀹炵幇绫�
*
- * @author 寮�鍙戜汉鍛樺悕瀛�
- * @since 2024-06-03
+ * @author flq
+ * @since 2024-06-05
*/
@Service
@RequiredArgsConstructor
@@ -90,10 +89,7 @@
public Result page(ExamTemplateQuery query) {
IPage<ExamTemplateVO> page = PageUtil.getPage(query, ExamTemplateVO.class);
baseMapper.getPage(page, query);
- PageInfo<ExamTemplateVO> pageInfo = new PageInfo<>();
- pageInfo.setList(page.getRecords());
- pageInfo.setTotal(page.getTotal());
- return Result.ok(pageInfo);
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
}
/**
@@ -105,7 +101,7 @@
public Result detail(Integer id) {
ExamTemplateVO vo = baseMapper.getById(id);
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
- return Result.ok(vo);
+ return Result.ok().data(vo);
}
/**
@@ -118,6 +114,6 @@
List<ExamTemplateVO> vos = entities.stream()
.map(entity -> ExamTemplateVO.getVoByEntity(entity, null))
.collect(Collectors.toList());
- return Result.ok(vos);
+ return Result.ok().data(vos);
}
}
--
Gitblit v1.8.0