guoli

src/main/java/com/fdkankan/manage/service/impl/CameraDetailServiceImpl.java

@@ -82,7 +82,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         //恢复10G基本容量
         this.update(wrapper);
 
-        if(!"local".equals(CacheUtil.uploadType) && cameraDetail.getType() !=10 && cameraDetail.getType() !=11){
+        if( cameraDetail.getType() !=10 && cameraDetail.getType() !=11){
             sceneProService.lockOrUnLockBySpace(cameraDetail);     //封存场景
         }
         //解绑删除相机。文件夹与场景绑定关系

src/main/java/com/fdkankan/manage/service/impl/CameraServiceImpl.java

@@ -200,11 +200,6 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             }
             cameraDetail.setGoodsId(goodId);
 
-            if("local".equals(CacheUtil.uploadType)) { //本地版本 ,入库即出库，并且添加无限期会员权限
-                cameraDetail.setCountry(2);
-                cameraDetail.setOwn(2);
-                cameraDetail.setOutTime(DateUtils.getDate(new Date()));
-            }
             cameraDetailList.add(cameraDetail);
         }
         return  cameraDetailService.saveBatch(cameraDetailList) ? cameraList.size() : 0;

src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -265,12 +265,8 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         cameraIncrementLogService.saveUnbindLog(cameraId);
         LambdaUpdateWrapper<UserIncrement> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(UserIncrement::getCameraId,cameraId);
-        if("local".equals(CacheUtil.uploadType)){
-            this.remove(wrapper);
-        }else {
-            wrapper.set(UserIncrement::getCameraId,null);
-            this.update(wrapper);
-        }
+        wrapper.set(UserIncrement::getCameraId,null);
+        this.update(wrapper);
     }
 
     @Override