wurui 4 nedēļas atpakaļ
vecāks
revīzija
1a8c8c5de3

+ 4 - 0
orbit-base-biz/base-biz-service/src/main/java/com/base/biz/model/dto/response/TargetDemandDTO.java

@@ -38,6 +38,10 @@ public class TargetDemandDTO {
     private String InvestigativeMeans;
     @ApiModelProperty("卫星ID")
     private String satelliteSelected;
+
+    @ApiModelProperty("卫星ID")
+    private List<String> satelliteIds;
+
     @ApiModelProperty("唯一标识")
     private String parentId;
     @ApiModelProperty

+ 4 - 0
orbit-base-biz/base-biz-service/src/main/java/com/base/biz/service/TargetDemandService.java

@@ -2,6 +2,7 @@ package com.base.biz.service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.base.api.client.PointRpcService;
@@ -116,6 +117,9 @@ public class TargetDemandService extends ServiceImpl<TargetDemandMapper, TargetD
         pointQueryWrapper.in("target_id", targetIds);
         List<SceneTargetPoint> sceneTargetPoints = sceneTargetPointMapper.selectList(pointQueryWrapper);
         for (TargetDemandDTO targetDemandDTO : targetDemandDTOS) {
+            List<SatelliteIdAndPayloadDTO> satelliteIdAndPayloadDTOS= JSONObject.parseArray(targetDemandDTO.getSatelliteSelected(),SatelliteIdAndPayloadDTO.class);
+            List<String> satelliteIds=satelliteIdAndPayloadDTOS.stream().map(SatelliteIdAndPayloadDTO::getSatelliteId).collect(Collectors.toList());
+            targetDemandDTO.setSatelliteIds(satelliteIds);
             //  点目标集合
             List<PointDTO> pointDTOList = new ArrayList<>();
             //  根据目标id匹配点目标