Merge remote-tracking branch 'origin/dev' into dev

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpAreaImageTotal.java

@@ -3,11 +3,9 @@ package com.upyuns.platform.rs.datacenter.entity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import tk.mybatis.mapper.annotation.KeySql;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.math.BigDecimal;
 
 @Data
@@ -21,7 +19,8 @@ public class RscpAreaImageTotal implements java.io.Serializable {
 
     /** id */
     @Id
-    @GeneratedValue(generator = "JDBC")
+    @KeySql(useGeneratedKeys = true)
+    @Column(name = "id",insertable = false)
     @ApiModelProperty(value = "")
     private String id;
 

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpImageDataInputFail.java

@@ -3,11 +3,9 @@ package com.upyuns.platform.rs.datacenter.entity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import tk.mybatis.mapper.annotation.KeySql;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.math.BigDecimal;
 
 @Data
@@ -21,7 +19,8 @@ public class RscpImageDataInputFail implements java.io.Serializable {
 
     /** 标识id */
     @Id
-    @GeneratedValue(generator = "JDBC")
+    @KeySql(useGeneratedKeys = true)
+    @Column(name = "id",insertable = false)
     @ApiModelProperty(value = "标识id")
     private Long id;
 

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpImageDataTotal.java

@@ -4,11 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import tk.mybatis.mapper.annotation.ColumnType;
+import tk.mybatis.mapper.annotation.KeySql;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 
@@ -23,7 +21,8 @@ public class RscpImageDataTotal implements java.io.Serializable {
 
     /** 标识id */
     @Id
-    @GeneratedValue(generator = "JDBC")
+    @KeySql(useGeneratedKeys = true)
+    @Column(name = "id",insertable = false)
     @ApiModelProperty(value = "标识id")
     private Long id;
 

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpImageInputLog.java

@@ -3,11 +3,9 @@ package com.upyuns.platform.rs.datacenter.entity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import tk.mybatis.mapper.annotation.KeySql;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 @Data
 @Table(name = "rscp_image_input_log")
@@ -24,7 +22,8 @@ public class RscpImageInputLog implements java.io.Serializable {
 
     /** id */
     @Id
-    @GeneratedValue(generator = "JDBC")
+    @KeySql(useGeneratedKeys = true)
+    @Column(name = "id",insertable = false)
     @ApiModelProperty(value = "")
     private Long id;
 

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpImagePrice.java

@@ -3,11 +3,9 @@ package com.upyuns.platform.rs.datacenter.entity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import tk.mybatis.mapper.annotation.KeySql;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 
@@ -22,7 +20,8 @@ public class RscpImagePrice implements java.io.Serializable {
 
     /** 标识 */
     @Id
-    @GeneratedValue(generator = "JDBC")
+    @KeySql(useGeneratedKeys = true)
+    @Column(name = "id",insertable = false)
     @ApiModelProperty(value = "标识")
     private String id;
 

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpResolution.java

@@ -3,11 +3,9 @@ package com.upyuns.platform.rs.datacenter.entity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import tk.mybatis.mapper.annotation.KeySql;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 @Data
 @Table(name = "rscp_resolution")
@@ -20,7 +18,8 @@ public class RscpResolution implements java.io.Serializable {
 
     /** id */
     @Id
-    @GeneratedValue(generator = "JDBC")
+    @KeySql(useGeneratedKeys = true)
+    @Column(name = "id",insertable = false)
     @ApiModelProperty(value = "")
     private String id;
 

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

@@ -6,10 +6,14 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 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.mapper.RscpAreaInfoMapper;
 import com.upyuns.platform.rs.datacenter.mapper.RscpImageDataTotalMapper;
 import com.upyuns.platform.rs.datacenter.pojo.ImageTotalInputDTO;
 import com.upyuns.platform.rs.datacenter.rest.RscpImageDataTotalController;
+import com.upyuns.platform.rs.datacenter.vo.ImageInputVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -18,6 +22,10 @@ import java.util.List;
 @Service
 public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, RscpImageDataTotal> {
 
+
+    @Autowired
+    RscpAreaInfoMapper rscpAreaInfoMapper;
+
     public List<RscpImageDataTotal> queryDataList(RscpImageDataTotalController.QueryDTO dto) {
         return mapper.queryDataList(dto);
     }
@@ -40,4 +48,13 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
 
         return mapper.getBinNameByGId(dto.getLeftTopLon(), dto.getLeftTopLat(), dto.getLeftBottomLon(), dto.getLeftBottomLat(), dto.getRightBottomLon(), dto.getRightBottomLat(), dto.getRightTopLon(), dto.getRightTopLat());
     }
+
+
+    public void aaa(ImageInputVO vo) {
+        ImageTotalInputDTO dto = BeanUtil.toBean(vo, ImageTotalInputDTO.class);
+//        RscpImageDataTotal rscpImageDataTotal = BeanUtil.toBean(vo, RscpImageDataTotal.class);
+        dto.setRange(getBinNameByGId(dto));
+        List<RscpAreaInfo> imageAreaInfoList = rscpAreaInfoMapper.getIntersectAreaInfo(dto.getRange());
+
+    }
 }

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

@@ -2,6 +2,7 @@ package com.upyuns.platform.rs.datacenter.mapper;
 
 import com.upyuns.platform.rs.datacenter.entity.RscpAreaInfo;
 import com.upyuns.platform.rs.datacenter.entity.RscpImagePrice;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -10,4 +11,7 @@ public interface RscpAreaInfoMapper extends Mapper<RscpAreaInfo> {
     public RscpAreaInfo queryAreaInfoByAreaCode(String areaCode);
 
     public List<RscpAreaInfo> getDirectSubAreas(String parentId);
+
+    @Select("select adminCode,proadcode,cityadcode,name,cityname,proname from rscm_area_info where st_intersects(geom, #{range})")
+    public List<RscpAreaInfo> getIntersectAreaInfo(String range);
 }
\ No newline at end of file

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

 package com.upyuns.platform.rs.datacenter.mapper;
 
+import com.upyuns.platform.rs.datacenter.entity.RscpAreaInfo;
 import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
 import com.upyuns.platform.rs.datacenter.rest.RscpImageDataTotalController;
 import org.apache.ibatis.annotations.Select;

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

@@ -20,6 +20,7 @@ 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.mapper.RscpAreaInfoMapper;
 import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO;
 import com.upyuns.platform.rs.datacenter.pojo.ImageTotalInputDTO;
 import com.upyuns.platform.rs.datacenter.vo.ImageInputVO;
@@ -58,10 +59,8 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
     @IgnoreUserToken
     public ObjectRestResponse unauthAaaa(PageParam pageParam) {
         ImageInputVO vo = JSONUtil.toBean("{\"rightTopLon\":87.33106598951404,\"leftBottomLon\":87.26891697286784,\"imageCloudage\":0.18,\"imageSensorType\":\"micro\",\"imageWidthInPixels\":5001,\"imageSpectrumTypeDisplay\":\"{全色,多光谱}\",\"imageSatelliteTypeDisplay\":\"newsat8\",\"supplier\":\"Satellogic\",\"imageSensorId\":\"micro\",\"imageProductTime\":\"2020-09-14 04:42:05\",\"leftTopLat\":44.022589860423246,\"imageResolution\":[1,1],\"rightBottomLon\":87.33106598951404,\"imageStartTime\":\"2020-09-14 04:42:05\",\"imageCenterTime\":\"2020-09-14 04:42:05\",\"imageProjection\":\"WGS-84\",\"imageFilePath\":\"/users/rscloudmart/data/sateLLogic/20201220/20200914_044205_SN8_L1_Changji-China\",\"imageSpectrumType\":\"{QS,DGP}\",\"imageSatelliteType\":\"newsat8\",\"imageSceneId\":\"newsat8_micro_L1_radiance_dca17df4-754d-4f02-ac65-3de4bfc66254_0_11_0\",\"imageCenterPointLon\":87.29999148119094,\"imageTakeTime\":\"2020-09-14 04:42:05\",\"leftTopLon\":87.26891697286784,\"imageEndTime\":\"2020-09-14 04:42:05\",\"rightTopLat\":44.022589860423246,\"leftBottomLat\":43.9774001602467,\"name\":\"20200914_044205_SN8_L1_Changji-China\",\"thumbnailPath\":\"/users/rscloudmart/thumbnail/data/sateLLogic/20201220/20200914_044205_SN8_L1_Changji-China\",\"imageCenterPointLat\":43.99999501033497,\"files\":[\"/20200914_044205_SN8_L1_Metadata.xml\",\"/20200914_044205_SN8_L1_RGB_Changji-China_showcase_Quicklook_800_800.png\",\"/20200914_044205_SN8_L1_RGB_Changji-China_showcase_Quicklook_800_800.jpeg\",\"/20200914_044205_SN8_L1_RGB_Changji-China_showcase_Quicklook_205_205.jpeg\",\"/20200914_044205_SN8_L1_RGB_Changji-China_showcase_Quicklook_98_98.jpeg\"],\"imageProductFormat\":\"TIFF\",\"imageHeightInPixels\":\"5001\",\"rightBottomLat\":43.9774001602467}", ImageInputVO.class);
-        //ImageTotalInputDTO dto = BeanUtil.toBean(vo, ImageTotalInputDTO.class);
-        RscpImageDataTotal rscpImageDataTotal = BeanUtil.toBean(vo, RscpImageDataTotal.class);
-//        rscpImageDataTotal.setImageResolution(rscpImageDataTotal.getImageResolution().replace("[", "{").replace("]", "}"));
-        return ObjectRestResponse.succ(baseBiz.insertSelectiveRe(rscpImageDataTotal));
+        baseBiz.aaa(vo);
+        return ObjectRestResponse.succ();
     }
 
 //   resolution