新增拍摄，带看角色

platform-api/src/main/java/com/platform/util/ApiBaseAction.java

@@ -7,6 +7,7 @@ import com.platform.interceptor.AuthorizationInterceptor;
 import com.platform.service.TokenService;
 import com.platform.utils.JwtUtil;
 import io.jsonwebtoken.Claims;
+import net.oschina.j2cache.redis.RedisUtils;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -50,6 +51,8 @@ public class ApiBaseAction {
     @Autowired
     protected TokenService tokenService;
 
+    public static final String REDIS_APP_LOGIN_USER_TOKEN = "zhiHouse:api:login:userToken:";               //redis新增token
+
     /**
      * 参数绑定异常
      */

platform-common/src/main/java/com/platform/service/custom/MySysUserBrandService.java

@@ -19,10 +19,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 2 * @Author: Abner
@@ -103,11 +100,13 @@ public class MySysUserBrandService extends SysUserBrandServiceImpl {
         return brands;
     }
 
-    public void reBindUser(Long fromUserId,Long userId ,String phone) {
+    public void reBindUser(Long fromUserId, Long userId , String phone, Set<Long> brandIds) {
         if ( ObjectUtils.isEmpty(fromUserId)) {
             throw new RuntimeException("参数有误！");
         }
-
+        if(brandIds.size() >0){
+            deleteByUserIdAndBrandId(fromUserId,brandIds);
+        }
         UpdateWrapper<SysUserBrand> updateWrapper = new UpdateWrapper<>();
         updateWrapper.set("user_id",userId);
         updateWrapper.set("phone_num",phone);
@@ -116,6 +115,13 @@ public class MySysUserBrandService extends SysUserBrandServiceImpl {
         update(updateWrapper);
     }
 
+    private void deleteByUserIdAndBrandId(Long fromUserId, Set<Long> brandIds) {
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.in("brand_id",brandIds);
+        wrapper.eq("user_id",fromUserId);
+        remove(wrapper);
+    }
+
     public void deleteByBrandIds(Integer[] ids) {
         QueryWrapper wrapper = new QueryWrapper();
         wrapper.in("brand_id",ids);

platform-shop/src/main/java/com/platform/controller/BrandController.java

@@ -111,13 +111,12 @@ public class BrandController extends AbstractController{
     public Result brandBindList(@RequestParam(name = "page") long page,@RequestHeader String token,
                            @RequestParam(name = "limit") long limit,String order,String sidx,
                            String sceneName,String brandName,Integer type,Integer livestreamStatus) {
-        //log.info("开始刷新列表..........."+System.currentTimeMillis());
         Long userId = null;
         //如果不是超级管理员，则只能查询本部门及子部门数据
         List<Long> roleIdList = getUser().getRoleIdList();
         if (!roleIdList.contains(1L) && !roleIdList.contains(5L)  ) {
             // 公司员工只能看到已经绑定自身为主播的数据
-            if (roleIdList.contains(8L) || roleIdList.contains(9L)) {
+            if (roleIdList.contains(8L) || roleIdList.contains(9L) || roleIdList.contains(81L)) {
                 userId = getUserId();
             }else{
                 if(ObjectUtils.isEmpty(getUser().getCompanyId())){
@@ -152,8 +151,6 @@ public class BrandController extends AbstractController{
             }
             return brandRspVo;
         }).collect(Collectors.toList());
-
-        //log.info("结束刷新列表..........."+System.currentTimeMillis());
         return Result.success(PageUtilsPlus.page(rspBrandList,resultPage));
     }
 
@@ -343,12 +340,12 @@ public class BrandController extends AbstractController{
                 return Result.success(new ArrayList<>());
             }
             params.put("deptIdList", getDeptId());
-            if(roleIds.contains(8L)){
+            if(roleIds.contains(8L) || roleIds.contains(81L)){
                 params.put("createUserId",getUser().getId());
             }
         }
         List<BrandEntity> list = brandService.queryList(params);
-        if(roleIds.contains(8L)){
+        if(roleIds.contains(8L) || roleIds.contains(81L)){
             List<BrandEntity> list2 = brandService.getBrandByUserId(getUser().getId());
             list.addAll(list2);
         }

platform-shop/src/main/java/com/platform/controller/GoodsController.java

@@ -78,7 +78,7 @@ public class GoodsController extends AbstractController{
                     return Result.success(pageUtil);
                 }
                 brandQuery.put("deptIdList", getDeptId());
-            } else if (roleIdList.contains(8L) || roleIdList.contains(2L)) {
+            } else if (roleIdList.contains(8L) || roleIdList.contains(2L) || roleIdList.contains(81L)) {
                 // 公司员工只能获取当前绑定当前用户直播间的商品数据
                 List<Long> brandIds = mySysUserBrandService.queryBrandIdList(getUserId());
                 List<Long> brandIds2 =  brandService.queryIdByUser(getUserId());

platform-shop/src/main/java/com/platform/controller/ZfbController.java

@@ -13,7 +13,9 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 @RestController
 @RequestMapping("/zfb")
@@ -37,7 +39,16 @@ public class ZfbController {
         // 获取直播间绑定信息
         List<Long> bindUsers = mySysUserBrandService.queryBrandIdList(userId);
         if (!ObjectUtils.isEmpty(bindUsers)) {
-           mySysUserBrandService.reBindUser(userId,toUserId,toUserPone);
+            Set<Long> newBinds = new HashSet<>();
+            List<Long> bindIds = mySysUserBrandService.queryBrandIdList(toUserId);
+            if(!ObjectUtils.isEmpty(bindIds) ){
+                for (Long bindUser : bindUsers) {
+                    if( bindIds.contains(bindUser)){
+                        newBinds.add(bindUser);
+                    }
+                }
+            }
+            mySysUserBrandService.reBindUser(userId,toUserId,toUserPone,newBinds);
         }
         return Result.success();
     }