feat(文档拆分): 拆分已入库文本更换新接口

2023-11-14 11:53:42 +08:00
parent 701b81ecd7
commit 1bade27371
6 changed files with 122 additions and 4 deletions
@@ -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<IPage<SplitFileInfo>> 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));
+    }
+
    /**
     * 文档拆分-查看
     *
@@ -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;
+}
@@ -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<String, Object> queryDocumentSplitDetailById(String id);
+
+    /**
+     * 文档拆分-拆分已入库文本分页列表查询
+     * @param queryWrapper
+     * @param page
+     * @return
+     */
+    IPage<SplitFileInfo> querySplitFileInfoByPage(@Param(Constants.WRAPPER) QueryWrapper<SplitFileInfo> queryWrapper, IPage<SplitFileInfo> page);
 }
@@ -212,6 +212,18 @@
        where id =#{id}
    </select>

+    <select id="querySplitFileInfoByPage" resultType="com.jero.modules.laws.documenttool.entity.SplitFileInfo">
+        select standard.*, o.id id, o.file_name, o.standard_file_type, o.url
+        from (select id standardId, standard_number, standard_number standardNo, standard_name, standard_state, release_date, 1 origin, create_time, create_by, update_by, update_time
+              from laws_domestic_standard
+              where del_flag = 0
+              union all
+              select id standardId, standard_number, standard_number standardNo, standard_name, standard_state, release_date, 3 origin, create_time, create_by, update_by, update_time
+              from laws_enterprise_standard
+              where del_flag = 0) standard left join oss_file o on standardId = o.standard_id
+        ${ew.customSqlSegment}
+    </select>
+
    <update id="editDocumentSplitDetail">
        UPDATE laws_document_split
            SET ${updateSet}
@@ -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<String, Object> parameter, HttpServletRequest request, HttpServletResponse response);
+
+    /**
+     * 文档拆分-拆分已入库文本分页列表查询
+     * @param splitFileInfo
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    IPage<SplitFileInfo> querySplitFileInfoByPage(SplitFileInfo splitFileInfo, Integer pageNo, Integer pageSize);
 }
@@ -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<SplitFileInfo> querySplitFileInfoByPage(SplitFileInfo splitFileInfo, Integer pageNo, Integer pageSize) {
+        QueryWrapper<SplitFileInfo> 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<String, Object> resultMap, StringBuilder fieldsBuilder, StringBuilder valuesBuilder) {
        // 所有key(字段名)
        resultMap.forEach((k, v) -> {