修改bug

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

@@ -0,0 +1,11 @@
+package org.springblade.manager.dto;
+
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+@Data
+public class CopyDto {
+    private Long id;
+    private String nodeName;
+    private Integer num;
+}

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/JinLinPushApiController.java

@@ -168,8 +168,8 @@ public class JinLinPushApiController {
 //        System.out.println("档案："+archiveAutoDtos.size());
 //        iJiLinArchiveAutoDtoService.saveBatch(archiveAutoDtos);
 
-            Long projId=jlPyProjId;
-        for (int j = 46; j <47 ; j++) {
+            Long projId=jlHjProjId;
+        for (int j = 0; j <100 ; j++) {
             Page<JiLinArchiveAutoDto> pages=iJiLinArchiveAutoDtoService.queryAll(j,500,projId);
             List<JiLinArchiveAutoDto> archiveAutoDtos = pages.getRecords();
             if(archiveAutoDtos.size()<500) {
@@ -180,13 +180,14 @@ public class JinLinPushApiController {
             List<JiLinPushCatalogDto> jiLinPushCatalogDtoList = new ArrayList<>();
             List<JiLinPushFileUrlDto> jiLinPushFileUrlDtoList = new ArrayList<>();
             for (int i = 0; i < archiveAutoDtos.size(); i++) {
+              String name=StringUtils.deleteWhitespace(archiveAutoDtos.get(i).getName());
                 //设置档案案卷
                 JiLinPushTomeDto jiLinPushTomeDto = new JiLinPushTomeDto();
-                jiLinPushTomeDto.setPactId(jlPyProjId);
+                jiLinPushTomeDto.setProjId(jlHjProjId);
                 jiLinPushTomeDto.setPactId(archiveAutoDtos.get(i).getContractId());
                 jiLinPushTomeDto.setKid(archiveAutoDtos.get(i).getTomeId());
                 jiLinPushTomeDto.setSortID(archiveAutoDtos.get(i).getNodeId());
-                jiLinPushTomeDto.setTomeSuper(StringUtils.deleteWhitespace(archiveAutoDtos.get(i).getName()));
+                jiLinPushTomeDto.setTomeSuper(name);
                 jiLinPushTomeDto.setRecordNum(archiveAutoDtos.get(i).getFileNumber());
                 jiLinPushTomeDto.setAddUserName(archiveAutoDtos.get(i).getUpdateUserName());
                 jiLinPushTomeDto.setAddTime(archiveAutoDtos.get(i).getCreateUserTime());
@@ -201,12 +202,12 @@ public class JinLinPushApiController {
                 jiLinPushTomeDtoList.add(jiLinPushTomeDto);
                 //    设置档案卷内目录
                 JiLinPushCatalogDto jiLinPushCatalogDto = new JiLinPushCatalogDto();
-                jiLinPushCatalogDto.setProjId(jlPyProjId);
+                jiLinPushCatalogDto.setProjId(jlHjProjId);
                 jiLinPushCatalogDto.setPactId(archiveAutoDtos.get(i).getContractId());
                 jiLinPushCatalogDto.setKid(archiveAutoDtos.get(i).getCatlogId());
                 jiLinPushCatalogDto.setSortId(archiveAutoDtos.get(i).getNodeId());
                 jiLinPushCatalogDto.setTomeId(archiveAutoDtos.get(i).getTomeId());
-                jiLinPushCatalogDto.setFileSuper(StringUtils.deleteWhitespace(archiveAutoDtos.get(i).getName()));
+                jiLinPushCatalogDto.setFileSuper(name);
                 jiLinPushCatalogDto.setCatalogRecord(archiveAutoDtos.get(i).getFileNumber());
                 jiLinPushCatalogDto.setAmsFileNum("0");
                 jiLinPushCatalogDto.setFileNum("0");
@@ -221,11 +222,11 @@ public class JinLinPushApiController {
                 jiLinPushCatalogDtoList.add(jiLinPushCatalogDto);
                 //设置档案文件
                 JiLinPushFileUrlDto jiLinPushFileUrlDto = new JiLinPushFileUrlDto();
-                jiLinPushFileUrlDto.setProjId(jlPyProjId);
+                jiLinPushFileUrlDto.setProjId(jlHjProjId);
                 jiLinPushFileUrlDto.setPactId(archiveAutoDtos.get(i).getContractId());
                 jiLinPushFileUrlDto.setKid(archiveAutoDtos.get(i).getId());
                 jiLinPushFileUrlDto.setCatalogID(archiveAutoDtos.get(i).getCatlogId());
-                jiLinPushFileUrlDto.setAnnexName(StringUtils.deleteWhitespace(archiveAutoDtos.get(i).getName()));
+                jiLinPushFileUrlDto.setAnnexName(name);
                 jiLinPushFileUrlDto.setTableNumber(archiveAutoDtos.get(i).getFileNumber());
                 jiLinPushFileUrlDto.setWeaveDate(archiveAutoDtos.get(i).getCreateUserTime());
                 jiLinPushFileUrlDto.setAnnexPage(archiveAutoDtos.get(i).getPageN());
@@ -237,42 +238,42 @@ public class JinLinPushApiController {
             }
         //传输吉林档案案卷的地址
         String tome=JSONObject.toJSONString(jiLinPushTomeDtoList);
-        String tomeMsg=tome+PYCLIENTSECRETKEY;
+        String tomeMsg=tome+HJCLIENTSECRETKEY;
         String tomeUrl="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/tome";
         String tomeSignature = DigestUtils.md5Hex(tomeMsg).toUpperCase();
         HashMap<String,String> tomeHeaders=new HashMap<>();
         tomeHeaders.put("Content-Type", "application/json");
-        tomeHeaders.put("clientId",PYCLIENTID);
+        tomeHeaders.put("clientId",HJCLIENTID);
         tomeHeaders.put("signature",tomeSignature);
-        tomeHeaders.put("systemId",PYSYSTEMID);
+        tomeHeaders.put("systemId",HJSYSTEMID);
         String tomeBody = HttpUtil.createPost(tomeUrl).addHeaders(tomeHeaders).body(tome).contentType("application/json").execute().body();
         System.out.println("第"+(j+1)+"次档案案卷"+tomeBody);
         //传输吉林档案卷内目录
         String catLog=JSONObject.toJSONString(jiLinPushCatalogDtoList);
-        String catLogMsg=catLog+PYCLIENTSECRETKEY;
+        String catLogMsg=catLog+HJCLIENTSECRETKEY;
         String catLogUrl="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/catalog";
         String catLogSignature = DigestUtils.md5Hex(catLogMsg).toUpperCase();
         HashMap<String,String> catLogHeaders=new HashMap<>();
         catLogHeaders.put("Content-Type", "application/json");
-        catLogHeaders.put("clientId",PYCLIENTID);
+        catLogHeaders.put("clientId",HJCLIENTID);
         catLogHeaders.put("signature",catLogSignature);
-        catLogHeaders.put("systemId",PYSYSTEMID);
+        catLogHeaders.put("systemId",HJSYSTEMID);
         String catLogBody = HttpUtil.createPost(catLogUrl).addHeaders(catLogHeaders).body(catLog).contentType("application/json").execute().body();
         System.out.println("第"+(j+1)+"次卷内目录"+catLogBody);
 
         //传输吉林档案文件
         String annex=JSONObject.toJSONString(jiLinPushFileUrlDtoList);
-        String annexMsg=annex+PYCLIENTSECRETKEY;
+        String annexMsg=annex+HJCLIENTSECRETKEY;
         String annexUrl="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/annex";
         String annexSignature = DigestUtils.md5Hex(annexMsg).toUpperCase();
         HashMap<String,String> annexHeaders=new HashMap<>();
         annexHeaders.put("Content-Type", "application/json");
-        annexHeaders.put("clientId",PYCLIENTID);
+        annexHeaders.put("clientId",HJCLIENTID);
         annexHeaders.put("signature",annexSignature);
-        annexHeaders.put("systemId",PYSYSTEMID);
+        annexHeaders.put("systemId",HJSYSTEMID);
         String annexBody = HttpUtil.createPost(annexUrl).addHeaders(annexHeaders).body(annex).contentType("application/json").execute().body();
         System.out.println("第"+(j+1)+"次档案文件"+annexBody);
         }
-        System.out.println("蒲烟传输结束");
+        System.out.println("烟长传输结束");
    }
 }

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

@@ -1641,6 +1641,7 @@ public class ExcelTabController extends BladeController {
         } else {
             nodeName = nodeName + "__" + 1;
         }
+        System.out.println("cr");
         wbsTreeContract.setNodeName(nodeName);
         wbsTreeContract.setIsCopeTab(2);
         wbsTreeContract.setIsTabPdf(1); // pdf 不能预览

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

@@ -322,8 +322,6 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                                 Object o = dataInfo2.get(dataMap.get(k).get(0));
                                 dataVal = JSON.toJSONString(o).replace("\"", "");
                             }
-
-
                             dataMap2.put(k, dataVal + "_^_" + dataMap.get(k).get(0).split("__")[1]);
                         }
                     }

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

@@ -33,10 +33,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.*;
 import org.springblade.manager.bean.NodeVO;
-import org.springblade.manager.dto.TableSortDTO;
-import org.springblade.manager.dto.RangeInfo;
-import org.springblade.manager.dto.WbsTreeContractDTO;
-import org.springblade.manager.dto.WbsTreeContractDTO2;
+import org.springblade.manager.dto.*;
 import org.springblade.manager.entity.*;
 import org.springblade.manager.excel.WbsExcelBatchUtil;
 import org.springblade.manager.excel.WbsExcelUtil;
@@ -1213,7 +1210,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             Map<String, String> jlTabMaps = new LinkedHashMap<>();
 
             List<WbsTreeContract> tabs = baseMapper.selectList(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getParentId, node.getId())
-                    .select(WbsTreeContract::getNodeName, WbsTreeContract::getTableOwner, WbsTreeContract::getPKeyId, WbsTreeContract::getInitTableName, WbsTreeContract::getSort, WbsTreeContract::getFullName, WbsTreeContract::getUpdateTime)
                     .eq(WbsTreeContract::getContractId, node.getContractId()).eq(WbsTreeContract::getType, 2)
                     .eq(WbsTreeContract::getWbsId, node.getWbsId())
                     .apply("(wbs_type is null OR wbs_type = " + node.getWbsType() + ")")
@@ -1225,6 +1221,98 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             //初始化表
             List<WbsTreeContract> sgTab = tabs.stream().filter(f -> "1,2,3".contains(f.getTableOwner())).collect(Collectors.toList());
             List<WbsTreeContract> jlTab = tabs.stream().filter(f -> "4,5,6".contains(f.getTableOwner())).collect(Collectors.toList());
+
+            List<CopyDto>sgList=new ArrayList<>();
+            List<CopyDto>jlList=new ArrayList<>();
+            //所以施工的表
+            for (WbsTreeContract sg : sgTab) {
+                String sgName = sg.getNodeName();
+                if(sgName.indexOf("（")>=0||sgName.indexOf("）")>=0){
+                    sgName = sgName.replaceAll("\\（.*?\\）", "");
+                }
+                if(sgName.indexOf("(")>=0||sgName.indexOf(")")>=0){
+                    sgName = sgName.replaceAll("\\(.*?\\)", "");
+                }
+                if(sgName.indexOf("__")>0){
+                    String[] sgNames = sgName.split("__");
+                    CopyDto c=new CopyDto();
+                    c.setNodeName(StringUtils.deleteWhitespace(sgNames[0]));
+                    c.setNum(Integer.parseInt(sgNames[1]));
+                    sgList.add(c);
+                }
+            }
+            //所以监理的复制表
+            for (WbsTreeContract jl : jlTab) {
+                String jlName = jl.getNodeName();
+                if(jlName.indexOf("（")>=0||jlName.indexOf("）")>=0){
+                    jlName=jlName.replaceAll("\\（.*?\\）", "");
+                }
+                if(jlName.indexOf("(")>=0||jlName.indexOf(")")>=0){
+                    jlName=jlName.replaceAll("\\(.*?\\)", "");
+                }
+                if(jlName.indexOf("__")>0){
+                    String[] sgNames = jlName.split("__");
+                    CopyDto c=new CopyDto();
+                    c.setNodeName(StringUtils.deleteWhitespace(sgNames[0]));
+                    c.setNum(Integer.parseInt(sgNames[1]));
+                    jlList.add(c);
+                }
+
+            }
+
+            if(sgList.size()>0){
+                //还需要添加的复制表
+                sgList.removeAll(jlList);
+                ArrayList<CopyDto> copyDtos = new ArrayList<>(sgList);
+                List<WbsTreeContract>list=new ArrayList<>();
+                for (WbsTreeContract jl : jlTab) {
+                    String jlName = jl.getNodeName();
+                    if(jlName.indexOf("（")>=0||jlName.indexOf("）")>=0){
+                        jlName=jlName.replaceAll("\\（.*?\\）", "");
+                        jlName=StringUtils.deleteWhitespace(jlName);
+                    }
+                    if(jlName.indexOf("(")>=0||jlName.indexOf(")")>=0){
+                        jlName=jlName.replaceAll("\\(.*?\\)", "");
+                        jlName=StringUtils.deleteWhitespace(jlName);
+                    }
+                    if(jlName.indexOf("__")>=0){
+                        String[] oldName = jlName.split("__");
+                        jlName=oldName[0];
+                    }
+                    for (CopyDto copyDto : sgList) {
+                        if(copyDto.getNodeName().equals(jlName)){
+                        String name= jl.getNodeName()+"__"+ copyDto.getNum();
+                            char charToFind = '_'; // 要查找的字符
+                            int count = 0;
+                            int index = name.indexOf(charToFind);
+                            while (index >= 0) {
+                                count++;
+                                index = name.indexOf(charToFind, index + 1);
+                            }
+                           if(count>2){
+                              continue;
+                           }
+                            long newPkId = SnowFlakeUtil.getId();
+                            WbsTreeContract wbsTreeContract = new WbsTreeContract();
+                            BeanUtil.copy(jl, wbsTreeContract);
+                            wbsTreeContract.setPKeyId(newPkId);
+                            wbsTreeContract.setCreateTime(new Date());
+                            wbsTreeContract.setNodeName(name);
+                            wbsTreeContract.setIsCopeTab(2);
+                            wbsTreeContract.setIsTabPdf(1); // pdf 不能预览
+                            wbsTreeContract.setIsBussShow(1); // 是否隐藏表
+                            wbsTreeContract.setTabFileType(1);//没有上传附件
+                            wbsTreeContract.setPdfUrl("");
+                            list.add(wbsTreeContract);
+                        }
+                    }
+
+                }
+                System.out.println(list.size());
+                this.saveBatch(list);
+                jlTab.addAll(list);
+            }
+
             List<WbsTreeContract> sgTabSort = sgTab.stream()
                     .sorted((a, b) -> {
                         Integer aSort = a.getSort() != null ? a.getSort() : 0;
@@ -1285,6 +1373,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 }
             }
 
+
+
             //构造表数据
             List<InsertDataVO> resultData = new LinkedList<>();
             this.syncTabDataImpl(sgTabMaps, jlTabMaps, resultData);
@@ -1359,7 +1449,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                             }
                             if (ObjectUtil.isNotEmpty(vo.getDataLength()) && vo.getDataLength() > 500) {
                                 //如果超过500字符长度，那么直接异常提示
-                                filedNames.add(vo.getName());
+                               // filedNames.add(vo.getName());
+                                exKeys.add(vo.getKey() + "---" + vo.getDataLength());
                             }
                         }
                         if (keys.size() > 0 && values.size() > 0 && keys.size() == values.size()) {
@@ -1490,10 +1581,8 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 String nodeNameReJL = splitJl[0];
                 String pKeyIdJL = splitJl[1];
                 String initTabNameJL = jlTab.getValue();
-
-                //表的代码名称相同，就复制数据，例如：G10=G10
+                //表的代码名称相同，就复制数据，例如：G10=G10 复制的表是G101去掉最后一位
                 if (nodeNameRe.equals(nodeNameReJL)) {
-
                     String htmlStringJL = this.getHtmlString(pKeyIdJL);
 
                     //获取质检实体表对应数据
@@ -2409,4 +2498,4 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             throw new ServiceException("请传入ids");
         }
     }
-}
+}