推送吉林档案

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

@@ -6,4 +6,7 @@ package org.springblade.archive.dto;
  * @description TODO
  */
 public class ArchiveDto {
+
+
+
 }

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

@@ -0,0 +1,19 @@
+package org.springblade.archive.dto;
+
+import lombok.Data;
+
+@Data
+public class JinLinPushFileUrlDto {
+    private Long projId;
+    private Long pactId;
+    private Long kid;
+    private Long catalogID;
+    private String annexName;
+    private String tableNumber;
+    private String weaveDate;
+    private Integer annexPage;
+    private String fileUrl;
+    private Integer sortOrder;
+    private String addUserName;
+    private String addTime;
+}

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

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

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

@@ -0,0 +1,17 @@
+package org.springblade.archive.dto;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class JinLinPushTreeDto {
+    private Long projId;
+    private  Long pactId;
+    private Long kid;
+    private Long parentID;
+    private  String tName;
+    private String addUserName;
+    private String addTime;
+}

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

@@ -0,0 +1,19 @@
+package org.springblade.archive.dto;
+
+
+import lombok.Data;
+
+@Data
+//接受吉林项目的项目ID和标段信息ID
+public class PactAndProjDto {
+    private Long pactId;
+    private String pactName;
+    private Long projId;
+    private String pactCode;
+    private String pactTypeName;
+    private Long orgId;
+    private String orgName;
+    private Long deptId;
+    private String deptName;
+
+}

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

@@ -16,6 +16,8 @@
  */
 package org.springblade.manager.dto;
 
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 import org.springblade.manager.entity.ArchiveTreeContract;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -30,5 +32,11 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class ArchiveTreeContractDTO extends ArchiveTreeContract {
     private static final long serialVersionUID = 1L;
-
+    private Long id;
+    private Long projectId;
+    private Long contractId;
+    private Long parentID;
+    private String nodeName;
+    private String updateUserName;
+    private String updateUserTime;
 }

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

@@ -1,5 +1,6 @@
 package org.springblade.manager.feign;
 
+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;
@@ -57,4 +58,7 @@ public interface ArchiveTreeContractClient {
 
     @PostMapping(API_PREFIX + "/getMatchNode")
     public ArchiveTreeContract getMatchNode(@RequestParam Long nodeId);
+
+    @PostMapping(API_PREFIX+"/getArchiveTreeContractDto")
+    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(@RequestParam String projId);
 }

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java

@@ -185,4 +185,5 @@ public interface IUserClient {
     @GetMapping(API_PREFIX + "/clearContractLocalCacheAndRedisCache")
     void clearContractLocalCacheAndRedisCache();
 
+
 }

blade-service/blade-archive/pom.xml

@@ -29,6 +29,11 @@
             <artifactId>itext-asian</artifactId>
             <version>5.2.0</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fasterxml.jackson.core</groupId>-->
+<!--            <artifactId>jackson-databind</artifactId>-->
+<!--            <version>2.13.1</version>-->
+<!--        </dependency>-->
         <!--sqlite-->
         <dependency>
             <groupId>org.xerial</groupId>
@@ -142,6 +147,12 @@
             <version>7.2.4</version>
             <type>pom</type>
         </dependency>
+        <dependency>
+            <groupId>com.e.visa</groupId>
+            <artifactId>http.client</artifactId>
+            <version>4.5.9</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

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

@@ -0,0 +1,123 @@
+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 org.apache.commons.codec.digest.DigestUtils;
+import org.springblade.archive.dto.JinLinPushTreeDto;
+import org.springblade.archive.dto.PactAndProjDto;
+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;
+import org.springframework.web.bind.annotation.RestController;
+
+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")
+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 String YCPYCLIENTID="hqs_veams03";
+    private static  final String YCPYCLIENTSECRETKEY="FA3E91A9C2F04ED5A4D76E2DF4D09463";
+    private static  final String YCSYSTEMID="9";
+    //恒集
+    private static final String HJPYCLIENTID="hqs_veams04";
+    private static  final String HJYCPYCLIENTSECRETKEY="50644A2D550A42E88964FE63B7C6D4E7";
+    private static  final String HJYCSYSTEMID="9";
+
+    @Resource
+    private IArchivesAutoService iArchivesAutoService;
+
+    @Autowired
+    private ArchiveTreeContractClient archiveTreeContractClient;
+
+    @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);
+     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<>();
+        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);
+
+        }
+//        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");
+//
+//        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 ;
+//    }
+
+
+
+
+}

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

@@ -1,70 +0,0 @@
-package org.springblade.archive.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import lombok.val;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.ssl.SSLContexts;
-import org.apache.http.util.EntityUtils;
-import org.springblade.archive.utils.HttpUtil;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-
-public class JinlinApiPush {
-
-    private static final String CLIENTID="hqs_veams01";
-    private static  final String CLIENTSECRETKEY="E54F640850C946E7A660402B85FBF0C7";
-    private static  final String SYSTEMID="9";
-    public static void main(String[] args) throws NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
-        //获取发送get请求的校验码
-        String s = "clientSecretKey="+CLIENTSECRETKEY+"&clientId="+CLIENTID;
-        String signature = "EB90C86BE03917A0EC5EE8CE86E81C76";
-        System.out.println(signature);
-        //创建http连接
-        //信任所有证书，关闭主机名校验
-//        SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(
-//                SSLContexts.custom().loadTrustMaterial
-//                        (null,new TrustSelfSignedStrategy()).build(),
-//                NoopHostnameVerifier.INSTANCE);
-        // 创建Httpclient对象
-       HttpClient httpClient =HttpClientBuilder.create().build();
-     //   String url = "https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/hqsws/hqsprojpact/query";
-        String url = "https://hgqs.jtyst.jl.gov.cn:6100/dock/openapi/hqsws/hqsprojpact/query";
-        HttpGet httpGet = new HttpGet(url);
-        httpGet.setHeader("Content-Type", "application/json");
-        httpGet.setHeader("clientId",CLIENTID);
-        httpGet.setHeader("signature",signature);
-        httpGet.setHeader("systemId",SYSTEMID);
-        try {
-            HttpResponse response = httpClient.execute(httpGet);
-            InputStream inputStream = response.getEntity().getContent();
-            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-            byte[] buffer = new byte[1024];
-            int index = 0;
-            while ((index = inputStream.read(buffer)) != -1) {
-                outputStream.write(buffer, 0, index);
-            }
-            JSONObject jsonObject = JSON.parseObject(outputStream.toString());
-            System.out.println(jsonObject);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}

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

@@ -2827,12 +2827,11 @@ public class ExcelTabController extends BladeController {
                     }
                     // 监理单位名称
                     if (jltitle.size() >= 1) {
-
                         for (Element element : jltitle) {
                             int trindex = Integer.parseInt(element.attr("trindex"));
                             if (trindex <= 10) {
-                                ProjectInfo projectInfo = projectInfoService.getById(tableNode2.getProjectId());
-                                reData.put(element.attr("keyName"), projectInfo.getProjectName()+"第"+contractInfo.getContractName()+"监理办");
+
+                                reData.put(element.attr("keyName"), contractInfo.getSupervisionUnitName());
                             }
                         }
                     }

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

@@ -1,19 +1,14 @@
 package org.springblade.manager.feign;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
-import org.springblade.archive.vo.ArchivesAutoVO;
+import org.springblade.manager.dto.ArchiveTreeContractDTO;
 import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springblade.manager.mapper.ArchiveTreeContractMapper;
 import org.springblade.manager.service.IArchiveTreeContractService;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Handler;
+import java.util.*;
 
 @RestController
 @AllArgsConstructor
@@ -138,4 +133,12 @@ public class ArchiveTreeContractImpl implements ArchiveTreeContractClient {
     public ArchiveTreeContract getMatchNode(@RequestParam Long nodeId) {
         return archiveTreeContractService.getMatchNode(nodeId);
     }
+
+    @Override
+    public List<ArchiveTreeContractDTO> getArchiveTreeContractDto(@RequestParam String projId) {
+
+        return archiveTreeContractService.getArchiveTreeContractDto(projId);
+    }
+
+
 }

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

@@ -22,6 +22,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springblade.archive.entity.ArchiveExpertConclusion;
 import org.springblade.business.entity.ArchiveFile;
 import org.springblade.business.entity.InformationQuery;
+import org.springblade.manager.dto.ArchiveTreeContractDTO;
 import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.vo.*;
@@ -148,4 +149,8 @@ public interface ArchiveTreeContractMapper extends BaseMapper<ArchiveTreeContrac
     int batchUpdateArchiveTreeContract(@Param("list") List<Map> list);
 
     void updateAllChild(@Param("node") ArchiveTreeContract archiveTreeContract);
+
+    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(@Param("projId")String projId);
+
+
 }

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

@@ -734,4 +734,20 @@
         where is_deleted = 0 and project_id = #{node.projectId} and FIND_IN_SET(#{node.id},ancestors) > 0
     </update>
 
+    <resultMap id="getArchiveTreeContractDtoMap" type="org.springblade.manager.dto.ArchiveTreeContractDTO">
+        <id column="id" property="id"/>
+        <result column="project_id" property="projectId"></result>
+        <result column="contract_id" property="contractId"></result>
+        <result column="parent_id" property="parentID"></result>
+        <result column="node_name" property="nodeName"></result>
+        <result column="update_time" property="updateUserTime"></result>
+        <result column="real_name" property="updateUserName"></result>
+    </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}
+    </select>
+
+
+
 </mapper>

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

@@ -135,4 +135,7 @@ public interface IArchiveTreeContractService extends BaseService<ArchiveTreeCont
     Boolean startInspect(Long projectId,Integer type);
 
     ArchiveTreeContract getMatchNode(Long nodeId);
+
+
+    List<ArchiveTreeContractDTO> getArchiveTreeContractDto(String projId);
 }

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

@@ -45,12 +45,11 @@ import org.springblade.common.utils.ForestNodeMergerEx;
 import org.springblade.manager.vo.*;
 import org.springblade.manager.mapper.ArchiveTreeContractMapper;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.meter.vo.NodeSortVO;
 import org.springframework.beans.BeanUtils;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -88,6 +87,8 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 
 	private final ArchiveAutoClient archiveAutoClient;
 
+	private final JdbcTemplate jdbcTemplate;
+
 
 
 
@@ -1576,6 +1577,10 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 		return (currentNode != null && StringUtils.isNotEmpty(currentNode.getRollor())) ? currentNode : originalNode;
 	}
 
+	@Override
+	public List<ArchiveTreeContractDTO> getArchiveTreeContractDto(String projId) {
+		return baseMapper.getArchiveTreeContractDto(projId);
+	}
 
 
 }

blade-service/blade-manager/src/main/resources/application-dev.yml

@@ -18,6 +18,10 @@ oss:
   secret-key: 5D3XQj4pBe8VbOAVFNqdioJA8riH4S
   bucket-name: bladex-test-info
 
+logging:
+  level:
+    com.baomidou.mybatisplus: debug
+
 #Mybatis-plus配置
 #mybatis-plus:
 #  configuration:

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -149,4 +149,5 @@ public class UserClient implements IUserClient {
         service.clearContractLocalCacheAndRedisCache();
     }
 
+
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java

@@ -240,4 +240,6 @@ public interface IUserService extends BaseService<User> {
     List<PrivateTreeVO> treePrivate(String projectId);
 
     List<PrivateTreeVO2> treePrivate2(String projectId);
+
+
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -1165,6 +1165,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         return vo2;
     }
 
+
+
     private List<PrivateTreeVO> buildTree(List<WbsTreePrivate> wbsTreePrivatesNodes, String projectId) {
         List<PrivateTreeVO> privateTreeVOS = BeanUtil.copyProperties(wbsTreePrivatesNodes, PrivateTreeVO.class);
         if (!privateTreeVOS.isEmpty()) {