Merge remote-tracking branch 'origin/master' into master

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -32,6 +32,8 @@ public interface LauncherConstant {
 
     String APPLICATION_ARCHIVE_NAME = APPLICATION_NAME_PREFIX + "archive";
 
+    String APPLICATION_LAND_NAME = APPLICATION_NAME_PREFIX + "land";
+
 
     String APPLICATION_VISUAL_NAME = APPLICATION_NAME_PREFIX + "visual";
 

blade-service-api/blade-land-api/pom.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>blade-service-api</artifactId>
+        <groupId>org.springblade</groupId>
+        <version>2.9.1.RELEASE</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>blade-land-api</artifactId>
+    <name>${project.artifactId}</name>
+    <version>${bladex.project.version}</version>
+    <packaging>jar</packaging>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

blade-service-api/pom.xml

@@ -26,6 +26,7 @@
         <module>blade-e-visa-api</module>
         <module>blade-archive-api</module>
         <module>blade-control-api</module>
+        <module>blade-land-api</module>
     </modules>
 
     <dependencies>

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

@@ -326,7 +326,7 @@ public class ArchivesAutoController extends BladeController {
 	@ApiOperation(value = "获取归档树同级节点", notes = "传入节点id")
 	public R test() {
 
-		archivesAutoService.test();
+		archiveAutoPdfService.test();
 		return R.data("");
 	}
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ArchiveFileMapper.xml

@@ -385,6 +385,23 @@
     </update>
 
     <select id="getListByContractId" resultType="org.springblade.business.entity.ArchiveFile">
+        SELECT
+            u.id,
+            u.project_id AS projectId,
+            u.node_id AS nodeId,
+            u.node_ext_id AS nodeExtId,
+            u.file_name AS fileName,
+            u.pdf_file_url AS pdfFileUrl,
+            u.sort
+        FROM
+            u_archive_file u
+                LEFT JOIN m_archive_tree_contract ar on u.node_id = ar.id
+        where 	u.contract_id = #{contractId}
+          AND u.is_deleted = 0
+          AND u.source_type = 1 and ar.is_deleted = 0;
+    </select>
+
+    <select id="getListByContractId1" resultType="org.springblade.business.entity.ArchiveFile">
         select id,
                project_id   as projectId,
                node_id      as nodeId,
@@ -395,6 +412,7 @@
         from u_archive_file
         where contract_id = #{contractId} and is_deleted = 0 and source_type = 1;
     </select>
+
     <select id="getAllArchiveAutoByContractType" resultType="org.springblade.archive.vo.ArchivesAutoVO">
         SELECT uaa.*, matc.tree_code as 'contractType'
         FROM u_archives_auto uaa

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -31,8 +31,8 @@
         <result column="source_type" property="sourceType"/>
         <result column="pdf_trial_url_position" property="pdfTrialUrlPosition"/>
        <result column="business_time" property="businessTime"/>
-        <result column="e_visa_pdf_page" property="eVisaPdfSize"/>
-        <result column="e_visa_pdf_size" property="eVisaPdfPage"/>
+        <result column="e_visa_pdf_page" property="eVisaPdfPage"/>
+        <result column="e_visa_pdf_size" property="eVisaPdfSize"/>
     </resultMap>
 
     <resultMap id="queryProcessDataMap" type="org.springblade.business.vo.QueryProcessDataVO">

blade-service/blade-land/pom.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>blade-service</artifactId>
+        <groupId>org.springblade</groupId>
+        <version>2.9.1.RELEASE</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>blade-land</artifactId>
+    <name>${project.artifactId}</name>
+    <version>${bladex.project.version}</version>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-core-boot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-swagger</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-land-api</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>

blade-service/blade-land/src/main/java/org/springblade/land/LandApplication.java

@@ -0,0 +1,19 @@
+package org.springblade.land;
+
+import org.springblade.common.constant.LauncherConstant;
+import org.springblade.core.cloud.feign.EnableBladeFeign;
+import org.springblade.core.launch.BladeApplication;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+@EnableBladeFeign
+@SpringCloudApplication
+@EnableAsync
+@EnableCaching //缓存
+public class LandApplication {
+
+    public static void main(String[] args) {
+        BladeApplication.run(LauncherConstant.APPLICATION_LAND_NAME, LandApplication.class, args);
+    }
+}

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

@@ -0,0 +1,19 @@
+#服务器端口
+server:
+  port: 9102
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.dev.url}
+    username: ${blade.datasource.dev.username}
+    password: ${blade.datasource.dev.password}
+
+oss:
+  enabled: true
+  name: alioss
+  tenant-mode: true
+  endpoint: https://oss-cn-chengdu.aliyuncs.com/
+  access-key: LTAI4FmSV1pWZAJ9xSvHg5rP
+  secret-key: 5D3XQj4pBe8VbOAVFNqdioJA8riH4S
+  bucket-name: bladex-test-info

blade-service/blade-land/src/main/resources/application-prod.yml

@@ -0,0 +1,11 @@
+#服务器端口
+server:
+  port: 8102
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.prod.url}
+    username: ${blade.datasource.prod.username}
+    password: ${blade.datasource.prod.password}
+

blade-service/blade-land/src/main/resources/application-test.yml

@@ -0,0 +1,10 @@
+#服务器端口
+server:
+  port: 8102
+
+#数据源配置
+spring:
+  datasource:
+    url: ${blade.datasource.test.url}
+    username: ${blade.datasource.test.username}
+    password: ${blade.datasource.test.password}

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

@@ -73,6 +73,7 @@
         <result column="key" property="key"/>
         <result column="has_children" property="hasChildren"/>
         <result column="node_type" property="nodeType"/>
+        <result column="major_data_type" property="majorDataType"/>
         <result column="old_id" property="oldId"/>
         <result column="sort" property="sort"/>
     </resultMap>
@@ -463,6 +464,7 @@
         d.id AS "value",
         d.id AS "key",
         old_id,
+        major_data_type,
         sort
         FROM m_wbs_tree_contract d
         WHERE

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

@@ -615,7 +615,7 @@ public class ArchiveTreeContractSyncImpl {
             if (current == null) {
                 return null; // 如果没有找到对应的节点，则返回 null
             }
-            if (current.getNodeType().equals(nodeType)) {
+            if (current.getNodeType() <= nodeType && !current.getNodeName().contains("中间交工")) {
                 return current.getPKeyId(); // 如果找到了符合要求的节点，则返回其 pKeyId 属性值
             }
             id = current.getParentId(); // 取出当前节点的父节点 ID，准备进行下一轮循环操作

blade-service/pom.xml

@@ -26,6 +26,7 @@
         <module>blade-e-visa</module>
         <module>blade-archive</module>
         <module>blade-control</module>
+        <module>blade-land</module>
     </modules>
 
     <dependencies>