dengsixing недель назад: 3
Родитель
Сommit
523e5fc2ae

+ 21 - 0
src/main/java/com/fdkankan/scene/dto/ListSegParamDTO.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.dto;
+
+import com.fdkankan.scene.vo.BaseSceneParamVO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+import lombok.NoArgsConstructor;
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class ListSegParamDTO {
+
+    private String num;
+
+    private String shapeType;
+
+    private String imagePath;
+
+}

+ 33 - 0
src/main/java/com/fdkankan/scene/enums/ShapeType.java

@@ -0,0 +1,33 @@
+package com.fdkankan.scene.enums;
+
+/**
+ * 用户状态
+ * 
+ * @author fdkk
+ */
+public enum ShapeType
+{
+    SEG_PANO("seg_pano", "全景图SEG"),
+    DETECT_PLY("detect_ply", "平面图DECT"),
+    OBB_PANO("obb_pano", "全景图OBB")
+    ;
+
+    private final String code;
+    private final String info;
+
+    ShapeType(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

+ 2 - 1
src/main/java/com/fdkankan/scene/httpclient/ShapesHttpClient.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.dtflys.forest.annotation.*;
 import com.dtflys.forest.callback.OnError;
 import com.dtflys.forest.callback.OnSuccess;
+import com.fdkankan.scene.dto.ListSegParamDTO;
 import com.fdkankan.scene.httpclient.callback.CommonErrorCallback;
 import com.fdkankan.scene.httpclient.callback.CommonSuccessCallback;
 import com.fdkankan.scene.httpclient.callback.CommonSuccessCondition;
@@ -19,7 +20,7 @@ import java.util.List;
 public interface ShapesHttpClient {
 
     @Post("${host}/service/shapes/seg/list")
-    ResultData<List<JSONObject>> shapesSegList(@Var("host") String host, @JSONBody BaseSceneParamVO param,OnSuccess onSuccess, OnError onError);
+    ResultData<List<JSONObject>> shapesSegList(@Var("host") String host, @JSONBody ListSegParamDTO param, OnSuccess onSuccess, OnError onError);
 
 //    @Post("${host}/service/manage/inner/traceEvidenceInfoList")
 //    ResultData traceEvidenceInfoList(@Var("host") String host, @Header("token") String token, @JSONBody TraceEvidenceInfoListParamVo param);

+ 3 - 3
src/main/java/com/fdkankan/scene/service/impl/SceneDrawServiceImpl.java

@@ -21,9 +21,11 @@ import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.bean.TagBean;
+import com.fdkankan.scene.dto.ListSegParamDTO;
 import com.fdkankan.scene.entity.SceneEditInfoExt;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.ScenePlusExt;
+import com.fdkankan.scene.enums.ShapeType;
 import com.fdkankan.scene.httpclient.ShapesHttpClient;
 import com.fdkankan.scene.httpclient.callback.CommonErrorCallback;
 import com.fdkankan.scene.httpclient.callback.CommonSuccessCallback;
@@ -208,9 +210,7 @@ public class SceneDrawServiceImpl implements ISceneDrawService {
             sortList.addAll(drawList);
         }
 
-        BaseSceneParamVO sceneParamVO = new BaseSceneParamVO();
-        sceneParamVO.setNum(num);
-        List<JSONObject> shapesReps = shapesHttpClient.shapesSegList(fdServiceHost, sceneParamVO, new CommonSuccessCallback(), new CommonErrorCallback()).getData();
+        List<JSONObject> shapesReps = shapesHttpClient.shapesSegList(fdServiceHost, ListSegParamDTO.builder().num(num).shapeType(ShapeType.SEG_PANO.getCode()).build(), new CommonSuccessCallback(), new CommonErrorCallback()).getData();
         if(CollUtil.isNotEmpty(shapesReps)){
             List<TagBean> shapeList = shapesReps.stream().map(v -> {
                 TagBean tagBean = new TagBean();