From 50ca8c0facbf7cb159babeb0e3277dc4ed6bc98b Mon Sep 17 00:00:00 2001
From: glj <glj>
Date: Wed, 14 Jun 2023 15:56:59 +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

---
 .../RemoteSensingSourceDataServiceImpl.java   | 82 +++++++++++++++----
 1 file changed, 66 insertions(+), 16 deletions(-)

diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java
index 34716b3..3194284 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/RemoteSensingSourceDataServiceImpl.java
@@ -108,22 +108,41 @@ public class RemoteSensingSourceDataServiceImpl extends ServiceImpl<RemoteSensin
 				String product_level = ExcelCellUtil.strHandle(row.get(1));
 				String product_serial_num = ExcelCellUtil.strHandle(row.get(2));
 				String product_time = ExcelCellUtil.strHandle(row.get(3));
-				String product_resolution = ExcelCellUtil.strHandle(row.get(4));
-				String cloud_cover = ExcelCellUtil.strHandle(row.get(5));
-				String satellite_code = ExcelCellUtil.strHandle(row.get(6));
-				String upper_left_lat = ExcelCellUtil.strHandle(row.get(7));
-				String upper_left_lon = ExcelCellUtil.strHandle(row.get(8));
-				String upper_right_lat = ExcelCellUtil.strHandle(row.get(9));
-				String upper_right_lon = ExcelCellUtil.strHandle(row.get(10));
-				String view_center_lat = ExcelCellUtil.strHandle(row.get(11));
-				String view_center_lon = ExcelCellUtil.strHandle(row.get(12));
-				String lower_right_lat = ExcelCellUtil.strHandle(row.get(13));
-				String lower_right_lon = ExcelCellUtil.strHandle(row.get(14));
-				String lower_left_lat = ExcelCellUtil.strHandle(row.get(15));
-				String lower_left_lon = ExcelCellUtil.strHandle(row.get(16));
-				String source_organization = ExcelCellUtil.strHandle(row.get(17));
-				String satellite_type_select = ExcelCellUtil.strHandle(row.get(18));
-				String picture_name = ExcelCellUtil.strHandle(row.get(19));
+				//product_bands_num
+				String product_bands_num = ExcelCellUtil.strHandle(row.get(4));
+				String product_resolution = ExcelCellUtil.strHandle(row.get(5));
+				//raw_data_stripe_num
+				String raw_data_stripe_num = ExcelCellUtil.strHandle(row.get(6));
+				String cloud_cover = ExcelCellUtil.strHandle(row.get(7));
+				//product_size
+				String product_size = ExcelCellUtil.strHandle(row.get(8));
+				//project_band_num
+				String project_band_num = ExcelCellUtil.strHandle(row.get(9));
+				//coverage_area
+				String coverage_area = ExcelCellUtil.strHandle(row.get(10));
+				//receiving_time
+				String satellite_code = ExcelCellUtil.strHandle(row.get(11));
+				String receiving_time = ExcelCellUtil.strHandle(row.get(12));
+				String upper_left_lat = ExcelCellUtil.strHandle(row.get(13));
+				String upper_left_lon = ExcelCellUtil.strHandle(row.get(14));
+				String upper_right_lat = ExcelCellUtil.strHandle(row.get(15));
+				String upper_right_lon = ExcelCellUtil.strHandle(row.get(16));
+				String view_center_lat = ExcelCellUtil.strHandle(row.get(17));
+				String view_center_lon = ExcelCellUtil.strHandle(row.get(18));
+				String lower_right_lat = ExcelCellUtil.strHandle(row.get(19));
+				String lower_right_lon = ExcelCellUtil.strHandle(row.get(20));
+				String lower_left_lat = ExcelCellUtil.strHandle(row.get(21));
+				String lower_left_lon = ExcelCellUtil.strHandle(row.get(22));
+				//create_time
+				//download_url
+				String download_url = ExcelCellUtil.strHandle(row.get(24));
+				String source_organization = ExcelCellUtil.strHandle(row.get(25));
+				//satellite_type
+				String satellite_type = ExcelCellUtil.strHandle(row.get(26));
+				//status
+				//upload_id
+				String satellite_type_select = ExcelCellUtil.strHandle(row.get(29));
+				String picture_name = ExcelCellUtil.strHandle(row.get(30));
 
 
 				RemoteSensingSourceData remoteSensingSourceData = new RemoteSensingSourceData();
@@ -188,6 +207,37 @@ public class RemoteSensingSourceDataServiceImpl extends ServiceImpl<RemoteSensin
 				if (StringUtil.isNotBlank(picture_name)) {
 					remoteSensingSourceData.setPictureName(picture_name);
 				}
+				if (StringUtil.isNotBlank(product_bands_num)) {
+					remoteSensingSourceData.setProductBandsNum(product_bands_num);
+				}
+				if (StringUtil.isNotBlank(raw_data_stripe_num)) {
+					remoteSensingSourceData.setRawDataStripeNum(Integer.parseInt(raw_data_stripe_num));
+				}
+				if (StringUtil.isNotBlank(product_size)) {
+					remoteSensingSourceData.setProductSize(Integer.parseInt(product_size));
+				}
+				if (StringUtil.isNotBlank(project_band_num)) {
+					remoteSensingSourceData.setProjectBandNum(Integer.parseInt(project_band_num));
+				}
+				if (StringUtil.isNotBlank(coverage_area)) {
+					remoteSensingSourceData.setCoverageArea(coverage_area);
+				}
+				if (StringUtil.isNotBlank(receiving_time)) {
+					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+					Date dateStr = null;
+					try {
+						dateStr = sdf.parse(receiving_time);
+					} catch (ParseException e) {
+						return R.fail("时间格式错误");
+					}
+					remoteSensingSourceData.setReceivingTime(dateStr);
+				}
+				if (StringUtil.isNotBlank(download_url)) {
+					remoteSensingSourceData.setDownloadUrl(download_url);
+				}
+				if (StringUtil.isNotBlank(satellite_type)) {
+					remoteSensingSourceData.setSatelliteType(satellite_type);
+				}
 				remoteSensingSourceData.setDisasterId(disasterId);
 				remoteSensingSourceData.setCreateTime(new Date());
 				remoteSensingSourceData.setStatus(3);