1

src/main/java/com/fdkankan/ucenter/constant/CameraConstant.java

@@ -21,7 +21,7 @@ public class CameraConstant {
     public static final String FAILURE_MSG_6005 = "无权操作该相机";
 
     public static final int FAILURE_CODE_6006 = 6006;
-    public static final String FAILURE_MSG_6006 = "不支持重复绑定";
+    public static final String FAILURE_MSG_6006 = "该相机已被绑定";
 
     public static final int FAILURE_CODE_6007 = 6007;
     public static final String FAILURE_MSG_6007 = "八目相机不支持解除绑定";

src/main/java/com/fdkankan/ucenter/service/impl/AppCameraService.java

@@ -81,7 +81,7 @@ public class AppCameraService {
 //            throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
 //        }
         if(cameraDetail.getCompanyId()!=null){
-            throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
+            throw new BusinessException(CameraConstant.FAILURE_CODE_6006, CameraConstant.FAILURE_MSG_6006);
         }
         List<Long> cameraIds = Collections.singletonList(camera.getId());
 

src/main/java/com/fdkankan/ucenter/service/impl/UserServiceImpl.java

@@ -70,6 +70,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     ICameraSpaceService cameraSpaceService;
     @Autowired
     ICompanyService companyService;
+    @Autowired
+    IUserRoleService userRoleService;
 
     private User getByEmail(String email){
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
@@ -114,6 +116,11 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         userEntity.setCreateTime(DateUserUtil.getDate(new Date()));
         userEntity.setUpdateTime(DateUserUtil.getDate(new Date()));
         this.save(userEntity);
+
+        UserRole userRole = new UserRole();
+        userRole.setUserId(userEntity.getId());
+        userRole.setRoleId(6L);
+        userRoleService.save(userRole);
     }
 
     @Override