zyp

fs-qwhook/src/main/java/com/fs/app/controller/AppBaseController.java

@@ -1,54 +0,0 @@
-package com.fs.app.controller;
-
-
-import com.fs.app.exception.FSException;
-import com.fs.app.utils.JwtUtils;
-import com.fs.common.core.redis.RedisCache;
-import com.fs.common.utils.ServletUtils;
-import com.fs.company.domain.CompanyUser;
-import com.fs.company.service.ICompanyUserService;
-import com.fs.store.domain.FsUser;
-import com.fs.store.service.IFsUserService;
-import io.jsonwebtoken.Claims;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-public class AppBaseController {
-	@Autowired
-	JwtUtils jwtUtils;
-	@Autowired
-	RedisCache redisCache;
-
-	@Autowired
-	private ICompanyUserService companyUserService;
-	@Autowired
-	private IFsUserService userService;
-	public Long getCompanyId() {
-		String headValue =  ServletUtils.getRequest().getHeader("APPToken");
-		Claims claims=jwtUtils.getClaimByToken(headValue);
-		String userId = claims.getSubject().toString();
-		Long companyId =(Long)redisCache.getCacheObject("companyId:"+userId);
-		return companyId;
-	}
-	public String getUserId()
-	{
-		String headValue =  ServletUtils.getRequest().getHeader("APPToken");
-		Claims claims=jwtUtils.getClaimByToken(headValue);
-		String userId = claims.getSubject().toString();
-		return userId;
-	}
-	//获取商城手机号
-	public Long getUserId(Long companyUserId)
-	{
-		CompanyUser companyUser=companyUserService.selectCompanyUserById(companyUserId);
-		FsUser user=userService.selectFsUserByPhone(companyUser.getPhonenumber());
-		if(user==null){
-			throw new FSException("未授权,请用员工手机号登录商城");
-		}
-		return user.getUserId();
-	}
-
-
-
-
-}

fs-qwhook/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -34,7 +34,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/app/fs/course")
 @Slf4j
-public class FsUserCourseVideoController extends AppBaseController {
+public class FsUserCourseVideoController {
 
     @Autowired
     private IFsUserCourseVideoService fsUserCourseVideoService;
@@ -53,7 +53,7 @@ public class FsUserCourseVideoController extends AppBaseController {
             return ResponseResult.fail(500,"无权限");
         }
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        param.setCompanyId(getCompanyId());
+        param.setCompanyId(qwUser.getCompanyId());
         List<FsUserCourseVideoPageListVO> list = fsUserCourseVideoService.pageListCourseVideo(param);
         PageInfo<FsUserCourseVideoPageListVO> pageInfo = new PageInfo<>(list);
         return ResponseResult.ok(pageInfo);
@@ -73,7 +73,7 @@ public class FsUserCourseVideoController extends AppBaseController {
             return ResponseResult.fail(500,"无权限");
         }
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        param.setCompanyId(getCompanyId());
+        param.setCompanyId(qwUser.getCompanyId());
         List<FsUserCourseListVO> fsUserCourseList = fsUserCourseService.getFsUserCourseList(param);
         PageInfo<FsUserCourseListVO> pageInfo = new PageInfo<>(fsUserCourseList);
         return ResponseResult.ok(pageInfo);
@@ -87,7 +87,7 @@ public class FsUserCourseVideoController extends AppBaseController {
             return ResponseResult.fail(500,"无权限");
         }
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        param.setCompanyId(getCompanyId());
+        param.setCompanyId(qwUser.getCompanyId());
         List<FsUserVideoListVO> listCourseVideo = fsUserCourseVideoService.getListCourseVideo(param);
         PageInfo<FsUserVideoListVO> result = new PageInfo<>(listCourseVideo);
         return ResponseResult.ok(result);