Merge branch 'feature-迪维-dsx' into test

src/main/java/com/fdkankan/openApi/dto/SceneJsonDTO.java

@@ -17,7 +17,7 @@ public class SceneJsonDTO {
     private String num;
 
     @NotEmpty(message = "数据不能为空")
-    private List<JSONObject> data;
+    private JSONObject data;
 
 
 

src/main/java/com/fdkankan/openApi/entity/www/SceneMarkShapeBox.java

@@ -53,5 +53,5 @@ public class SceneMarkShapeBox implements Serializable {
 
       //第三方
       @TableField(typeHandler = FastjsonTypeHandler.class, value = "external_boxes")
-      private List<JSONObject> externalBoxes;
+      private JSONObject externalBoxes;
 }

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

@@ -63,9 +63,10 @@ public class SceneMarkShapeBoxServiceImpl extends ServiceImpl<MarkShapeBoxMapper
         SceneMarkShapeBoxPostDTO sceneMarkShapeBoxPostVO =new SceneMarkShapeBoxPostDTO(sceneNum,sceneMarkShapes);
         ResultData res = shapesBoxClient.post(planeCovertBasePathUrl + planeCovert, JSONObject.toJSONString(sceneMarkShapeBoxPostVO));
         log.info("请求node转换服务-{}",res);
+        SceneMarkShapeBox data = null;
         if (res.getCode()==200){
             JSONObject resData = (JSONObject)res.getData();
-            SceneMarkShapeBox data= JSONObject.parseObject(resData.toJSONString(),SceneMarkShapeBox.class);
+            data = JSONObject.parseObject(resData.toJSONString(),SceneMarkShapeBox.class);
             SceneMarkShapeBox sceneMarkShapeBox = findBySceneNum(sceneNum);
             if (ObjectUtil.isNotNull(sceneMarkShapeBox)){
                 log.info("存在shapesBox数据进行替换");
@@ -79,7 +80,7 @@ public class SceneMarkShapeBoxServiceImpl extends ServiceImpl<MarkShapeBoxMapper
                 return data;
             }
         }
-        return null;
+        return data;
     }
 
     @Override