From 82b02f1f57316b1a7718059b6b345ae276fc60d2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 21 Sep 2023 17:15:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=8B=86=E5=88=86=E5=B7=B2=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=96=87=E6=9C=AC-=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileSplitInfoController.java | 19 +++++++++++------ .../service/ISarFileSplitInfoService.java | 5 +++++ .../impl/SarFileSplitInfoServiceImpl.java | 12 +++++++++++ .../split/vo/SplitFilePageInfoParam.java | 21 +++++++++++++++++++ 4 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/split/vo/SplitFilePageInfoParam.java diff --git a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java index 623e738d..3c34a014 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ b/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>> splitFilePageInfo(@RequestBody Map parameter) { - IPage> infoPage = bussDocumentLibraryEOService.ocrPageInfo(parameter); - return Result.OK(infoPage); + public Result> splitFilePageInfo(SplitFilePageInfoParam param, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest request) { + Page page = new Page<>(pageNo,pageSize); + Page ossFilePage = sarFileSplitInfoService.splitFilePageInfoList(page, request, param); + + return Result.OK(ossFilePage); } /** diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java b/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java index 8a063320..e22b55a4 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java +++ b/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 { void batchUpdateByDocumentSerialNumber(String oldSerialNumber,String newSerialNumber,String newTitle,String newTitleEn); + Page splitFilePageInfoList(Page page, HttpServletRequest request, SplitFilePageInfoParam param); } diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index aac4f411..d84ec54d 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/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 splitFilePageInfoList(Page page, HttpServletRequest request, SplitFilePageInfoParam param) { + QueryWrapper wrapper = new QueryWrapper<>(); + + Page pageList = ossFileService.page(page, wrapper); + return pageList; + } } diff --git a/laws-modules/src/main/java/com/jero/modules/split/vo/SplitFilePageInfoParam.java b/laws-modules/src/main/java/com/jero/modules/split/vo/SplitFilePageInfoParam.java new file mode 100644 index 00000000..8eed9bd9 --- /dev/null +++ b/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; + +}