From 6b3dc3554b4fb1e88f5320d3e3ae7651de8446c5 Mon Sep 17 00:00:00 2001 From: glj Date: Tue, 25 Apr 2023 10:37:43 +0800 Subject: [PATCH] =?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 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 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}