浏览代码

深时迁移,移动laserData文件,更新dataSource

lyhzzz 2 年之前
父节点
当前提交
b25c8a9c14

+ 1 - 0
src/main/java/com/fdkankan/manage/httpClient/param/LaserSceneMoveParam.java

@@ -10,4 +10,5 @@ public class LaserSceneMoveParam {
     private String snCode;
     private String toSnCode;
     private Long userId;
+    private String dataSource;
 }

+ 2 - 1
src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -196,12 +196,13 @@ public class LaserService {
         }
     }
 
-    public void move(String num, String snCode, String toSnCode,Long userId) {
+    public void move(String num, String snCode, String toSnCode,Long userId,String newDataSource) {
         LaserSceneMoveParam param = new LaserSceneMoveParam();
         param.setSceneCode(num);
         //param.setSnCode(snCode);
         param.setToSnCode(toSnCode);
         param.setUserId(userId);
+        param.setDataSource(newDataSource);
         if(userId != null){
             User user = userService.getById(userId);
             if(user != null){

+ 16 - 3
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -424,6 +424,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             throw new BusinessException(ResultCode.MOVE_ERROR_COPY);
         }
 
+        if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11) {       //深时场景
+            //迁移深时 dataSource
+            File file = new File(dataSource + "_laserData/laserData");
+            if (!file.exists()) {
+                throw new BusinessException(ResultCode.MOVE_ERROR);
+            }
+        }
 
         Long oldUseSpace = oldCameraDetail.getUsedSpace() - space < 0 ? 0 : oldCameraDetail.getUsedSpace() - space;
         oldCameraDetail.setUsedSpace(oldUseSpace);
@@ -465,10 +472,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         //协作相机
         sceneResourceCameraService.setCooperationUser(cameraDetail,param.getNum());
+
+        String newDataSource = updateFdageNewDataSource(scenePro, scenePlus, oldCamera.getSnCode(), param.getSnCode(), dataSource);
+
         if(cameraDetail.getType() == 10 || cameraDetail.getType() == 11){       //深时场景
-            laserService.move(param.getNum(),oldCamera.getSnCode(),camera.getSnCode(),cameraDetail.getUserId());
+            //迁移深时 dataSource
+            FileUtil.move(new File(dataSource +"_laserData/laserData"),new File(newDataSource+"_laserData/laserData"),true);
+            laserService.move(param.getNum(),oldCamera.getSnCode(),camera.getSnCode(),cameraDetail.getUserId(),newDataSource);
         }
-        updateFdageNewDataSource(scenePro,scenePlus,oldCamera.getSnCode(),param.getSnCode(),dataSource);
+
     }
 
 
@@ -492,7 +504,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     /**
      * 兼容,之前迁移,不使用旧snCode 替换新snCode。重写文件
      */
-    public void updateFdageNewDataSource(ScenePro scenePro,ScenePlus scenePlus,String oldSnCode,String newSnCode,String dataSource) {
+    public String updateFdageNewDataSource(ScenePro scenePro,ScenePlus scenePlus,String oldSnCode,String newSnCode,String dataSource) {
         String localPathFdage = null;
         try {
             newSnCode = newSnCode.toLowerCase();
@@ -520,6 +532,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 fYunFileServiceInterface.deleteFolder(oldFdagePaht);
             }
             sceneMoveLogService.saveLog(scenePro,scenePlus,oldSnCode,newSnCode,dataSource,newDataSource, fileContent);
+            return newDataSource;
         }catch (Exception e){
             log.error("updateFdage-error:oldSnCode:{},newSnCode:{},dataSource:{}",oldSnCode,newSnCode,dataSource);
             log.error("updateFdage-error:",e);

+ 0 - 4
src/main/java/com/fdkankan/manage/service/impl/SysUserServiceImpl.java

@@ -45,10 +45,6 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
     @Autowired
     private ISysRoleService roleService;
     @Autowired
-    private ISysMenuService menuService;
-    @Autowired
-    private RedisUtil redisUtil;
-    @Autowired
     private ISysMenuService sysMenuService;
 
     @Override