Bläddra i källkod

去除定时任务和

lyhzzz 3 år sedan
förälder
incheckning
d1f4a2af26

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/CameraController.java

@@ -69,7 +69,7 @@ public class CameraController {
     @PostMapping("/add")
     public Result add(@RequestBody JSONObject jsonObject,@RequestHeader String token){
         String username = JwtUtil.getUsername(token);
-        List<String> errorSnCode = cameraService.bind(jsonObject.getInteger("cameraType"), jsonObject.getString("snCode"), username);
+        List<String> errorSnCode = cameraService.bind( jsonObject.getString("snCode"), username);
         JSONObject object = new JSONObject();
         object.put("errorSnCode",errorSnCode);
         return Result.success(object);

+ 1 - 1
src/main/java/com/fdkankan/ucenter/service/ICameraService.java

@@ -29,7 +29,7 @@ public interface ICameraService extends IService<Camera> {
 
     void unbind(Long cameraId, String ids,String userName);
 
-    List<String> bind(Integer cameraType, String snCode, String username);
+    List<String> bind( String snCode, String username);
 
     void saveCooperationUser(String ids, Long cameraId,String resourceIds, String username);
 

+ 3 - 21
src/main/java/com/fdkankan/ucenter/service/impl/AppCameraService.java

@@ -51,30 +51,12 @@ public class AppCameraService {
     }
 
     public CameraAppVo bindCamera(String userName, String snCode) {
-        User user = userService.getByUserName(userName);
-        if(user == null){
-            throw new BusinessException(AppConstant.FAILURE_CODE_4007, AppConstant.FAILURE_MSG_4007);
-        }
+        cameraService.bind(snCode,userName);
+
         Camera camera = cameraService.getBySnCode(snCode);
-        if(camera == null){
-            throw new BusinessException(AppConstant.FAILURE_CODE_4010, AppConstant.FAILURE_MSG_4010);
-        }
         CameraDetail cameraDetail = cameraDetailService.getByCameraId(camera.getId());
-        if(cameraDetail == null){
-            throw new BusinessException(AppConstant.FAILURE_CODE_4010, AppConstant.FAILURE_MSG_4010);
-        }
-        if (cameraDetail.getUserId() != null){
-            throw new BusinessException(CameraConstant.FAILURE_CODE_6006, CameraConstant.FAILURE_MSG_6006);
-        }
-        List<Long> cameraIds = Collections.singletonList(camera.getId());
-
-        cameraDetail.setUserId(user.getId());
-        cameraDetailService.bindCamera(cameraIds,user.getId());
-        sceneProService.bindOrUnCamera(cameraIds,user.getId());
-        scenePlusService.bindOrUnCamera(cameraIds,user.getId());
         CameraAppVo responseCamera = new CameraAppVo();
-        responseCamera.setChildName(camera.getChildName());
-
+        responseCamera.setChildName(snCode);
         responseCamera.setUsedSpace(BigInteger.valueOf(cameraDetail.getUsedSpace()));
         responseCamera.setTotalSpace(BigInteger.valueOf(cameraDetail.getTotalSpace()));
         responseCamera.setUsedSpaceStr(FileSizeUtil.formatFileSize(cameraDetail.getUsedSpace()));

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

@@ -222,7 +222,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     }
 
     @Override
-    public List<String> bind(Integer cameraType, String snCodes, String username) {
+    public List<String> bind( String snCodes, String username) {
         User user = userService.getByUserName(username);
         String[] snCodeArr = snCodes.split(",");
         List<String> snCodeList = Arrays.asList(snCodeArr);