迁移按钮控制

src/main/java/com/fdkankan/manage_jp/entity/ScenePlusExt.java

@@ -176,5 +176,6 @@ public class ScenePlusExt implements Serializable {
     @TableField("is_obj")
     private Integer isObj;
 
-
+    @TableField("location")
+    private Integer location;
 }

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

@@ -122,7 +122,8 @@ 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, Long userId,String version,
+                     String oldNum,String algorithmTime,Integer sceneSource,Integer shootCount,Integer location,Integer isObj ){
         String phone = null;
         String snCode = null;
         if(userId != null){
@@ -138,14 +139,24 @@ public class LaserService {
         params.put("createTime", createTime);
         params.put("phone", phone);
         params.put("sceneCode", newNum);
+        params.put("oldSceneCode", oldNum);
         params.put("snCode",snCode);
         params.put("status", status);
         params.put("password", sceneKey);
-        params.put("title", sceneName);
+        //params.put("title", sceneName);
         params.put("userId", userId);
         params.put("isCopy", true);
         params.put("path",path);
         params.put("version",version);
+        params.put("sceneSource",sceneSource);
+        params.put("algorithmTime",algorithmTime);
+        params.put("shootCount",shootCount);
+        if(location != null){
+            params.put("location",location);
+        }
+        if(isObj == 1){
+            params.put("buildObjStatus",isObj);
+        }
         Result result = laserClient.saveOrEdit(newNum, params);
         if( result.getCode() != HttpStatus.OK.value()){
             log.error("激光场景状态同步失败!");

src/main/java/com/fdkankan/manage_jp/service/impl/SceneCommonService.java

@@ -269,7 +269,8 @@ public class SceneCommonService {
 
             if(scenePlus.getSceneSource() == 4){  //深时复制
                 laserService.copy(scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
-                        sceneEditInfo.getScenePassword(),scenePlus.getTitle(),scenePlus.getUserId(),"V4");
+                        sceneEditInfo.getScenePassword(),scenePlus.getUserId(),"V4",
+                        oldNum,plusExt.getAlgorithm(),scenePlus.getSceneSource(),plusExt.getShootCount(),plusExt.getLocation(),plusExt.getIsObj());
             }else {
                 laserService.cloudPointBuild(oldNum,newNum);
             }
@@ -290,7 +291,8 @@ public class SceneCommonService {
             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.getUserId(),"V4",
+                        oldNum,plusExt.getAlgorithm(),scenePlus.getSceneSource(),plusExt.getShootCount(),plusExt.getLocation(),plusExt.getIsObj());
             }
             scenePlus.setSceneStatus(-2);
             scenePlusService.updateById(scenePlus);
@@ -357,7 +359,8 @@ public class SceneCommonService {
 
             if(scenePro.getSceneSource() == 4){  //深时复制
                 laserService.copy(scenePro.getCameraId(),scenePro.getCreateTime(),newNum,0,null,
-                        oldEditScene.getSceneKey(),scenePro.getSceneName(),scenePro.getUserId(),"V3");
+                        oldEditScene.getSceneKey(),scenePro.getUserId(),"V3",
+                        oldNum,scenePro.getAlgorithm(),scenePro.getSceneSource(),scenePro.getShootCount(),null,scenePro.getIsObj());
             }
             /*
              *cp oss nas
@@ -393,7 +396,9 @@ public class SceneCommonService {
             if(scenePro.getSceneSource() == 4){  //深时复制
                 String laserPath = laserService.copyDataSource(oldDataSource,scenePro.getDataSource());
                 laserService.copy(scenePro.getCameraId(),scenePro.getCreateTime(),newNum,2,laserPath,
-                        oldEditScene.getSceneKey(),scenePro.getSceneName(),scenePro.getUserId(),"V3");
+                        oldEditScene.getSceneKey(),scenePro.getUserId(),"V3",
+                        oldNum,scenePro.getAlgorithm(),scenePro.getSceneSource(),scenePro.getShootCount(),null,scenePro.getIsObj());
+
             }
             scenePro.setStatus(-2);
             sceneProService.updateById(scenePro);

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

@@ -132,6 +132,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         Set<Long> roleIds = userRoleService.getByUser(user);
         List<String> numList = new ArrayList<>();
+        List<String> cooNumList = new ArrayList<>();
         if(!roleIds.contains(5L)){      //平台管理员
             param.setCompanyId(user.getCompanyId());
             param.setUserId(user.getId());
@@ -147,10 +148,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         Page<SceneVo> page  = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         List<String> sceneNumList = page.getRecords().stream().map(SceneVo::getNum).collect(Collectors.toList());
-        if(roleIds.contains(5L)){      //平台管理员
-            if(!sceneNumList.isEmpty()){
-                numList = tmContractorNumService.getNumList(sceneNumList);
-            }
+        if(!sceneNumList.isEmpty()){
+            cooNumList =  tmContractorNumService.getNumList(sceneNumList);
         }
         HashMap<String,JSONObject> ssSceneMap = new HashMap<>();
         if(param.getType() == 2){
@@ -184,9 +183,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 record.setIsMain(false);
                 record.setIsDel(false);
                 record.setIsDownload(false);
-                record.setIsMigrate(false);
             }
-            if(roleIds.contains(5L) && numList != null && numList.contains(record.getNum())){
+            if(cooNumList != null && cooNumList.contains(record.getNum())){
                 record.setIsMigrate(false);
             }
             if(coldMap.get(record.getNum())!=null){