浏览代码

深时复制添加参数IsOBj

lyhzzz 2 年之前
父节点
当前提交
3f9a23f54a

+ 5 - 1
src/main/java/com/fdkankan/ucenter/httpClient/service/LaserService.java

@@ -177,7 +177,7 @@ public class LaserService {
 
 
     public void copy(Long camaraId, String createTime, String newNum, Integer status,
-                     String  path, String sceneKey, String sceneName, Long userId,String version){
+                     String  path, String sceneKey, String sceneName, Long userId,String version,Integer isObj){
         String phone = null;
         String snCode = null;
         if(userId != null){
@@ -201,6 +201,10 @@ public class LaserService {
         params.put("isCopy", true);
         params.put("path",path);
         params.put("version",version);
+        if(isObj == 1){
+            params.put("buildObjStatus",isObj);
+
+        }
         Result result = laserClient.saveOrEdit(newNum, params);
         if( result.getCode() != HttpStatus.OK.value()){
             log.error("激光场景状态同步失败!");

+ 2 - 2
src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -250,7 +250,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
                 if(scenePlus.getSceneSource() == 4){  //深时复制
                     laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
-                            sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4");
+                            sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4",plusExt.getIsObj());
                 }
 
                 List<Surveillance> list = surveillanceService.list(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, num));
@@ -311,7 +311,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 if(scenePlus.getSceneSource() == 4){  //深时复制
                     String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());
                     laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,2,laserPath,
-                            sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4");
+                            sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4",plusExt.getIsObj());
                 } else if(!"aws".equals(NacosProperty.uploadType)){
                     laserService.cloudPointBuild(num,newNum);
                 }

+ 2 - 2
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -752,7 +752,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         this.save(oldScene);
         if(oldScene.getSceneSource() == 4){  //深时复制
             laserService.copy(oldScene.getCameraId(),oldScene.getCreateTime(),newNum,0,null,
-                    oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId(),"V3");
+                    oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId(),"V3",oldScene.getIsObj());
         }
         //更新video
         Map map = new HashMap();
@@ -828,7 +828,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 if(oldScene.getSceneSource() == 4){  //深时复制
                     String laserPath = laserService.copyDataSource(preDataSource,oldScene.getDataSource());
                     laserService.copy(oldScene.getCameraId(),oldScene.getCreateTime(),newNum,2,laserPath,
-                            oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId(),"V3");
+                            oldEditScene.getSceneKey(),oldScene.getSceneName(),oldScene.getUserId(),"V3",oldScene.getIsObj());
                 }
                 sceneCopyLogService.saveByNum(oldNum,newNum,oldScene.getUserId());