From 981f6531d7e257eff4cd43a8576e89ecd13238a6 Mon Sep 17 00:00:00 2001
From: glj <13935964706@163.com>
Date: Sun, 17 Mar 2024 17:59:58 +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

---
 .../main/java/com/kening/vordm/entity/AdminManager.java   | 2 ++
 .../kening/vordm/mapper/GuestManageDisasterRefMapper.xml  | 3 ++-
 .../kening/vordm/service/impl/EntityDataServiceImpl.java  | 8 +++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java
index 79ebf8e..30a7385 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/AdminManager.java
@@ -25,6 +25,8 @@ public class AdminManager extends DisasterInfo{
 
 	private String researchField;
 
+	private String vordmId;
+
 	private Date reviewTime;
 
 	private Date applyTime;
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..72150c5 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,8 @@
             di.disaster_time,
             di.disaster_level,
             di.disaster_country,
-            di.sponsor_organization
+            di.sponsor_organization,
+            di.vordm_id as vordmId
         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/service/impl/EntityDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
index 8db7b09..87e60c8 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
@@ -114,7 +114,13 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 			remoteSensingSourceData.setProductResolution(entityDataUserVo.getProductResolution());
 			remoteSensingSourceData.setCloudCover(entityDataUserVo.getCloudCover());
 
-			Date date= new Date(DateTime.parse(entityDataUserVo.getProductTime()));
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.S'Z'");
+			Date date = null;
+			try {
+				date = sdf.parse(entityDataUserVo.getProductTime());
+			} catch (ParseException e) {
+				e.printStackTrace();
+			}
 			remoteSensingSourceData.setProductTime(date);
 			remoteSensingSourceData.setProductBandsNum(entityDataUserVo.getProductBandsNum());
 			//0-爬虫获取，1-未审核，2-，已审核，上传源数据未补充下载 链接，3-已审核上传源数据已补充下载链接