From 599e9a0fbbf3c2f7ef21bff02be0cfb8b6ef11a6 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 30 Mar 2022 19:59:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E8=A7=A3=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 69 ++++++++++--------- .../SarFileSplitInfoController.java | 13 ++++ .../SarFileSplitMenuEOController.java | 2 +- .../service/ISarFileSplitInfoService.java | 4 ++ .../impl/SarFileSplitInfoServiceImpl.java | 31 +++++++++ 5 files changed, 86 insertions(+), 33 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 53d34b83d..365d0df3b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.document.service.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ZipUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -12,11 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.WebsocketConst; -import com.jero.common.constant.enums.CutEnum; -import com.jero.common.constant.enums.IsMustEnum; -import com.jero.common.constant.enums.MessageTypeEnum; -import com.jero.common.constant.enums.ModuleEnum; -import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.common.constant.enums.*; import com.jero.common.es.JeroElasticsearchTemplate; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; @@ -40,13 +37,11 @@ import com.jero.modules.message.websocket.WebSocket; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.split.common.FileUnZip; +import com.jero.modules.split.entity.SarFileSplitInfoEO; +import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.subscribe.entity.OnlCgformSubscribe; import com.jero.modules.subscribe.service.IOnlCgformSubscribeService; -import com.jero.modules.system.entity.SysAnnouncement; -import com.jero.modules.system.entity.SysCategory; -import com.jero.modules.system.entity.SysCategoryTreeVO; -import com.jero.modules.system.entity.SysDictItem; -import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.entity.*; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.ISysAnnouncementService; import com.jero.modules.system.service.ISysDepartService; @@ -59,20 +54,8 @@ import lombok.SneakyThrows; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFDateUtil; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.VerticalAlignment; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.usermodel.WorkbookFactory; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.shiro.SecurityUtils; @@ -87,11 +70,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; +import java.io.*; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -138,6 +117,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl infoEOList = sarFileSplitInfoService.queryByFileId(fileInfo.getId()); + if (CollectionUtil.isNotEmpty(infoEOList)) { + mapNew.put("splitFlag", 1); + mapNew.put("splitInfoId", infoEOList.get(0).getId()); + } else{ + mapNew.put("splitFlag", 0); + } + resultTemp.add(mapNew); i++; } else { Map mapNew = new HashMap<>(); mapNew.put("value", fileInfo); mapPut(cut, mapNew, "field_show_type", onlCgformField.getFieldShowType(), "dict_field", onlCgformField.getDictField(), "db_field_name", onlCgformField.getDbFieldName(), "db_field_txt", onlCgformField.getDbFieldTxt(), "db_field_en_name", onlCgformField.getDbFieldEnName(), "area", areaName, null); + // 添加标准分解单跳转 + List infoEOList = sarFileSplitInfoService.queryByFileId(fileInfo.getId()); + if (CollectionUtil.isNotEmpty(infoEOList)) { + mapNew.put("splitFlag", 1); + mapNew.put("splitInfoId", infoEOList.get(0).getId()); + } else{ + mapNew.put("splitFlag", 0); + } resultTemp.add(mapNew); } } @@ -933,6 +930,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl infoEOList = sarFileSplitInfoService.queryByFileId(fileInfos.get(0).getId()); + if (CollectionUtil.isNotEmpty(infoEOList)) { + mapNew.put("splitFlag", 1); + mapNew.put("splitInfoId", infoEOList.get(0).getId()); + } else{ + mapNew.put("splitFlag", 0); + } resultTemp.add(mapNew); } } else { @@ -2124,10 +2129,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl bindToDocumentLibrary(String id, String connectId, String fileName) { + // 设置fileId + boolean bindState = sarFileSplitInfoService.bindToDocumentLibrary(id, connectId, fileName); + if(bindState){ + return Result.OK("回传成功"); + } else { + return Result.error("回传失败"); + } + } + /** * 添加 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java index be1acade3..7dcc9e506 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitMenuEOController.java @@ -118,7 +118,7 @@ public class SarFileSplitMenuEOController extends JeroController>> copyMenuNotChildrenall(@RequestParam(value = "ids",required = false) String ids, @RequestParam(value = "menuids",required = false) String menuids, @RequestParam(value = "infoIds",required = false) String infoIds) throws Exception { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java index 1e219427a..162c5d0a4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java @@ -59,4 +59,8 @@ public interface ISarFileSplitInfoService extends IService { * @return */ List queryList(); + + List queryByFileId(String fileId); + + boolean bindToDocumentLibrary(String id, String connectId, String fileName); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index 94a1169f4..3cbbabd05 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java @@ -1,6 +1,10 @@ package com.jero.modules.split.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +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.entity.SarFileSplitMenuEO; import com.jero.modules.split.mapper.SarFileSplitInfoMapper; @@ -12,6 +16,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; import java.util.UUID; +import java.util.stream.Collectors; /** * @Description: 文档拆分表 @@ -24,6 +29,10 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public List queryByFileId(String fileId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SarFileSplitInfoEO::getFileId, fileId); + return this.list(queryWrapper); + } + + @Override + public boolean bindToDocumentLibrary(String id, String connectId, String fileName) { + List ossFileList = ossFileService.getFileInfosByConnectId(connectId); + List fileOfSplit = ossFileList.stream().filter(e->"fileName".equals(e.getFileName())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(fileOfSplit)) { + String fileId = fileOfSplit.get(0).getId(); + SarFileSplitInfoEO infoEO = new SarFileSplitInfoEO(); + infoEO.setId(id); + infoEO.setFileId(fileId); + this.updateById(infoEO); + return true; + } + return false; + } }