Skip to content

R
rs-cloud-platform
Commit 64913f80 authored by 周健威's avatar 周健威
Browse files
Options

修改代码

parent 0d96146f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImageDataTotalController.java
View file @ 64913f80
...@@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE; import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE; import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
...@@ -64,7 +65,7 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo ...@@ -64,7 +65,7 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
@IgnoreUserToken @IgnoreUserToken
public ObjectRestResponse unauthAaaa(PageParam pageParam) { 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\":\"/rscloudmart/data/sateLLogic/20201220/20200914_044205_SN8_L1_Changji-China/20200914_044205_SN8_L1_Changji-China.zip\",\"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); // 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\":\"/rscloudmart/data/sateLLogic/20201220/20200914_044205_SN8_L1_Changji-China/20200914_044205_SN8_L1_Changji-China.zip\",\"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);
ImageInputVO vo = JSONUtil.toBean("{\"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\"],\"imageCenterPointLat\":87.2999914811909,\"imageCenterPointLon\":43.999995010329178,\"imageCenterTime\":\"2020-09-14 04:42:05\",\"imageCloudage\":0.18,\"imageEndTime\":\"2020-09-14 04:42:05\",\"imageFilePath\":\"/rscloudmart/data/sateLLogic/20200914/20200914_044205_SN8_L1_Changji-China//20200914_044205_SN8_L1_Changji-China.zip\",\"imageHeightInPixels\":5001,\"imageProductFormat\":\"TIFF\",\"imageProductTime\":\"2020-09-14 04:42:05\",\"imageProjection\":\"WGS-84\",\"imageResolution\":[1,1],\"imageSatelliteType\":\"newsat8\",\"imageSatelliteTypeDisplay\":\"newsat8\",\"imageSceneId\":\"newsat8_micro_L1_radiance_dca17df4-754d-4f02-ac65-3de4bfc66254_0_11_0\",\"imageSensorId\":\"micro\",\"imageSensorType\":\"micro\",\"imageSpectrumType\":\"{QS,DGP}\",\"imageSpectrumTypeDisplay\":\"{全色,多光谱}\",\"imageStartTime\":\"2020-09-14 04:42:05\",\"imageTakeTime\":\"2020-09-14 04:42:05\",\"imageWidthInPixels\":5001,\"leftBottomLat\":87.331065989514,\"leftBottomLon\":44.02258986041743,\"leftTopLat\":87.2689169728678,\"leftTopLon\":44.02258986041743,\"name\":\"20200914_044205_SN8_L1_Changji-China\",\"rightBottomLat\":87.331065989514,\"rightBottomLon\":43.977400160240926,\"rightTopLat\":87.2689169728678,\"rightTopLon\":43.977400160240926,\"supplier\":\"Satellogic\",\"thumbnailPath\":\"/rscloudmart/thumbnail/data/sateLLogic/20200914/20200914_044205_SN8_L1_Changji-China\"}", ImageInputVO.class); ImageInputVO vo = JSONUtil.toBean("{\"files\":[\"Fegin//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\"],\"imageCenterPointLat\":87.2999914811909,\"imageCenterPointLon\":43.999995010329178,\"imageCenterTime\":\"2020-09-14 04:42:05\",\"imageCloudage\":0.18,\"imageEndTime\":\"2020-09-14 04:42:05\",\"imageFilePath\":\"/rscloudmart/data/sateLLogic/20200914/20200914_044205_SN8_L1_Changji-China//20200914_044205_SN8_L1_Changji-China.zip\",\"imageHeightInPixels\":5001,\"imageProductFormat\":\"TIFF\",\"imageProductTime\":\"2020-09-14 04:42:05\",\"imageProjection\":\"WGS-84\",\"imageResolution\":[1,1],\"imageSatelliteType\":\"newsat8\",\"imageSatelliteTypeDisplay\":\"newsat8\",\"imageSceneId\":\"newsat8_micro_L1_radiance_dca17df4-754d-4f02-ac65-3de4bfc66254_0_11_0\",\"imageSensorId\":\"micro\",\"imageSensorType\":\"micro\",\"imageSpectrumType\":\"{QS,DGP}\",\"imageSpectrumTypeDisplay\":\"{全色,多光谱}\",\"imageStartTime\":\"2020-09-14 04:42:05\",\"imageTakeTime\":\"2020-09-14 04:42:05\",\"imageWidthInPixels\":5001,\"leftBottomLat\":87.331065989514,\"leftBottomLon\":44.02258986041743,\"leftTopLat\":87.2689169728678,\"leftTopLon\":44.02258986041743,\"name\":\"20200914_044205_SN8_L1_Changji-China\",\"rightBottomLat\":87.331065989514,\"rightBottomLon\":43.977400160240926,\"rightTopLat\":87.2689169728678,\"rightTopLon\":43.977400160240926,\"supplier\":\"Satellogic\",\"thumbnailPath\":\"/rscloudmart/thumbnail/data/sateLLogic/20200914/20200914_044205_SN8_L1_Changji-China\"}", ImageInputVO.class);
vo.clearBracket(); vo.clearBracket();
baseBiz.inStorage(vo); baseBiz.inStorage(vo);
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
...@@ -127,8 +128,8 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo ...@@ -127,8 +128,8 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
w.andEqualTo(RscpImagePrice::getStatus, SYS_TRUE); w.andEqualTo(RscpImagePrice::getStatus, SYS_TRUE);
return w; return w;
}, " daily_sort asc"); }, " daily_sort asc");
List<Long> longs = CollUtil.toList(ids.split(",")).parallelStream().map(e -> Long.valueOf(e)).collect(Collectors.toList());
List<RscpImageDataTotal> list2 = baseBiz.selectByAttrs(RscpImageDataTotal::getId, CollUtil.toList(ids.split(","))); List<RscpImageDataTotal> list2 = baseBiz.selectByAttrs(RscpImageDataTotal::getId, longs);
List<ImageDataVO> list3 = CollUtil.newArrayList(); List<ImageDataVO> list3 = CollUtil.newArrayList();
list2.forEach(t -> { list2.forEach(t -> {
ImageDataVO vo = BeanUtil.toBean(t, ImageDataVO.class); ImageDataVO vo = BeanUtil.toBean(t, ImageDataVO.class);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment