推送吉林档案

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

@@ -69,22 +69,22 @@ public class JinLinPushApiController {
     @GetMapping("/test")
     public void JinlinApiPush() throws JsonProcessingException {
         //获取发送get请求的校验码
-     String query = "clientSecretKey="+HJCLIENTSECRETKEY;
+     String query = "clientSecretKey="+PYCLIENTSECRETKEY;
      String querySignature = DigestUtils.md5Hex(query).toUpperCase();
        // 获取吉林项目合同段的地址
      String queryUrl = "https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/hqsws/hqsprojpact/query";
      HashMap<String,String> queryHeaders=new HashMap<>();
         queryHeaders.put("Content-Type", "application/json");
-        queryHeaders.put("clientId",HJCLIENTID);
+        queryHeaders.put("clientId",PYCLIENTID);
         queryHeaders.put("signature",querySignature);
-        queryHeaders.put("systemId",HJSYSTEMID);
+        queryHeaders.put("systemId",PYSYSTEMID);
      String queryBody = HttpUtil.createGet(queryUrl).addHeaders(queryHeaders).execute().body();
      JSONObject jsonObject=JSONObject.parseObject(queryBody);
      //吉林蒲烟项目合同段信息
      List<PactAndProjDto> pactAndProjDtoList = JSONObject.parseArray(jsonObject.getString("data").toString(),PactAndProjDto.class);
 
      //重庆吉林蒲烟项目合同段信息（中间表）
-     List<ArchiveJiLinPush>archiveJiLinPushList= iArchiveJiLinPushService.getArchiveJiLinPush(jlHjProjId);
+     List<ArchiveJiLinPush>archiveJiLinPushList= iArchiveJiLinPushService.getArchiveJiLinPush(jlPyProjId);
 
      //中间项目合同中间集合
      List<JiLinQueryDto>dtos=new ArrayList<>();
@@ -102,177 +102,175 @@ public class JinLinPushApiController {
                 }
             }
         }
-      //传入重庆的项目ID，和吉林需要的合同段集合 查出重庆的目录树
-        Long projectId=cqHjProjectId;
-        List<ArchiveTreeContractDTO> archiveTreeContractDtos = archiveTreeContractClient.getArchiveTreeContractDto(dtos,projectId);
-        System.out.println(archiveTreeContractDtos.size());
-      //构建需要传给吉林的目录树 数据
-        List<JiLinPushTreeDto>jiLinPushTreeDtos=new ArrayList<>();
-        for (ArchiveTreeContractDTO archiveTreeContractDto : archiveTreeContractDtos) {
-            JiLinPushTreeDto jiLinPushTreeDto = new JiLinPushTreeDto();
-            jiLinPushTreeDto.setKid(archiveTreeContractDto.getId());
-            jiLinPushTreeDto.setAddTime(archiveTreeContractDto.getUpdateUserTime());
-            jiLinPushTreeDto.setParentID(archiveTreeContractDto.getParentID());
-            jiLinPushTreeDto.setTName(archiveTreeContractDto.getNodeName());
-            jiLinPushTreeDto.setAddUserName(archiveTreeContractDto.getUpdateUserName());
-            jiLinPushTreeDto.setPactId(archiveTreeContractDto.getContractId());
-            //直接统一设置好目录树项目Id为吉林的项目ID
-            jiLinPushTreeDto.setProjId(jlHjProjId);
-            jiLinPushTreeDtos.add(jiLinPushTreeDto);
+//      //传入重庆的项目ID，和吉林需要的合同段集合 查出重庆的目录树
+//        Long projectId=cqHjProjectId;
+//        List<ArchiveTreeContractDTO> archiveTreeContractDtos = archiveTreeContractClient.getArchiveTreeContractDto(dtos,projectId);
+//        System.out.println(archiveTreeContractDtos.size());
+//      //构建需要传给吉林的目录树 数据
+//        List<JiLinPushTreeDto>jiLinPushTreeDtos=new ArrayList<>();
+//        for (ArchiveTreeContractDTO archiveTreeContractDto : archiveTreeContractDtos) {
+//            JiLinPushTreeDto jiLinPushTreeDto = new JiLinPushTreeDto();
+//            jiLinPushTreeDto.setKid(archiveTreeContractDto.getId());
+//            jiLinPushTreeDto.setAddTime(archiveTreeContractDto.getUpdateUserTime());
+//            jiLinPushTreeDto.setParentID(archiveTreeContractDto.getParentID());
+//            jiLinPushTreeDto.setTName(archiveTreeContractDto.getNodeName());
+//            jiLinPushTreeDto.setAddUserName(archiveTreeContractDto.getUpdateUserName());
+//            jiLinPushTreeDto.setPactId(archiveTreeContractDto.getContractId());
+//            //直接统一设置好目录树项目Id为吉林的项目ID
+//            jiLinPushTreeDto.setProjId(jlHjProjId);
+//            jiLinPushTreeDtos.add(jiLinPushTreeDto);
+//
+//        }
+//        //双重循环构建好的目录树数据和中间表集合 对比合同段Id
+//        for (JiLinPushTreeDto jiLinPushTreeDto : jiLinPushTreeDtos) {
+//            for (ArchiveJiLinPush archiveJiLinPush : archiveJiLinPushList) {
+//                //目录树的合同段ID等于中间表的重庆合同段Id,
+//                if(jiLinPushTreeDto.getPactId()!=null&& jiLinPushTreeDto.getPactId().equals(archiveJiLinPush.getCqContractId())){
+//                    //将目录树的合同段ID，设置成吉林的合同段Id
+//                    jiLinPushTreeDto.setPactId(archiveJiLinPush.getJlPactId());
+//                }
+//            }
+//        }
+//        System.out.println(jiLinPushTreeDtos.size());
+//
+//        String tree= JSONObject.toJSONString(jiLinPushTreeDtos);
+//        String treeMsg=tree+HJCLIENTSECRETKEY;
+//        String treeSignature = DigestUtils.md5Hex(treeMsg).toUpperCase();
+//        //传输吉林目录树的地址
+//        String treeUrl="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/tree";
+//        HashMap<String,String> treeHeaders=new HashMap<>();
+//        treeHeaders.put("Content-Type", "application/json");
+//        treeHeaders.put("clientId",HJCLIENTID);
+//        treeHeaders.put("signature",treeSignature);
+//        treeHeaders.put("systemId",HJSYSTEMID);
+//        //开始传输目录树
+//        String treeBody = HttpUtil.createPost(treeUrl).addHeaders(treeHeaders).body(tree).contentType("application/json").execute().body();
+//        System.out.println(tree);
+//        System.out.println(treeBody);
 
-        }
-        //双重循环构建好的目录树数据和中间表集合 对比合同段Id
-        for (JiLinPushTreeDto jiLinPushTreeDto : jiLinPushTreeDtos) {
+       //根据项目ID，合同段ID 查询出所有符合的档案数据
+        List<JiLinArchiveAutoDto>archiveAutoDtos=iArchivesAutoService.getArchiveAutoDtoList(cqPyProjectId,dtos);
+
+        //双重循环查出来的档案 将我们的项目 合同ID 设置为吉林的
+        for (JiLinArchiveAutoDto archiveAutoDto : archiveAutoDtos) {
+            Long id = SnowFlakeUtil.getId();
+            Long id1 = SnowFlakeUtil.getId();
+            archiveAutoDto.setProjectId(jlPyProjId);
+            archiveAutoDto.setTomeId(id);
+            archiveAutoDto.setCatlogId(id1);
             for (ArchiveJiLinPush archiveJiLinPush : archiveJiLinPushList) {
-                //目录树的合同段ID等于中间表的重庆合同段Id,
-                if(jiLinPushTreeDto.getPactId()!=null&& jiLinPushTreeDto.getPactId().equals(archiveJiLinPush.getCqContractId())){
-                    //将目录树的合同段ID，设置成吉林的合同段Id
-                    jiLinPushTreeDto.setPactId(archiveJiLinPush.getJlPactId());
+                if (archiveAutoDto.getContractId() != null && archiveAutoDto.getContractId().equals(archiveJiLinPush.getCqContractId())) {
+                    archiveAutoDto.setContractId(archiveJiLinPush.getJlPactId());
                 }
             }
         }
-        System.out.println(jiLinPushTreeDtos.size());
+        System.out.println("档案："+archiveAutoDtos.size());
+        iJiLinArchiveAutoDtoService.saveBatch(archiveAutoDtos);
 
-        String tree= JSONObject.toJSONString(jiLinPushTreeDtos);
-        String treeMsg=tree+HJCLIENTSECRETKEY;
-        String treeSignature = DigestUtils.md5Hex(treeMsg).toUpperCase();
-        //传输吉林目录树的地址
-        String treeUrl="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/tree";
-        HashMap<String,String> treeHeaders=new HashMap<>();
-        treeHeaders.put("Content-Type", "application/json");
-        treeHeaders.put("clientId",HJCLIENTID);
-        treeHeaders.put("signature",treeSignature);
-        treeHeaders.put("systemId",HJSYSTEMID);
-        //开始传输目录树
-        String treeBody = HttpUtil.createPost(treeUrl).addHeaders(treeHeaders).body(tree).contentType("application/json").execute().body();
-        System.out.println(tree);
-        System.out.println(treeBody);
-
-       //根据项目ID，合同段ID 查询出所有符合的档案数据
-//        List<JiLinArchiveAutoDto>archiveAutoDtos=iArchivesAutoService.getArchiveAutoDtoList(cqHjProjectId,dtos);
-
-        //双重循环查出来的档案 将我们的项目 合同ID 设置为吉林的
-//        for (JiLinArchiveAutoDto archiveAutoDto : archiveAutoDtos) {
-//            Long id = SnowFlakeUtil.getId();
-//            Long id1 = SnowFlakeUtil.getId();
-//            archiveAutoDto.setProjectId(jlPyProjId);
-//            archiveAutoDto.setTomeId(id);
-//            archiveAutoDto.setCatlogId(id1);
-//            for (ArchiveJiLinPush archiveJiLinPush : archiveJiLinPushList) {
-//                if (archiveAutoDto.getContractId() != null && archiveAutoDto.getContractId().equals(archiveJiLinPush.getCqContractId())) {
-//                    archiveAutoDto.setContractId(archiveJiLinPush.getJlPactId());
-//                }
+//        Long projId=jlPyProjId;
+//        for (int j = 0; j <100 ; j++) {
+//            Page<JiLinArchiveAutoDto> pages=iJiLinArchiveAutoDtoService.queryAll(j,500,projId);
+//            List<JiLinArchiveAutoDto> archiveAutoDtos = pages.getRecords();
+//            if(archiveAutoDtos.size()<500) {
+//                System.out.println("最后一次数据大小："+archiveAutoDtos.size());
+//                j=101;
 //            }
-//        }
-//        System.out.println("档案："+archiveAutoDtos.size());
-//        iJiLinArchiveAutoDtoService.saveBatch(archiveAutoDtos);
-//        int pageNum=1;
-//        int size=500;
-//        Page<JiLinArchiveAutoDto> pages=iJiLinArchiveAutoDtoService.queryAll(pageNum,size);
-//        System.out.println(pages.getRecords().size());
-
-
-//       List<JiLinPushTomeDto> jiLinPushTomeDtoList=new ArrayList<>();
-//       List<JiLinPushCatalogDto>jiLinPushCatalogDtoList=new ArrayList<>();
-//       List<JiLinPushFileUrlDto>jiLinPushFileUrlDtoList=new ArrayList<>();
-//
-//        for (int i = 0; i < archiveAutoDtos.size(); i++) {
-//            if(i>=50){
-//                break;
+//            List<JiLinPushTomeDto> jiLinPushTomeDtoList = new ArrayList<>();
+//            List<JiLinPushCatalogDto> jiLinPushCatalogDtoList = new ArrayList<>();
+//            List<JiLinPushFileUrlDto> jiLinPushFileUrlDtoList = new ArrayList<>();
+//            for (int i = 0; i < archiveAutoDtos.size(); i++) {
+//                //设置档案案卷
+//                JiLinPushTomeDto jiLinPushTomeDto = new JiLinPushTomeDto();
+//                jiLinPushTomeDto.setPactId(jlPyProjId);
+//                jiLinPushTomeDto.setPactId(archiveAutoDtos.get(i).getContractId());
+//                jiLinPushTomeDto.setKid(archiveAutoDtos.get(i).getTomeId());
+//                jiLinPushTomeDto.setSortID(archiveAutoDtos.get(i).getNodeId());
+//                jiLinPushTomeDto.setTomeSuper(archiveAutoDtos.get(i).getName());
+//                jiLinPushTomeDto.setRecordNum(archiveAutoDtos.get(i).getFileNumber());
+//                jiLinPushTomeDto.setAddUserName(archiveAutoDtos.get(i).getUpdateUserName());
+//                jiLinPushTomeDto.setAddTime(archiveAutoDtos.get(i).getCreateUserTime());
+//                jiLinPushTomeDto.setBWeaveDate(archiveAutoDtos.get(i).getStartDate());
+//                jiLinPushTomeDto.setEWeaveDate(archiveAutoDtos.get(i).getEndDate());
+//                jiLinPushTomeDto.setKeepTerm(archiveAutoDtos.get(i).getStorageTime());
+//                jiLinPushTomeDto.setSortOrder(i);
+//                jiLinPushTomeDto.setMutualNum("0");
+//                jiLinPushTomeDto.setWeaveUnit(archiveAutoDtos.get(i).getUnit());
+//                jiLinPushTomeDto.setSecrecy(archiveAutoDtos.get(i).getSecretLevel());
+//                jiLinPushTomeDto.setYear(Integer.parseInt(archiveAutoDtos.get(i).getStorageTime()));
+//                jiLinPushTomeDtoList.add(jiLinPushTomeDto);
+//                //    设置档案卷内目录
+//                JiLinPushCatalogDto jiLinPushCatalogDto = new JiLinPushCatalogDto();
+//                jiLinPushCatalogDto.setProjId(jlPyProjId);
+//                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(archiveAutoDtos.get(i).getName());
+//                jiLinPushCatalogDto.setCatalogRecord(archiveAutoDtos.get(i).getFileNumber());
+//                jiLinPushCatalogDto.setAmsFileNum("0");
+//                jiLinPushCatalogDto.setFileNum("0");
+//                jiLinPushCatalogDto.setWeaveDate(archiveAutoDtos.get(i).getCreateUserTime());
+//                jiLinPushCatalogDto.setPieceCount(archiveAutoDtos.get(i).getFileN());
+//                jiLinPushCatalogDto.setDutyPerson(archiveAutoDtos.get(i).getRollor());
+//                jiLinPushCatalogDto.setFilePage(archiveAutoDtos.get(i).getPageN());
+//                jiLinPushCatalogDto.setReferenceInfo("0");
+//                jiLinPushCatalogDto.setSortOrder(i);
+//                jiLinPushCatalogDto.setAddUserName(archiveAutoDtos.get(i).getUpdateUserName());
+//                jiLinPushCatalogDto.setAddTime(archiveAutoDtos.get(i).getUpdateUserTime());
+//                jiLinPushCatalogDtoList.add(jiLinPushCatalogDto);
+//                //设置档案文件
+//                JiLinPushFileUrlDto jiLinPushFileUrlDto = new JiLinPushFileUrlDto();
+//                jiLinPushFileUrlDto.setProjId(jlPyProjId);
+//                jiLinPushFileUrlDto.setPactId(archiveAutoDtos.get(i).getContractId());
+//                jiLinPushFileUrlDto.setKid(archiveAutoDtos.get(i).getId());
+//                jiLinPushFileUrlDto.setCatalogID(archiveAutoDtos.get(i).getCatlogId());
+//                jiLinPushFileUrlDto.setAnnexName(archiveAutoDtos.get(i).getName());
+//                jiLinPushFileUrlDto.setTableNumber(archiveAutoDtos.get(i).getFileNumber());
+//                jiLinPushFileUrlDto.setWeaveDate(archiveAutoDtos.get(i).getCreateUserTime());
+//                jiLinPushFileUrlDto.setAnnexPage(archiveAutoDtos.get(i).getPageN());
+//                jiLinPushFileUrlDto.setFileUrl(archiveAutoDtos.get(i).getPdfFileUrl() == null ? archiveAutoDtos.get(i).getFileUrl() : archiveAutoDtos.get(i).getPdfFileUrl());
+//                jiLinPushFileUrlDto.setSortOrder(i);
+//                jiLinPushFileUrlDto.setAddUserName(archiveAutoDtos.get(i).getUpdateUserName());
+//                jiLinPushFileUrlDto.setAddTime(archiveAutoDtos.get(i).getUpdateUserTime());
+//                jiLinPushFileUrlDtoList.add(jiLinPushFileUrlDto);
 //            }
-//            Long id = SnowFlakeUtil.getId();
-//            //设置档案案卷
-//            JiLinPushTomeDto jiLinPushTomeDto=new JiLinPushTomeDto();
-//            jiLinPushTomeDto.setPactId(jlPyProjId);
-//            jiLinPushTomeDto.setPactId(archiveAutoDtos.get(i).getContractId());
-//            jiLinPushTomeDto.setKid(id);
-//            jiLinPushTomeDto.setSortID(archiveAutoDtos.get(i).getNodeId());
-//            jiLinPushTomeDto.setTomeSuper(archiveAutoDtos.get(i).getName());
-//            jiLinPushTomeDto.setRecordNum(archiveAutoDtos.get(i).getFileNumber());
-//            jiLinPushTomeDto.setAddUserName(archiveAutoDtos.get(i).getUpdateUser());
-//            jiLinPushTomeDto.setAddTime(archiveAutoDtos.get(i).getCreateTime());
-//            jiLinPushTomeDto.setBWeaveDate(archiveAutoDtos.get(i).getStartDate());
-//            jiLinPushTomeDto.setEWeaveDate(archiveAutoDtos.get(i).getEndDate());
-//            jiLinPushTomeDto.setKeepTerm(archiveAutoDtos.get(i).getStorageTime());
-//            jiLinPushTomeDto.setSortOrder(i);
-//            jiLinPushTomeDto.setMutualNum("0");
-//            jiLinPushTomeDto.setWeaveUnit(archiveAutoDtos.get(i).getUnit());
-//            jiLinPushTomeDto.setSecrecy(archiveAutoDtos.get(i).getSecretLevel());
-//            jiLinPushTomeDto.setYear(Integer.parseInt(archiveAutoDtos.get(i).getStorageTime()));
-//            jiLinPushTomeDtoList.add(jiLinPushTomeDto);
-//        //    设置档案卷内目录
-//            JiLinPushCatalogDto jiLinPushCatalogDto=new JiLinPushCatalogDto();
-//            jiLinPushCatalogDto.setProjId(jlPyProjId);
-//            jiLinPushCatalogDto.setPactId(archiveAutoDtos.get(i).getContractId());
-//            jiLinPushCatalogDto.setKid(id+1L);
-//            jiLinPushCatalogDto.setSortId(archiveAutoDtos.get(i).getNodeId());
-//            jiLinPushCatalogDto.setTomeId(id);
-//            jiLinPushCatalogDto.setFileSuper(archiveAutoDtos.get(i).getName());
-//            jiLinPushCatalogDto.setCatalogRecord(archiveAutoDtos.get(i).getFileNumber());
-//            jiLinPushCatalogDto.setAmsFileNum("0");
-//            jiLinPushCatalogDto.setFileNum("0");
-//            jiLinPushCatalogDto.setWeaveDate(archiveAutoDtos.get(i).getCreateTime());
-//            jiLinPushCatalogDto.setPieceCount(archiveAutoDtos.get(i).getFileN());
-//            jiLinPushCatalogDto.setDutyPerson(archiveAutoDtos.get(i).getRollor());
-//            jiLinPushCatalogDto.setFilePage(archiveAutoDtos.get(i).getPageN());
-//            jiLinPushCatalogDto.setReferenceInfo("0");
-//            jiLinPushCatalogDto.setSortOrder(i);
-//            jiLinPushCatalogDto.setAddUserName(archiveAutoDtos.get(i).getUpdateUser());
-//            jiLinPushCatalogDto.setAddTime(archiveAutoDtos.get(i).getUpdateTime());
-//            jiLinPushCatalogDtoList.add(jiLinPushCatalogDto);
-//            //设置档案文件
-//            JiLinPushFileUrlDto jiLinPushFileUrlDto=new JiLinPushFileUrlDto();
-//            jiLinPushFileUrlDto.setProjId(jlPyProjId);
-//            jiLinPushFileUrlDto.setPactId(archiveAutoDtos.get(i).getContractId());
-//            jiLinPushFileUrlDto.setKid(archiveAutoDtos.get(i).getId());
-//            jiLinPushFileUrlDto.setCatalogID(id+1L);
-//            jiLinPushFileUrlDto.setAnnexName(archiveAutoDtos.get(i).getName());
-//            jiLinPushFileUrlDto.setTableNumber(archiveAutoDtos.get(i).getFileNumber());
-//            jiLinPushFileUrlDto.setWeaveDate(archiveAutoDtos.get(i).getCreateTime());
-//            jiLinPushFileUrlDto.setAnnexPage(archiveAutoDtos.get(i).getPageN());
-//            jiLinPushFileUrlDto.setFileUrl(archiveAutoDtos.get(i).getPdfFileUrl()==null?archiveAutoDtos.get(i).getFileUrl():archiveAutoDtos.get(i).getPdfFileUrl());
-//            jiLinPushFileUrlDto.setSortOrder(i);
-//            jiLinPushFileUrlDto.setAddUserName(archiveAutoDtos.get(i).getUpdateUser());
-//            jiLinPushFileUrlDto.setAddTime(archiveAutoDtos.get(i).getUpdateTime());
-//            jiLinPushFileUrlDtoList.add(jiLinPushFileUrlDto);
-//
+//                //传输吉林档案案卷的地址
+//                String tome=JSONObject.toJSONString(jiLinPushTomeDtoList);
+//                String tomeMsg=tome+PYCLIENTSECRETKEY;
+//                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("signature",tomeSignature);
+//                tomeHeaders.put("systemId",PYSYSTEMID);
+//                String tomeBody = HttpUtil.createPost(tomeUrl).addHeaders(tomeHeaders).body(tome).contentType("application/json").execute().body();
+//                System.out.println("第"+j+"次档案案卷"+tomeBody);
+//                //传输吉林档案卷内目录
+//                String catLog=JSONObject.toJSONString(jiLinPushCatalogDtoList);
+//                String catLogMsg=catLog+PYCLIENTSECRETKEY;
+//                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("signature",catLogSignature);
+//                catLogHeaders.put("systemId",PYSYSTEMID);
+//                String catLogBody = HttpUtil.createPost(catLogUrl).addHeaders(catLogHeaders).body(catLog).contentType("application/json").execute().body();
+//                System.out.println("第"+j+"次卷内目录"+catLogBody);
+//                //传输吉林档案文件
+//                String annex=JSONObject.toJSONString(jiLinPushFileUrlDtoList);
+//                String annexMsg=annex+PYCLIENTSECRETKEY;
+//                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("signature",annexSignature);
+//                annexHeaders.put("systemId",PYSYSTEMID);
+//                String annexBody = HttpUtil.createPost(annexUrl).addHeaders(annexHeaders).body(annex).contentType("application/json").execute().body();
+//                System.out.println("第"+j+"次档案文件"+annexBody);
 //        }
-//            //传输吉林档案案卷的地址
-//            String tome=JSONObject.toJSONString(jiLinPushTomeDtoList);
-//            System.out.println(tome);
-//            String tomeMsg=tome+PYCLIENTSECRETKEY;
-//            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("signature",tomeSignature);
-//            tomeHeaders.put("systemId",PYSYSTEMID);
-//            String tomeBody = HttpUtil.createPost(tomeUrl).addHeaders(tomeHeaders).body(tome).contentType("application/json").execute().body();
-//            System.out.println(tomeBody);
-//            //传输吉林档案卷内目录
-//            String catLog=JSONObject.toJSONString(jiLinPushCatalogDtoList);
-//            String catLogMsg=catLog+PYCLIENTSECRETKEY;
-//            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("signature",catLogSignature);
-//            catLogHeaders.put("systemId",PYSYSTEMID);
-//            String catLogBody = HttpUtil.createPost(catLogUrl).addHeaders(catLogHeaders).body(catLog).contentType("application/json").execute().body();
-//            System.out.println(catLogBody);
-//            //传输吉林档案文件
-//            String annex=JSONObject.toJSONString(jiLinPushFileUrlDtoList);
-//            String annexMsg=annex+PYCLIENTSECRETKEY;
-//            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("signature",annexSignature);
-//            annexHeaders.put("systemId",PYSYSTEMID);
-//            String annexBody = HttpUtil.createPost(annexUrl).addHeaders(annexHeaders).body(annex).contentType("application/json").execute().body();
-//            System.out.println(annexBody);
+//        System.out.println("蒲烟传输结束");
    }
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -1193,10 +1193,10 @@
         <result column="end_date" property="endDate"></result>
         <result column="storage_time" property="storageTime"></result>
         <result column="secret_level" property="secretLevel"></result>
-        <result column="update_user" property="updateUserName"></result>
+        <result column="real_name" property="updateUserName"></result>
         <result column="update_time" property="updateUserTime"></result>
         <result column="auto_file_sort" property="autoFileSort"></result>
-        <result column="create_time" property="createUserTime"></result>
+        <result column="create__time" property="createUserTime"></result>
         <result column="file_n" property="fileN"></result>
         <result column="rollor" property="rollor"></result>
         <result column="node_id" property="nodeId"></result>

blade-service/blade-archive/src/main/java/org/springblade/archive/service/IJiLinArchiveAutoDtoService.java

@@ -9,5 +9,5 @@ import java.util.List;
 
 
 public interface IJiLinArchiveAutoDtoService extends IService<JiLinArchiveAutoDto > {
-    Page<JiLinArchiveAutoDto> queryAll(int pageNum, int size);
+    Page<JiLinArchiveAutoDto> queryAll(int pageNum, int size,Long projId);
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/JiLinArchiveAutoDtoImpl.java

@@ -23,9 +23,10 @@ public class JiLinArchiveAutoDtoImpl extends ServiceImpl<JiLinArchiveAutoDtoMapp
     @Resource
     JiLinArchiveAutoDtoMapper jiLinArchiveAutoDtoMapper;
     @Override
-    public Page<JiLinArchiveAutoDto> queryAll(int pageNum, int size) {
+    public Page<JiLinArchiveAutoDto> queryAll(int pageNum, int size,Long projId) {
         Page<JiLinArchiveAutoDto>page=new Page<>(pageNum,size);
         QueryWrapper<JiLinArchiveAutoDto> wrapper = new QueryWrapper<>();
+        wrapper.eq("project_id",projId);
         return jiLinArchiveAutoDtoMapper.selectPage(page,wrapper);
     }
 }

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

@@ -1339,9 +1339,11 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             Elements dwtitle = doc.select("el-input[placeholder~=.*承包单位]");
             Elements sgtitle = doc.select("el-input[placeholder~=^施工单位]");
             Elements sgtitle1 = doc.select("el-input[placeholder=安装单位]");
+            Elements sgtitle2= doc.select("el-input[placeholder=承建单位]");
 
             Elements defText = doc.getElementsByAttribute("defText");
             sgtitle.addAll(sgtitle1);
+            sgtitle.addAll(sgtitle2);
 
             //合同段显示合同编号
             Elements htdtitle = doc.select("el-input[placeholder~=.*合同段.*]");

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

@@ -460,12 +460,14 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         if (wbsTreeContract == null) {
             return Collections.emptyList();
         }
+        System.out.println(primaryKeyId+":"+wbsTreeContract);
 
         //当前项目合同段只会存在一个角色roleId
         SaveUserInfoByProject userInfo = baseMapper.selectRoleInfo(userId, contractId, projectId);
         if (userInfo == null) {
             throw new ServiceException("请先分配当前用户对该合同段的角色信息");
         }
+        System.out.println("角色"+":"+userInfo);
         String roleId = userInfo.getRoleId();
 
         //获取当前用户角色与表单所属方关系信息
@@ -473,6 +475,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         if (wbsTableOwnerRoleList.size() == 0) {
             throw new ServiceException("当前用户角色未授权，请先分配角色查看元素表相对应的权限");
         }
+        System.out.println("所属方"+":"+wbsTableOwnerRoleList);
 
         //角色表单权限（后管权限配置）
         Set<String> roleTableOwnerSets = wbsTableOwnerRoleList.stream().map(WbsTableOwnerRole::getTableOwnerNumber).collect(Collectors.toSet());
@@ -510,6 +513,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                             wbsTreeContract.getProjectId(), wbsTreeContract.getWbsId(),
                             wbsTreeContract.getContractId(), wbsTreeContract.getId(),
                             wbsTreeContract.getContractIdRelation());
+                    System.out.println("表单"+":"+resultTabs);
                 }else{
                     resultTabs = new ArrayList<>();
                 }