From 074096b8bd97b93281fe33dd27c8f50905fd81df Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 12 Oct 2023 11:36:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E6=9F=A5=E8=AF=A2=E3=80=81=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=B7=B2=E5=85=A5=E5=BA=93=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/constant/enums/TableEnum.java | 2 +- .../SarFileSplitInfoController.java | 53 ++++++++++++------- .../split/entity/SarFileSplitInfoEO.java | 22 ++++++-- .../split/entity/SarFileSplitItemsEO.java | 3 +- .../mapper/xml/FileSplitItemsEOMapper.xml | 53 ++++++++++--------- .../xml/SarFileSplitItemsValEOMapper.xml | 12 ++--- .../split/page/SarFileSplitInfoEOPage.java | 13 +++++ .../split/page/SarFileSplitItemsEOPage.java | 2 +- .../split/service/impl/FileSpiltService.java | 8 +-- .../impl/FileSplitItemsEOServiceImpl.java | 38 ++++++------- .../impl/SarFileSplitInfoServiceImpl.java | 37 +++++++++++-- 11 files changed, 154 insertions(+), 89 deletions(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java b/laws-base/laws-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java index e7056677..a3a3174e 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java @@ -9,7 +9,7 @@ public enum TableEnum { BUSS_DOCUMENT_LIBRARY("buss_document_library"), OCR_RECORD("ocr_record"), FILE_SPLIT("sar_file_split_info"), - FILE_SPLIT_ITEMS("sar_file_split_items"), + FILE_SPLIT_ITEMS("laws_document_split"), TAG("onl_cgform_tag"), TAG_AREA("onl_cgform_area"), ONL_CGFORM_COLLECTION("onl_cgform_collection"), 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 51fd509c..a80c28c7 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 @@ -1,11 +1,11 @@ package com.jero.modules.split.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.LineHumpUtil; import com.jero.modules.document.service.IBussDocumentLibraryEOService; @@ -15,6 +15,8 @@ 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 com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -25,12 +27,12 @@ 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; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -53,11 +55,14 @@ public class SarFileSplitInfoController extends JeroController queryPageList(SarFileSplitInfoEOPage sarFileSplitInfoEOPage) { QueryWrapper queryWrapper = new QueryWrapper<>(); - if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getSerialNumber())){ - sarFileSplitInfoEOPage.setSerialNumber(sarFileSplitInfoEOPage.getSerialNumber().replace("%","\\%")); + if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getSerialNumberOrName())){ + sarFileSplitInfoEOPage.setSerialNumberOrName(sarFileSplitInfoEOPage.getSerialNumberOrName().replace("%","\\%")); } - if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getTitle())){ - sarFileSplitInfoEOPage.setTitle(sarFileSplitInfoEOPage.getTitle().replace("%","\\%")); + if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getAuthor())){ + sarFileSplitInfoEOPage.setAuthor(sarFileSplitInfoEOPage.getAuthor().replace("%","\\%")); } if(StringUtils.isNotEmpty(sarFileSplitInfoEOPage.getFileId())){//判断是不是以及传回文档库 queryWrapper.lambda().isNotNull(SarFileSplitInfoEO::getFileId); @@ -78,13 +83,23 @@ public class SarFileSplitInfoController extends JeroController + qw.lambda().like(SarFileSplitInfoEO::getSerialNumber, sarFileSplitInfoEOPage.getSerialNumberOrName()) + .or().like(SarFileSplitInfoEO::getTitle, sarFileSplitInfoEOPage.getSerialNumberOrName())); + } + queryWrapper.lambda().eq(StringUtils.isNotBlank(sarFileSplitInfoEOPage.getSplitStatus()), SarFileSplitInfoEO::getSplitStatus, sarFileSplitInfoEOPage.getSplitStatus()); + if (StringUtils.isNotBlank(sarFileSplitInfoEOPage.getAuthor())){ + List list = sysUserService.list(new LambdaQueryWrapper().like(SysUser::getRealname, sarFileSplitInfoEOPage.getAuthor())); + if (!list.isEmpty()){ + List userIds = list.stream().map(SysUser::getId).collect(Collectors.toList()); + queryWrapper.lambda().in(SarFileSplitInfoEO::getAuthor, userIds); + } + } queryWrapper.orderBy(StringUtils.isNotBlank(sarFileSplitInfoEOPage.getOrderByField()), "1".equals(sarFileSplitInfoEOPage.getOrderBy())?true:false, sarFileSplitInfoEOPage.getOrderByField()) .orderBy(StringUtils.isBlank(sarFileSplitInfoEOPage.getOrderByField()), false, "create_time"); - Page page = new Page(sarFileSplitInfoEOPage.getPageNo(), sarFileSplitInfoEOPage.getPageSize()); + Page page = new Page<>(sarFileSplitInfoEOPage.getPageNo(), sarFileSplitInfoEOPage.getPageSize()); IPage pageList = sarFileSplitInfoService.page(page, queryWrapper); List rows = pageList.getRecords(); sarFileSplitInfoService.dataProcessing(sarFileSplitInfoEOPage.getCut(), rows); @@ -213,9 +228,9 @@ public class SarFileSplitInfoController extends JeroController> splitFilePageInfo(SplitFilePageInfoParam param, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest request) { + @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); diff --git a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java index fc92d651..c6a734af 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java +++ b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -85,10 +86,20 @@ public class SarFileSplitInfoEO implements Serializable { @ApiModelProperty(value = "文件名称") private String fileName; + /**拆分状态（1：编辑中 2：已发布）*/ + @Excel(name = "拆分状态", width = 15) + @ApiModelProperty(value = "拆分状态（1：编辑中 2：已发布）") + @Dict(dicCode = "split_status") + private String splitStatus; + + /**编辑人*/ + @Excel(name = "编辑人", width = 15) + @ApiModelProperty(value = "编辑人") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") + private String author; + /**拆分结果*/ - @Excel(name = "拆分结果", width = 15, dicCode = "split_result") -// @Dict(dicCode = "split_result") - @ApiModelProperty(value = "拆分结果") + @Excel(name = "拆分结果", width = 15) private String splitResult; /**文件id*/ @@ -101,6 +112,11 @@ public class SarFileSplitInfoEO implements Serializable { @ApiModelProperty(value = "文档库关联id") private String connectId; + /**标准关联id*/ + @Excel(name = "标准关联id", width = 15) + @ApiModelProperty(value = "标准关联id") + private String standardId; + @TableField(exist = false) private String flag; diff --git a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java index 130e4e8e..fb1d7041 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java +++ b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsEO.java @@ -2,7 +2,6 @@ package com.jero.modules.split.entity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import lombok.Data; import java.io.Serializable; @@ -10,7 +9,7 @@ import java.util.Date; import java.util.List; /** - * 功能：SAR_FILE_SPLIT_ITEMS SarFileSplitItemsEOEntity
+ * 功能：laws_document_split SarFileSplitItemsEOEntity
* 作者：code generator
* 日期： 2020-01-03
* 版权所有：版权归北京卡达克数据技术中心所有。
diff --git a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml index 083d419c..b6f6c10b 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/FileSplitItemsEOMapper.xml @@ -4,48 +4,48 @@ - insert into sar_file_split_items(${insertField}) + insert into laws_document_split(${insertField}) values (${insertValue}) - delete from sar_file_split_items + delete from laws_document_split where id = #{value} - + - delete from SAR_FILE_SPLIT_ITEMS + delete from laws_document_split where id in #{item} @@ -85,12 +85,12 @@ - delete from sar_file_split_items + delete from laws_document_split where menu_id in #{item} @@ -109,10 +109,10 @@ - insert into sar_file_split_items - (id, info_id, items_num, items_name, menu_id, - creation_user, creation_time, modify_time, - modify_user, iterms_conditions,zhan3_shi4_shun4_xu4) + insert into laws_document_split + (id, info_id, item_num, item_title, menu_id, + create_by, create_time, update_time, + update_by, Item_content,sort_number) values ( #{item.id, jdbcType=VARCHAR}, #{item.infoId, jdbcType=VARCHAR}, #{item.itemsNum, jdbcType=VARCHAR}, @@ -124,15 +124,16 @@ ) + - update sar_file_split_items + update laws_document_split zhan3_shi4_shun4_xu4 = #{sarFileSplitItemsEO.zhan3Shi4Shun4Xu4}, diff --git a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml index b924cf94..3479d3b6 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml @@ -244,9 +244,9 @@ delete from SAR_FILE_SPLIT_ITEMS_VAL where EXISTS ( - select 1 from SAR_FILE_SPLIT_ITEMS - where SAR_FILE_SPLIT_ITEMS_VAL.ITEM_ID=SAR_FILE_SPLIT_ITEMS.id - and SAR_FILE_SPLIT_ITEMS.INFO_ID in + select 1 from laws_document_split + where SAR_FILE_SPLIT_ITEMS_VAL.ITEM_ID=laws_document_split.id + and laws_document_split.INFO_ID in #{item} @@ -292,9 +292,9 @@ delete from SAR_FILE_SPLIT_ITEMS_VAL where EXISTS ( - select 1 from SAR_FILE_SPLIT_ITEMS - where SAR_FILE_SPLIT_ITEMS_VAL.ITEM_ID=SAR_FILE_SPLIT_ITEMS.id - and SAR_FILE_SPLIT_ITEMS.MENU_ID in + select 1 from laws_document_split + where SAR_FILE_SPLIT_ITEMS_VAL.ITEM_ID=laws_document_split.id + and laws_document_split.MENU_ID in #{item} diff --git a/laws-modules/src/main/java/com/jero/modules/split/page/SarFileSplitInfoEOPage.java b/laws-modules/src/main/java/com/jero/modules/split/page/SarFileSplitInfoEOPage.java index 0bd1bd2a..3c5fcd8b 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/page/SarFileSplitInfoEOPage.java +++ b/laws-modules/src/main/java/com/jero/modules/split/page/SarFileSplitInfoEOPage.java @@ -1,5 +1,6 @@ package com.jero.modules.split.page; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -31,6 +32,10 @@ public class SarFileSplitInfoEOPage { /**编号*/ private String serialNumber; + /**标准编号/标准名称*/ + @ApiModelProperty(value = "标准编号/标准名称") + private String serialNumberOrName; + /**标题*/ private String title; @@ -46,6 +51,14 @@ public class SarFileSplitInfoEOPage { /**文件id*/ private String fileId; + /**拆分状态*/ + @ApiModelProperty(value = "拆分状态") + private String splitStatus; + + /**编辑人*/ + @ApiModelProperty(value = "编辑人") + private String author; + //分页 private Integer pageNo; private Integer pageSize; diff --git a/laws-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java b/laws-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java index 871ebcff..36601e9e 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java +++ b/laws-modules/src/main/java/com/jero/modules/split/page/SarFileSplitItemsEOPage.java @@ -7,7 +7,7 @@ import lombok.Data; import java.util.List; /** - * 功能：SAR_FILE_SPLIT_ITEMS SarFileSplitItemsEOPage
+ * 功能：laws_document_split SarFileSplitItemsEOPage
* 作者：code generator
* 日期： 2020-01-03
* 版权所有：版权归北京卡达克数据技术中心所有。
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 847ed82b..027fd027 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -1,8 +1,6 @@ package com.jero.modules.split.service.impl; -import java.util.Map; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.itextpdf.text.ListLabel; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MinioUtil; @@ -39,14 +37,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - -import javax.xml.parsers.DocumentBuilder; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.*; -import java.util.List; -import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -401,6 +394,7 @@ public class FileSpiltService { sarFileSplitMenuEOMapper.insertForeach(treeList); for (int i = 0; i < messageList.size(); i++) { messageList.get(i).setZhan3Shi4Shun4Xu4(String.valueOf(i+1)); + messageList.get(i).setInfoId(sarFileSplitInfoEO.getId()); } iSarFileSplitItemsEOService.insertForeach(messageList); iSarFileSplitItemsValEOService.insertForeach(itemValList); diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 01b501e2..06828968 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -542,7 +542,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); @@ -726,7 +726,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl= '" + value.split(",")[0] + "'" - + " and " + "date_format(sar_file_split_items." + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'"); + conditionSb.append(" and " + "date_format(laws_document_split." + key + ",'%Y-%m-%d') >= '" + value.split(",")[0] + "'" + + " and " + "date_format(laws_document_split." + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'"); } else { - conditionSb.append(" and " + "date_format(sar_file_split_items." + key + ",'%Y-%m-%d') = '" + value + "'"); + conditionSb.append(" and " + "date_format(laws_document_split." + key + ",'%Y-%m-%d') = '" + value + "'"); } } else if (FieldTypeEnum.TEXT_NUMBER.getValue().equals(fieldType)) { Double value = Double.valueOf(entry.getValue().toString()); - conditionSb.append(" and sar_file_split_items." + key + " =" + value); + conditionSb.append(" and laws_document_split." + key + " =" + value); } else if (FieldTypeEnum.PERSON.getValue().equals(fieldType)) { String value = (String) entry.getValue(); if(value.contains("%")){ @@ -799,13 +799,13 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl().lambda() + .eq(SarFileSplitInfoEO::getFileType, sarFileSplitInfoEO.getFileType()) + .eq(SarFileSplitInfoEO::getSerialNumber, sarFileSplitInfoEO.getSerialNumber())); + if(count > 0){ + if(LanguageEnum.CN.equals(MessageUtils.getLanguage())) { + throw new JeroBootException("不可重复拆分文件状态加标准号相同的数据！"); + }else{ + throw new JeroBootException("Non-repeatable split file status plus standard number the same data!"); + } + } + } + /** * 更新 * @@ -259,10 +286,10 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(splitInfoEO.getSerialNumber()); - if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) { - splitInfoEO.setDocumentId(bussDocumentLibraryEOList.get(0).get("id").toString()); - } +// List> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(splitInfoEO.getSerialNumber()); +// if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) { +// splitInfoEO.setDocumentId(bussDocumentLibraryEOList.get(0).get("id").toString()); +// } if(StringUtils.isNotEmpty(splitInfoEO.getFileId())) { splitInfoEO.setFlag("1"); }else{