推送吉林档案

blade-ops/blade-develop/src/main/resources/templates/code.properties

@@ -1,5 +1,5 @@
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=123456
 author=BladeX

blade-ops/blade-develop/src/test/resources/templates/code.properties

@@ -1,5 +1,5 @@
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-spring.datasource.password=root
+spring.datasource.password=123456
 author=BladeX

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/dto/ArchiveAutoDto.java

@@ -0,0 +1,27 @@
+package org.springblade.archive.dto;
+
+import lombok.Data;
+
+@Data
+public class ArchiveAutoDto {
+    private Long id;
+    private Long projectId;
+    private Long contractId;
+    private String name;
+    private  String fileNumber;
+    private String  unit;
+    private String startDate;
+    private String endDate;
+    private String storageTime;
+    private String secretLevel;
+    private String updateUser;
+    private String updateTime;
+    private String autoFileSort;
+    private String createTime;
+    private Integer fileN;
+    private String rollor;
+    private Long  nodeId;
+    private Integer pageN;
+    private String fileUrl;
+    private String pdfFileUrl;
+}

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/dto/JiLinPushCatalogDto.java

@@ -0,0 +1,29 @@
+package org.springblade.archive.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class JiLinPushCatalogDto {
+    private Long projId;
+    private Long pactId;
+    private Long kid;
+    private Long sortId;
+    private Long tomeId;
+    private String fileSuper;
+    private String catalogRecord;
+    private String amsFileNum;
+    private  String fileNum;
+    private  String weaveDate;
+    private Integer pieceCount;
+    private String dutyPerson;
+    private Integer filePage;
+    private String referenceInfo;
+    private Integer sortOrder;
+    private String addUserName;
+    private String addTime;
+
+}

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/dto/JinLinPushFileUrlDto.java → blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/dto/JiLinPushFileUrlDto.java

@@ -3,7 +3,7 @@ package org.springblade.archive.dto;
 import lombok.Data;
 
 @Data
-public class JinLinPushFileUrlDto {
+public class JiLinPushFileUrlDto {
     private Long projId;
     private Long pactId;
     private Long kid;

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/dto/JiLinPushTomeDto.java

@@ -0,0 +1,29 @@
+package org.springblade.archive.dto;
+
+import io.swagger.models.auth.In;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class JiLinPushTomeDto {
+
+    private Long projId;
+    private Long pactId;
+    private Long kid;
+    private Long sortID;
+    private String tomeSuper;
+    private String RecordNum;
+    private String weaveUnit;
+    private String bWeaveDate;
+    private String eWeaveDate;
+    private String keepTerm;
+    private String secrecy;
+    private Integer year;
+    private String mutualNum;
+    private String addUserName;
+    private String addTime;
+    private Integer sortOrder;
+}

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/dto/JinLinPushTreeDto.java → blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/dto/JiLinPushTreeDto.java

@@ -2,11 +2,8 @@ package org.springblade.archive.dto;
 
 import lombok.Data;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Data
-public class JinLinPushTreeDto {
+public class JiLinPushTreeDto {
     private Long projId;
     private  Long pactId;
     private Long kid;

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/dto/JiLinQueryDto.java

@@ -0,0 +1,11 @@
+package org.springblade.archive.dto;
+
+import lombok.Data;
+
+@Data
+public class JiLinQueryDto {
+    private Long cqProjectId;
+    private Long cqContractId;
+    private Long jlProjectId;
+    private Long jlPactId;
+}

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/dto/JinLinPushTomeDto.java

@@ -1,8 +0,0 @@
-package org.springblade.archive.dto;
-
-import lombok.Data;
-
-@Data
-public class JinLinPushTomeDto {
-
-}

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchiveJiLinPush.java

@@ -0,0 +1,22 @@
+package org.springblade.archive.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+
+@Data
+@TableName("u_jilin_push")
+
+public class ArchiveJiLinPush extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    private Long cqProjectId;
+    private String cqProjectName;
+    private Long cqContractId;
+    private String cqContractName;
+    private Long jlProjectId;
+    private String jlProjectName;
+    private Long jlPactId;
+    private String jlPactName;
+}

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/feign/ArchiveAutoClient.java

@@ -1,5 +1,7 @@
 package org.springblade.archive.feign;
 
+import org.springblade.archive.dto.ArchiveAutoDto;
+import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.archive.entity.ArchiveProjectConfig;
 import org.springblade.archive.entity.ArchivesAuto;
 import org.springblade.archive.vo.ArchivesAutoVO;
@@ -44,4 +46,6 @@ public interface ArchiveAutoClient {
      */
     @PostMapping(API_PREFIX + "/batchUpdateExpertId")
     R<Boolean> batchUpdateExpertId(@RequestBody UpdateExpertVO vo);
+
+
 }

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/ArchiveTreeContractClient.java

@@ -1,9 +1,11 @@
 package org.springblade.manager.feign;
 
+import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.manager.dto.ArchiveTreeContractDTO;
 import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -60,5 +62,5 @@ public interface ArchiveTreeContractClient {
     public ArchiveTreeContract getMatchNode(@RequestParam Long nodeId);
 
     @PostMapping(API_PREFIX+"/getArchiveTreeContractDto")
-    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(@RequestParam String projId);
+    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(@RequestBody List<JiLinQueryDto>dtos, @RequestParam Long cqProjectId);
 }

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

@@ -1,21 +1,19 @@
 package org.springblade.archive.controller;
 
 import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.Api;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.springblade.archive.dto.JinLinPushTreeDto;
-import org.springblade.archive.dto.PactAndProjDto;
+import org.springblade.archive.dto.*;
+import org.springblade.archive.entity.ArchiveJiLinPush;
+import org.springblade.archive.feign.ArchiveAutoClient;
+import org.springblade.archive.service.IArchiveJiLinPushService;
 import org.springblade.archive.service.IArchivesAutoService;
-import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.manager.dto.ArchiveTreeContractDTO;
 import org.springblade.manager.feign.ArchiveTreeContractClient;
-import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,25 +23,30 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 @RestController
 @Api(value = "吉林档案推送", tags = "吉林档案推送")
 @RequestMapping("/jinLinPush")
+@Slf4j
 public class JinLinPushApiController {
     //蒲烟
     private static final String PYCLIENTID="hqs_veams02";
     private static  final String PYCLIENTSECRETKEY="69701959EB6549A6A083D5A277CF0A50";
     private static  final String PYSYSTEMID="9";
+    private static final Long jlPyProjId=72900L;
+    private static  final Long cqPyProjectId=1644168307341238273L;
     //烟长
     private static final String YCPYCLIENTID="hqs_veams03";
     private static  final String YCPYCLIENTSECRETKEY="FA3E91A9C2F04ED5A4D76E2DF4D09463";
     private static  final String YCSYSTEMID="9";
+    private static final Long jlYcProjId=73100L;
+    private static final Long cqYcProjectId=1644178425269166081L;
     //恒集
-    private static final String HJPYCLIENTID="hqs_veams04";
-    private static  final String HJYCPYCLIENTSECRETKEY="50644A2D550A42E88964FE63B7C6D4E7";
-    private static  final String HJYCSYSTEMID="9";
+    private static final String HJCLIENTID="hqs_veams04";
+    private static  final String HJCLIENTSECRETKEY="50644A2D550A42E88964FE63B7C6D4E7";
+    private static  final String HJSYSTEMID="9";
+    private static final Long jlHjProjId=73200L;
+    private static final Long jlHjProjectId=1644178786029641730L;
 
     @Resource
     private IArchivesAutoService iArchivesAutoService;
@@ -51,71 +54,279 @@ public class JinLinPushApiController {
     @Autowired
     private ArchiveTreeContractClient archiveTreeContractClient;
 
+    @Resource
+    private IArchiveJiLinPushService iArchiveJiLinPushService;
+
     @GetMapping("/test")
     public void JinlinApiPush() throws JsonProcessingException {
         //获取发送get请求的校验码
-     String s = "clientSecretKey="+PYCLIENTSECRETKEY;
-     String signature1 = DigestUtils.md5Hex(s).toUpperCase();
-     String url1 = "https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/hqsws/hqsprojpact/query";
-     HashMap<String,String> headers=new HashMap<>();
-     headers.put("Content-Type", "application/json");
-     headers.put("clientId",PYCLIENTID);
-     headers.put("signature",signature1);
-     headers.put("systemId",PYSYSTEMID);
-     String body = HttpUtil.createGet(url1).addHeaders(headers).execute().body();
-     JSONObject jsonObject=JSONObject.parseObject(body);
+     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",PYCLIENTID);
+        queryHeaders.put("signature",querySignature);
+        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);
-     String projId="1644168307341238273";
-        List<ArchiveTreeContractDTO> archiveTreeContractDtos = archiveTreeContractClient.getArchiveTreeContractDto(projId);
-        List<JinLinPushTreeDto>jinLinPushTreeDtos=new ArrayList<>();
+
+     //重庆吉林蒲烟项目合同段信息（中间表）
+     List<ArchiveJiLinPush>archiveJiLinPushList= iArchiveJiLinPushService.getArchiveJiLinPush(jlPyProjId);
+
+     //中间项目合同中间集合
+     List<JiLinQueryDto>dtos=new ArrayList<>();
+     for (PactAndProjDto pactAndProjDto : pactAndProjDtoList) {
+            for (ArchiveJiLinPush archiveJiLinPush : archiveJiLinPushList) {
+                //吉林的合同段Id等于中间表吉林的合同段Id
+                if(pactAndProjDto.getPactId().equals(archiveJiLinPush.getJlPactId())){
+                    //筛选出两边共同有的项目合同段 并设置好两边的项目ID 和合同段ID
+                    JiLinQueryDto jiLinQueryDto=new JiLinQueryDto();
+                    jiLinQueryDto.setCqContractId(archiveJiLinPush.getCqContractId());
+                    jiLinQueryDto.setCqProjectId(archiveJiLinPush.getCqProjectId());
+                    jiLinQueryDto.setJlProjectId(archiveJiLinPush.getJlProjectId());
+                    jiLinQueryDto.setJlPactId(archiveJiLinPush.getJlPactId());
+                    dtos.add(jiLinQueryDto);
+                }
+            }
+        }
+      //传入重庆的项目ID，和吉林需要的合同段集合 查出重庆的目录树
+        List<ArchiveTreeContractDTO> archiveTreeContractDtos = archiveTreeContractClient.getArchiveTreeContractDto(dtos,cqPyProjectId);
+        System.out.println("重庆的目录树"+archiveTreeContractDtos.size());
+      //构建需要传给吉林的目录树 数据
+        List<JiLinPushTreeDto>jiLinPushTreeDtos=new ArrayList<>();
         for (ArchiveTreeContractDTO archiveTreeContractDto : archiveTreeContractDtos) {
-            JinLinPushTreeDto jinLinPushTreeDto = new JinLinPushTreeDto();
-            jinLinPushTreeDto.setKid(archiveTreeContractDto.getId());
-            jinLinPushTreeDto.setAddTime(archiveTreeContractDto.getUpdateUserTime());
-            jinLinPushTreeDto.setParentID(archiveTreeContractDto.getParentID());
-            jinLinPushTreeDto.setTName(archiveTreeContractDto.getNodeName());
-            jinLinPushTreeDto.setAddUserName(archiveTreeContractDto.getUpdateUserName());
-            jinLinPushTreeDto.setPactId(archiveTreeContractDto.getContractId());
-            jinLinPushTreeDto.setProjId(archiveTreeContractDto.getProjectId());
-            jinLinPushTreeDtos.add(jinLinPushTreeDto);
+            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(jlPyProjId);
+            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());
+        System.out.println(jiLinPushTreeDtos.get(20));
+//        String tree= JSONObject.toJSONString(jiLinPushTreeDtos);
+//        String treeMsg=tree+PYCLIENTSECRETKEY;
+//        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",PYCLIENTID);
+//        treeHeaders.put("signature",treeSignature);
+//        treeHeaders.put("systemId",PYSYSTEMID);
+//        //开始传输目录树
+//        String treeBody = HttpUtil.createPost(treeUrl).addHeaders(treeHeaders).body(tree).contentType("application/json").execute().body();
+//        System.out.println(treeBody);
+
+       //根据项目ID，合同段ID 查询出所有符合的档案数据
+        List<ArchiveAutoDto>archiveAutoDtos=iArchivesAutoService.getArchiveAutoDtoList(cqPyProjectId,dtos);
+        //双重循环查出来的档案 将我们的项目 合同ID 设置为吉林的
+        for (ArchiveAutoDto archiveAutoDto : archiveAutoDtos) {
+            archiveAutoDto.setProjectId(jlPyProjId);
+            for (ArchiveJiLinPush archiveJiLinPush : archiveJiLinPushList) {
+                if (archiveAutoDto.getContractId() != null && archiveAutoDto.getContractId().equals(archiveJiLinPush.getCqContractId())) {
+                    archiveAutoDto.setContractId(archiveJiLinPush.getJlPactId());
+                }
+            }
+        }
+        System.out.println("档案"+archiveAutoDtos.size());
+        System.out.println(archiveAutoDtos.get(20));
 
+       List<JiLinPushTomeDto> list=new ArrayList<>();
+        for (int i = 0; i < archiveAutoDtos.size(); i++) {
+            if(i>=20){
+                break;
+            }
+            JiLinPushTomeDto jiLinPushTomeDto=new JiLinPushTomeDto();
+            jiLinPushTomeDto.setPactId(jlPyProjId);
+            jiLinPushTomeDto.setPactId(archiveAutoDtos.get(i).getContractId());
+            jiLinPushTomeDto.setKid(archiveAutoDtos.get(i).getNodeId()+1L);
+            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.setSortID(Long.valueOf(i));
+            jiLinPushTomeDto.setMutualNum("0");
+            jiLinPushTomeDto.setWeaveUnit(archiveAutoDtos.get(i).getUnit());
+            jiLinPushTomeDto.setSecrecy(archiveAutoDtos.get(i).getSecretLevel());
+            jiLinPushTomeDto.setYear(Integer.parseInt(archiveAutoDtos.get(i).getStorageTime()));
+            list.add(jiLinPushTomeDto);
+            i++;
+            log.info(""+i);
         }
-//        String s= JSONObject.toJSONString(jinLinPushTreeDtos);
-//        String msg=s+PYCLIENTSECRETKEY;
-//        String PYSignature = DigestUtils.md5Hex(msg).toUpperCase();
-//        System.out.println(PYSignature);
-//        String url="https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/veams/api/doc/tree";
-//        HashMap<String,String> headers=new HashMap<>();
-//        headers.put("Content-Type", "application/json");
+
+
+
+//        JiLinPushTomeDto jiLinPushTomeDto=new JiLinPushTomeDto();
+//        jiLinPushTomeDto.setProjId(72900L);
+//        jiLinPushTomeDto.setPactId(44804217L);
+//        jiLinPushTomeDto.setKid(1644215386427621385L+1L);
+//        jiLinPushTomeDto.setSortID(1644215386427621385L);
+//        jiLinPushTomeDto.setTomeSuper("G1221PYJL102001  延吉至长春高速公路大蒲柴河至烟筒山段建设项目PYZJB01合同段2021年K201+516.999-K211+690道路巡视记录");
+//        jiLinPushTomeDto.setRecordNum("111");
+//        jiLinPushTomeDto.setAddUserName("111");
+//        jiLinPushTomeDto.setAddTime("2024-09-11");
+//        jiLinPushTomeDto.setBWeaveDate("2024-08-11");
+//        jiLinPushTomeDto.setEWeaveDate("2024-09-10");
+//        jiLinPushTomeDto.setKeepTerm("3年");
+//        jiLinPushTomeDto.setSortID(1L);
+//        jiLinPushTomeDto.setMutualNum("0");
+//        jiLinPushTomeDto.setWeaveUnit("重庆");
+//        jiLinPushTomeDto.setSecrecy("3");
+//        jiLinPushTomeDto.setYear(3);
+//
+//        JiLinPushTomeDto jiLinPushTomeDto1 = new JiLinPushTomeDto();
+//        jiLinPushTomeDto1.setProjId(72900L);
+//        jiLinPushTomeDto1.setPactId(44804217L);
+//        jiLinPushTomeDto1.setKid(1644215386427621385L+2L);
+//        jiLinPushTomeDto1.setSortID(1644215386427621385L);
+//        jiLinPushTomeDto1.setTomeSuper("G1221PYJL102001  延吉至长春高速公路大蒲柴河至烟筒山段建设项目PYZJB01合同段2021年K201+516.999-K211+690道路巡视记录");
+//        jiLinPushTomeDto1.setRecordNum("111");
+//        jiLinPushTomeDto1.setAddUserName("111");
+//        jiLinPushTomeDto1.setAddTime("2024-09-11");
+//        jiLinPushTomeDto1.setBWeaveDate("2024-08-11");
+//        jiLinPushTomeDto1.setEWeaveDate("2024-09-10");
+//        jiLinPushTomeDto1.setKeepTerm("3年");
+//        jiLinPushTomeDto1.setSortID(1L);
+//        jiLinPushTomeDto1.setMutualNum("0");
+//        jiLinPushTomeDto1.setWeaveUnit("重庆");
+//        jiLinPushTomeDto1.setSecrecy("3");
+//        jiLinPushTomeDto1.setYear(3);
+//
+//        List<JiLinPushTomeDto>dtos=new ArrayList<>();
+//        dtos.add(jiLinPushTomeDto);
+//        dtos.add(jiLinPushTomeDto1);
+
+//   String tome=JSONObject.toJSONString(dtos);
+//   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);
+//
+//     JiLinPushCatalogDto jiLinPushCatalogDto = new JiLinPushCatalogDto();
+//      jiLinPushCatalogDto.setProjId(72900L);
+//      jiLinPushCatalogDto.setPactId(44804217L);
+//      jiLinPushCatalogDto.setKid(1644215386427621385L+2L);
+//      jiLinPushCatalogDto.setSortId(1644215386427621385L);
+//      jiLinPushCatalogDto.setTomeId(1644215386427621385L+1L);
+//      jiLinPushCatalogDto.setFileSuper("1111");
+//      jiLinPushCatalogDto.setCatalogRecord("222200");
+//      jiLinPushCatalogDto.setAmsFileNum("0");
+//      jiLinPushCatalogDto.setFileNum("0");
+//      jiLinPushCatalogDto.setWeaveDate("2024-07-09");
+//      jiLinPushCatalogDto.setPieceCount(7);
+//      jiLinPushCatalogDto.setDutyPerson("豆豆");
+//      jiLinPushCatalogDto.setFilePage(7);
+//      jiLinPushCatalogDto.setReferenceInfo("0");
+//      jiLinPushCatalogDto.setSortOrder(1);
+//      jiLinPushCatalogDto.setAddUserName("豆豆");
+//      jiLinPushCatalogDto.setAddTime("2024-09-09");
+//
+//        JiLinPushCatalogDto jiLinPushCatalogDto1 = new JiLinPushCatalogDto();
+//        jiLinPushCatalogDto1.setProjId(72900L);
+//        jiLinPushCatalogDto1.setPactId(44804217L);
+//        jiLinPushCatalogDto1.setKid(1644215386427621385L+3L);
+//        jiLinPushCatalogDto1.setSortId(1644215386427621385L);
+//        jiLinPushCatalogDto1.setTomeId(1644215386427621385L+1L);
+//        jiLinPushCatalogDto1.setFileSuper("1111");
+//        jiLinPushCatalogDto1.setCatalogRecord("222200");
+//        jiLinPushCatalogDto1.setAmsFileNum("0");
+//        jiLinPushCatalogDto1.setFileNum("0");
+//        jiLinPushCatalogDto1.setWeaveDate("2024-07-09");
+//        jiLinPushCatalogDto1.setPieceCount(7);
+//        jiLinPushCatalogDto1.setDutyPerson("豆豆");
+//        jiLinPushCatalogDto1.setFilePage(7);
+//        jiLinPushCatalogDto1.setReferenceInfo("0");
+//        jiLinPushCatalogDto1.setSortOrder(1);
+//        jiLinPushCatalogDto1.setAddUserName("豆豆");
+//        jiLinPushCatalogDto1.setAddTime("2024-09-09");
 //
-//        headers.put("clientId",PYCLIENTID);
-//        headers.put("signature",PYSignature);
-//        headers.put("systemId",PYSYSTEMID);
-//        System.out.println(s);
-//        String body = HttpUtil.createPost(url).addHeaders(headers).form(s).execute().body();
-//        System.out.println(body);
-
-
-
-
-    }
-
-//    //组装树形结构
-//    public static List<JinLinPushTreeDto> getChildrenGroupingStream(List<JinLinPushTreeDto> result) {
-//        //根据父id分组
-//        Map<Long, List<JinLinPushTreeDto>> intentionMap = result.stream().collect(Collectors.groupingBy(JinLinPushTreeDto::getParentID));
-//        //复制result数据
-//        List<JinLinPushTreeDto> treeList = new ArrayList<>(result);
-//        //遍历result来组装带有children关联性的对象，如果找到子级就删除List的数据
-//        for (JinLinPushTreeDto intention : result) {
-//            List<JinLinPushTreeDto> children = intentionMap.get(intention.getKid());
-//            if (CollectionUtils.isNotEmpty(children)) {
-//                intention.getData().addAll(children);
-//                treeList.removeAll(children);
-//            }
-//        }
-//        return treeList ;
-//    }
+//         List<JiLinPushCatalogDto>jiLinPushCatalogDtoList=new ArrayList<>();
+//        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);
+//        JiLinPushFileUrlDto jiLinPushFileUrlDto = new JiLinPushFileUrlDto();
+//        jiLinPushFileUrlDto.setProjId(72900L);
+//        jiLinPushFileUrlDto.setPactId(44804217L);
+//        jiLinPushFileUrlDto.setKid(1682310830420393984L);
+//        jiLinPushFileUrlDto.setCatalogID(1644215386427621385L+2L);
+//        jiLinPushFileUrlDto.setAnnexName("G1221PYJL102001  延吉至长春高速公路大蒲柴河至烟筒山段建设项目PYZJB01合同段2021年K201+516.999-K211+690道路巡视记录");
+//        jiLinPushFileUrlDto.setTableNumber("G1221PYJL102001");
+//        jiLinPushFileUrlDto.setWeaveDate("2024-09-08");
+//        jiLinPushFileUrlDto.setAnnexPage(6);
+//        jiLinPushFileUrlDto.setFileUrl("https://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com//upload/20220713/bd748b37f0a84790f9c3d72d30daedac.pdf");
+//        jiLinPushFileUrlDto.setSortOrder(1);
+//        jiLinPushFileUrlDto.setAddUserName("豆豆");
+//        jiLinPushFileUrlDto.setAddTime("2024-08-09");
+//
+//        JiLinPushFileUrlDto jiLinPushFileUrlDto1 = new JiLinPushFileUrlDto();
+//        jiLinPushFileUrlDto1.setProjId(72900L);
+//        jiLinPushFileUrlDto1.setPactId(44804217L);
+//        jiLinPushFileUrlDto1.setKid(1682310830420393984L);
+//        jiLinPushFileUrlDto1.setCatalogID(1644215386427621385L+3L);
+//        jiLinPushFileUrlDto1.setAnnexName("延吉至长春高速公路大蒲柴河至烟筒山段建设项目");
+//        jiLinPushFileUrlDto1.setTableNumber("G1221PYJL102002");
+//        jiLinPushFileUrlDto1.setWeaveDate("2024-09-08");
+//        jiLinPushFileUrlDto1.setAnnexPage(6);
+//        jiLinPushFileUrlDto1.setFileUrl("https://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com//upload/20220720/4ba7021876f50e079db67acbdcbd7f28.pdf");
+//        jiLinPushFileUrlDto1.setSortOrder(1);
+//        jiLinPushFileUrlDto1.setAddUserName("豆豆");
+//        jiLinPushFileUrlDto1.setAddTime("2024-08-09");
+//        List<JiLinPushFileUrlDto>jiLinPushFileUrlDtoList=new ArrayList<>();
+//
+//
+//        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);
+   }
+
+
+
 
 
 

blade-service/blade-archive/src/main/java/org/springblade/archive/feign/ArchiveAutoClientImpl.java

@@ -2,6 +2,8 @@ package org.springblade.archive.feign;
 
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
+import org.springblade.archive.dto.ArchiveAutoDto;
+import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.archive.entity.ArchiveProjectConfig;
 import org.springblade.archive.entity.ArchivesAuto;
 import org.springblade.archive.mapper.ArchivesAutoMapper;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 @RestController
@@ -70,4 +73,6 @@ public class ArchiveAutoClientImpl implements ArchiveAutoClient {
         return R.data(true);
     }
 
+
+
 }

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

@@ -0,0 +1,10 @@
+package org.springblade.archive.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.archive.entity.ArchiveJiLinPush;
+
+import java.util.List;
+
+public interface ArchiveJiLinPushMapper extends BaseMapper<ArchiveJiLinPush> {
+    List<ArchiveJiLinPush> getArchiveJiLinPush(Long projId);
+}

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.archive.mapper.ArchiveJiLinPushMapper">
+
+    <select id="getArchiveJiLinPush" resultType="org.springblade.archive.entity.ArchiveJiLinPush">
+        SELECT * from u_jilin_push where jl_project_id=#{projId}
+    </select>
+</mapper>

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

@@ -19,7 +19,9 @@ package org.springblade.archive.mapper;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.archive.dto.ArchiveAutoDto;
 import org.springblade.archive.dto.ArchivesAutoDTO;
+import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.archive.entity.ArchiveConclusion;
 import org.springblade.archive.entity.ArchivesAuto;
 import org.springblade.archive.vo.*;
@@ -202,4 +204,6 @@ public interface ArchivesAutoMapper extends BaseMapper<ArchivesAuto> {
 	List<ArchiveWarningVO> getSpotCheck(@Param("projectId") Long projectId,@Param("nodeId") Long nodeId);
 
 	List<CabinetVO> getUnitAllCabinet(@Param("projectId") Long projectId,@Param("nodeId") Long nodeId);
+
+    List<ArchiveAutoDto> getArchiveAutoDtoList(@Param("projId") Long projId,@Param("dtos") List<JiLinQueryDto>dtos);
 }

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

@@ -1182,7 +1182,38 @@
         </foreach>
     </update>
 
+    <resultMap id="archiveAutoDtoMap" type="org.springblade.archive.dto.ArchiveAutoDto">
+        <id column="id" property="id"></id>
+        <result column="project_id" property="projectId"></result>
+        <result column="contract_id" property="contractId"></result>
+        <result column="name" property="name"></result>
+        <result column="file_number" property="fileNumber"></result>
+        <result column="unit" property="unit"></result>
+        <result column="start_date" property="startDate"></result>
+        <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="updateUser"></result>
+        <result column="update_time" property="updateTime"></result>
+        <result column="auto_file_sort" property="autoFileSort"></result>
+        <result column="create_time" property="createTime"></result>
+        <result column="file_n" property="fileN"></result>
+        <result column="rollor" property="rollor"></result>
+        <result column="node_id" property="nodeId"></result>
+        <result column="page_n" property="pageN"></result>
+        <result column="file_url" property="fileUrl"></result>
+        <result column="pdf_file_url" property="pdfFileUrl"></result>
+    </resultMap>
 
+    <select id="getArchiveAutoDtoList" resultMap="archiveAutoDtoMap">
+        select a.id,a.project_id,a.contract_id,a.name,a.file_number,a.unit,a.start_date,a.end_date,a.storage_time,a.secret_level,b.real_name,a.update_time,
+               a.auto_file_sort,a.create_time,a.file_n,a.rollor,a.node_id,a.page_n ,c.file_url,c.pdf_file_url from u_archives_auto as a  join blade_user as b on a.update_user=b.id
+              join u_archive_file as c on a.id=c.archive_id
+          where a.project_id=#{projId} and a.contract_id in
+        <foreach collection="dtos" item="item" open="(" separator="," close=")">
+            #{item.cqContractId}
+        </foreach>
+    </select>
 
 
 </mapper>

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

@@ -0,0 +1,10 @@
+package org.springblade.archive.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.archive.entity.ArchiveJiLinPush;
+
+import java.util.List;
+
+public interface IArchiveJiLinPushService extends IService<ArchiveJiLinPush> {
+    List<ArchiveJiLinPush> getArchiveJiLinPush(Long projId);
+}

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

@@ -16,7 +16,9 @@
  */
 package org.springblade.archive.service;
 
+import org.springblade.archive.dto.ArchiveAutoDto;
 import org.springblade.archive.dto.ArchiveWarningDTO;
+import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.archive.dto.SaveApplyDTO;
 import org.springblade.archive.entity.ArchiveConclusion;
 import org.springblade.archive.entity.ArchivesAuto;
@@ -151,4 +153,6 @@ public interface IArchivesAutoService extends BaseService<ArchivesAuto> {
     IPage<ArchiveWarningVO> warningPage(Query query, ArchiveWarningDTO dto);
 
 	List<List<Map<String, List<CabinetVO>>>> getUnitAllCabinet(Long projectId, Integer type);
+
+    List<ArchiveAutoDto> getArchiveAutoDtoList(Long projId,List<JiLinQueryDto>dtos);
 }

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

@@ -36,7 +36,9 @@ import com.itextpdf.text.pdf.PdfWriter;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.springblade.archive.dto.ArchiveAutoDto;
 import org.springblade.archive.dto.ArchiveWarningDTO;
+import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.archive.dto.SaveApplyDTO;
 import org.springblade.archive.entity.*;
 import org.springblade.archive.mapper.ArchiveConclusionMapper;
@@ -3683,6 +3685,11 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		return vo;
 	}
 
+	@Override
+	public List<ArchiveAutoDto> getArchiveAutoDtoList(Long projId,List<JiLinQueryDto>dtos) {
+		List<ArchiveAutoDto> list = baseMapper.getArchiveAutoDtoList(projId,dtos);
+		return list;
+	}
 
 
 	public void deleteFile(String defaultDir,Long id){

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

@@ -0,0 +1,18 @@
+package org.springblade.archive.service.impl;
+
+import org.springblade.archive.entity.ArchiveJiLinPush;
+import org.springblade.archive.mapper.ArchiveJiLinPushMapper;
+import org.springblade.archive.service.IArchiveJiLinPushService;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class IArchiveJiLinPushServiceImpl extends BaseServiceImpl<ArchiveJiLinPushMapper,ArchiveJiLinPush> implements IArchiveJiLinPushService {
+    @Override
+    public List<ArchiveJiLinPush> getArchiveJiLinPush(Long projId) {
+        return baseMapper.getArchiveJiLinPush(projId);
+    }
+}

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/ArchiveTreeContractImpl.java

@@ -1,6 +1,7 @@
 package org.springblade.manager.feign;
 
 import lombok.AllArgsConstructor;
+import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.manager.dto.ArchiveTreeContractDTO;
 import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springblade.manager.mapper.ArchiveTreeContractMapper;
@@ -135,9 +136,8 @@ public class ArchiveTreeContractImpl implements ArchiveTreeContractClient {
     }
 
     @Override
-    public List<ArchiveTreeContractDTO> getArchiveTreeContractDto(@RequestParam String projId) {
-
-        return archiveTreeContractService.getArchiveTreeContractDto(projId);
+    public List<ArchiveTreeContractDTO> getArchiveTreeContractDto(List<JiLinQueryDto>dtos, Long cqProjectId) {
+        return archiveTreeContractService.getArchiveTreeContractDto(dtos,cqProjectId);
     }
 
 

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.java

@@ -19,6 +19,7 @@ package org.springblade.manager.mapper;
 
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
+import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.archive.entity.ArchiveExpertConclusion;
 import org.springblade.business.entity.ArchiveFile;
 import org.springblade.business.entity.InformationQuery;
@@ -150,7 +151,7 @@ public interface ArchiveTreeContractMapper extends BaseMapper<ArchiveTreeContrac
 
     void updateAllChild(@Param("node") ArchiveTreeContract archiveTreeContract);
 
-    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(@Param("projId")String projId);
+    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(@Param("dtos")List<JiLinQueryDto>dtos,@Param("cqProjectId")Long cqProjectId);
 
 
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.xml

@@ -745,9 +745,10 @@
     </resultMap>
     <select id="getArchiveTreeContractDto" resultMap="getArchiveTreeContractDtoMap">
         select a.id,a.project_id,a.parent_id,a.contract_id,a.node_name,b.real_name,a.update_time from m_archive_tree_contract AS a LEFT JOIN blade_user AS b
-        on a.update_user=b.id where project_id=#{projId}
+        on a.update_user=b.id where project_id=#{cqProjectId}
+        and a.contract_id in
+    <foreach collection="dtos" item="item"  open="(" separator="," close=")">
+        #{item.cqContractId}
+    </foreach>
     </select>
-
-
-
 </mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IArchiveTreeContractService.java

@@ -19,6 +19,7 @@ package org.springblade.manager.service;
 import com.mixsmart.utils.StringUtils;
 import feign.Param;
 
+import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.manager.dto.ArchiveTreeContractAutoRuleMapDTO;
 import org.springblade.manager.dto.ArchiveTreeContractDTO;
 import org.springblade.manager.dto.ArchiveTreeDTO;
@@ -137,5 +138,5 @@ public interface IArchiveTreeContractService extends BaseService<ArchiveTreeCont
     ArchiveTreeContract getMatchNode(Long nodeId);
 
 
-    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(String projId);
+    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(List<JiLinQueryDto>dtos,Long cqProjectId);
 }

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

@@ -22,6 +22,7 @@ import com.mixsmart.utils.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.AllArgsConstructor;
+import org.springblade.archive.dto.JiLinQueryDto;
 import org.springblade.archive.entity.ArchiveExpertConclusion;
 import org.springblade.archive.feign.ArchiveAutoClient;
 import org.springblade.archive.vo.UpdateExpertVO;
@@ -1578,8 +1579,8 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 	}
 
 	@Override
-	public List<ArchiveTreeContractDTO> getArchiveTreeContractDto(String projId) {
-		return baseMapper.getArchiveTreeContractDto(projId);
+	public List<ArchiveTreeContractDTO> getArchiveTreeContractDto(List<JiLinQueryDto>dtos,Long cqProjectId) {
+		return baseMapper.getArchiveTreeContractDto(dtos,cqProjectId);
 	}