1111

src/main/java/com/fdkankan/openApi/controller/www/SceneMarkShapeController.java

@@ -89,7 +89,7 @@ public class SceneMarkShapeController extends BaseController
     @SaIgnore
     @GetMapping("/getShapBox")
     @ValidateApi(method = "scene:getShapBox")
-    public ResultData getShapBox(@RequestParam("num") String num) {
+    public ResultData getShapBox(@RequestParam("num") String num, @RequestParam("showOrig") Integer showOrig) {
         this.checkScene(num);
         return ResultData.ok(sceneMarkShapeBoxService.getShapBox(num));
     }

src/main/java/com/fdkankan/openApi/service/www/ISceneMarkShapeBoxService.java

@@ -23,7 +23,7 @@ public interface ISceneMarkShapeBoxService extends IService<SceneMarkShapeBox> {
 
     void saveExternalBox(SceneJsonDTO param);
 
-    Map<String, Object> getShapBox(String num);
+    Map<String, Object> getShapBox(String num, Integer showOrig);
 
 //    String covertToShapeBox(String sceneNum);
 }

src/main/java/com/fdkankan/openApi/service/www/impl/SceneMarkShapeBoxServiceImpl.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -89,17 +90,28 @@ public class SceneMarkShapeBoxServiceImpl extends ServiceImpl<MarkShapeBoxMapper
     }
 
     @Override
-    public Map<String, Object> getShapBox(String num) {
+    public Map<String, Object> getShapBox(String num, Integer showOrig) {
         SceneMarkShapeBox sceneMarkShapeBox = this.findBySceneNum(num);
         if(Objects.isNull(sceneMarkShapeBox)){
             return null;
         }
         Map<String, Object> result = new HashMap<>();
         result.put("boundingBox", sceneMarkShapeBox.getBoundingBox());
-        if(Objects.nonNull(sceneMarkShapeBox.getExternalBoxes())){
-            result.put("result", sceneMarkShapeBox.getExternalBoxes());
-        }else {
-            result.put("result", sceneMarkShapeBox.getBoxes());
+        if(Objects.nonNull(showOrig) && showOrig == 1){
+            List<SceneMarkShape> shapes = sceneMarkShapeService.findByNum(num);
+            List<Map<String, Object>> shapeList = shapes.stream().map(v -> {
+                Map<String, Object> map = new HashMap<>();
+                map.put("imagePath", v.getImagePath());
+                map.put("shapes", v.getShapes());
+                return map;
+            }).collect(Collectors.toList());
+            result.put("result", shapeList);
+        }else{
+            if(Objects.nonNull(sceneMarkShapeBox.getExternalBoxes())){
+                result.put("result", sceneMarkShapeBox.getExternalBoxes());
+            }else {
+                result.put("result", sceneMarkShapeBox.getBoxes());
+            }
         }
         return result;
     }