From f71c2f5bef50fe3452795354cbc77a80d3dd5b44 Mon Sep 17 00:00:00 2001
From: why <986973311@qq.com>
Date: Thu, 20 Apr 2023 17:45:33 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vordm/mapper/DisasterInfoMapper.xml       | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index c665bf9..75669d1 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -121,19 +121,32 @@
     </select>
 
     <select id="getLeft3Data" resultType="com.kening.vordm.vo.GroupByUse">
-        select t.sponsor_organization as `name`, count(*) as cnt, 'sponsorOrganization' as `type`
-        from disaster_info t
-        where t.sponsor_organization != ''
-        GROUP BY t.sponsor_organization
-        ORDER BY cnt desc LIMIT 5
+--         select t.sponsor_organization as `name`, count(*) as cnt, 'sponsorOrganization' as `type`
+--         from disaster_info t
+--         where t.sponsor_organization != ''
+--         GROUP BY t.sponsor_organization
+--         ORDER BY cnt desc LIMIT 5
+        SELECT
+            g.username AS `name`,
+            count(*) AS cnt,
+            'sponsorOrganization' AS `type`
+        FROM
+            disaster_info t
+                INNER JOIN guest_manage_disaster_ref gm ON gm.disaster_id = t.id
+                INNER JOIN guest_info g ON g.id = gm.sponsor_id
+        WHERE
+             gm.`status` != 2
+        GROUP BY
+            gm.sponsor_id
+        ORDER BY
+            cnt DESC
+            LIMIT 5
     </select>
 
     <select id="getLeft4Data" resultType="com.kening.vordm.vo.GroupByUse">
-        select gi.organization as `name`, count(*) as cnt, 'responseOrganization' as `type`
-        from guest_manage_disaster_ref t
-                 INNER JOIN guest_info gi on gi.id = t.manager_id
-        where gi.organization != '' and t.`status` = '1'
-        GROUP BY gi.organization
+        select b.`name` as `name`, count(*) as cnt, 'responseOrganization' as `type`
+        from disaster_info t INNER JOIN blade_user b on t.chief_id = b.id
+        GROUP BY t.chief_id
         ORDER BY cnt desc LIMIT 5
     </select>
 

From b5076f32d1bcb5732afb021edb52007333b96e51 Mon Sep 17 00:00:00 2001
From: why <986973311@qq.com>
Date: Fri, 21 Apr 2023 18:17:33 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kening/vordm/controller/CenterController.java | 6 ++++++
 .../main/java/com/kening/vordm/mapper/GuestInfoMapper.java | 2 ++
 .../main/java/com/kening/vordm/mapper/GuestInfoMapper.xml  | 6 ++++++
 .../java/com/kening/vordm/service/GuestInfoService.java    | 3 +++
 .../kening/vordm/service/impl/GuestInfoServiceImpl.java    | 7 +++++++
 5 files changed, 24 insertions(+)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java
index 816ddef..5ffa006 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/CenterController.java
@@ -12,6 +12,7 @@ import com.kening.vordm.service.GuestInfoService;
 import com.kening.vordm.service.ToolService;
 import com.kening.vordm.vo.CenterDisasterInfo;
 import com.kening.vordm.vo.DisasterInfoVo;
+import com.kening.vordm.vo.UserVo;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -68,5 +69,10 @@ public class CenterController {
 	public R<Boolean> updatePassword(@RequestBody Map<String, String> param) {
 		return R.data(guestInfoService.updatePassword(param.get("originalPassword"), param.get("password"), param.get("email")));
 	}
+
+	@PostMapping("/updateAccount")
+	public R<Boolean> updateAccount(@RequestBody UserVo userVo) {
+		return R.data(guestInfoService.updateAccount(userVo));
+	}
 }
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java
index 687e16d..ec2bad4 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java
@@ -18,4 +18,6 @@ public interface GuestInfoMapper extends BaseMapper<GuestInfo> {
     UserVo getBladeUserByEmail(@Param("email") String email);
 
 	int updatePassword(String email, String password);
+
+	int updateAccount(UserVo userVo);
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
index 0e997da..bcc3f82 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
@@ -26,6 +26,12 @@
     <update id="updatePassword">
         update blade_user t set t.password = #{password} where t.email = #{email}
     </update>
+    <update id="updateAccount">
+
+        update blade_user t set t.name = #{name}, t.real_name = #{realName}, t.organization = #{organization},
+               t.research_field = #{researchField}, t.occupation = #{occupation}
+         where t.id = #{id}
+    </update>
 
     <select id="getBladeUserByEmail" resultType="com.kening.vordm.vo.UserVo">
         select * FROM blade_user
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java
index b01793c..43ff3bc 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/GuestInfoService.java
@@ -3,6 +3,7 @@ package com.kening.vordm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kening.vordm.entity.GuestInfo;
+import com.kening.vordm.vo.UserVo;
 
 /**
 * @author G1393
@@ -12,4 +13,6 @@ import com.kening.vordm.entity.GuestInfo;
 public interface GuestInfoService extends IService<GuestInfo> {
 
 	Boolean updatePassword(String oldPassword, String password, String email);
+
+	Boolean updateAccount(UserVo userVo);
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java
index 3d1a2e8..644d8d3 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/GuestInfoServiceImpl.java
@@ -39,4 +39,11 @@ implements GuestInfoService {
 		}
 
 	}
+
+	@Override
+	public Boolean updateAccount(UserVo userVo) {
+		int i = this.baseMapper.updateAccount(userVo);
+		CacheUtil.clear(USER_CACHE);
+		return i>0;
+	}
 }

From a5913eae41de15ff508870091e4941c36f7d7e1b Mon Sep 17 00:00:00 2001
From: whq <460794335@qq.com>
Date: Mon, 24 Apr 2023 19:28:36 +0800
Subject: [PATCH 03/13] Twitter

---
 kn-service/vordm-twitter/Dockerfile           | 15 ++++++++++++++
 kn-service/vordm-twitter/pom.xml              | 20 +++++++++++++++++++
 .../crawl/twitter/TwitterApplication.java     |  7 +++++++
 .../src/main/resources/application-dev.yaml   |  0
 .../src/main/resources/application-prod.yaml  |  0
 .../src/main/resources/application.yaml       | 12 +++++++++++
 6 files changed, 54 insertions(+)
 create mode 100644 kn-service/vordm-twitter/Dockerfile
 create mode 100644 kn-service/vordm-twitter/pom.xml
 create mode 100644 kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java
 create mode 100644 kn-service/vordm-twitter/src/main/resources/application-dev.yaml
 create mode 100644 kn-service/vordm-twitter/src/main/resources/application-prod.yaml
 create mode 100644 kn-service/vordm-twitter/src/main/resources/application.yaml

diff --git a/kn-service/vordm-twitter/Dockerfile b/kn-service/vordm-twitter/Dockerfile
new file mode 100644
index 0000000..a8eeb9b
--- /dev/null
+++ b/kn-service/vordm-twitter/Dockerfile
@@ -0,0 +1,15 @@
+FROM bladex/alpine-java:openjdk8-openj9_cn_slim
+
+LABEL maintainer=whq<460794335@qq.com>
+
+RUN mkdir -p /kn/vordm
+
+WORKDIR /kn/vordm
+
+EXPOSE 8989
+
+ADD ./target/vordm-crawl.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+
+CMD ["--spring.profiles.active=test"]
diff --git a/kn-service/vordm-twitter/pom.xml b/kn-service/vordm-twitter/pom.xml
new file mode 100644
index 0000000..78ba4e5
--- /dev/null
+++ b/kn-service/vordm-twitter/pom.xml
@@ -0,0 +1,20 @@
+<?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>kn-service</artifactId>
+        <groupId>com.kening.platform</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>vordm-twitter</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>
diff --git a/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java b/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java
new file mode 100644
index 0000000..9822078
--- /dev/null
+++ b/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java
@@ -0,0 +1,7 @@
+package com.kening.platform;
+
+public class Main {
+	public static void main(String[] args) {
+		System.out.println("Hello world!");
+	}
+}
diff --git a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml
new file mode 100644
index 0000000..e69de29
diff --git a/kn-service/vordm-twitter/src/main/resources/application-prod.yaml b/kn-service/vordm-twitter/src/main/resources/application-prod.yaml
new file mode 100644
index 0000000..e69de29
diff --git a/kn-service/vordm-twitter/src/main/resources/application.yaml b/kn-service/vordm-twitter/src/main/resources/application.yaml
new file mode 100644
index 0000000..68512b0
--- /dev/null
+++ b/kn-service/vordm-twitter/src/main/resources/application.yaml
@@ -0,0 +1,12 @@
+server:
+    port: 8989
+
+spring:
+    cloud:
+        gateway:
+            discovery:
+                locator:
+                    enabled: true
+        loadbalancer:
+            retry:
+                enabled: true

From 05fe6dd72faf9002ca16738fbb622ee02137d92f Mon Sep 17 00:00:00 2001
From: whq <460794335@qq.com>
Date: Mon, 24 Apr 2023 19:28:56 +0800
Subject: [PATCH 04/13] Twitter

---
 kn-service/pom.xml                            |  1 +
 kn-service/vordm-twitter/Dockerfile           |  2 +-
 kn-service/vordm-twitter/pom.xml              | 54 +++++++++++++++++++
 .../crawl/twitter/TwitterApplication.java     | 12 +++--
 .../src/main/resources/application-dev.yaml   |  7 +++
 .../src/main/resources/application.yaml       |  2 +-
 6 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/kn-service/pom.xml b/kn-service/pom.xml
index e1b2c42..8406685 100644
--- a/kn-service/pom.xml
+++ b/kn-service/pom.xml
@@ -6,6 +6,7 @@
     <modules>
         <module>biz-vordm</module>
         <module>vordm-crawl</module>
+        <module>vordm-twitter</module>
         <!--        <module>kn-setting</module>-->
     </modules>
 
diff --git a/kn-service/vordm-twitter/Dockerfile b/kn-service/vordm-twitter/Dockerfile
index a8eeb9b..7fb149c 100644
--- a/kn-service/vordm-twitter/Dockerfile
+++ b/kn-service/vordm-twitter/Dockerfile
@@ -6,7 +6,7 @@ RUN mkdir -p /kn/vordm
 
 WORKDIR /kn/vordm
 
-EXPOSE 8989
+EXPOSE 8987
 
 ADD ./target/vordm-crawl.jar ./app.jar
 
diff --git a/kn-service/vordm-twitter/pom.xml b/kn-service/vordm-twitter/pom.xml
index 78ba4e5..9dbfdb2 100644
--- a/kn-service/vordm-twitter/pom.xml
+++ b/kn-service/vordm-twitter/pom.xml
@@ -17,4 +17,58 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.kening.platform</groupId>
+            <artifactId>kn-launcher</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-web</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-undertow</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>wildfly-common</artifactId>
+                    <groupId>org.wildfly.common</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.itmuch</groupId>
+            <artifactId>spring-cloud-wii</artifactId>
+            <version>2.2.6.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+        </dependency>
+        <!--Hystrix-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>HdrHistogram</artifactId>
+                    <groupId>org.hdrhistogram</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Nacos -->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+    </dependencies>
+
 </project>
diff --git a/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java b/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java
index 9822078..a86ca1c 100644
--- a/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java
+++ b/kn-service/vordm-twitter/src/main/java/com/kening/crawl/twitter/TwitterApplication.java
@@ -1,7 +1,13 @@
-package com.kening.platform;
+package com.kening.crawl.twitter;
 
-public class Main {
+import org.springblade.core.launch.BladeApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+@SpringCloudApplication
+@ComponentScan({"org.springblade", "com.kening.crawl.twitter"})
+public class TwitterApplication {
 	public static void main(String[] args) {
-		System.out.println("Hello world!");
+		BladeApplication.run("vordm-twitter", TwitterApplication.class, args);
 	}
 }
diff --git a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml
index e69de29..93c68f9 100644
--- a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml
+++ b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml
@@ -0,0 +1,7 @@
+wii:
+    # 异构微服务的IP
+    ip: 78.46.158.237
+    # 异构微服务的端口
+    port: 7000
+    # 异构微服务的健康检查URL
+    #health-check-route: /health
diff --git a/kn-service/vordm-twitter/src/main/resources/application.yaml b/kn-service/vordm-twitter/src/main/resources/application.yaml
index 68512b0..bd57f03 100644
--- a/kn-service/vordm-twitter/src/main/resources/application.yaml
+++ b/kn-service/vordm-twitter/src/main/resources/application.yaml
@@ -1,5 +1,5 @@
 server:
-    port: 8989
+    port: 8980
 
 spring:
     cloud:

From 890c26bfb5c959c18204aa024620575fda843339 Mon Sep 17 00:00:00 2001
From: whq <460794335@qq.com>
Date: Mon, 24 Apr 2023 19:55:20 +0800
Subject: [PATCH 05/13] Twitter

---
 kn-service/vordm-twitter/Dockerfile                        | 2 +-
 .../vordm-twitter/src/main/resources/application-dev.yaml  | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/kn-service/vordm-twitter/Dockerfile b/kn-service/vordm-twitter/Dockerfile
index 7fb149c..457912a 100644
--- a/kn-service/vordm-twitter/Dockerfile
+++ b/kn-service/vordm-twitter/Dockerfile
@@ -6,7 +6,7 @@ RUN mkdir -p /kn/vordm
 
 WORKDIR /kn/vordm
 
-EXPOSE 8987
+EXPOSE 8980
 
 ADD ./target/vordm-crawl.jar ./app.jar
 
diff --git a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml
index 93c68f9..e69de29 100644
--- a/kn-service/vordm-twitter/src/main/resources/application-dev.yaml
+++ b/kn-service/vordm-twitter/src/main/resources/application-dev.yaml
@@ -1,7 +0,0 @@
-wii:
-    # 异构微服务的IP
-    ip: 78.46.158.237
-    # 异构微服务的端口
-    port: 7000
-    # 异构微服务的健康检查URL
-    #health-check-route: /health

From 54ea3a9431f8b5a7c5ef680dd68cc2e0f75826b5 Mon Sep 17 00:00:00 2001
From: whq <460794335@qq.com>
Date: Mon, 24 Apr 2023 19:58:10 +0800
Subject: [PATCH 06/13] Twitter

---
 kn-service/vordm-twitter/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kn-service/vordm-twitter/pom.xml b/kn-service/vordm-twitter/pom.xml
index 9dbfdb2..01ce55a 100644
--- a/kn-service/vordm-twitter/pom.xml
+++ b/kn-service/vordm-twitter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kn-service</artifactId>
         <groupId>com.kening.platform</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

From 9648ec944b8662ad2885706ac2f40f65bb5e2698 Mon Sep 17 00:00:00 2001
From: whq <460794335@qq.com>
Date: Mon, 24 Apr 2023 19:59:47 +0800
Subject: [PATCH 07/13] Twitter

---
 kn-service/vordm-twitter/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kn-service/vordm-twitter/Dockerfile b/kn-service/vordm-twitter/Dockerfile
index 457912a..d2ba668 100644
--- a/kn-service/vordm-twitter/Dockerfile
+++ b/kn-service/vordm-twitter/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /kn/vordm
 
 EXPOSE 8980
 
-ADD ./target/vordm-crawl.jar ./app.jar
+ADD ./target/vordm-twitter.jar ./app.jar
 
 ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
 

From 472d54963b9b4bdc66c323816cc494efe31aa8f1 Mon Sep 17 00:00:00 2001
From: whq <460794335@qq.com>
Date: Mon, 24 Apr 2023 20:16:50 +0800
Subject: [PATCH 08/13] =?UTF-8?q?whq=EF=BC=9A=20=E8=BF=98=E5=8E=9F?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kening/vordm/VoRdmApplication.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java
index 3761a4f..cd32db5 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java
@@ -11,6 +11,6 @@ import org.springframework.cloud.client.SpringCloudApplication;
 @SpringCloudApplication
 public class VoRdmApplication {
 	public static void main(String[] args) {
-		BladeApplication.run("gljNew-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
+		BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
 	}
 }

From 8be32612a57edfa2cf2e45d77d5d4cd4c300dfdc Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Tue, 25 Apr 2023 09:16:15 +0800
Subject: [PATCH 09/13] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RemoteSensingSourceDataController.java    | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java
index e8bbf53..d08f310 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java
@@ -28,42 +28,47 @@ public class RemoteSensingSourceDataController {
 
 	/**
 	 * 根据页码和灾害信息查出遥感影像源数据，可多个灾害
+	 *
 	 * @param disasterInfo
 	 * @param query
 	 * @return
 	 */
 	@GetMapping("/SourceData")
-	public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query){
+	public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceData(DisasterInfo disasterInfo, Query query) {
 		List<Long> disasterIds = disasterInfoService.getDisasterId(disasterInfo);
-		if (disasterIds.isEmpty()){
+		if (disasterIds.isEmpty()) {
 			return R.data(null);
 		}
-		return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),new QueryWrapper<RemoteSensingSourceData>().in("disaster_id",disasterIds)));
+		return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), new QueryWrapper<RemoteSensingSourceData>().in("disaster_id", disasterIds)));
 	}
 
 	/**
 	 * 实体数据列表信息
+	 *
 	 * @param optionsJson 实体数据条件信息
-	 * @param query  current当前页  size 每页数据量
+	 * @param query       current当前页  size 每页数据量
 	 * @return
 	 */
 	@GetMapping("/Condition")
-	public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceDataByCondition( String optionsJson, Query query) {
+	public R<IPage<RemoteSensingSourceData>> getRemoteSensingSourceDataByCondition(String optionsJson, Query query) {
 		RemoteSensingSourceData remoteSensingSourceData = new RemoteSensingSourceData();
-		if (optionsJson!=null){
-			remoteSensingSourceData = (RemoteSensingSourceData)JSON.parseObject(optionsJson, RemoteSensingSourceData.class);
+		if (optionsJson != null) {
+			remoteSensingSourceData = (RemoteSensingSourceData) JSON.parseObject(optionsJson, RemoteSensingSourceData.class);
 		}
 		return R.data(remoteSensingSourceDataService.getRemoteSensingSourceDataByCondition(Condition.getPage(query), remoteSensingSourceData));
 	}
 
 	/**
 	 * 实体数据列表信息
-	 *  @param params
-	 * 	@param query
-	 * 	@return
+	 *
+	 * @param disasterId
+	 * @param query
+	 * @return
 	 */
 	@GetMapping("/PagesData")
-	public R<IPage<RemoteSensingSourceData>> Pages(@RequestParam Map<String,Object> params, Query query){
-		return R.data(remoteSensingSourceDataService.page(Condition.getPage(query),Condition.getQueryWrapper(params,RemoteSensingSourceData.class)));
+	public R<IPage<RemoteSensingSourceData>> pages(Query query, String disasterId) {
+		QueryWrapper<RemoteSensingSourceData> qw = new QueryWrapper<>();
+		qw.eq("disaster_id", disasterId);
+		return R.data(remoteSensingSourceDataService.page(Condition.getPage(query), qw));
 	}
 }

From 6b3dc3554b4fb1e88f5320d3e3ae7651de8446c5 Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Tue, 25 Apr 2023 10:37:43 +0800
Subject: [PATCH 10/13] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kening/vordm/vo/CallForHelpVo.java     | 5 +++++
 .../src/main/java/com/kening/vordm/VoRdmApplication.java     | 2 +-
 .../main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 1 +
 .../main/java/com/kening/vordm/mapper/EntityDataMapper.xml   | 4 ++--
 .../main/java/com/kening/vordm/mapper/GuestInfoMapper.xml    | 1 -
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java
index ac46f70..b903d5a 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java
@@ -67,4 +67,9 @@ public class CallForHelpVo extends DisasterInfo {
 	 * 受灾国家
 	 */
 	private String disasterCountry;
+
+	/**
+	 * 受灾国家
+	 */
+	private String vordmId;
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java
index cd32db5..3761a4f 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java
@@ -11,6 +11,6 @@ import org.springframework.cloud.client.SpringCloudApplication;
 @SpringCloudApplication
 public class VoRdmApplication {
 	public static void main(String[] args) {
-		BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
+		BladeApplication.run("gljNew-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
 	}
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index 6fc84ff..fc25e8a 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -173,6 +173,7 @@
         SELECT
         d.chief_id,
         d.chief_name,
+        d.vordm_id,
         u.username ,
         u.last_name AS lastName,
         u.first_name AS firstName,
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
index 78bf371..3b8cf9b 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
@@ -40,8 +40,8 @@
                ms.vordm_id,
                ms.name AS msName
         from entity_data ed
-        inner join guest_info gi on gi.id = ed.uploader_id
-            inner join map_server ms on ms.disaster_id = ed.disaster_id
+        left join guest_info gi on gi.id = ed.uploader_id
+        left join map_server ms on ms.disaster_id = ed.disaster_id
         <where>
             <if test="entityData.disasterId != null and entityData.disasterId != ''">
                 ed.disaster_id = #{entityData.disasterId}
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
index 41dd933..3180088 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml
@@ -27,7 +27,6 @@
         update blade_user t set t.password = #{password} where t.email = #{email}
     </update>
     <update id="updateAccount">
-
         update blade_user t set t.name = #{name}, t.real_name = #{realName}, t.organization = #{organization},
                                 t.research_field = #{researchField}, t.occupation = #{occupation}, t.code = #{country}
         where t.id = #{id}

From d7dc4eb2e100b8462dfd3aa6a61353ba3f6bf0ae Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Tue, 25 Apr 2023 10:48:44 +0800
Subject: [PATCH 11/13] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kening/vordm/VoRdmApplication.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java
index 3761a4f..cd32db5 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/VoRdmApplication.java
@@ -11,6 +11,6 @@ import org.springframework.cloud.client.SpringCloudApplication;
 @SpringCloudApplication
 public class VoRdmApplication {
 	public static void main(String[] args) {
-		BladeApplication.run("gljNew-"+CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
+		BladeApplication.run(CommonConstant.KN_VORDM_MODULE_NAME, VoRdmApplication.class, args);
 	}
 }

From 839a033a64bc10c4ef896624757be5df43ac1f75 Mon Sep 17 00:00:00 2001
From: liyuchen <791867849@qq.com>
Date: Tue, 25 Apr 2023 16:14:51 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=81=BE=E5=AE=B3?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6-liyuchen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index ba8aabc..af7ff3c 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -216,7 +216,10 @@
                 and d.chief_id = #{callForHelpVo.chiefIdEquals}
             </if>
             <if test="callForHelpVo.disasterType != null and callForHelpVo.disasterType != ''">
-                and bdb.dict_value like concat('%', #{callForHelpVo.disasterType},'%')
+                and d.disaster_type = #{callForHelpVo.disasterType}
+            </if>
+            <if test="callForHelpVo.disasterCountry != null and callForHelpVo.disasterCountry != ''">
+                and d.disaster_country like concat('%', #{callForHelpVo.disasterCountry},'%')
             </if>
         </where>
         order by d.upload_time desc

From 2a46da88c6462a504884fc6f16b2303000886024 Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Tue, 25 Apr 2023 18:34:35 +0800
Subject: [PATCH 13/13] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/kening/vordm/entity/DataUpload.java   |  2 ++
 .../com/kening/vordm/entity/EntityData.java   |  4 ++++
 .../java/com/kening/vordm/entity/Hotspot.java |  4 ----
 .../com/kening/vordm/entity/OtherData.java    |  2 ++
 .../com/kening/vordm/vo/CallForHelpVo.java    |  3 +++
 .../controller/AdminManagerController.java    |  1 -
 .../controller/EntityDataController.java      | 11 +++++++++
 .../kening/vordm/mapper/DataUploadMapper.xml  |  8 ++++---
 .../vordm/mapper/DisasterInfoMapper.xml       |  1 +
 .../kening/vordm/mapper/EntityDataMapper.xml  |  6 ++++-
 .../mapper/GuestManageDisasterRefMapper.xml   |  2 +-
 .../kening/vordm/mapper/OtherDataMapper.xml   |  5 ++--
 .../kening/vordm/mapper/VisualDataMapper.xml  |  1 +
 .../service/impl/OtherDataServiceImpl.java    |  1 +
 .../service/impl/PictureInfoServiceImpl.java  | 24 ++++++++++++-------
 15 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java
index fec1c4c..d0d5c05 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/DataUpload.java
@@ -23,4 +23,6 @@ public class DataUpload extends EntityData{
 	private Date disasterTime;
 
 	private Long disasterId;
+
+	private String vordmId;
 }
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
index 985f1d9..f60627d 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/EntityData.java
@@ -107,6 +107,10 @@ public class EntityData implements Serializable {
 	 */
 	private Integer isDeleted;
 
+	/**
+	 * 是否发布（0未发布/1已发布）
+	 */
+	private Integer isPublish;
 
 	/**
 	 * 上传人姓名
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java
index 4195787..88b5fca 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Hotspot.java
@@ -76,10 +76,6 @@ public class Hotspot implements Serializable {
 	@ExcelIgnore
     private Date reviewTime;
 
-	/**
-	 * 是否删除 0未删除 1已删除
-	 */
-	private Integer isDeleted;
 
 	@ExcelIgnore
     @TableField(exist = false)
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
index deb9653..2bb7457 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
@@ -18,6 +18,8 @@ public class OtherData{
 
 	private String type;
 
+	private String title;
+
 	private String remark;
 
 	private Long disasterId;
diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java
index b903d5a..3af04e0 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/CallForHelpVo.java
@@ -72,4 +72,7 @@ public class CallForHelpVo extends DisasterInfo {
 	 * 受灾国家
 	 */
 	private String vordmId;
+
+
+	private Date reviewTime;
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java
index 982ed30..5d6061b 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdminManagerController.java
@@ -33,7 +33,6 @@ public class AdminManagerController {
 	 */
 	@GetMapping("/pages")
 	public R pages(Query query, @RequestParam Map<String,Object> params){
-
 		return R.data(guestManageDisasterRefService.queryPage(Condition.getPage(query),params));
 	}
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java
index 9d70501..dcb1031 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/EntityDataController.java
@@ -61,5 +61,16 @@ public class EntityDataController {
 		entityData.setReviewTime(new Date());
 		return R.data(entityDataService.updateById(entityData));
 	}
+
+
+	/**
+	 * 修改实体数据
+	 * @param entityData
+	 * @return
+	 */
+	@PostMapping("/updateEntityData")
+	public R updateEntityData(@RequestBody EntityData entityData) {
+		return R.data(entityDataService.updateById(entityData));
+	}
 }
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml
index f42a1a9..7cc30fe 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DataUploadMapper.xml
@@ -21,13 +21,15 @@
             di.disaster_keyword,
             bdb.dict_value as disasterType,
             di.id as disasterId,
+            di.vordm_id AS vordmId,
             di.disaster_time as disasterTime,
             di.disaster_country as disasterCountry
         from entity_data ed
-                 left join blade_user bu on bu.id = ed.uploader_id
-                 left join disaster_info di on di.id = ed.disaster_id
-                 left join blade_dict_biz bdb on di.disaster_type = dict_key
+        left join blade_user bu on bu.id = ed.uploader_id
+        left join disaster_info di on di.id = ed.disaster_id
+        left join blade_dict_biz bdb on di.disaster_type = dict_key
         where ed.disaster_id is not null
+        AND di.disaster_keyword IS NOT NUll
         group by di.id,bdb.dict_value
     </select>
 
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
index ba8aabc..d4b2aa7 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
@@ -191,6 +191,7 @@
         d.upload_time,
         d.geometry,
         d.respond_status,
+        ud.review_time AS reviewTime,
         bdb.dict_value as dictValue
         From
         guest_manage_disaster_ref ud join
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
index 3b8cf9b..bc6f8f8 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/EntityDataMapper.xml
@@ -21,6 +21,9 @@
             <result property="managerId" column="manager_id" jdbcType="BIGINT"/>
             <result property="reviewTime" column="review_time" jdbcType="TIMESTAMP"/>
             <result property="sourceOrganization" column="source_organization" jdbcType="TIMESTAMP"/>
+            <result property="uploadType" column="upload_type" jdbcType="INTEGER"/>
+            <result property="isDeleted" column="is_deleted" jdbcType="INTEGER"/>
+            <result property="isPublish" column="is_publish" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -29,7 +32,8 @@
         ed.upload_time,ed.disaster_id,ed.visual_flag,
         ed.visual_lon,ed.visual_lat,
         ed.status,ed.uploader_id,ed.manager_id,
-        ed.review_time, ed.source_organization
+        ed.review_time, ed.source_organization,
+        ed.upload_type, ed.is_deleted, ed.is_publish
     </sql>
 
     <select id="getEntityDataList" resultType="com.kening.vordm.entity.EntityData">
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml
index eef1bb7..1e89081 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestManageDisasterRefMapper.xml
@@ -34,7 +34,7 @@
             di.disaster_time,
             di.disaster_level,
             di.disaster_country,
-            di.sponsor_organization
+            di.sponsor_organization,
         from guest_manage_disaster_ref gmdr
         left join disaster_info di on gmdr.disaster_id = di.id
         left join blade_user bu on gmdr.manager_id = bu.id
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/OtherDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/OtherDataMapper.xml
index 936a778..2dc2107 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/OtherDataMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/OtherDataMapper.xml
@@ -19,12 +19,13 @@
     <select id="queryDisasterPage" resultType="com.kening.vordm.entity.DataUpload">
         select
             di.disaster_keyword,
+            di.vordm_id,
             bdb.dict_value as disasterType,
             di.id as disasterId,
             di.disaster_time as disasterTime,
             di.disaster_country as disasterCountry
         from disaster_info di
-                 left join blade_dict_biz bdb on di.disaster_type = dict_key
+        left join blade_dict_biz bdb on di.disaster_type = dict_key
     </select>
 
     <select id="queryPage" resultType="com.kening.vordm.entity.DataUpload">
@@ -35,7 +36,7 @@
             ed.visual_lon,ed.visual_lat,
             ed.status,ed.uploader_id,ed.manager_id,
             ed.review_time, ed.source_organization,
-            ed.upload_type,
+            ed.upload_type, ed.is_publish,
             bu.name as uploaderName
         from entity_data ed
         left join blade_user bu on bu.id = ed.uploader_id
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/VisualDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/VisualDataMapper.xml
index e06a2a7..bec22aa 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/VisualDataMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/VisualDataMapper.xml
@@ -21,6 +21,7 @@
             di.disaster_keyword,
             bdb.dict_value as disasterType,
             di.id as disasterId,
+            di.vordm_id,
             di.disaster_time as disasterTime,
             di.disaster_country as disasterCountry
         from disaster_info di
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
index 5652da0..d28ecc9 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
@@ -102,6 +102,7 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
 		entityData.setDisasterId(OtherData.getDisasterId());
 		entityData.setUploadTime(new Date());
 		entityData.setRemark(OtherData.getRemark());
+		entityData.setTitle(OtherData.getTitle());
 		entityData.setStatus(1);
 		entityData.setUploadType(2);
 		entityData.setUploaderId(AuthUtil.getUserId());
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java
index caeaba5..bbeced8 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java
@@ -16,15 +16,15 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
-* @author G1393
-* @description 针对表【picture_info(照片存储表)】的数据库操作Service实现
-* @createDate 2023-04-04 15:54:31
-*/
+ * @author G1393
+ * @description 针对表【picture_info(照片存储表)】的数据库操作Service实现
+ * @createDate 2023-04-04 15:54:31
+ */
 @Slf4j
 @Service
 @AllArgsConstructor
 public class PictureInfoServiceImpl extends ServiceImpl<PictureInfoMapper, PictureInfo>
-implements PictureInfoService {
+	implements PictureInfoService {
 
 	/**
 	 * 对象存储模块
@@ -33,6 +33,7 @@ implements PictureInfoService {
 
 	/**
 	 * 修改图片信息
+	 *
 	 * @param pictureInfo
 	 * @return
 	 */
@@ -44,7 +45,7 @@ implements PictureInfoService {
 		picture.setLink(bladeFile.getLink());
 		picture.setName(bladeFile.getOriginalName());
 		picture.setSize(multipartFile.getSize());
-		picture.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".")+1));
+		picture.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".") + 1));
 		picture.setIsMain(pictureInfo.getIsMain());
 		picture.setId(pictureInfo.getId());
 		return updateById(picture);
@@ -52,21 +53,26 @@ implements PictureInfoService {
 
 	/**
 	 * 上传图片
+	 *
 	 * @param otherData
 	 * @return
 	 */
 	@Override
 	public boolean uploadData(OtherData otherData) {
-		log.info("上传数据:{}",otherData);
+		log.info("上传数据:{}", otherData);
 		List<PictureInfo> pictureInfoList = new ArrayList<>();
 		for (MultipartFile multipartFile : otherData.getFile()) {
 			BladeFile bladeFile = minioTemplate.putFile(multipartFile);
 			PictureInfo pictureInfo = new PictureInfo();
 			pictureInfo.setLink(bladeFile.getLink());
 			pictureInfo.setDisasterId(otherData.getDisasterId());
-			pictureInfo.setName(bladeFile.getOriginalName());
+			if (otherData.getTitle() != null) {
+				pictureInfo.setName(otherData.getTitle());
+			} else {
+				pictureInfo.setName(bladeFile.getName());
+			}
 			pictureInfo.setSize(multipartFile.getSize());
-			pictureInfo.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".")+1));
+			pictureInfo.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".") + 1));
 			pictureInfo.setIsMain(otherData.getIsMain());
 			pictureInfoList.add(pictureInfo);
 		}