Revert "批量上传清表"

This reverts commit a0fb0ebc

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ExcelTabBatchUploadDTO.java

@@ -1,18 +0,0 @@
-package org.springblade.manager.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class ExcelTabBatchUploadDTO implements Serializable {
-
-    @ApiModelProperty("选择上传的当前节点id")
-    private Long id;
-
-    @ApiModelProperty("上传的文件对象集合")
-    private List<ExcelTabFileDTO> fileList;
-
-}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ExcelTabFileDTO.java

@@ -1,18 +0,0 @@
-package org.springblade.manager.dto;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.Serializable;
-
-@Data
-public class ExcelTabFileDTO implements Serializable {
-
-    @ApiModelProperty("清表文件名")
-    private String fileName;
-
-    @ApiModelProperty("清表excel文件")
-    private MultipartFile file;
-
-}

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -3325,11 +3325,17 @@ public class ExcelTabController extends BladeController {
         return filename.toLowerCase().endsWith(".xlsx") || filename.toLowerCase().endsWith(".xls");
     }
 
-    private boolean isExcelFile(MultipartFile file){
-        try (InputStream inputStream = file.getInputStream(); org.apache.poi.ss.usermodel.Workbook workbook = WorkbookFactory.create(inputStream)) {
+    private boolean isExcelFile(MultipartFile file) throws IOException {
+        org.apache.poi.ss.usermodel.Workbook workbook = null;
+        try (InputStream inputStream = file.getInputStream()) {
+            workbook = WorkbookFactory.create(inputStream);
             return ObjectUtil.isNotEmpty(workbook);
         } catch (Exception e) {
             return false;
+        } finally {
+            if (workbook != null) {
+                workbook.close();
+            }
         }
     }
 

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -1381,21 +1381,17 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                     List<WbsTree> addPublicTables = addPublicTable.stream().filter(node ->
                             wbsTreePrivatesProjectNodes.stream().map(WbsTreePrivate::getId).collect(Collectors.toList()).contains(node.getParentId())).collect(Collectors.toList());
 
-
                     //构造
-                    List<Long> ids = addPublicTables.stream().map(WbsTree::getId).collect(Collectors.toList());
-                    if (ids.size() > 0) {
-                        List<WbsTree> resultDataList = wbsTreeMapper.selectList(Wrappers.<WbsTree>lambdaQuery().in(WbsTree::getId, ids));
-                        for (WbsTree tree : resultDataList) {
-                            WbsTreePrivate dataPrivate = BeanUtil.copyProperties(tree, WbsTreePrivate.class);
-                            if (dataPrivate != null) {
-                                dataPrivate.setPKeyId(SnowFlakeUtil.getId());
-                                dataPrivate.setWbsType(wbsTreePrivate.getWbsType());
-                                dataPrivate.setProjectId(wbsTreePrivate.getProjectId());
-                                dataPrivate.setFullName(dataPrivate.getNodeName());
-                                dataPrivate.setInitTableId(tree.getInitTableId().toString());
-                                insertDataPrivateList.add(dataPrivate);//新增
-                            }
+                    List<WbsTree> resultDataList = wbsTreeMapper.selectList(Wrappers.<WbsTree>lambdaQuery().in(WbsTree::getId, addPublicTables.stream().map(WbsTree::getId).collect(Collectors.toList())));
+                    for (WbsTree tree : resultDataList) {
+                        WbsTreePrivate dataPrivate = BeanUtil.copyProperties(tree, WbsTreePrivate.class);
+                        if (dataPrivate != null) {
+                            dataPrivate.setPKeyId(SnowFlakeUtil.getId());
+                            dataPrivate.setWbsType(wbsTreePrivate.getWbsType());
+                            dataPrivate.setProjectId(wbsTreePrivate.getProjectId());
+                            dataPrivate.setFullName(dataPrivate.getNodeName());
+                            dataPrivate.setInitTableId(tree.getInitTableId().toString());
+                            insertDataPrivateList.add(dataPrivate);//新增
                         }
                     }
 
@@ -1447,19 +1443,16 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                             wbsTreePrivatesProjectNodes.stream().map(WbsTreePrivate::getId).collect(Collectors.toList()).contains(node.getParentId())).collect(Collectors.toList());
 
                     //构造
-                    List<Long> privateIds = addPrivateTables.stream().map(WbsTreePrivate::getPKeyId).collect(Collectors.toList());
-                    if (privateIds.size() > 0) {
-                        List<WbsTreePrivate> resultDataList = baseMapper.selectList(Wrappers.<WbsTreePrivate>lambdaQuery().in(WbsTreePrivate::getPKeyId, privateIds));
-                        for (WbsTreePrivate tree : resultDataList) {
-                            WbsTreePrivate dataPrivate = BeanUtil.copyProperties(tree, WbsTreePrivate.class);
-                            if (dataPrivate != null) {
-                                dataPrivate.setPKeyId(SnowFlakeUtil.getId());
-                                dataPrivate.setWbsId(wbsTreePrivate.getWbsId());
-                                dataPrivate.setWbsType(tree.getWbsType());
-                                dataPrivate.setProjectId(wbsTreePrivate.getProjectId());
-                                dataPrivate.setInitTableId(tree.getInitTableId());
-                                insertDataPrivateList.add(dataPrivate);
-                            }
+                    List<WbsTreePrivate> resultDataList = baseMapper.selectList(Wrappers.<WbsTreePrivate>lambdaQuery().in(WbsTreePrivate::getPKeyId, addPrivateTables.stream().map(WbsTreePrivate::getPKeyId).collect(Collectors.toList())));
+                    for (WbsTreePrivate tree : resultDataList) {
+                        WbsTreePrivate dataPrivate = BeanUtil.copyProperties(tree, WbsTreePrivate.class);
+                        if (dataPrivate != null) {
+                            dataPrivate.setPKeyId(SnowFlakeUtil.getId());
+                            dataPrivate.setWbsId(wbsTreePrivate.getWbsId());
+                            dataPrivate.setWbsType(tree.getWbsType());
+                            dataPrivate.setProjectId(wbsTreePrivate.getProjectId());
+                            dataPrivate.setInitTableId(tree.getInitTableId());
+                            insertDataPrivateList.add(dataPrivate);
                         }
                     }
                 }
@@ -1511,19 +1504,16 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                             wbsTreePrivatesProjectNodes.stream().map(WbsTreePrivate::getId).collect(Collectors.toList()).contains(node.getParentId())).collect(Collectors.toList());
 
                     //构造
-                    List<Long> ids = addPublicTables.stream().map(WbsTree::getId).collect(Collectors.toList());
-                    if (ids.size() > 0) {
-                        List<WbsTree> resultDataList = wbsTreeMapper.selectList(Wrappers.<WbsTree>lambdaQuery().in(WbsTree::getId, ids));
-                        for (WbsTree tree : resultDataList) {
-                            WbsTreePrivate dataPrivate = BeanUtil.copyProperties(tree, WbsTreePrivate.class);
-                            if (dataPrivate != null) {
-                                dataPrivate.setPKeyId(SnowFlakeUtil.getId());
-                                dataPrivate.setWbsType(wbsTreePrivate.getWbsType());
-                                dataPrivate.setProjectId(wbsTreePrivate.getProjectId());
-                                dataPrivate.setFullName(dataPrivate.getNodeName());
-                                dataPrivate.setInitTableId(ObjectUtils.isNotEmpty(tree.getInitTableId()) ? tree.getInitTableId().toString() : null);
-                                insertDataPrivateList.add(dataPrivate);//新增
-                            }
+                    List<WbsTree> resultDataList = wbsTreeMapper.selectList(Wrappers.<WbsTree>lambdaQuery().in(WbsTree::getId, addPublicTables.stream().map(WbsTree::getId).collect(Collectors.toList())));
+                    for (WbsTree tree : resultDataList) {
+                        WbsTreePrivate dataPrivate = BeanUtil.copyProperties(tree, WbsTreePrivate.class);
+                        if (dataPrivate != null) {
+                            dataPrivate.setPKeyId(SnowFlakeUtil.getId());
+                            dataPrivate.setWbsType(wbsTreePrivate.getWbsType());
+                            dataPrivate.setProjectId(wbsTreePrivate.getProjectId());
+                            dataPrivate.setFullName(dataPrivate.getNodeName());
+                            dataPrivate.setInitTableId(ObjectUtils.isNotEmpty(tree.getInitTableId()) ? tree.getInitTableId().toString() : null);
+                            insertDataPrivateList.add(dataPrivate);//新增
                         }
                     }
 
@@ -1573,19 +1563,16 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
                             wbsTreePrivatesProjectNodes.stream().map(WbsTreePrivate::getId).collect(Collectors.toList()).contains(node.getParentId())).collect(Collectors.toList());
 
                     //构造
-                    List<Long> privateIds = addPrivateTables.stream().map(WbsTreePrivate::getPKeyId).collect(Collectors.toList());
-                    if (privateIds.size() > 0) {
-                        List<WbsTreePrivate> resultDataList = baseMapper.selectList(Wrappers.<WbsTreePrivate>lambdaQuery().in(WbsTreePrivate::getPKeyId, privateIds));
-                        for (WbsTreePrivate tree : resultDataList) {
-                            WbsTreePrivate dataPrivate = BeanUtil.copyProperties(tree, WbsTreePrivate.class);
-                            if (dataPrivate != null) {
-                                dataPrivate.setPKeyId(SnowFlakeUtil.getId());
-                                dataPrivate.setWbsId(wbsTreePrivate.getWbsId());
-                                dataPrivate.setWbsType(tree.getWbsType());
-                                dataPrivate.setProjectId(wbsTreePrivate.getProjectId());
-                                dataPrivate.setInitTableId(ObjectUtils.isNotEmpty(tree.getInitTableId()) ? tree.getInitTableId() : null);
-                                insertDataPrivateList.add(dataPrivate);
-                            }
+                    List<WbsTreePrivate> resultDataList = baseMapper.selectList(Wrappers.<WbsTreePrivate>lambdaQuery().in(WbsTreePrivate::getPKeyId, addPrivateTables.stream().map(WbsTreePrivate::getPKeyId).collect(Collectors.toList())));
+                    for (WbsTreePrivate tree : resultDataList) {
+                        WbsTreePrivate dataPrivate = BeanUtil.copyProperties(tree, WbsTreePrivate.class);
+                        if (dataPrivate != null) {
+                            dataPrivate.setPKeyId(SnowFlakeUtil.getId());
+                            dataPrivate.setWbsId(wbsTreePrivate.getWbsId());
+                            dataPrivate.setWbsType(tree.getWbsType());
+                            dataPrivate.setProjectId(wbsTreePrivate.getProjectId());
+                            dataPrivate.setInitTableId(ObjectUtils.isNotEmpty(tree.getInitTableId()) ? tree.getInitTableId() : null);
+                            insertDataPrivateList.add(dataPrivate);
                         }
                     }
                 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -473,8 +473,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     private void sortListPublic(List<WbsTreeQueryValueVO> list) {
         list.sort(Comparator.comparing(WbsTreeQueryValueVO::getSort, Comparator.nullsLast(Integer::compare)));
         for (WbsTreeQueryValueVO item : list) {
-            if (Optional.ofNullable(item.getType()).orElse(0) == 1 &&
-                    Optional.ofNullable(item.getHasChildren()).orElse(false)) {
+            if (ObjectUtil.isNotEmpty(item.getType()) && item.getType() == 1 && ObjectUtil.isNotEmpty(item.getHasChildren()) && item.getHasChildren()) {
                 sortListPublic(item.getChildren());
             }
         }
@@ -486,8 +485,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     private void sortListPrivate(List<WbsTreePrivateQueryValueVO> list) {
         list.sort(Comparator.comparing(WbsTreePrivateQueryValueVO::getSort, Comparator.nullsLast(Integer::compare)));
         for (WbsTreePrivateQueryValueVO item : list) {
-            if (Optional.ofNullable(item.getType()).orElse(0) == 1 &&
-                    Optional.ofNullable(item.getHasChildren()).orElse(false)) {
+            if (ObjectUtil.isNotEmpty(item.getType()) && item.getType() == 1 && ObjectUtil.isNotEmpty(item.getHasChildren()) && item.getHasChildren()) {
                 sortListPrivate(item.getChildren());
             }
         }