Skip to content

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

修改代码

parent f10b3385
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 10 deletions
ace-common/src/main/java/com/upyuns/platform/rs/gtdata/GtDataRestClient.java
View file @ 953a7154
......@@ -1627,6 +1627,28 @@ public class GtDataRestClient {
}
/**
*
* Description： 子用户登陆并更新认证信息
*
*/
protected void sonUserlogin() throws GtDataRestException {
Map<String, Object> tokenMap = getToken();
defaultToken = (String) tokenMap.get("token");
defaultTime = (String) tokenMap.get("time");
if (200 != (Integer) tokenMap.get("HttpStatusCode")) {
throw new GtDataRestException((String) tokenMap.get("errorCode"));
}
Map<String, Object> loginMap = login(defaultToken, defaultTime);
defaultTime = (String) loginMap.get("time");
defaultSign = (String) loginMap.get("sign");
if (200 != (Integer) loginMap.get("HttpStatusCode")) {
throw new GtDataRestException((String) loginMap.get("errorCode"));
}
}
/**
*
* Description： 更新认证信息
......
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImageDataTotalController.java
View file @ 953a7154
......@@ -63,7 +63,7 @@ public class RscpImageDataTotalController extends BaseController<RscpImageDataTo
@RequestMapping(value = "/app/unauth/aaa", method = RequestMethod.GET)
@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);
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);
baseBiz.aaa(vo);
return ObjectRestResponse.succ();
}
......
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/ShoppingCartInfoBiz.java
View file @ 953a7154
......@@ -127,7 +127,8 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
ImageDataVO imageDataVO = imageDataVOList.get(0);
ShoppingCartInfo old = selectByUser(appUserDTO.getUserid(), Long.valueOf(imageDataVO.getId()));
if (old != null) {
return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
return ObjectRestResponse.succ();
//return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
} else {
ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo();
shoppingCartInfo.setDetailId(Long.valueOf(imageDataVO.getId()));
......@@ -158,7 +159,8 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
if (imageImgStorage != null) {
ShoppingCartInfo old = selectByUser(appUserDTO.getUserid(), Long.valueOf(imageImgStorage.getId()));
if (old != null) {
return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
return ObjectRestResponse.succ();
//return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
} else {
ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo();
shoppingCartInfo.setDetailId(Long.valueOf(imageImgStorage.getId()));
......@@ -192,7 +194,8 @@ public class ShoppingCartInfoBiz extends BaseBiz<ShoppingCartInfoMapper, Shoppin
if (industryApplicationInfo != null) {
ShoppingCartInfo old = selectByUser(appUserDTO.getUserid(), Long.valueOf(industryApplicationInfo.getId()));
if (old != null) {
return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
return ObjectRestResponse.succ();
//return ObjectRestResponse.createFailedResult(ResultCode.ORDER_GOODS_EXIST, ResultCode.getMsg(ResultCode.ORDER_GOODS_EXIST));
} else {
ShoppingCartInfo shoppingCartInfo = new ShoppingCartInfo();
shoppingCartInfo.setDetailId(Long.valueOf(industryApplicationInfo.getId()));
......
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/job/WebsiteScheduleTask.java
View file @ 953a7154
......@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.upyuns.platform.rs.datacenter.fegin.DatacenterFeign;
import com.upyuns.platform.rs.datacenter.pojo.ImageDataVO;
import com.upyuns.platform.rs.gtdata.GtDataRestClient;
import com.upyuns.platform.rs.website.biz.ImageInfoRelationBiz;
import com.upyuns.platform.rs.website.biz.IndustryApplicationInfoBiz;
import com.upyuns.platform.rs.website.biz.OrderInfoBiz;
......@@ -28,9 +29,9 @@ import java.util.stream.Collectors;
import static com.upyuns.platform.rs.website.entity.OrderInfo.SENDTYPE_OL;
import static com.upyuns.platform.rs.website.type.OrderStatusEnum.ORDER_PAID;
@Configuration //1.主要用于标记配置类，兼备Component的效果。
@EnableScheduling // 2.开启定时任务
@Slf4j
//@Configuration //1.主要用于标记配置类，兼备Component的效果。
//@EnableScheduling // 2.开启定时任务
//@Slf4j
public class WebsiteScheduleTask {
@Autowired
......@@ -48,6 +49,9 @@ public class WebsiteScheduleTask {
@Autowired
DatacenterFeign datacenterFeign;
@Autowired
GtDataRestClient gtDataRestClient;
public static final int ITEM_STANDARD_DATA = ItemTypeEnum.STANDARD_DATA.getType();
public static final int ITEM_INDUSTRY_INFO = ItemTypeEnum.INDUSTRY_INFO.getType();
public static final int ITEM_IMAGE_STORAGE = ItemTypeEnum.IMAGE_STORAGE.getType();
......@@ -67,6 +71,11 @@ public class WebsiteScheduleTask {
});
list.forEach(orderInfo -> {
String innerOrderPath = "/order/"+orderInfo.getOrderNo()+ "/";
String orderPath = "/"+ orderInfo.getUserId()+ innerOrderPath;
//创建订单文件夹
gtDataRestClient.mkdirOnly("/"+ orderInfo.getUserId()+ "/order/"+orderInfo.getOrderNo());
List<OldeliveryJson> jsons = CollUtil.newArrayList();
List<OrderItem> items = orderItemBiz.selectList(new OrderItem(){{
setOrderId(orderInfo.getOrderId());
......@@ -75,22 +84,36 @@ public class WebsiteScheduleTask {
if(ITEM_STANDARD_DATA == it.getType()) {
List<ImageDataVO> imageDataVOS = datacenterFeign.queryByIds(it.getDetailId()+ "").getData();
imageDataVOS.forEach(vo -> {
//拷贝文件
Integer fileFlag = vo.getImageFilePath().lastIndexOf("/")+ 1;
String fileName = vo.getImageFilePath().substring(fileFlag);
gtDataRestClient.copy(vo.getImageFilePath(), orderPath+ fileName);
jsons.add(new OldeliveryJson(){{
setName(vo.getName());
setPath(vo.getImageFilePath());
setPath(innerOrderPath+ fileName);
}});
});
}else if(ITEM_INDUSTRY_INFO == it.getType()) {
IndustryApplicationInfo iai = industryApplicationInfoBiz.selectById(it.getDetailId().intValue());
//拷贝文件
Integer fileFlag = iai.getSourceFile().lastIndexOf("/")+ 1;
String fileName = iai.getSourceFile().substring(fileFlag);
gtDataRestClient.copy(iai.getSourceFile(), orderPath+ fileName);
jsons.add(new OldeliveryJson(){{
setName(it.getName());
setPath(iai.getSourceFile());
setPath(innerOrderPath+ fileName);
}});
}else if(ITEM_IMAGE_STORAGE == it.getType()) {
ImageInfoRelation iir = imageInfoRelationBiz.selectById(it.getDetailId().intValue());
//拷贝文件
Integer fileFlag = iir.getUrl().lastIndexOf("/")+ 1;
String fileName = iir.getUrl().substring(fileFlag);
gtDataRestClient.copy(iir.getUrl(), orderPath+ fileName);
jsons.add(new OldeliveryJson(){{
setName(it.getName());
setPath(iir.getFileWidth());
setPath(innerOrderPath+ fileName);
}});
}
});
......
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