Browse Source

1、新增运营管理角色,
2公出汇总、部门统计新增运营管理查询权限部门及下级权限
3、权限列表新增60秒缓存。

anderx 3 years ago
parent
commit
b63e5141b5

+ 2 - 1
src/main/java/com/goafanti/admin/service/DepartmentService.java

@@ -55,8 +55,9 @@ public interface DepartmentService {
 
 	/**
 	 * 获取财务管理部门
-	 * @param adminId
 	 * @return
 	 */
 	List<String> getFinanceDep(String aid);
+
+
 }

+ 7 - 13
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -6,6 +6,7 @@ import javax.annotation.Resource;
 
 import com.goafanti.admin.service.DepartmentService;
 import com.goafanti.common.dao.*;
+import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Department;
 import com.goafanti.common.utils.RedisUtil;
 import org.springframework.beans.BeanUtils;
@@ -365,18 +366,6 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	}
 	@Override
 	public DepCountBo selectAllUser(String depId, String startTime, String endTime,String aName) {
-    	DepCountBo 	depCountBo=CacheableSelectAllUser(depId,startTime,endTime,aName);
-
-		return depCountBo;
-	}
-	@Cacheable(cacheNames = "selectAllUser#500",key = "'selectAllUser:depId:'+#depId+'startTime:'+#startTime+" +"'endTime:'+#endTime+'aName:'+#aName")
-	public DepCountBo CacheableSelectAllUser(String depId, String startTime, String endTime,String aName) {
-    	return getselectAllUser(depId,startTime,endTime,aName);
-	}
-
-
-
-	public DepCountBo getselectAllUser(String depId, String startTime, String endTime,String aName) {
 		DepCountBo acb=new DepCountBo();
 		if (endTime!=null)endTime=endTime+" 23:59:59";
 		List<DepCountBo >deps=new ArrayList<>();
@@ -388,11 +377,16 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 			OrganizationListOut oo=departmentMapper.selectAllById(depId);
 			acb.setName(oo.getName());
 			acb.setId(depId);
-			deps=departmentMapper.selectBysuperId(oo.getId());
+			if(TokenManager.hasRole(AFTConstants.OPERATION_MANAGER)){
+				List<String> myShiroDep = departmentService.selectMyDeps();
+				if (!myShiroDep.contains(depId))throw new BusinessException("无权查看此部门信息");
+
+			}
 			depIds =departmentService.selectSubordinateDeps(depId);
 			Department department = new Department();
 			department.setId(depId);
 			depIds.add(department);
+			deps=departmentMapper.selectBysuperId(oo.getId());
 		}
 		List<AdminCustomerBo> list =departmentMapper.AlldepCount(depIds,startTime,  endTime);
 		for (AdminCustomerBo ad : list) {

+ 5 - 1
src/main/java/com/goafanti/admin/service/impl/DepartmentServiceImpl.java

@@ -145,8 +145,12 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
 
 	@Override
 	public List<String> getFinanceDep(String aid) {
-
 		return departmentMapper.getFinanceDep(aid);
 	}
 
+
+
+
+
+
 }

+ 3 - 1
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -50,11 +50,13 @@ public class AFTConstants {
 	/**	外包审核员 */
 	public static final String  OUTSOURCE_AUDITOR                   = "9991";
 	/** 人事管理员*/
-	public static final String  PERSONNEL_AUDITOR                 = "9990";
+	public static final String  PERSONNEL_AUDITOR              	  	= "9990";
 	/** 专利管理员 */
 	public static final String  PATENT_AUDITOR 	                  	= "9992";
 	/** 公司管理 */
 	public static final String  COMPANY_MANAGER 	                = "9993";
+	/** 运营管理 */
+	public static final String  OPERATION_MANAGER		            = "9989";
 	/** 渠道专员 */
 	public static final String  CHANNEL                      		= "80";
 	/** 渠道总监 */

+ 2 - 1
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -152,7 +152,7 @@ public class BaseController {
 	/**
 	 *	获取权利列表
 	 * @return String  返回权限列表 逗号隔开 1=营销员,2=营销经理,3=营销管理员,4=营销总监,5=财务专员,6=财务经理,7=财务管理员,
-	 * 					8=技术员,9=技术经理,10=技术管理员
+	 * 					8=技术员,9=技术经理,10=技术管理员,11=运营管理
 	 */
 	public String shiroAddRedis() {
 		redisUtil.deleteString("shiroList");
@@ -167,6 +167,7 @@ public class BaseController {
 		if (TokenManager.hasRole(AFTConstants.TECH))str=str.append(8).append(",");
 		if (TokenManager.hasRole(AFTConstants.TECH_MANAGER))str=str.append(9).append(",");
 		if (TokenManager.hasRole(AFTConstants.TECH_ADMIN))str=str.append(10).append(",");
+		if (TokenManager.hasRole(AFTConstants.OPERATION_MANAGER))str=str.append(11).append(",");
 		if (str.length()<1)return "";
 		String shiroList=str.substring(0,str.length()-1);
 		redisUtil.setString("shiroList",shiroList);

+ 2 - 0
src/main/java/com/goafanti/core/cache/serializer/FastJsonRedisSerializer.java

@@ -27,6 +27,8 @@ public class FastJsonRedisSerializer implements RedisSerializer<Object> {
 		pc.addAccept("com.goafanti.order.bo.outProvinceStatisticsList");
 		pc.addAccept("com.goafanti.weChat.bo.OutPublicStatistics");
 		pc.addAccept("com.goafanti.core.mybatis.page.Pagination");
+		pc.addAccept("com.goafanti.common.bo.Result");
+		pc.addAccept("com.goafanti.permission.bo.PermissionBo");
 		pc.addAccept("java.util.Map");
 
 	}

+ 23 - 21
src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java

@@ -3,6 +3,7 @@ package com.goafanti.permission.controller;
 import javax.annotation.Resource;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -24,12 +25,13 @@ public class NewPermissionApiController extends BaseApiController {
 	PermissionMapper		permissionMapper;
 	/**权限管理列表 **/
 	@RequestMapping(value = "/permissions", method = RequestMethod.POST)
+	@Cacheable(cacheNames = "permissions#60",key = "'permissions:'+'all'")
 	public Result permissions() {
 		Result res = new Result();
 		res.setData(permissionService.findPermissionsAll());
 		return res;
 	}
-	
+
 	/**权限管理最上级新增 **/
 	@RequestMapping(value = "/addSupPermission" , method = RequestMethod.POST)
 	public Result addSupPermission(Permission record ){
@@ -51,7 +53,7 @@ public class NewPermissionApiController extends BaseApiController {
 	public Permission selectSuperIdById(String id ){
 		return permissionService.selectSuperIdById(id);
 	}
-	
+
 	/**权限管理新增 **/
 	@RequestMapping(value = "/addPermission" , method = RequestMethod.POST)
 	public Result addPermission(Permission record ){
@@ -83,13 +85,13 @@ public class NewPermissionApiController extends BaseApiController {
 			String aut=autNo+"0"+Count;
 			String sid=permissionMapper.selectIdByAutNo(aut);
 			while(sid!=null){
-				Count=(Count+1)%100;				
+				Count=(Count+1)%100;
 				if(Count>=10){
-					aut=autNo+Count;	
+					aut=autNo+Count;
 				}else{
 					aut=autNo+"0"+Count;
 				}
-				sid=permissionMapper.selectIdByAutNo(aut);			
+				sid=permissionMapper.selectIdByAutNo(aut);
 			}
 			record.setAutNo(aut);
 		}
@@ -97,16 +99,16 @@ public class NewPermissionApiController extends BaseApiController {
 			String aut=autNo+Count;
 			String sid=permissionMapper.selectIdByAutNo(aut);
 			while(sid!=null){
-				Count=(Count+1)%100;			
+				Count=(Count+1)%100;
 				aut=autNo+Count;
-				sid=permissionMapper.selectIdByAutNo(aut);				
+				sid=permissionMapper.selectIdByAutNo(aut);
 			}
 			record.setAutNo(aut);
 		}
 		res.setData(permissionService.insertSubordinate(record));
 		return res;
 	}
-	
+
 	/**删除列表信息**/
 	@RequestMapping(value = "/deleteById" , method = RequestMethod.POST)
 	public Result deleteById(String id){
@@ -128,7 +130,7 @@ public class NewPermissionApiController extends BaseApiController {
 		res.setData(permissionService.deleteById(id));
 		return res;
 	}
-	
+
 	/**编辑页面数据读取**/
 	@RequestMapping(value = "/selectAllById" , method = RequestMethod.POST)
 	public Result selectAllById(String id){
@@ -136,7 +138,7 @@ public class NewPermissionApiController extends BaseApiController {
 		res.setData(permissionService.selectAllById(id));
 		return res;
 	}
-	
+
 	/**上级权限自动补全查询**/
 	@RequestMapping(value = "/selectName" , method = RequestMethod.POST)
 	public Result selectName(String name){
@@ -144,7 +146,7 @@ public class NewPermissionApiController extends BaseApiController {
 		res.setData(permissionService.selectName(name));
 		return res;
 	}
-	
+
 	/**修改信息**/
 	@RequestMapping(value = "/updateById" , method = RequestMethod.POST)
 	public Result updateById(Permission record ){
@@ -158,7 +160,7 @@ public class NewPermissionApiController extends BaseApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,"名称"));
 			return res;
 		}
-		
+
 		String pname=permissionMapper.selectAutNoByNamei(record.getSuperId());
 		if(StringUtils.isBlank(pname)){
 			res.getError().add(buildError("","上级权限不匹配"));
@@ -176,7 +178,7 @@ public class NewPermissionApiController extends BaseApiController {
 				res.getError().add(buildError("","权限层级超限"));
 				return res;
 			}
-			
+
 		}
 		//*********权限编号判断**************
 		String superName=record.getSuperId();//上级名称
@@ -191,13 +193,13 @@ public class NewPermissionApiController extends BaseApiController {
 			String aut=autNo+"0"+Count;
 			String sid=permissionMapper.selectIdByAutNo(aut);
 			while(sid!=null){
-				Count=(Count+1)%100;			
+				Count=(Count+1)%100;
 				if(Count>=10){
-					aut=autNo+Count;	
+					aut=autNo+Count;
 				}else{
 					aut=autNo+"0"+Count;
 				}
-				sid=permissionMapper.selectIdByAutNo(aut);			
+				sid=permissionMapper.selectIdByAutNo(aut);
 			}
 			record.setAutNo(aut);
 		}
@@ -205,19 +207,19 @@ public class NewPermissionApiController extends BaseApiController {
 			String aut=autNo+Count;
 			String sid=permissionMapper.selectIdByAutNo(aut);
 			while(sid!=null){
-				Count=(Count+1)%100;				
+				Count=(Count+1)%100;
 				aut=autNo+Count;
-				sid=permissionMapper.selectIdByAutNo(aut);				
+				sid=permissionMapper.selectIdByAutNo(aut);
 			}
 			record.setAutNo(aut);
 		}
 		res.setData(permissionService.updateById(record,superName));
 		return res;
 	}
-	
+
 	/**
 	 * 查询导航
-	 * @param navId 导航	
+	 * @param navId 导航
 	 * @return
 	 */
 	@RequestMapping(value = "/selectNavList",method=RequestMethod.GET)
@@ -226,7 +228,7 @@ public class NewPermissionApiController extends BaseApiController {
 		res.setData(permissionService.selectNavList());
 		return res;
 	}
-	
+
 	/**
 	 * 查询菜单
 	 * @param navId

+ 0 - 2
src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java

@@ -231,9 +231,7 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 	}
 
 	@Override
-	@Cacheable(value = "findPermissionsAll#500", key = "'all'")
 	public Map<String,Object> findPermissionsAll() {
-		System.out.println("===========================================findPermissionsAll#500");
 		Map<String,Object> params = new HashMap<String, Object>();
 		List<PermissionBo> one=permissionMapper.selectOneAll();
 		for (PermissionBo i:one){

+ 4 - 2
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -628,10 +628,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			if(in.getDeps()!=null){
 				map.put("deps", departmentService.parseArray(in.getDeps()));
 			}
-		}else if(TokenManager.hasRole(AFTConstants.COMPANY_MANAGER)||TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
+		}else if(TokenManager.hasRole(AFTConstants.COMPANY_MANAGER)||TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)||TokenManager.hasRole(AFTConstants.OPERATION_MANAGER)){
 			in.setType(1);
 			if (in.getDeps()!=null){
-				map.put("deps", departmentService.selectSubDeps(in.getDeps()));
+				List<String> list = departmentService.selectSubDeps(in.getDeps());
+				if (list.isEmpty()) throw new BusinessException("无权查看此部门信息");
+				map.put("deps", list);
 			}else {
 				map.put("deps",departmentService.selectMyDeps());
 			}