From 846b16040349f110a2d7998204a6babafedb4c73 Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Mon, 8 May 2023 09:10:02 +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

---
 .../vordm/entity/RemoteSensingSourceData.java     |  5 +++++
 .../mapper/RemoteSensingSourceDataMapper.xml      |  5 ++++-
 .../vordm/service/impl/EntityDataServiceImpl.java |  6 +++++-
 .../service/impl/PictureInfoServiceImpl.java      | 15 +++++++++------
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java
index 3f1a3e9..ea87d61 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/RemoteSensingSourceData.java
@@ -165,6 +165,11 @@ public class RemoteSensingSourceData implements Serializable {
 	 */
 	private Integer status;
 
+	/**
+	 * 上传用户
+	 */
+	private Long uploadId;
+
 	/**
 	 * 分辨率集合最大值
 	 */
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml
index 4a25900..e39e414 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/RemoteSensingSourceDataMapper.xml
@@ -33,6 +33,9 @@
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
             <result property="downloadUrl" column="download_url" jdbcType="VARCHAR"/>
             <result property="sourceOrganization" column="source_organization" jdbcType="VARCHAR"/>
+            <result property="satelliteType" column="satellite_type" jdbcType="INTEGER"/>
+            <result property="status" column="status" jdbcType="INTEGER"/>
+            <result property="uploadId" column="upload_id" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -44,7 +47,7 @@
         upper_left_lon,upper_right_lat,upper_right_lon,
         view_center_lat,view_center_lon,lower_right_lat,
         lower_right_lon,lower_left_lat,lower_left_lon,
-        disaster_id,create_time,download_url,source_organization
+        disaster_id,create_time,download_url,source_organization,satellite_type,status,upload_id
     </sql>
 
     <select id="getRemoteSensingSourceData" resultMap="BaseResultMap">
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 d6deba8..5dc30cf 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
@@ -75,6 +75,8 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 		//创建实体数据
 		EntityData entityData = new EntityData();
 
+		RemoteSensingSourceData remoteSensingSourceData = new RemoteSensingSourceData();
+
 		//判断上传用户是否存在
 		LambdaQueryWrapper<GuestInfo> qw = new LambdaQueryWrapper<>();
 		qw.eq(GuestInfo::getEmail, entityDataUserVo.getEmail());
@@ -91,12 +93,13 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 			guestInfo.setProfessionalTitle(entityDataUserVo.getProfessionalTitle());
 			guestInfoMapper.insert(guestInfo);
 			entityData.setUploaderId(guestInfo.getId());
+			remoteSensingSourceData.setUploadId(guestInfo.getId());
 		} else {
 			entityData.setUploaderId(guestInfo1.getId());
+			remoteSensingSourceData.setUploadId(guestInfo1.getId());
 		}
 
 		if (entityDataUserVo.getType().equals("4")) {
-			RemoteSensingSourceData remoteSensingSourceData = new RemoteSensingSourceData();
 			remoteSensingSourceData.setDisasterId(entityDataUserVo.getDisasterId());
 			remoteSensingSourceData.setSourceOrganization(entityDataUserVo.getOrganization());
 			remoteSensingSourceData.setSatelliteCode(entityDataUserVo.getSatelliteCode());
@@ -104,6 +107,7 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
 			remoteSensingSourceData.setCloudCover(entityDataUserVo.getCloudCover());
 			remoteSensingSourceData.setProductTime(entityDataUserVo.getProductTime());
 			remoteSensingSourceData.setProductBandsNum(entityDataUserVo.getProductBandsNum());
+			//0-爬虫获取，1-未审核，2-，已审核，上传源数据未补充下载 链接，3-已审核上传源数据已补充下载链接
 			remoteSensingSourceData.setStatus(1);
 			return R.status(remoteSensingSourceDataMapper.insert(remoteSensingSourceData) > 0);
 		} else {
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 e170f18..376aa16 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
@@ -39,13 +39,16 @@ public class PictureInfoServiceImpl extends ServiceImpl<PictureInfoMapper, Pictu
 	 */
 	@Override
 	public boolean updatePicture(PictureInfo pictureInfo) {
-		MultipartFile multipartFile = pictureInfo.getFile();
-		BladeFile bladeFile = minioTemplate.putFile(multipartFile);
 		PictureInfo picture = new PictureInfo();
-		picture.setLink(bladeFile.getLink());
-		picture.setName(bladeFile.getOriginalName());
-		picture.setSize(multipartFile.getSize());
-		picture.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".") + 1));
+
+		MultipartFile multipartFile = pictureInfo.getFile();
+		if (multipartFile!=null){
+			BladeFile bladeFile = minioTemplate.putFile(multipartFile);
+			picture.setLink(bladeFile.getLink());
+			picture.setSize(multipartFile.getSize());
+			picture.setType(multipartFile.getOriginalFilename().substring(multipartFile.getOriginalFilename().indexOf(".") + 1));
+		}
+		picture.setName(pictureInfo.getName());
 		picture.setIsMain(pictureInfo.getIsMain());
 		picture.setId(pictureInfo.getId());
 		return updateById(picture);