Prechádzať zdrojové kódy

局域网版解绑相机,删除相机权益

lyhzzz 2 rokov pred
rodič
commit
0201c941e4

+ 4 - 1
src/main/java/com/fdkankan/manage/service/impl/CameraDetailServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.Constant;
+import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
@@ -81,7 +82,9 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         wrapper.set(CameraDetail::getTotalSpace,Long.parseLong(Constant.EXPANSION_SPACE_VALUE_1G ) * 10L);
         this.update(wrapper);
 
-        sceneProService.lockOrUnLockBySpace(cameraDetail,cameraId,-2);     //封存场景
+        if(!"local".equals(CacheUtil.uploadType)){
+            sceneProService.lockOrUnLockBySpace(cameraDetail,cameraId,-2);     //封存场景
+        }
 
     }
 

+ 0 - 1
src/main/java/com/fdkankan/manage/service/impl/CameraVersionServiceImpl.java

@@ -186,7 +186,6 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
                         .eq(CameraVersion::getType,param.getType());
                 this.update(updateWrapper);
             }
-            cameraVersion.setStatus(param.getStatus());
             this.updateById(param);
             return;
         }

+ 9 - 3
src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.exception.BusinessException;
@@ -171,9 +172,14 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     @Override
     public void unbindCamera(Long cameraId) {
         LambdaUpdateWrapper<UserIncrement> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.set(UserIncrement::getCameraId,null)
-                .eq(UserIncrement::getCameraId,cameraId);
-        this.update(wrapper);
+        wrapper.eq(UserIncrement::getCameraId,cameraId);
+        if("local".equals(CacheUtil.uploadType)){
+            this.remove(wrapper);
+        }else {
+            wrapper.set(UserIncrement::getCameraId,null);
+            this.update(wrapper);
+        }
+
     }
 
     @Override