From 1bade273717448dc078b253c8f2fb200c8e3c69b Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Tue, 14 Nov 2023 11:53:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20?= =?UTF-8?q?=E6=8B=86=E5=88=86=E5=B7=B2=E5=85=A5=E5=BA=93=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DocumentSplitController.java | 15 +++++ .../documenttool/entity/SplitFileInfo.java | 63 +++++++++++++++++++ .../mapper/DocumentSplitMapper.java | 9 +++ .../mapper/xml/DocumentSplitMapper.xml | 12 ++++ .../service/IDocumentSplitService.java | 10 +++ .../impl/DocumentSplitServiceImpl.java | 17 +++-- 6 files changed, 122 insertions(+), 4 deletions(-) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java index ee6da55b..6ab6cd43 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java @@ -7,6 +7,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.util.MessageUtils; import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView; +import com.jero.modules.laws.documenttool.entity.SplitFileInfo; import com.jero.modules.laws.documenttool.service.IDocumentSplitService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsValEO; @@ -62,6 +63,20 @@ public class DocumentSplitController { return Result.OK(documentSplitService.queryByPage(documentSplitInfo, pageNo, pageSize)); } + /** + * 文档拆分-拆分已入库文本 + * + * @return + */ + @AutoLog(value = "文档拆分-拆分已入库文本分页列表查询") + @ApiOperation(value="文档拆分-拆分已入库文本分页列表查询", notes="文档拆分-拆分已入库文本分页列表查询") + @GetMapping(value = "/querySplitFileInfoByPage") + public Result> queryByPage(SplitFileInfo splitFileInfo, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + return Result.OK(documentSplitService.querySplitFileInfoByPage(splitFileInfo, pageNo, pageSize)); + } + /** * 文档拆分-查看 * diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java new file mode 100644 index 00000000..4a51e2f1 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SplitFileInfo.java @@ -0,0 +1,63 @@ +package com.jero.modules.laws.documenttool.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +import java.util.Date; + +/** + * @ClassName: SplitFileInfo + * @Description: + * @Author: yjz + * @Date: 2023-11-14 11:29 + * @Version: 1.0 + **/ +@Data +public class SplitFileInfo { + @Excel(name = "文件名称") + private String fileName; + + @Excel(name = "文件地址") + private String url; + + @Excel(name = "标准文件类型") + @Dict(dicCode = "process_manuscript") + private String standardFileType; + + @ApiModelProperty(value = "标准id") + private String standardId; + + @ApiModelProperty(value = "标准编号") + private String standardNo; + + @ApiModelProperty(value = "创建人") + private String createBy; + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + @ApiModelProperty(value = "更新人") + private String updateBy; + + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + @TableField(exist = false) + @ApiModelProperty(value = "来源") + @Dict(dicCode = "standard_source") + private String origin; + + @TableField(exist = false) + @ApiModelProperty(value = "标准号") + private String standardNumber; + + @TableField(exist = false) + @ApiModelProperty(value = "标准名称") + private String standardName; +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java index 9712e69d..39efc198 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo; import com.jero.modules.laws.documenttool.entity.SarFileSplitItemsVal; import com.jero.modules.laws.documenttool.entity.SarFileSplitMenu; +import com.jero.modules.laws.documenttool.entity.SplitFileInfo; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsValEO; import org.apache.ibatis.annotations.Param; @@ -184,4 +185,12 @@ public interface DocumentSplitMapper { * @return */ Map queryDocumentSplitDetailById(String id); + + /** + * 文档拆分-拆分已入库文本分页列表查询 + * @param queryWrapper + * @param page + * @return + */ + IPage querySplitFileInfoByPage(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, IPage page); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml index 13647bd4..4d565269 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml @@ -212,6 +212,18 @@ where id =#{id} + + UPDATE laws_document_split SET ${updateSet} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java index 8665659e..815bf0a8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java @@ -3,6 +3,7 @@ package com.jero.modules.laws.documenttool.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView; +import com.jero.modules.laws.documenttool.entity.SplitFileInfo; import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.entity.SarFileSplitItemsValEO; @@ -173,4 +174,13 @@ public interface IDocumentSplitService { * @param response */ void exportDocumentSplitDetail(Map parameter, HttpServletRequest request, HttpServletResponse response); + + /** + * 文档拆分-拆分已入库文本分页列表查询 + * @param splitFileInfo + * @param pageNo + * @param pageSize + * @return + */ + IPage querySplitFileInfoByPage(SplitFileInfo splitFileInfo, Integer pageNo, Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 9754dd8e..34699392 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -19,10 +19,7 @@ import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.mapper.LawsCommonMapper; import com.jero.modules.laws.documenttool.common.DirectoryComparator; import com.jero.modules.laws.documenttool.common.DocumentSplitCommon; -import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo; -import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView; -import com.jero.modules.laws.documenttool.entity.SarFileSplitItemsVal; -import com.jero.modules.laws.documenttool.entity.SarFileSplitMenu; +import com.jero.modules.laws.documenttool.entity.*; import com.jero.modules.laws.documenttool.factory.ConditionMapFactory; import com.jero.modules.laws.documenttool.handler.impl.DateManyConditionImpl; import com.jero.modules.laws.documenttool.handler.impl.UniversalImpl; @@ -1028,6 +1025,18 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { } } + @Override + public IPage querySplitFileInfoByPage(SplitFileInfo splitFileInfo, Integer pageNo, Integer pageSize) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(StringUtils.isNotBlank(splitFileInfo.getOrigin()), "origin", splitFileInfo.getOrigin()); + queryWrapper.like(StringUtils.isNotBlank(splitFileInfo.getStandardNumber()), "standard_number", splitFileInfo.getStandardNumber()); + queryWrapper.like(StringUtils.isNotBlank(splitFileInfo.getStandardName()), "standard_name", splitFileInfo.getStandardName()); + queryWrapper.like(StringUtils.isNotBlank(splitFileInfo.getStandardFileType()), "standard_file_type", splitFileInfo.getStandardFileType()); + queryWrapper.isNotNull("o.standard_id"); + queryWrapper.orderByDesc("create_time"); + return documentSplitMapper.querySplitFileInfoByPage(queryWrapper, new Page<>(pageNo, pageSize)); + } + private void manageData(Map resultMap, StringBuilder fieldsBuilder, StringBuilder valuesBuilder) { // 所有key(字段名) resultMap.forEach((k, v) -> {