update 拆分已入库文本-分页查询

laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java

@@ -10,9 +10,12 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.lanswitch.service.ILanguageSwitchService;
 import com.jero.modules.ocr.util.LineHumpUtil;
+import com.jero.modules.oss.entity.OSSFile;
+import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
 import com.jero.modules.split.page.SarFileSplitInfoEOPage;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
+import com.jero.modules.split.vo.SplitFilePageInfoParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -23,6 +26,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
@@ -193,17 +197,20 @@ public class SarFileSplitInfoController extends JeroController<SarFileSplitInfoE
 
 	/**
 	 * 拆分已入库文本
-	 * @param parameter
 	 * @return
 	 */
 	@AutoLog(value = "拆分已入库文本-分页查询")
 	@ApiOperation(value="拆分已入库文本-分页查询", notes="拆分已入库文本-分页查询")
-	@PostMapping(value = "/splitFilePageInfo")
+	@GetMapping(value = "/splitFilePageInfo")
-	@ResponseBody
 //	@RequiresPermissions("split:sarFileSplitInfo:splitFile")
-	public Result<IPage<Map<String,Object>>> splitFilePageInfo(@RequestBody Map<String,Object> parameter) {
+	public Result<IPage<OSSFile>> splitFilePageInfo(SplitFilePageInfoParam param,
-		IPage<Map<String,Object>> infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter);
+															   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-		return Result.OK(infoPage);
+															   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															   HttpServletRequest request) {
+		Page<OSSFile> page = new Page<>(pageNo,pageSize);
+		Page<OSSFile> ossFilePage = sarFileSplitInfoService.splitFilePageInfoList(page, request, param);
+
+		return Result.OK(ossFilePage);
 	}
 
 	/**

laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java

@@ -1,8 +1,12 @@
 package com.jero.modules.split.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
+import com.jero.modules.split.vo.SplitFilePageInfoParam;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -71,4 +75,5 @@ public interface ISarFileSplitInfoService extends IService<SarFileSplitInfoEO> {
 
 	void batchUpdateByDocumentSerialNumber(String oldSerialNumber,String newSerialNumber,String newTitle,String newTitleEn);
 
+    Page<OSSFile> splitFilePageInfoList(Page<OSSFile> page, HttpServletRequest request, SplitFilePageInfoParam param);
 }

laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java

@@ -3,6 +3,8 @@ package com.jero.modules.split.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.LanguageEnum;
 import com.jero.common.constant.enums.ModuleEnum;
@@ -22,6 +24,7 @@ import com.jero.modules.split.mapper.SarFileSplitInfoMapper;
 import com.jero.modules.split.mapper.SarFileSplitMenuEOMapper;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
 import com.jero.modules.split.service.ISarFileSplitMenuEOService;
+import com.jero.modules.split.vo.SplitFilePageInfoParam;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.service.ISysDictItemService;
 import org.apache.commons.lang3.StringUtils;
@@ -30,6 +33,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -325,4 +329,12 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
 			updateBatchById(updateEOList);
 		}
 	}
+
+    @Override
+    public Page<OSSFile> splitFilePageInfoList(Page<OSSFile> page, HttpServletRequest request, SplitFilePageInfoParam param) {
+		QueryWrapper<OSSFile> wrapper = new QueryWrapper<>();
+
+		Page<OSSFile> pageList = ossFileService.page(page, wrapper);
+		return pageList;
+	}
 }

laws-modules/src/main/java/com/jero/modules/split/vo/SplitFilePageInfoParam.java

@@ -0,0 +1,21 @@
+package com.jero.modules.split.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liJiaRao
+ * @date 2023-09-21 17:07
+ */
+@Data
+public class SplitFilePageInfoParam {
+    @ApiModelProperty(value = "来源")
+    private String origin;
+    @ApiModelProperty(value = "标准号")
+    private String standardNumber;
+    @ApiModelProperty(value = "标准名称")
+    private String standardName;
+    @ApiModelProperty(value = "文本状态")
+    private String standardFileType;
+
+}