Commit 3cea569a authored by 高建强's avatar 高建强

item:@PersonIdentify移动至公共模块

parent 58bef5fe
package com.yeejoin.equipmanage.core.framework;
package com.yeejoin.amos.boot.module.common.api.core.framework;
import com.alibaba.fastjson.JSON;
......@@ -7,8 +7,8 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
import com.yeejoin.amos.boot.module.common.api.exception.PermissionException;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import com.yeejoin.equipmanage.exception.PermissionException;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
......@@ -33,7 +33,7 @@ public class PersonIdentifyAspect {
@Autowired
private IOrgUsrService orgUsrService;
@Before(value = "@annotation(com.yeejoin.equipmanage.core.framework.PersonIdentify) && @annotation(permission)")
@Before(value = "@annotation(com.yeejoin.amos.boot.module.common.api.core.framework.PersonIdentify) && @annotation(permission)")
public void personIdentity(JoinPoint joinPoint, PersonIdentify permission) throws PermissionException {
ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
if (permission.isNeedIdentity() && reginParam != null) {
......
......@@ -3,7 +3,6 @@ package com.yeejoin.equipmanage.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
import com.yeejoin.equipmanage.common.entity.Video;
import com.yeejoin.equipmanage.common.entity.dto.VideoDTO;
......@@ -12,7 +11,6 @@ import com.yeejoin.equipmanage.common.entity.vo.PageVideoVO;
import com.yeejoin.equipmanage.common.entity.vo.VideoListVo;
import com.yeejoin.equipmanage.common.enums.ExcelEnums;
import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
import com.yeejoin.equipmanage.core.framework.PersonIdentify;
import com.yeejoin.equipmanage.dto.ExcelDto;
import com.yeejoin.equipmanage.service.IExcelService;
import com.yeejoin.equipmanage.service.IVideoService;
......@@ -278,11 +276,11 @@ public class VideoController extends AbstractBaseController {
return flvUrl;
}
@PersonIdentify
@TycloudOperation(ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/companyTreeByUserAndType", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司部门树", notes = "根据登录人及类型获取公司部门树")
public List<OrgMenuDto> companyTreeByUserAndType(@RequestParam(required = false) String type) {
return orgUsrService.companyTreeByUserAndType(getUserInfo(), type);
}
// @PersonIdentify
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @RequestMapping(value = "/companyTreeByUserAndType", method = RequestMethod.GET)
// @ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司部门树", notes = "根据登录人及类型获取公司部门树")
// public List<OrgMenuDto> companyTreeByUserAndType(@RequestParam(required = false) String type) {
// return orgUsrService.companyTreeByUserAndType(getUserInfo(), type);
// }
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment