复制场景location字段

src/main/java/com/fdkankan/ucenter/httpClient/service/LaserService.java

@@ -178,7 +178,7 @@ public class LaserService {
 
 
     public void copy(String oldNum ,Long camaraId, String createTime, String newNum, Integer status,
-                     String  path, String sceneKey, String sceneName, Long userId,String version,Integer isObj,
+                     String  path, String sceneKey, Integer location, Long userId,String version,Integer isObj,
                      Integer sceneSource,String algorithmTime){
         String phone = null;
         String snCode = null;
@@ -210,6 +210,9 @@ public class LaserService {
         params.put("version",version);
         params.put("sceneSource",sceneSource);
         params.put("algorithmTime",algorithmTime);
+        if(location != null){
+            params.put("location",location);
+        }
         if(isObj == 1){
             params.put("buildObjStatus",isObj);
 

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -241,7 +241,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
             if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){  //深时复制
                 laserService.copy(oldNum,scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
-                        sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4",plusExt.getIsObj(),scenePlus.getSceneSource(),plusExt.getAlgorithmTime());
+                        sceneEditInfo.getScenePassword(),plusExt.getLocation(),scenePlus.getUserId(),"V4",plusExt.getIsObj(),scenePlus.getSceneSource(),plusExt.getAlgorithmTime());
             }else {
                 laserService.cloudPointBuild(oldNum,newNum);
             }
@@ -263,7 +263,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){  //深时复制
                     String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());
                     laserService.copy(oldNum,scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,2,laserPath,
-                            sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4",plusExt.getIsObj(),scenePlus.getSceneSource(),plusExt.getAlgorithmTime());
+                            sceneEditInfo.getScenePassword(),plusExt.getLocation(),scenePlus.getUserId(),"V4",plusExt.getIsObj(),scenePlus.getSceneSource(),plusExt.getAlgorithmTime());
                 }
                 scenePlus.setSceneStatus(-2);
                 this.updateById(scenePlus);

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -769,7 +769,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
             if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5) {  //深时复制
                 laserService.copy(oldNum,scenePro.getCameraId(),scenePro.getCreateTime(),newNum,0,null,
-                        oldEditScene.getSceneKey(),scenePro.getSceneName(),scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime());
+                        oldEditScene.getSceneKey(),null,scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime());
             }
 
             try {
@@ -802,7 +802,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5){  //深时复制
                     String laserPath = laserService.copyDataSource(oldDataSource,scenePro.getDataSource());
                     laserService.copy(oldNum,scenePro.getCameraId(),scenePro.getCreateTime(),newNum,2,laserPath,
-                            oldEditScene.getSceneKey(),scenePro.getSceneName(),scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime());
+                            oldEditScene.getSceneKey(),null,scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime());
                 }
                 scenePro.setStatus(-2);
                 this.updateById(scenePro);