修改代码

pom.xml

@@ -120,7 +120,7 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+                <groupId>org.apache.maven.plugins</groupId>g
                 <artifactId>maven-deploy-plugin</artifactId>
                 <version>2.8.2</version>
             </plugin>

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/fegin/RscloudboxClientRest.java

+package com.upyuns.platform.rs.datacenter.fegin;
+
+import com.upyuns.platform.rs.datacenter.pojo.rscloudbox.ImageDataDto;
+import com.upyuns.platform.rs.datacenter.pojo.rscloudbox.RscmAreaImageDto;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 数据管理系统提供的rest接口
+ * 
+ * @author huangxj 2018年1月3日
+ * 
+ * @version v1.0
+ */
+@RefreshScope
+@FeignClient(name = "RscloudboxClientRest", url = "${rscloudbox.client.ip}")
+public interface RscloudboxClientRest {
+
+	/**
+	 * 数据列表检索
+	 * 数据列表检索
+	 *
+	 * @author huangxj 2017年9月20日
+	 *
+	 * @version v1.0
+	 */
+	@RequestMapping(method = RequestMethod.POST, value = "/cloudbox/saveImage")
+	public Map<String, Object> saveImage(@RequestBody ImageDataDto imageDataDto);
+
+}

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/pojo/rscloudbox/ImageDataDto.java

+package com.upyuns.platform.rs.datacenter.pojo.rscloudbox;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ImageDataDto implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+	private String id;
+	private String dataNo;
+	private String categoryId;
+	private String name;
+	private String range;
+	private String thumbnailPath;
+	private String displayName;
+	private String imageResolution;
+	private String imageSpectrumType;
+	private String imageSpectrumTypeDisplay;
+	private String imageRowCol;
+	private String imageRow;
+	private String imageCol;
+	private String imageProductType;
+	private String imageProductTypeDisplay;
+	private String imageFilePath;
+	private String imageCenterPoint;
+	private String imageProvince;
+	private String imageCity;
+	private String imageArea;
+	private String imageProjection;
+	private String imageSatelliteType;
+	private String imageSatelliteTypeDisplay;
+	private String imageTakeTime;
+	private Double imageCloudage;
+	private String imageProductLevel;
+	private String imageObservation;
+	private String imageSensorType;
+	private Double sellPrice;
+	private Integer isSell;
+	private Integer isDel;
+	private String remark;
+	private String files;
+	private String imageWmsPath;
+	private String imageOutPath;
+	private Integer imageIsSave;
+	private Date createDt;
+	private String jobId;
+	private Integer correctStatus;
+	// 序列号
+	private String imageSceneId;
+	// 产品号
+	private String imageProductId;
+	
+	private String imageStartTime;
+	private String imageEndTime;
+	private String imageProductTime;
+	private String imageSensorId;
+	
+	public String getImageSensorId() {
+		return imageSensorId;
+	}
+
+	public void setImageSensorId(String imageSensorId) {
+		this.imageSensorId = imageSensorId;
+	}
+
+	public String getImageProductTime() {
+		return imageProductTime;
+	}
+
+	public void setImageProductTime(String imageProductTime) {
+		this.imageProductTime = imageProductTime;
+	}
+
+	public String getImageStartTime() {
+		return imageStartTime;
+	}
+
+	public void setImageStartTime(String imageStartTime) {
+		this.imageStartTime = imageStartTime;
+	}
+
+	public String getImageEndTime() {
+		return imageEndTime;
+	}
+
+	public void setImageEndTime(String imageEndTime) {
+		this.imageEndTime = imageEndTime;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getDataNo() {
+		return dataNo;
+	}
+
+	public void setDataNo(String dataNo) {
+		this.dataNo = dataNo;
+	}
+
+	public String getCategoryId() {
+		return categoryId;
+	}
+
+	public void setCategoryId(String categoryId) {
+		this.categoryId = categoryId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getRange() {
+		return range;
+	}
+
+	public void setRange(String range) {
+		this.range = range;
+	}
+
+	public String getThumbnailPath() {
+		return thumbnailPath;
+	}
+
+	public void setThumbnailPath(String thumbnailPath) {
+		this.thumbnailPath = thumbnailPath;
+	}
+
+	public String getDisplayName() {
+		return displayName;
+	}
+
+	public void setDisplayName(String displayName) {
+		this.displayName = displayName;
+	}
+
+	public String getImageResolution() {
+		return imageResolution;
+	}
+
+	public void setImageResolution(String imageResolution) {
+		this.imageResolution = imageResolution;
+	}
+
+	public String getImageSpectrumType() {
+		return imageSpectrumType;
+	}
+
+	public void setImageSpectrumType(String imageSpectrumType) {
+		this.imageSpectrumType = imageSpectrumType;
+	}
+
+	public String getImageSpectrumTypeDisplay() {
+		return imageSpectrumTypeDisplay;
+	}
+
+	public void setImageSpectrumTypeDisplay(String imageSpectrumTypeDisplay) {
+		this.imageSpectrumTypeDisplay = imageSpectrumTypeDisplay;
+	}
+
+	public String getImageRowCol() {
+		return imageRowCol;
+	}
+
+	public void setImageRowCol(String imageRowCol) {
+		this.imageRowCol = imageRowCol;
+	}
+
+	public String getImageRow() {
+		return imageRow;
+	}
+
+	public void setImageRow(String imageRow) {
+		this.imageRow = imageRow;
+	}
+
+	public String getImageCol() {
+		return imageCol;
+	}
+
+	public void setImageCol(String imageCol) {
+		this.imageCol = imageCol;
+	}
+
+	public String getImageProductType() {
+		return imageProductType;
+	}
+
+	public void setImageProductType(String imageProductType) {
+		this.imageProductType = imageProductType;
+	}
+
+	public String getImageProductTypeDisplay() {
+		return imageProductTypeDisplay;
+	}
+
+	public void setImageProductTypeDisplay(String imageProductTypeDisplay) {
+		this.imageProductTypeDisplay = imageProductTypeDisplay;
+	}
+
+	public String getImageFilePath() {
+		return imageFilePath;
+	}
+
+	public void setImageFilePath(String imageFilePath) {
+		this.imageFilePath = imageFilePath;
+	}
+
+	public String getImageCenterPoint() {
+		return imageCenterPoint;
+	}
+
+	public void setImageCenterPoint(String imageCenterPoint) {
+		this.imageCenterPoint = imageCenterPoint;
+	}
+
+	public String getImageProvince() {
+		return imageProvince;
+	}
+
+	public void setImageProvince(String imageProvince) {
+		this.imageProvince = imageProvince;
+	}
+
+	public String getImageCity() {
+		return imageCity;
+	}
+
+	public void setImageCity(String imageCity) {
+		this.imageCity = imageCity;
+	}
+
+	public String getImageArea() {
+		return imageArea;
+	}
+
+	public void setImageArea(String imageArea) {
+		this.imageArea = imageArea;
+	}
+
+	public String getImageProjection() {
+		return imageProjection;
+	}
+
+	public void setImageProjection(String imageProjection) {
+		this.imageProjection = imageProjection;
+	}
+
+	public String getImageSatelliteType() {
+		return imageSatelliteType;
+	}
+
+	public void setImageSatelliteType(String imageSatelliteType) {
+		this.imageSatelliteType = imageSatelliteType;
+	}
+
+	public String getImageSatelliteTypeDisplay() {
+		return imageSatelliteTypeDisplay;
+	}
+
+	public void setImageSatelliteTypeDisplay(String imageSatelliteTypeDisplay) {
+		this.imageSatelliteTypeDisplay = imageSatelliteTypeDisplay;
+	}
+
+	public String getImageTakeTime() {
+		return imageTakeTime;
+	}
+
+	public void setImageTakeTime(String imageTakeTime) {
+		this.imageTakeTime = imageTakeTime;
+	}
+
+	public Double getImageCloudage() {
+		return imageCloudage;
+	}
+
+	public void setImageCloudage(Double imageCloudage) {
+		this.imageCloudage = imageCloudage;
+	}
+
+	public String getImageProductLevel() {
+		return imageProductLevel;
+	}
+
+	public void setImageProductLevel(String imageProductLevel) {
+		this.imageProductLevel = imageProductLevel;
+	}
+
+	public String getImageObservation() {
+		return imageObservation;
+	}
+
+	public void setImageObservation(String imageObservation) {
+		this.imageObservation = imageObservation;
+	}
+
+	public String getImageSensorType() {
+		return imageSensorType;
+	}
+
+	public void setImageSensorType(String imageSensorType) {
+		this.imageSensorType = imageSensorType;
+	}
+
+	public Double getSellPrice() {
+		return sellPrice;
+	}
+
+	public void setSellPrice(Double sellPrice) {
+		this.sellPrice = sellPrice;
+	}
+
+	public Integer getIsSell() {
+		return isSell;
+	}
+
+	public void setIsSell(Integer isSell) {
+		this.isSell = isSell;
+	}
+
+	public Integer getIsDel() {
+		return isDel;
+	}
+
+	public void setIsDel(Integer isDel) {
+		this.isDel = isDel;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getFiles() {
+		return files;
+	}
+
+	public void setFiles(String files) {
+		this.files = files;
+	}
+
+	public String getImageWmsPath() {
+		return imageWmsPath;
+	}
+
+	public void setImageWmsPath(String imageWmsPath) {
+		this.imageWmsPath = imageWmsPath;
+	}
+
+	public String getImageOutPath() {
+		return imageOutPath;
+	}
+
+	public void setImageOutPath(String imageOutPath) {
+		this.imageOutPath = imageOutPath;
+	}
+
+	public Integer getImageIsSave() {
+		return imageIsSave;
+	}
+
+	public void setImageIsSave(Integer imageIsSave) {
+		this.imageIsSave = imageIsSave;
+	}
+
+	public Date getCreateDt() {
+		return createDt;
+	}
+
+	public void setCreateDt(Date createDt) {
+		this.createDt = createDt;
+	}
+
+	public String getJobId() {
+		return jobId;
+	}
+
+	public void setJobId(String jobId) {
+		this.jobId = jobId;
+	}
+
+	public Integer getCorrectStatus() {
+		return correctStatus;
+	}
+
+	public void setCorrectStatus(Integer correctStatus) {
+		this.correctStatus = correctStatus;
+	}
+
+	public String getImageSceneId() {
+		return imageSceneId;
+	}
+
+	public void setImageSceneId(String imageSceneId) {
+		this.imageSceneId = imageSceneId;
+	}
+
+	public String getImageProductId() {
+		return imageProductId;
+	}
+
+	public void setImageProductId(String imageProductId) {
+		this.imageProductId = imageProductId;
+	}
+}
\ No newline at end of file

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/pojo/rscloudbox/RsImageMetaData.java

+package com.upyuns.platform.rs.datacenter.pojo.rscloudbox;
+
+
+import lombok.Data;
+
+/**
+ * @author
+ * 
+ * @Description   影像信息类
+ * 
+ * @version V1.0
+ */
+@Data
+public class RsImageMetaData {
+	private String  id ; //标识id
+	private String  area_no ; // 地区编号
+	private String  image_row_col ; // 行列号
+	private String  image_satellite_type ;// 卫星
+	private double  image_start_resolution ; // 开始分辨率
+	private double  image_end_resolution ; // 结束分辨率
+	private String  image_spectrum_type ; // 光谱
+	private String  begin_time ;
+	private String  update_time ; // 更新时间
+	private String  gemo ; // 切图范围
+	private String  range ; // 数据范围
+	private Integer num ; // 影像数量
+	private Integer is_cover ; // 是否全覆盖
+	private String  image_area ; // 面积
+	private String  data_id ; // 影像id
+	private String  image_product_type ; // 数据类型（0101:标准数据;0102:正射影像）
+	private String  relation_no ; // 组合数据id
+	private String  name ; // 名称
+	private double  image_cloudage ; // 云量
+	private String  sensor_id;//传感器类型
+	private String  product_level;// 影像级别
+	private String  collect_start_time;//采集时间
+	private String  collect_end_time;//采集时间
+	private String  Product_id;//产品序列号
+	private String  file_path;//XML路径
+	private String  area_no_array;
+	private String  jobId;
+	private boolean iscorrect;
+	private String  img_url;
+	private String  srid;
+	private String  record_id;
+	private String area_description;
+	private String tip;
+	private Integer auto_tag;
+	
+	private String image_sensor_type; //传感器类型
+	private Integer image_is_save; // 数据是否已存，0否，1是
+	
+	private String image_resolution; // 分辨率数组
+	
+	private String image_projection; // 投影
+	
+	private String image_city; // 覆盖大区市
+	
+//	public Integer getAuto_tag() {
+//		return auto_tag;
+//	}
+//	public void setAuto_tag(Integer auto_tag) {
+//		this.auto_tag = auto_tag;
+//	}
+//	public String getId() {
+//		return id;
+//	}
+//	public void setId(String id) {
+//		this.id = id;
+//	}
+//	public String getArea_no() {
+//		return area_no;
+//	}
+//	public void setArea_no(String area_no) {
+//		this.area_no = area_no;
+//	}
+//	public String getImage_row_col() {
+//		return image_row_col;
+//	}
+//	public void setImage_row_col(String image_row_col) {
+//		this.image_row_col = image_row_col;
+//	}
+//	public String getImage_satellite_type() {
+//		return image_satellite_type;
+//	}
+//	public void setImage_satellite_type(String image_satellite_type) {
+//		this.image_satellite_type = image_satellite_type;
+//	}
+//
+//	public String getImage_spectrum_type() {
+//		return image_spectrum_type;
+//	}
+//	public void setImage_spectrum_type(String image_spectrum_type) {
+//		this.image_spectrum_type = image_spectrum_type;
+//	}
+//	public String getBegin_time() {
+//		return begin_time;
+//	}
+//	public void setBegin_time(String begin_time) {
+//		this.begin_time = begin_time;
+//	}
+//
+//	public String getUpdate_time() {
+//		return update_time;
+//	}
+//	public void setUpdate_time(String update_time) {
+//		this.update_time = update_time;
+//	}
+//	public String getGemo() {
+//		return gemo;
+//	}
+//	public void setGemo(String gemo) {
+//		this.gemo = gemo;
+//	}
+//	public String getRange() {
+//		return range;
+//	}
+//	public void setRange(String range) {
+//		this.range = range;
+//	}
+//	public Integer getNum() {
+//		return num;
+//	}
+//	public void setNum(Integer num) {
+//		this.num = num;
+//	}
+//	public Integer getIs_cover() {
+//		return is_cover;
+//	}
+//	public void setIs_cover(Integer is_cover) {
+//		this.is_cover = is_cover;
+//	}
+//
+//	public synchronized String getImage_area() {
+//		return image_area;
+//	}
+//	public synchronized void setImage_area(String image_area) {
+//		this.image_area = image_area;
+//	}
+//	public String getData_id() {
+//		return data_id;
+//	}
+//	public void setData_id(String data_id) {
+//		this.data_id = data_id;
+//	}
+//	public String getImage_product_type() {
+//		return image_product_type;
+//	}
+//	public void setImage_product_type(String image_product_type) {
+//		this.image_product_type = image_product_type;
+//	}
+//	public String getRelation_no() {
+//		return relation_no;
+//	}
+//	public void setRelation_no(String relation_no) {
+//		this.relation_no = relation_no;
+//	}
+//	public String getName() {
+//		return name;
+//	}
+//	public void setName(String name) {
+//		this.name = name;
+//	}
+//	public  double getImage_cloudage() {
+//		return image_cloudage;
+//	}
+//	public  void setImage_cloudage(double image_cloudage) {
+//		this.image_cloudage = image_cloudage;
+//	}
+//	public String getSensor_id() {
+//		return sensor_id;
+//	}
+//	public void setSensor_id(String sensor_id) {
+//		this.sensor_id = sensor_id;
+//	}
+//	public String getProduct_level() {
+//		return product_level;
+//	}
+//	public void setProduct_level(String product_level) {
+//		this.product_level = product_level;
+//	}
+//	public String getCollect_start_time() {
+//		return collect_start_time;
+//	}
+//	public void setCollect_start_time(String collect_start_time) {
+//		this.collect_start_time = collect_start_time;
+//	}
+//	public String getCollect_end_time() {
+//		return collect_end_time;
+//	}
+//	public void setCollect_end_time(String collect_end_time) {
+//		this.collect_end_time = collect_end_time;
+//	}
+//	public String getProduct_id() {
+//		return Product_id;
+//	}
+//	public void setProduct_id(String product_id) {
+//		Product_id = product_id;
+//	}
+//	public String getFile_path() {
+//		return file_path;
+//	}
+//	public void setFile_path(String file_path) {
+//		this.file_path = file_path;
+//	}
+//	public double getImage_start_resolution() {
+//		return image_start_resolution;
+//	}
+//	public void setImage_start_resolution(double image_start_resolution) {
+//		this.image_start_resolution = image_start_resolution;
+//	}
+//	public double getImage_end_resolution() {
+//		return image_end_resolution;
+//	}
+//	public void setImage_end_resolution(double image_end_resolution) {
+//		this.image_end_resolution = image_end_resolution;
+//	}
+//	public String getJobId() {
+//		return jobId;
+//	}
+//	public void setJobId(String jobId) {
+//		this.jobId = jobId;
+//	}
+//	public  String getArea_no_array() {
+//		return area_no_array;
+//	}
+//	public  void setArea_no_array(String area_no_array) {
+//		this.area_no_array = area_no_array;
+//	}
+//	public synchronized boolean isIscorrect() {
+//		return iscorrect;
+//	}
+//	public synchronized void setIscorrect(boolean iscorrect) {
+//		this.iscorrect = iscorrect;
+//	}
+//	public synchronized String getImg_url() {
+//		return img_url;
+//	}
+//	public synchronized void setImg_url(String img_url) {
+//		this.img_url = img_url;
+//	}
+//	public String getRecord_id() {
+//		return record_id;
+//	}
+//	public void setRecord_id(String record_id) {
+//		this.record_id = record_id;
+//	}
+//	public String getSrid() {
+//		return srid;
+//	}
+//	public void setSrid(String srid) {
+//		this.srid = srid;
+//	}
+//	public String getArea_description() {
+//		return area_description;
+//	}
+//	public void setArea_description(String area_description) {
+//		this.area_description = area_description;
+//	}
+//	public String getTip() {
+//		return tip;
+//	}
+//	public void setTip(String tip) {
+//		this.tip = tip;
+//	}
+//	public String getImage_sensor_type() {
+//		return image_sensor_type;
+//	}
+//	public void setImage_sensor_type(String image_sensor_type) {
+//		this.image_sensor_type = image_sensor_type;
+//	}
+//	public Integer getImage_is_save() {
+//		return image_is_save;
+//	}
+//	public void setImage_is_save(Integer image_is_save) {
+//		this.image_is_save = image_is_save;
+//	}
+//	public String getImage_resolution() {
+//		return image_resolution;
+//	}
+//	public void setImage_resolution(String image_resolution) {
+//		this.image_resolution = image_resolution;
+//	}
+//	public String getImage_projection() {
+//		return image_projection;
+//	}
+//	public void setImage_projection(String image_projection) {
+//		this.image_projection = image_projection;
+//	}
+//	public String getImage_city() {
+//		return image_city;
+//	}
+//	public void setImage_city(String image_city) {
+//		this.image_city = image_city;
+//	}
+}

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/pojo/rscloudbox/RscmAreaImageDto.java

+
+package com.upyuns.platform.rs.datacenter.pojo.rscloudbox;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Map;
+
+@Data
+public class RscmAreaImageDto implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "标识id")
+	private String id;
+
+	@ApiModelProperty(value = "地区编号")
+	private String areaNo;
+
+	@ApiModelProperty(value = "行列号")
+	private String imageRowCol;
+
+	@ApiModelProperty(value = "卫星")
+	private String imageSatelliteType;
+
+	@ApiModelProperty(value = "影像最小分辨率")
+	private Double imageStartResolution;
+
+	@ApiModelProperty(value = "光谱")
+	private String imageSpectrumType;
+
+	@ApiModelProperty(value = "开始时间")
+	private String beginTime;
+
+	@ApiModelProperty(value = "更新时间")
+	private String updateTime;
+
+	@ApiModelProperty(value = "切图范围")
+	private String gemo;
+
+	@ApiModelProperty(value = "数据范围")
+	private String range;
+
+	@ApiModelProperty(value = "影像数量")
+	private Integer num;
+
+	@ApiModelProperty(value = "是否全覆盖")
+	private Integer isCover;
+
+	@ApiModelProperty(value = "影像id")
+	private String dataId;
+
+	@ApiModelProperty(value = "数据类型（0101:标准数据;0102:正射影像）")
+	private String imageProductType;
+
+	@ApiModelProperty(value = "组合数据id")
+	private String relationNo;
+
+	@ApiModelProperty(value = "名称")
+	private String name;
+
+	@ApiModelProperty(value = "云量")
+	private Double imageCloudage;
+
+	@ApiModelProperty(value = "传感器类型")
+	private String sensorId;
+
+	@ApiModelProperty(value = "影像级别")
+	private String productLevel;
+
+	@ApiModelProperty(value = "采集开始时间")
+	private String collectStartTime;
+
+	@ApiModelProperty(value = "")
+	private String filePath;
+
+	@ApiModelProperty(value = "产品序列号")
+	private String productId;
+
+	@ApiModelProperty(value = "是否完成影像校正")
+	private Boolean iscorrect;
+
+	@ApiModelProperty(value = "订单任务id")
+	private String jobid;
+
+	@ApiModelProperty(value = "地区编码数组")
+	private String areaNoArray;
+
+	@ApiModelProperty(value = "并行切割后的影像wms服务地址")
+	private String imgUrl;
+
+	@ApiModelProperty(value = "影像的面积")
+	private Double imageArea;
+
+	@ApiModelProperty(value = "数据记录唯一标示id")
+	private String recordId;
+
+	@ApiModelProperty(value = "数据采集结束时间")
+	private String collectEndTime;
+
+	@ApiModelProperty(value = "分辨率最大值")
+	private Double imageEndResolution;
+
+	@ApiModelProperty(value = "标题")
+	private String tip;
+
+	@ApiModelProperty(value = "坐标")
+	private String srid;
+
+	@ApiModelProperty(value = "地区描述（广东省东莞市松山湖）")
+	private String areaDescription;
+
+	@ApiModelProperty(value = "压缩包大小")
+	private Long imageSize;
+
+	@ApiModelProperty(value = "是否自动入库【0：手动；1：自动】")
+	private Integer autoTag;
+
+	@ApiModelProperty(value = "传感器类型")
+	private String imageSensorType;
+
+	@ApiModelProperty(value = "数据是否已存，0否，1是")
+	private Integer imageIsSave;
+
+	@ApiModelProperty(value = "分辨率[数组]")
+	private String imageResolution;
+
+	@ApiModelProperty(value = "投影")
+	private String imageProjection;
+
+	@ApiModelProperty(value = "覆盖大区市")
+	private String imageCity;
+
+//	public ImageDataDto toImageDataDto() {
+//
+//		ImageDataDto imageDataDto = BeanMapper.map(this, ImageDataDto.class);
+//		imageDataDto.setThumbnailPath(getFilePath() + "/" + getName());
+//		imageDataDto.setImageSpectrumTypeDisplay(getImageSpectrumType());
+//		imageDataDto.setImageTakeTime(getBeginTime());
+//		imageDataDto.setImageProductLevel(getProductLevel());
+//		imageDataDto.setImageSceneId(getSensorId());
+//		imageDataDto.setImageProductId(getProductId());
+//		imageDataDto.setImageStartTime(getCollectStartTime());
+//		imageDataDto.setImageEndTime(getCollectEndTime());
+//		imageDataDto.setImageProductTime(getUpdateTime());
+//		imageDataDto.setImageFilePath(getFilePath());
+//		imageDataDto.setId(getDataId());
+//		imageDataDto.setImageSensorId(getSensorId());
+//
+//		return imageDataDto;
+//	}
+
+//	public Map<String, Object> toImageDataMap() {
+//
+//		ImageDataDto imageDataDto = toImageDataDto();
+//
+//		Map<String, Object> imageDataMap = MapsKeyRename.reNameToUndersore(BeanMapper.map(imageDataDto, Map.class),
+//				true);
+//
+//		return imageDataMap;
+//	}
+
+}

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpImageDataTotalBiz.java

@@ -11,14 +11,17 @@ import com.upyuns.platform.rs.datacenter.entity.RscpAreaImageTotal;
 import com.upyuns.platform.rs.datacenter.entity.RscpAreaInfo;
 import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
 import com.upyuns.platform.rs.datacenter.entity.RscpImageInputLog;
+import com.upyuns.platform.rs.datacenter.fegin.RscloudboxClientRest;
 import com.upyuns.platform.rs.datacenter.mapper.RscpAreaInfoMapper;
 import com.upyuns.platform.rs.datacenter.mapper.RscpImageDataTotalMapper;
 import com.upyuns.platform.rs.datacenter.pojo.ImageTotalInputDTO;
 import com.upyuns.platform.rs.datacenter.pojo.imagedata.BgImageQueryDTO;
 import com.upyuns.platform.rs.datacenter.pojo.imagedata.QueryDTO;
+import com.upyuns.platform.rs.datacenter.pojo.rscloudbox.ImageDataDto;
 import com.upyuns.platform.rs.datacenter.rest.RscpImageDataTotalController;
 import com.upyuns.platform.rs.datacenter.vo.ImageInputVO;
 import com.upyuns.platform.rs.datacenter.vo.MaxMinVO;
+import com.upyuns.platform.rs.gtdata.GtDataRestClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +29,9 @@ import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.text.MessageFormat;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -49,6 +54,12 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
     @Autowired
     RscpAreaInfoMapper rscpAreaInfoMapper;
 
+    @Autowired
+    RscloudboxClientRest rscloudboxClientRest;
+
+    @Autowired
+    GtDataRestClient gtDataRestClient;
+
     public void inStorage(ImageInputVO ii) {
         ExecutorService executorService = Executors.newCachedThreadPool();
         executorService.execute(() -> {
@@ -83,6 +94,9 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
                 //更新地区信息
                 rscpAreaImageTotalBiz.inStorageAreaDeal(imageTotalInputDTO);
 
+                //插入接收系统
+                inputbox(imageTotalInputDTO.getId());
+
             }catch (Exception e) {
                 log.error(e.getMessage(), e);
                 if(null != ii.getLogId()) {
@@ -127,7 +141,7 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
     public RscpImageDataTotal queryDataList(Long id) {
         List<RscpImageDataTotal> list2 = mapper.queryDataById(id);
         if(list2.size() > 0) {
-            RscpImageDataTotal rscpImageDataTotal = list2.get(0);
+//            RscpImageDataTotal rscpImageDataTotal = list2.get(0);
             return list2.get(0);
         }
         throw new BaseException("数据不存在", PARAM_ILLEGAL_CODE);
@@ -174,4 +188,183 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
     public String queryGeomsJson(QueryDTO dto){
         return mapper.queryGeomsJson(dto);
     }
+
+    public Map<String, Object>  inputbox(Long dataid) {
+        RscpImageDataTotal rscpImageDataTotal = queryDataList(dataid);
+        ImageDataDto imageDataDto = new ImageDataDto();
+        imageDataDto.setId(rscpImageDataTotal.getId().toString());
+//        imageDataDto.setAreaDescription(null);
+//        imageDataDto.setAreaNo(null);
+//        imageDataDto.setAreaNoArray(null);
+//        imageDataDto.setAutoTag(null);
+        imageDataDto.setImageTakeTime(rscpImageDataTotal.getImageTakeTime());
+        imageDataDto.setImageEndTime(rscpImageDataTotal.getImageEndTime());
+        imageDataDto.setImageStartTime(rscpImageDataTotal.getImageStartTime());
+        imageDataDto.setImageProductTime(rscpImageDataTotal.getImageProductTime());
+//        imageDataDto.setDataId(rscpImageDataTotal.getId().toString());
+//        imageDataDto.setGemo(null);
+        imageDataDto.setImageArea(StrUtil.isNotBlank(rscpImageDataTotal.getImageArea()) ? rscpImageDataTotal.getImageArea() : null);
+        imageDataDto.setImageCity(rscpImageDataTotal.getImageCity());
+        imageDataDto.setImageCloudage(null != rscpImageDataTotal.getImageCloudage() ? rscpImageDataTotal.getImageCloudage().doubleValue() : null);
+//        Double resolution = (rscpImageDataTotal.getImageResolution() == null || rscpImageDataTotal.getImageResolution().length <= 0)?
+//                null: rscpImageDataTotal.getImageResolution()[0].doubleValue();
+//        rscmAreaImageDto.setImageEndResolution(resolution);
+
+        if((rscpImageDataTotal.getImageResolution() == null || rscpImageDataTotal.getImageResolution().length <= 0)) {
+            imageDataDto.setImageResolution("");
+        }else {
+            String resolutionStr = "{";
+            for(int i = 0; i < rscpImageDataTotal.getImageResolution().length; i++) {
+                BigDecimal resolution = rscpImageDataTotal.getImageResolution()[i];
+                resolutionStr += resolution;
+                if(i == rscpImageDataTotal.getImageResolution().length - 1) {
+                    resolutionStr += "}";
+                }else {
+                    resolutionStr += ",";
+                }
+//                if(i = 0) {
+//                    rscmAreaImageDto.setImageStartResolution();
+//                }
+            }
+            imageDataDto.setImageResolution(resolutionStr);
+        }
+
+        imageDataDto.setImageIsSave(1);
+        imageDataDto.setImageProductType(rscpImageDataTotal.getImageProductType());
+        imageDataDto.setImageProjection(rscpImageDataTotal.getImageProjection());
+        imageDataDto.setImageRowCol(rscpImageDataTotal.getImageRowCol());
+        imageDataDto.setImageSatelliteType(rscpImageDataTotal.getImageSatelliteType());
+        imageDataDto.setImageSensorType(rscpImageDataTotal.getImageSensorType());
+//        imageDataDto.setImageSize(null);
+//        rscmAreaImageDto.setImageSpectrumType(null != rscpImageDataTotal.getImageSpectrumType() ? rscpImageDataTotal.getImageSpectrumType().toString() : null);
+        if(null == rscpImageDataTotal.getImageSpectrumType() || rscpImageDataTotal.getImageSpectrumType().length <= 0) {
+            imageDataDto.setImageSpectrumType("");
+        }else {
+            String spectrumTypeStr = "{";
+            for(int i = 0; i < rscpImageDataTotal.getImageSpectrumType().length; i++) {
+                String pectrumType = rscpImageDataTotal.getImageSpectrumType()[i];
+                spectrumTypeStr += pectrumType;
+                if(i == rscpImageDataTotal.getImageSpectrumType().length - 1) {
+                    spectrumTypeStr += "}";
+                }else {
+                    spectrumTypeStr += ",";
+                }
+            }
+            imageDataDto.setImageSpectrumType(spectrumTypeStr);
+        }
+
+        if(null == rscpImageDataTotal.getImageSpectrumTypeDisplay() || rscpImageDataTotal.getImageSpectrumTypeDisplay().length <= 0) {
+            imageDataDto.setImageSpectrumTypeDisplay("");
+        }else {
+            String spectrumTypeStr = "{";
+            for(int i = 0; i < rscpImageDataTotal.getImageSpectrumTypeDisplay().length; i++) {
+                String pectrumType = rscpImageDataTotal.getImageSpectrumTypeDisplay()[i];
+                spectrumTypeStr += pectrumType;
+                if(i == rscpImageDataTotal.getImageSpectrumTypeDisplay().length - 1) {
+                    spectrumTypeStr += "}";
+                }else {
+                    spectrumTypeStr += ",";
+                }
+            }
+            imageDataDto.setImageSpectrumTypeDisplay(spectrumTypeStr);
+        }
+
+//        imageDataDto.setImgUrl(null);
+        imageDataDto.setCorrectStatus(rscpImageDataTotal.getCorrectStatus());
+//        imageDataDto.setIsCover(null);
+//        imageDataDto.setJobid(null);
+        imageDataDto.setName(rscpImageDataTotal.getName());
+//        imageDataDto.setNum(null);
+        imageDataDto.setImageProductId(rscpImageDataTotal.getImageProductId());
+        imageDataDto.setImageProductLevel(rscpImageDataTotal.getImageProductLevel());
+        imageDataDto.setRange(rscpImageDataTotal.getRange());
+//        imageDataDto.setRecordId(null);
+//        imageDataDto.setRelationNo(null);
+        imageDataDto.setImageSensorId(rscpImageDataTotal.getImageSensorId());
+//        imageDataDto.setSrid(null);
+//        imageDataDto.setTip(null);
+//        rscmAreaImageDto.setUpdateTime(rscpImageDataTotal.getCreateDt());
+
+        imageDataDto.setImageSceneId(rscpImageDataTotal.getImageSceneId());
+
+        imageDataDto.setImageFilePath(rscpImageDataTotal.getImageFilePath());
+        imageDataDto.setThumbnailPath(rscpImageDataTotal.getThumbnailPath());
+
+        //复制到zmp目录
+        String sourcePath = rscpImageDataTotal.getImageFilePath();
+        Integer index = rscpImageDataTotal.getImageFilePath().lastIndexOf(rscpImageDataTotal.getName()+".tar.gz");
+        if(index > 0) {
+            sourcePath = rscpImageDataTotal.getImageFilePath().substring(0, index);
+        }
+
+        if(sourcePath.startsWith("/")) {
+            sourcePath = sourcePath.substring(1);
+        }
+
+        String targetPath = sourcePath;
+        targetPath = targetPath.replaceAll("rscloudmart", "zmp");
+        Map<String, Object> copy0Map = gtDataRestClient.mkdirs(targetPath);
+        Boolean sign = false;
+        if (200 == (Integer) copy0Map.get("HttpStatusCode") ) {
+            sign = true;
+        }else if(2002 == (Integer) ((Map<String, Object>) copy0Map.get("GTDataException")).get("errorCode")) {
+            sign = true;
+        }else {
+            log.warn(MessageFormat
+                    .format("mkdir ({0}) ... Fail!Code: {1} Message: {2}",
+                            targetPath,
+                            copy0Map.get("result"),
+                            copy0Map.get("message")));
+            copy0Map.put("targetPath", targetPath);
+//            return copy0Map;
+        }
+        if(sign) {
+            String sourceFile = sourcePath + rscpImageDataTotal.getName()+".tar.gz";
+            String targetFile = targetPath + rscpImageDataTotal.getName()+".tar.gz";
+            Map<String, Object> copyMap = gtDataRestClient.copy(sourceFile, targetFile);
+            if (200 != (Integer) copyMap.get("HttpStatusCode") && 2002 != (Integer) ((Map<String, Object>) copy0Map.get("GTDataException")).get("errorCode")) {
+                log.warn(MessageFormat
+                        .format("Copy data file({0}) to {1}... Fail!Code: {2} Message: {3}",
+                                sourcePath,
+                                targetPath,
+                                copyMap.get("result"),
+                                copyMap.get("message")));
+                copyMap.put("sourcePath", sourcePath);
+                copyMap.put("targetPath", targetPath);
+//                return copyMap;
+            }else {
+                //复制压缩图
+                String sourceTPath = rscpImageDataTotal.getThumbnailPath();
+                sourceTPath = THUMBNAIL_PATH + sourceTPath + "_800_800.png";
+                String targetTPath = targetPath + rscpImageDataTotal.getName()+ "_800_800.png";
+                Map<String, Object> copy2Map = gtDataRestClient.copy(sourceTPath, targetTPath);
+                if (200 != (Integer) copyMap.get("HttpStatusCode") ) {
+                    log.warn(MessageFormat
+                            .format("Copy data file({0}) to {1}... Fail!Code: {2} Message: {3}",
+                                    sourcePath,
+                                    targetPath,
+                                    copyMap.get("result"),
+                                    copyMap.get("message")));
+                    copyMap.put("sourceTPath", sourcePath);
+                    copyMap.put("targetTPath", targetPath);
+//                    return copy2Map;
+                }
+            }
+        }
+
+
+        return
+//                CollUtil.newHashMap();
+                rscloudboxClientRest.saveImage(imageDataDto);
+    }
+
+    public static void main(String[] args) {
+        String name = "GF6_PMS_E126.5_N46.8_20230903_L1A1420349421";
+        String path = "/rscloudmart/data/GF6//GF6_PMS_E126.5_N46.8_20230903_L1A1420349421//GF6_PMS_E126.5_N46.8_20230903_L1A1420349421.tar.gz";
+        Integer index = path.lastIndexOf(name+".tar.gz");
+        if(path.lastIndexOf(name+".tar.gz") > 0) {
+            String sourcePath = path.substring(0, index);
+            System.out.println(sourcePath);
+        }
+    }
 }

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/mapper/RscpImageDataTotalMapper.java

@@ -57,4 +57,7 @@ public interface RscpImageDataTotalMapper extends Mapper<RscpImageDataTotal> {
 
     @Select("SELECT Max(image_take_time) as max_time, min(image_take_time) as min_time where cover_statistics = 0")
     MaxMinVO coverStatisticsMaxMin();
+
+    @Update("update rscp_image_data_total set image_area = st_area(range,true)/1000/1000 where id = #{id}")
+    String updateImageAreaByRange(Long id);
 }
\ No newline at end of file

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImageDataTotalController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -23,11 +24,14 @@ import com.upyuns.platform.rs.datacenter.biz.RscpImagePriceBiz;
 import com.upyuns.platform.rs.datacenter.entity.RscpAreaImageTotal;
 import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
 import com.upyuns.platform.rs.datacenter.entity.RscpImagePrice;
+import com.upyuns.platform.rs.datacenter.fegin.RscloudboxClientRest;
 import com.upyuns.platform.rs.datacenter.mapper.RscpAreaInfoMapper;
 import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO;
 import com.upyuns.platform.rs.datacenter.pojo.ImagePageFeginDTO;
 import com.upyuns.platform.rs.datacenter.pojo.ImageTotalInputDTO;
 import com.upyuns.platform.rs.datacenter.pojo.imagedata.QueryDTO;
+import com.upyuns.platform.rs.datacenter.pojo.rscloudbox.ImageDataDto;
+import com.upyuns.platform.rs.datacenter.pojo.rscloudbox.RscmAreaImageDto;
 import com.upyuns.platform.rs.datacenter.utils.ShpToGeojson;
 import com.upyuns.platform.rs.datacenter.vo.ImageInputVO;
 import com.upyuns.platform.rs.gtdata.GtDataRestClient;
@@ -44,6 +48,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
@@ -66,6 +71,9 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
     @Autowired
     private RedisTemplate redisTemplate;
 
+    @Autowired
+    RscloudboxClientRest rscloudboxClientRest;
+
     @RequestMapping(value = "/app/unauth/query", method = RequestMethod.GET)
     @IgnoreUserToken
     public ObjectRestResponse unauthQuery(PageParam pageParam) {
@@ -192,6 +200,15 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
         );
     }
 
+
+    @RequestMapping(value = "/app/unauth/inputbbox", method = RequestMethod.GET)
+    @IgnoreUserToken
+    @IgnoreClientToken
+    public ObjectRestResponse inputbbox(Long dataid) {
+        Map<String, Object> map = baseBiz.inputbox(dataid);
+        return ObjectRestResponse.succ(map);
+    }
+
     public static void main(String[] args) {
         String str = StrUtil.sub("UPDATE rscp_image_data_total SET name = '20200914_044205_SN8_L1_Changji-China',range = '0106000020E6100000010000000103000000010000000500000067DB7B39E40246409EF388EF35D1554067DB7B39E4024640F471672F30D5554083ABCD721BFD4540F471672F30D5554083ABCD721BFD45409EF388EF35D1554067DB7B39E40246409EF388EF35D15540',thumbnail_path = '/rscloudmart/thumbnail/data/sateLLogic/20200914/20200914_044205_SN8_L1_Changji-China',image_resolution = [1, 1],image_spectrum_type = [{QS, DGP}],image_spectrum_type_display = [{全色, 多光谱}],image_file_path = '/rscloudmart/data/sateLLogic/20200914/20200914_044205_SN8_L1_Changji-China//20200914_044205_SN8_L1_Changji-China.zip',image_projection = ?,image_satellite_type = ?,image_satellite_type_display = ?,image_take_time = ?,image_cloudage = ?,image_sensor_type = ?,files = ?,image_sensor_id = ?,image_scene_id = ?,image_product_format = ?,image_product_time = ?,image_start_time = ?,image_end_time = ?,image_center_time = ?,image_width_in_pixels = ?,image_height_in_pixels = ? WHERE id = ?", 569, 589);
         System.out.println(str);

rs-datacenter/rs-datacenter-server/src/main/resources/bootstrap.yml

@@ -32,3 +32,6 @@ spring:
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml
         namespace: rs-cloud-platform
+rscloudbox:
+  client:
+    ip: http://127.0.0.1:8090
\ No newline at end of file