2.2.0

src/main/java/com/fdkankan/scene/dto/ListSegParamDTO.java

@@ -6,6 +6,9 @@ import lombok.Builder;
 import lombok.Data;
 
 import lombok.NoArgsConstructor;
+
+import java.util.Set;
+
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
@@ -18,4 +21,6 @@ public class ListSegParamDTO {
 
     private String imagePath;
 
+    private Set<String> imagePaths;
+
 }

src/main/java/com/fdkankan/scene/service/impl/SceneDrawServiceImpl.java

@@ -35,6 +35,7 @@ import com.fdkankan.scene.vo.BaseSceneParamVO;
 import com.fdkankan.scene.vo.DeleteFileParamVO;
 import com.fdkankan.scene.vo.DeleteSidListParamVO;
 import com.fdkankan.web.response.ResultData;
+import org.apache.velocity.runtime.directive.contrib.For;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -235,7 +236,16 @@ public class SceneDrawServiceImpl implements ISceneDrawService {
             sortList.addAll(drawList);
         }
 
-        List<JSONObject> shapesReps = shapesHttpClient.shapesSegList(fdServiceHost, ListSegParamDTO.builder().num(num).shapeType(ShapeType.SEG_PANO.getCode()).build(), new CommonSuccessCallback(), new CommonErrorCallback()).getData();
+        String visionTxtStr = fYunFileService.getFileContent(String.format(UploadFilePath.IMG_VIEW_PATH, num) + "vision.txt");
+        JSONObject visionTxt = JSON.parseObject(visionTxtStr);
+        JSONArray sweepLocations = visionTxt.getJSONArray("sweepLocations");
+        Set<String> imagePaths = sweepLocations.stream().map(v -> {
+            JSONObject sl = (JSONObject) v;
+            return sl.getInteger("id") + ".jpg";
+        }).collect(Collectors.toSet());
+        List<JSONObject> shapesReps = shapesHttpClient.shapesSegList(fdServiceHost,
+                ListSegParamDTO.builder().num(num).shapeType(ShapeType.SEG_PANO.getCode()).imagePaths(imagePaths).build(),
+                new CommonSuccessCallback(), new CommonErrorCallback()).getData();
         if(CollUtil.isNotEmpty(shapesReps)){
             List<TagBean> shapeList = shapesReps.stream().map(v -> {
                 TagBean tagBean = new TagBean();