فهرست منبع

全景解绑相机,绑定相机日志

lyhzzz 2 سال پیش
والد
کامیت
5df4c2924c

+ 1 - 1
src/main/java/com/fdkankan/ucenter/entity/CameraIncrementLog.java

@@ -32,7 +32,7 @@ public class CameraIncrementLog implements Serializable {
     private Long cameraId;
 
     /**
-     * 0 绑定,1未绑定
+     * 0 授权权益,1解除权益,2绑定相机,3解绑相机
      */
     @TableField("operation_type")
     private Integer operationType;

+ 2 - 0
src/main/java/com/fdkankan/ucenter/service/ICameraIncrementLogService.java

@@ -17,5 +17,7 @@ public interface ICameraIncrementLogService extends IService<CameraIncrementLog>
 
     void saveLog(Long cameraId, Long incrementId, Long userId, Integer operationType);
 
+    void saveLog(List<Long> cameraIds, Long incrementId, Long userId, Integer operationType);
+
     void saveLog(List<Long> cameraIds,String userName);
 }

+ 8 - 0
src/main/java/com/fdkankan/ucenter/service/impl/AppCameraService.java

@@ -38,6 +38,8 @@ public class AppCameraService {
     IScenePlusService scenePlusService;
     @Autowired
     IUserIncrementService userIncrementService;
+    @Autowired
+    ICameraIncrementLogService cameraIncrementLogService;
 
 
     public List<CameraAppVo> getCameraForUser(String userName, Integer cameraType) {
@@ -78,6 +80,8 @@ public class AppCameraService {
         List<Long> cameraIds = Collections.singletonList(camera.getId());
 
         cameraDetail.setUserId(user.getId());
+        cameraIncrementLogService.saveLog(camera.getId(),null,user.getId(),2);
+
         cameraDetailService.bindCamera(cameraIds,user.getId());
         sceneProService.bindOrUnCamera(cameraIds,user.getId());
         scenePlusService.bindOrUnCamera(cameraIds,user.getId());
@@ -109,6 +113,10 @@ public class AppCameraService {
         }
         List<Long> cameraIds = Collections.singletonList(camera.getId());
 
+        UserIncrement userIncrement = userIncrementService.getByCameraId(camera.getId());
+        cameraIncrementLogService.saveLog(camera.getId(),userIncrement.getId(),user.getId(),1);
+        cameraIncrementLogService.saveLog(camera.getId(),userIncrement.getId(),user.getId(),3);
+
         userIncrementService.unbindCamera(cameraIds);                   //取消关联用户权益
         cameraDetailService.unbindCamera(cameraIds);                     //取消相机用户关联
         sceneProService.bindOrUnCamera(cameraIds,null);             //取消关联场景

+ 8 - 0
src/main/java/com/fdkankan/ucenter/service/impl/CameraIncrementLogServiceImpl.java

@@ -41,6 +41,13 @@ public class CameraIncrementLogServiceImpl extends ServiceImpl<ICameraIncrementL
     }
 
     @Override
+    public void saveLog(List<Long> cameraIds, Long incrementId, Long userId, Integer operationType) {
+        for (Long cameraId : cameraIds) {
+            this.saveLog(cameraId,incrementId,userId,operationType);
+        }
+    }
+
+    @Override
     public void saveLog(List<Long> cameraIds,String userName) {
         User user = userService.getByUserName(userName);
         if(user == null){
@@ -50,6 +57,7 @@ public class CameraIncrementLogServiceImpl extends ServiceImpl<ICameraIncrementL
             UserIncrement byCameraId = userIncrementService.getByCameraId(cameraId);
             if(byCameraId != null ){
                 this.saveLog(cameraId,byCameraId.getId(),user.getId(),1);
+                this.saveLog(cameraId,byCameraId.getId(),user.getId(),3);
             }
         }
     }

+ 2 - 0
src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -270,6 +270,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
             }
         }
 
+        cameraIncrementLogService.saveLog(cameraIds,null,user.getId(),2);
+
         cameraDetailService.bindCamera(cameraIds,user.getId());
         sceneService.bindOrUnCamera(cameraIds,user.getId());
         sceneProService.bindOrUnCamera(cameraIds,user.getId());