lyhzzz 2 éve
szülő
commit
1c99f13a7a

+ 4 - 0
src/main/java/com/fdkankan/manage/httpClient/client/FdKKClient.java

@@ -3,6 +3,7 @@ package com.fdkankan.manage.httpClient.client;
 import com.alibaba.fastjson.JSONObject;
 import com.dtflys.forest.annotation.Address;
 import com.dtflys.forest.annotation.Get;
+import com.dtflys.forest.annotation.Header;
 import com.dtflys.forest.annotation.Query;
 import com.fdkankan.manage.httpClient.address.FdkkAddressSource;
 
@@ -17,4 +18,7 @@ public interface FdKKClient {
 
     @Get("/api/scene/file/rebuildScene")
     JSONObject rebuildScene( @Query HashMap<String, Object> param);
+
+    @Get("/ucerter/_manage/_copy_scene")
+    JSONObject copyScene( @Query HashMap<String, Object> param ,@Header("sign") String sign);
 }

+ 13 - 7
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -11,6 +11,7 @@ import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.util.*;
+import com.fdkankan.manage.httpClient.client.FdKKClient;
 import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.util.CreateObjUtilSelf;
 import com.fdkankan.manage.util.MangerUploadToOssUtil;
@@ -28,6 +29,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import javax.annotation.Resource;
 import java.io.File;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -69,6 +71,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     IScenePlusExtService scenePlusExtService;
     @Autowired
     LaserService laserService;
+    @Resource
+    FdKKClient fdKKClient;
 
 
     @Value("${main.url}")
@@ -318,15 +322,17 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(detailEntity == null){
             throw new BusinessException(CameraConstant.FAILURE_CODE_6029, CameraConstant.FAILURE_MSG_6029);
         }
-        String newNum = scene3dNumService.generateSceneNum(detailEntity.getType());
 
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("num",sceneNum);
+        fdKKClient.copyScene(param,"m_a_n_a_g_e");
 
-        if(scenePro !=null){        //v3场景复制
-            this.copyV3Scene(scenePro,newNum,detailEntity,camera.getSnCode());
-        }
-        if(scenePlus != null){      //v4场景复制
-            scenePlusService.copyV4Scene(scenePlus,newNum,detailEntity,camera.getSnCode());
-        }
+//        if(scenePro !=null){        //v3场景复制
+//            this.copyV3Scene(scenePro,newNum,detailEntity,camera.getSnCode());
+//        }
+//        if(scenePlus != null){      //v4场景复制
+//            scenePlusService.copyV4Scene(scenePlus,newNum,detailEntity,camera.getSnCode());
+//        }
     }
 
     @Override