1

ruoyi-admin/src/main/resources/application.yml

@@ -47,6 +47,10 @@ user:
 
 # Spring配置
 spring:
+  jackson:
+    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
   # 资源信息
   messages:
     # 国际化资源文件路径

ruoyi-zzb/src/main/java/com/ruoyi/zzb/study/controller/StudyController.java

@@ -25,10 +25,9 @@ public class StudyController {
 	private StudyService studyService;
 
 	@PostMapping("/findAllInfo")
-	public JSONObject findAllInfo(HttpServletResponse response, HttpServletRequest request,@RequestBody JSONObject params) {
-
+	public JSONObject findAllInfo(HttpServletResponse response, HttpServletRequest request,@Validated @RequestBody UserSearchParam userSearchParam) {
 		try {
-			JSONObject result = studyService.findAllInfo();
+			Page<StudyDocInfo> result = studyService.findAllInfo(userSearchParam);
 			return RspResult.success(result);
 		}catch (Exception e){
 			e.printStackTrace();
@@ -102,7 +101,7 @@ public class StudyController {
 
 
 	@PostMapping("/findInfoByTitle")
-	public JSONObject findInfoByTitle(HttpServletResponse response, HttpServletRequest request,@RequestBody UserSearchParam userSearchParam) {
+	public JSONObject findInfoByTitle(HttpServletResponse response, HttpServletRequest request, @Validated @RequestBody UserSearchParam userSearchParam) {
 
 		try {
 			Page<StudyDocInfo> result = studyService.findInfoByTitle(userSearchParam);

ruoyi-zzb/src/main/java/com/ruoyi/zzb/study/domain/BasePaging.java

@@ -2,6 +2,9 @@ package com.ruoyi.zzb.study.domain;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * 公共分页类
  * @author pan_junbiao
@@ -12,11 +15,13 @@ public class BasePaging
     /**
      * 当前页码
      */
+    @NotNull
     private int pageIndex;
 
     /**
      * 分页大小
      */
+    @NotNull
     private int pageSize;
 
     /**

ruoyi-zzb/src/main/java/com/ruoyi/zzb/study/domain/StudyDocInfo.java

@@ -1,12 +1,13 @@
 package com.ruoyi.zzb.study.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 
+
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;

ruoyi-zzb/src/main/java/com/ruoyi/zzb/study/service/StudyService.java

@@ -38,12 +38,22 @@ public class StudyService {
     private BasePersonInfoMapper basePersonInfoMapper;
 
 
-    public JSONObject findAllInfo() {
-        JSONObject resultData = new JSONObject();
-        List<StudyDocInfo> StudyDocInfoList= studyDocInfoMapper.selectList(new QueryWrapper<>());
-        resultData.put("data",StudyDocInfoList);
-        System.err.println(JSONObject.toJSONString(StudyDocInfoList));
-        return resultData;
+    public Page<StudyDocInfo>  findAllInfo(UserSearchParam searchParam) {
+  //分页参数
+        Page<StudyDocInfo> rowPage = new Page(searchParam.getPageIndex(), searchParam.getPageSize());
+
+        //查询条件
+        LambdaQueryWrapper<StudyDocInfo> queryWrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotEmpty(searchParam.getTitle()))
+
+
+        //排序
+        queryWrapper.orderByAsc(StudyDocInfo::getOrderNum);
+        queryWrapper.orderByAsc(StudyDocInfo::getCreateTime);
+        //分页查询
+        rowPage = studyDocInfoMapper.selectPage(rowPage, queryWrapper);
+        return rowPage;
+
     }
 
     public JSONObject findByWrapper(String id) {
@@ -133,14 +143,10 @@ public class StudyService {
         {
             queryWrapper.like(StudyDocInfo::getTitle,searchParam.getTitle());
         }
-//        if(StringUtils.isNotEmpty(searchParam.getProvince()))
-//        {
-//            queryWrapper.eq(UserInfo::getProvince,searchParam.getProvince());
-//        }
 
         //排序
+        queryWrapper.orderByAsc(StudyDocInfo::getOrderNum);
         queryWrapper.orderByAsc(StudyDocInfo::getCreateTime);
-
         //分页查询
         rowPage = studyDocInfoMapper.selectPage(rowPage, queryWrapper);
         return rowPage;