小重构

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/CourseSpeciatlyController.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.core.basic.api.controller;
 
-import io.swagger.annotations.ApiOperation;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -18,73 +16,78 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.commons.web.security.entity.AccessUser;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.dao.CourseRepo;
 import cn.com.qmth.examcloud.core.basic.dao.SpecialtyRepo;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Course;
 import cn.com.qmth.examcloud.core.basic.dao.entity.Specialty;
 import cn.com.qmth.examcloud.core.basic.service.impl.CourseSpeciatlyService;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * @Description 课程专业关联API
  * @author Administrator
- * @Date  2017年8月8号
+ * @Date 2017年8月8号
  */
 @RestController
 @RequestMapping("${$rmp.ctr.basic}/CourseSpeciatly")
-public class CourseSpeciatlyController extends ControllerSupport{
+public class CourseSpeciatlyController extends ControllerSupport {
 
 	@Autowired
 	CourseSpeciatlyService courseSpeciatlyService;
-	
+
 	@Autowired
 	CourseRepo courseRepo;
-	
+
 	@Autowired
 	SpecialtyRepo specialtyRepo;
-	
+
 	/**
 	 * 根据专业ID查询课程
+	 * 
 	 * @param speciatlyId
 	 * @return
 	 */
-	@ApiOperation(value="根据专业ID取课程",notes="根据专业ID取课程")
+	@ApiOperation(value = "根据专业ID取课程", notes = "根据专业ID取课程")
 	@GetMapping("/allCourses/{speciatlyId}")
-	public ResponseEntity getAllCoursesBySpeciatly(@PathVariable String speciatlyId,HttpServletRequest request){
+	public ResponseEntity getAllCoursesBySpeciatly(@PathVariable String speciatlyId,
+			HttpServletRequest request) {
 		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
 		List<Course> courses = courseSpeciatlyService.getAllCoursesBySpeciatlyId(speciatlyId);
-		//List<Course> list = courseSpeciatlyService.getCoursesNotInSpeciatly(courses);
+		// List<Course> list =
+		// courseSpeciatlyService.getCoursesNotInSpeciatly(courses);
 		List<Course> list = courseRepo.findByOrgId(accessUser.getRootOrgId());
 		Map map = new HashMap();
 		map.put("courseList", courses);
 		map.put("courseAllList", list);
-		return new ResponseEntity(map,HttpStatus.OK);
+		return new ResponseEntity(map, HttpStatus.OK);
 	}
-	
-	@ApiOperation(value="新增关联课程专业",notes="新增关联课程专业")
+
+	@ApiOperation(value = "新增关联课程专业", notes = "新增关联课程专业")
 	@PostMapping("/addCourse/{speciallyId}")
-	public ResponseEntity addCourseSpeciatly(@RequestBody List<String> list,@PathVariable String speciallyId,HttpServletRequest request){
+	public ResponseEntity addCourseSpeciatly(@RequestBody List<String> list,
+			@PathVariable String speciallyId, HttpServletRequest request) {
 		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
 		courseSpeciatlyService.addCourseSpecialty(accessUser.getUserId(), list, speciallyId);
 		return new ResponseEntity(HttpStatus.OK);
 	}
-	
-	@ApiOperation(value="根据课程ID取专业",notes="根据课程ID取专业")
+
+	@ApiOperation(value = "根据课程ID取专业", notes = "根据课程ID取专业")
 	@GetMapping("/allSpecialty/{courseId}")
-	public ResponseEntity getAllSpeciatly(@PathVariable Long courseId,HttpServletRequest request){
+	public ResponseEntity getAllSpeciatly(@PathVariable Long courseId, HttpServletRequest request) {
 		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
 		List<Specialty> specialtys = courseSpeciatlyService.getAllSpecialtyByCourseId(courseId);
 		List<Specialty> list = specialtyRepo.findByOrgId(accessUser.getRootOrgId());
 		Map map = new HashMap();
 		map.put("specialtyList", specialtys);
 		map.put("specialtyAllList", list);
-		return new ResponseEntity(map,HttpStatus.OK);
+		return new ResponseEntity(map, HttpStatus.OK);
 	}
-	
-	@ApiOperation(value="新增关联课程专业",notes="新增关联课程专业")
+
+	@ApiOperation(value = "新增关联课程专业", notes = "新增关联课程专业")
 	@PostMapping("/addSpeciatly/{courseId}")
-	public ResponseEntity addSpeciatly(@RequestBody List<String> list,@PathVariable Long courseId,HttpServletRequest request){
+	public ResponseEntity addSpeciatly(@RequestBody List<String> list, @PathVariable Long courseId,
+			HttpServletRequest request) {
 		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
 		courseSpeciatlyService.addCourse(accessUser.getUserId(), list, courseId);
 		return new ResponseEntity(HttpStatus.OK);

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/PermissionController.java

@@ -1,56 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.api.controller;
-
-import java.util.List;
-import java.util.Map;
-
-import io.swagger.annotations.ApiOperation;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
-import cn.com.qmth.examcloud.core.basic.service.impl.PermissionService;
-import cn.com.qmth.examcloud.core.basic.service.impl.RolePermissionRelationService;
-
-//@RestController
-@RequestMapping("${$rmp.ctr.basic}/permission")
-@Deprecated
-public class PermissionController {
-
-	@Autowired
-	private PermissionService permissionService;
-	
-	@Autowired
-	private RolePermissionRelationService rolePermissionRelationService;
-	
-	@ApiOperation(value="按系统查询权限",notes="按系统查询权限")
-    @GetMapping("/{systemName}")
-	public ResponseEntity findAllPermission(@PathVariable String systemName){
-		Map<String,List<Permission>> returnMap = permissionService.findPermissionsBySystem(systemName);
-		return new ResponseEntity(returnMap, HttpStatus.OK);
-	}
-	
-	@ApiOperation(value="保存权限",notes="保存权限")
-    @PostMapping
-	public ResponseEntity savePermission(@RequestBody Permission permission){
-		permissionService.savePermission(permission);
-		return new ResponseEntity(HttpStatus.OK);
-	}
-	
-	//by weiwenhai
-	@ApiOperation(value="删除菜单权限",notes="删除菜单权限")
-	@DeleteMapping("/{id}")
-	public ResponseEntity deletePermission(@PathVariable String id){
-		Integer permissionId = Integer.valueOf(id);
-		Map<String,String> map = permissionService.deletePermission(permissionId);
-		return new ResponseEntity(map,HttpStatus.OK);
-	}
-}

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/RolePermissionRelationController.java

@@ -1,59 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.api.controller;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import io.swagger.annotations.ApiOperation;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
-import cn.com.qmth.examcloud.core.basic.dao.entity.RolePermissionRelation;
-import cn.com.qmth.examcloud.core.basic.service.impl.RolePermissionRelationService;
-
-//@RestController
-@RequestMapping("${$rmp.ctr.basic}/rolePermissionRelation")
-@Deprecated
-public class RolePermissionRelationController {
-	
-	@Autowired
-	private RolePermissionRelationService rolePermissionRelationService;
-	
-	@ApiOperation(value="按系统和角色查询权限",notes="按系统和当前角色查询权限")
-	@GetMapping("/permissions/{systemName}/{roleCodes}")
-	public ResponseEntity findPermissionByRole(@PathVariable String systemName,@PathVariable String roleCodes){
-		RolePermissionRelation rolePermissionRelation = new RolePermissionRelation();
-		rolePermissionRelation.setSystemName(systemName);
-		String[] roleCodeArray = roleCodes.split(",");
-		List<String> roleCodeList = new ArrayList<String>();
-		for(int i = 0;i<roleCodeArray.length;i++){
-			roleCodeList.add(roleCodeArray[i]);
-		}
-		rolePermissionRelation.setRoleCodes(roleCodeList);
-		Map<String,List<Permission>> permissionMap = rolePermissionRelationService.findPermissionByRole(rolePermissionRelation);
-		return new ResponseEntity(permissionMap, HttpStatus.OK);
-	}
-	
-	@ApiOperation(value="根据角色和系统查询数据",notes="根据角色和系统查询数据")
-	@GetMapping("/{systemName}/{roleCode}/{permissionType}")
-	public ResponseEntity findBySystemNameAndRoleName(@PathVariable String systemName,@PathVariable String roleCode,@PathVariable String permissionType){
-		List<RolePermissionRelation> permissions = rolePermissionRelationService.findPermission(systemName,roleCode,permissionType);
-		return new ResponseEntity(permissions, HttpStatus.OK);
-	}
-	
-	@ApiOperation(value="保存角色权限设定",notes="保存角色权限设定")
-    @PostMapping
-	public ResponseEntity saveRolePermission(@RequestBody RolePermissionRelation rolePermissionRelation){
-		rolePermissionRelationService.saveRolePermission(rolePermissionRelation);
-		return new ResponseEntity(HttpStatus.OK);
-	}
-}

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/UserRoleController.java

@@ -1,85 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.api.controller;
-
-import cn.com.qmth.examcloud.core.basic.dao.UserRepo;
-import cn.com.qmth.examcloud.core.basic.dao.UserRoleRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.UserEntity;
-import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
-import cn.com.qmth.examcloud.core.basic.service.impl.UserRoleService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 用户角色服务API
- * Created by songyue on 17/1/13.
- */
-@RestController
-@RequestMapping("${$rmp.ctr.basic}/userRole")
-public class UserRoleController {
-
-    @Autowired
-    UserRoleService userRoleService;
-
-    @Autowired
-    UserRoleRepo userRoleRepo;
-
-    @Autowired
-    UserRepo userRepo;
-
-    @ApiOperation(value="获取全部角色",notes="获取全部角色")
-    @GetMapping("/all")
-    public ResponseEntity getAllRoles(){
-        return new ResponseEntity(userRoleService.findAllRoles(), HttpStatus.OK);
-    }
-
-    @ApiOperation(value="获取评卷角色",notes="获取评卷角色")
-    @GetMapping("/marker")
-    public ResponseEntity getMarkerRoles(){
-        return new ResponseEntity(userRoleService.findMarkerRoles(), HttpStatus.OK);
-    }
-
-    @ApiOperation(value="获取非评卷角色",notes="获取非评卷角色")
-    @GetMapping("/nonMarker")
-    public ResponseEntity getNonMarkerRoles(){
-        return new ResponseEntity(userRoleService.findNonMarkerRoles(), HttpStatus.OK);
-    }
-
-    @ApiOperation(value="获取管理员角色",notes="获取管理员角色")
-    @GetMapping("/admin")
-    public ResponseEntity getAdminRoles(){
-        return new ResponseEntity(userRoleService.findAdminRoles(), HttpStatus.OK);
-    }
-
-    @ApiOperation(value="新增用户角色",notes="新增角色")
-    @PostMapping
-    public ResponseEntity addUserRole(@RequestBody UserRole userRole){
-        return new ResponseEntity(userRoleRepo.save(userRole), HttpStatus.CREATED);
-    }
-
-    @ApiOperation(value="更新用户角色",notes="更新角色")
-    @PutMapping
-    public ResponseEntity updateUserRole(@RequestBody UserRole userRole){
-        return new ResponseEntity(userRoleRepo.save(userRole), HttpStatus.OK);
-    }
-
-    @ApiOperation(value="按id删除用户",notes="删除")
-    @DeleteMapping("/{id}")
-    public ResponseEntity deleteUserRole(@PathVariable Long id){
-        userRoleRepo.delete(id);
-        return new ResponseEntity(HttpStatus.OK);
-    }
-    
-    @ApiOperation(value="获取印刷阅卷角色",notes="获取印刷阅卷角色")
-    @GetMapping("/qmther")
-    public ResponseEntity getPrinterRoles(){
-        return new ResponseEntity(userRoleService.findQmthRoles(), HttpStatus.OK);
-    }
-    
-    @ApiOperation(value="获取学校机构角色",notes="获取学校机构角色")
-    @GetMapping("/school")
-    public ResponseEntity<Object> getSchoolRoles(){
-    	return new ResponseEntity<Object>(userRoleService.findSchoolRoles(),HttpStatus.OK);
-    }
-}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/PermissionRepo.java

@@ -1,20 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
-
-public interface PermissionRepo extends JpaRepository<Permission,Integer>{
-	
-	public List<Permission> findBySystemNameAndType(String systemName,String type);
-	
-	public List<Permission> findByIdIn(List<Integer> ids);
-	
-	//by weiwenhai 根据id删除权限
-	public void delete(Integer id);
-	
-	//根据父级权限id查询所有子权限
-	public List<Permission> findByParentId(Integer id);
-}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/RolePermissionRelationRepo.java

@@ -1,19 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import cn.com.qmth.examcloud.core.basic.dao.entity.RolePermissionRelation;
-
-public interface RolePermissionRelationRepo  extends JpaRepository<RolePermissionRelation,Integer>{
-
-	
-	public List<RolePermissionRelation> findByRoleCodeAndSystemNameAndPermissionType(String roleCode,String systemName,String permissionType);
-	
-	
-	void deleteByRoleCodeAndSystemNameAndPermissionType(String roleCode,String systemName,String PermissionType);
-	
-	//by weiwenhai 根据权限id查询权限角色
-	public List<RolePermissionRelation> findByPermissionId(Integer id);
-}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/UserLoginRepo.java

@@ -1,18 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.query.QueryByExampleExecutor;
-import org.springframework.transaction.annotation.Transactional;
-
-import cn.com.qmth.examcloud.core.basic.dao.entity.UserLogin;
-
-/**
- * Created by songyue on 17/2/22.
- */
-public interface UserLoginRepo extends JpaRepository<UserLogin,Long>,QueryByExampleExecutor<UserLogin> {
-
-    UserLogin findFirstByUserId(Long userId);
-
-    @Transactional
-    void deleteByUserId(Long userId);
-}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/UserOpsLogRepo.java

@@ -1,12 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.query.QueryByExampleExecutor;
-
-import cn.com.qmth.examcloud.core.basic.dao.entity.UserOpsLog;
-
-/**
- * Created by songyue on 17/2/22.
- */
-public interface UserOpsLogRepo extends JpaRepository<UserOpsLog,Long>,QueryByExampleExecutor<UserOpsLog> {
-}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/UserRoleRepo.java

@@ -1,12 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.query.QueryByExampleExecutor;
-
-import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
-
-/**
- * Created by songyue on 17/2/22.
- */
-public interface UserRoleRepo extends JpaRepository<UserRole,Long>,QueryByExampleExecutor<UserRole> {
-}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/Permission.java

@@ -1,108 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao.entity;
-
-import java.util.List;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-
-/**
- * 
- * @author  	chenken
- * @date    	2017年6月15日下午2:57:19
- * @company 	QMTH
- * @description	权限
- */
-@Entity
-@Table(name = "ecs_permission")
-public class Permission {
-	
-	@Id
-    @GeneratedValue
-	private Integer id;
-	/**
-	 * 权限名称
-	 */
-	
-	private String name;
-	/**
-	 * 父ID
-	 */
-	private Integer parentId;
-	/**
-	 * URL访问路径
-	 */
-	private String urlPath;
-	/**
-	 * 系统名称
-	 */
-	private String systemName;
-	
-	/**
-	 * 权限类型
-	 */
-	private String type;
-	
-	/**
-	 * 权限描述
-	 */
-	private String description;
-	
-	//@Transient:不参与持久化
-	@Transient
-	private List<Permission> subPermissions;
-	
-	public Integer getId() {
-		return id;
-	}
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public Integer getParentId() {
-		return parentId;
-	}
-	public void setParentId(Integer parentId) {
-		this.parentId = parentId;
-	}
-	
-	public String getUrlPath() {
-		return urlPath;
-	}
-	public void setUrlPath(String urlPath) {
-		this.urlPath = urlPath;
-	}
-	public String getSystemName() {
-		return systemName;
-	}
-	public void setSystemName(String systemName) {
-		this.systemName = systemName;
-	}
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	public List<Permission> getSubPermissions() {
-		return subPermissions;
-	}
-	public void setSubPermissions(List<Permission> subPermissions) {
-		this.subPermissions = subPermissions;
-	}
-	public String getType() {
-		return type;
-	}
-	public void setType(String type) {
-		this.type = type;
-	}
-	
-}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/RolePermissionRelation.java

@@ -1,102 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao.entity;
-
-import java.util.List;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-/**
- * 
- * @author  	chenken
- * @date    	2017年6月15日下午3:01:03
- * @company 	QMTH
- * @description	角色权限关联
- */
-@Entity
-@Table(name="ecs_role_permission_relation")
-public class RolePermissionRelation {
-	@Id
-    @GeneratedValue
-	private int id;
-	/**
-	 * 角色code
-	 */
-	private String roleCode;
-	/**
-	 * 归属系统
-	 */
-	private String systemName;
-	/**
-	 * 权限ID
-	 */
-	private Integer permissionId;
-	/**
-	 * 权限类型
-	 */
-	private String permissionType;
-	@Transient
-	private List<String> roleCodes;
-	//@Transient:不参与持久化
-	@Transient
-	private List<Integer> permissionIds;
-	
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public String getRoleCode() {
-		return roleCode;
-	}
-
-	public void setRoleCode(String roleCode) {
-		this.roleCode = roleCode;
-	}
-
-	public String getSystemName() {
-		return systemName;
-	}
-
-	public void setSystemName(String systemName) {
-		this.systemName = systemName;
-	}
-
-	public Integer getPermissionId() {
-		return permissionId;
-	}
-
-	public void setPermissionId(Integer permissionId) {
-		this.permissionId = permissionId;
-	}
-
-	public List<Integer> getPermissionIds() {
-		return permissionIds;
-	}
-
-	public void setPermissionIds(List<Integer> permissionIds) {
-		this.permissionIds = permissionIds;
-	}
-
-	public List<String> getRoleCodes() {
-		return roleCodes;
-	}
-
-	public void setRoleCodes(List<String> roleCodes) {
-		this.roleCodes = roleCodes;
-	}
-
-	public String getPermissionType() {
-		return permissionType;
-	}
-
-	public void setPermissionType(String permissionType) {
-		this.permissionType = permissionType;
-	}
-	
-}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserLogin.java

@@ -1,73 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by songyue on 17/5/18.
- */
-@Entity
-@Table(name = "ecs_core_user_login")
-public class UserLogin implements Serializable{
-    private static final long serialVersionUID = 4931722046427053540L;
-
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    private Long userId;
-
-    private Date loginTime;
-
-    private String ipAddress;
-
-    private String token;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Date getLoginTime() {
-        return loginTime;
-    }
-
-    public void setLoginTime(Date loginTime) {
-        this.loginTime = loginTime;
-    }
-
-    public String getIpAddress() {
-        return ipAddress;
-    }
-
-    public void setIpAddress(String ipAddress) {
-        this.ipAddress = ipAddress;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserOpsLog.java

@@ -1,76 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by songyue on 17/6/20.
- */
-@Entity
-@Table(name = "ecs_core_user_log")
-public class UserOpsLog implements Serializable{
-    private static final long serialVersionUID = -2147663545069026711L;
-
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    private String action;
-
-    private Long userId;
-
-    private String userName;
-
-    private Date createTime;
-
-    public UserOpsLog(String action, Long userId, String userName, Date createTime) {
-        this.action = action;
-        this.userId = userId;
-        this.userName = userName;
-        this.createTime = createTime;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getAction() {
-        return action;
-    }
-
-    public void setAction(String action) {
-        this.action = action;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-}

examcloud-core-basic-dao/src/main/java/cn/com/qmth/examcloud/core/basic/dao/entity/UserRole.java

@@ -1,66 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.dao.entity;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-/**
- * Created by songyue on 17/2/22.
- */
-@Entity
-@Table(name = "ecs_core_user_role")
-public class UserRole implements Serializable{
-    private static final long serialVersionUID = -5202947216906275866L;
-
-    @Id
-    @GeneratedValue
-    private Long id;
-
-    @NotNull
-    private String roleCode;
-    
-    @NotNull
-    @Deprecated
-    private String appCode="@";
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getRoleCode() {
-        return roleCode;
-    }
-
-    public void setRoleCode(String roleCode) {
-        this.roleCode = roleCode;
-    }
-    
-    @Deprecated
-    public String getAppCode() {
-		return appCode;
-	}
-    
-    @Deprecated
-	public void setAppCode(String appCode) {
-		this.appCode = appCode;
-	}
-
-	public UserRole() {
-    }
-    
-    public UserRole(String roleCode) {
-    	this.roleCode = roleCode;
-    }
-}

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/bean/UserInfo.java

@@ -1,180 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.service.bean;
-
-import java.io.Serializable;
-import java.util.List;
-
-import cn.com.qmth.examcloud.core.basic.dao.entity.UserRole;
-
-/**
- * Created by songyue on 17/2/22.
- */
-public class UserInfo implements Serializable {
-    private static final long serialVersionUID = 7939545789907406883L;
-
-    private Long userId;
-
-    private Long orgId;
-
-    private Long rootOrgId;
-
-    private String name;
-
-    private String loginName;
-
-    private String type;
-
-    private String token;
-
-    private String avatar;
-
-    private String orgName;
-
-    private String rootOrgName;
-
-    private String rootOrgLogo;
-
-    private Long studentId;
-
-    private String identityNumber;
-
-    private String studentCode;
-
-    private List<UserRole> userRoles;
-
-    private List<String> roleNames;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public String getOrgName() {
-        return orgName;
-    }
-
-    public void setOrgName(String orgName) {
-        this.orgName = orgName;
-    }
-
-    public String getRootOrgName() {
-        return rootOrgName;
-    }
-
-    public void setRootOrgName(String rootOrgName) {
-        this.rootOrgName = rootOrgName;
-    }
-
-    public String getRootOrgLogo() {
-        return rootOrgLogo;
-    }
-
-    public void setRootOrgLogo(String rootOrgLogo) {
-        this.rootOrgLogo = rootOrgLogo;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public Long getRootOrgId() {
-        return rootOrgId;
-    }
-
-    public void setRootOrgId(Long rootOrgId) {
-        this.rootOrgId = rootOrgId;
-    }
-
-    public Long getStudentId() {
-        return studentId;
-    }
-
-    public void setStudentId(Long studentId) {
-        this.studentId = studentId;
-    }
-
-    public String getIdentityNumber() {
-        return identityNumber;
-    }
-
-    public void setIdentityNumber(String identityNumber) {
-        this.identityNumber = identityNumber;
-    }
-
-    public List<UserRole> getUserRoles() {
-        return userRoles;
-    }
-
-    public void setUserRoles(List<UserRole> userRoles) {
-        this.userRoles = userRoles;
-    }
-
-    public List<String> getRoleNames() {
-        return roleNames;
-    }
-
-    public void setRoleNames(List<String> roleNames) {
-        this.roleNames = roleNames;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public UserInfo() {
-    }
-}

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/PermissionService.java

@@ -1,69 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
-
-
-/**
- * 
- * @author  	chenken
- * @date    	2017年6月15日下午3:27:59
- * @company 	QMTH
- * @description
- */
-@Deprecated
-public interface PermissionService {
-	/**
-	 * 保存权限
-	 * @param permission
-	 */
-	public void savePermission(Permission permission);
-	
-	/**
-	 * 按照对象查询
-	 * @param permission
-	 * @return
-	 */
-	public List<Permission> findByPermission(Permission permission);
-	
-	/**
-	 * 按系统取出权限
-	 * @param systemName
-	 * @return
-	 */
-	public Map<String,List<Permission>> findPermissionsBySystem(String systemName);
-	/**
-	 * 按ID查询权限
-	 * @return
-	 */
-	public Permission findById(int id);
-	/**
-	 * 按ID集合查询权限 IDS
-	 * @param ids
-	 * @return
-	 */
-	public List<Permission> findPermissionByIds(List<Integer> ids);
-	
-	//by weiwenhai
-	/**
-	 * 根据id删除权限
-	 * @param id
-	 */
-	public void deletePermissionById(Integer id);
-	
-	/**
-	 * 根据父级权限id查询所有子权限
-	 * @param id
-	 * @return
-	 */
-	public List<Permission> findPermissionByParentId(Integer id);
-	
-	/**
-	 * 根据权限id删除权限
-	 * @param id
-	 * @return
-	 */
-	public Map<String,String> deletePermission(Integer id);
-}

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/PermissionServiceImpl.java

@@ -1,110 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.service.impl;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.core.basic.dao.PermissionRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
-import cn.com.qmth.examcloud.core.basic.dao.entity.RolePermissionRelation;
-import cn.com.qmth.examcloud.core.basic.dao.enums.PermissionType;
-
-/**
- * 
- * @author  	chenken
- * @date    	2017年6月15日下午3:06:45
- * @company 	QMTH
- * @description	权限service
- */
-//@Service("permissionService")
-@Deprecated
-public class PermissionServiceImpl implements PermissionService{
-	
-	@Autowired
-	private PermissionRepo permissionRepo;
-	
-	@Autowired
-	private RolePermissionRelationService rolePermissionRelationService;
-	
-	@Override
-	public void savePermission(Permission permission) {
-		permissionRepo.save(permission);
-	}
-
-	@Override
-	public Map<String,List<Permission>> findPermissionsBySystem(String systemName) {
-		Map<String,List<Permission>> returnMap = new HashMap<String, List<Permission>>();
-		String menuType = PermissionType.MENU.name();
-		returnMap.put(menuType, permissionRepo.findBySystemNameAndType(systemName,menuType));
-		String pageType = PermissionType.PAGE.name();
-		returnMap.put(pageType, permissionRepo.findBySystemNameAndType(systemName,pageType));
-		return returnMap;
-	}
-
-	@Override
-	public Permission findById(int id) {
-		return permissionRepo.findOne(id);
-	}
-
-	@Override
-	public List<Permission> findPermissionByIds(List<Integer> ids) {
-		return permissionRepo.findByIdIn(ids);
-	}
-
-	@Override
-	public List<Permission> findByPermission(Permission permission) {
-		return permissionRepo.findAll(Example.of(permission));
-	}
-
-	//by weiwenhai 根据id删除权限
-	@Override
-	public void deletePermissionById(Integer id) {
-		permissionRepo.delete(id);
-	}
-
-	//根据父级权限id查询所有子权限
-	@Override
-	public List<Permission> findPermissionByParentId(Integer id) {
-		return permissionRepo.findByParentId(id);
-	}
-
-	@Override
-	public Map<String, String> deletePermission(Integer id) {
-		Map<String,String> map = new HashMap<String,String>();
-		List<RolePermissionRelation> rolePermissionRelations = rolePermissionRelationService.findRolePermissionRelationByPermissonId(id);
-		//首先判断该权限能否删除
-		if(rolePermissionRelations.size()>0){
-			map.put("message", "该权限在使用中，无法删除");
-			map.put("messageType", "warning");
-			return map;
-		}else{
-			Permission permission = findById(id);
-			//然后判断该权限是否有父级
-			if(permission.getParentId()!= null){
-				deletePermissionById(id);
-				map.put("message", "删除成功");
-				map.put("messageType", "success");
-				return map;
-			}else{
-				//最后判断父级下的权限是否删除
-				List<Permission> permission_son = findPermissionByParentId(id);
-				if(permission_son.size()>0){
-					map.put("message", "存在子级菜单，无法删除");
-					map.put("messageType", "warning");
-					return map;
-				}
-				deletePermissionById(id);
-				map.put("message", "删除成功");
-				map.put("messageType", "success");
-				return map;
-			}
-		}
-	}
-	
-}

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/RolePermissionRelationService.java

@@ -1,51 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
-import cn.com.qmth.examcloud.core.basic.dao.entity.RolePermissionRelation;
-
-/**
- * 
- * @author  	chenken
- * @date    	2017年6月15日下午5:26:13
- * @company 	QMTH
- * @description 角色权限关联
- */
-@Deprecated
-public interface RolePermissionRelationService {
-	/**
-	 * 根据角色查询权限
-	 * @param roleName
-	 * @param systemName
-	 * @return
-	 */
-	public Map<String,List<Permission>> findPermissionByRole(RolePermissionRelation rolePermissionRelation);
-	/**
-	 * 保存角色权限
-	 * @param rolePermissionRelation
-	 */
-	public void saveRolePermission(RolePermissionRelation rolePermissionRelation);
-	/**
-	 * 删除角色权限
-	 * @param roleName
-	 * @param systemName
-	 */
-	public void deleteRolePermission(String roleName,String systemName,String permissionType);
-	/**
-	 * 根据角色和系统查询
-	 * @param systemName
-	 * @param roleCode
-	 * @return
-	 */
-	public List<RolePermissionRelation> findPermission(String systemName,String roleCode,String permissionType);
-	
-	//by weiwenhai
-	/**
-	 * 根据权限id查询权限角色
-	 * @param id
-	 * @return
-	 */
-	public List<RolePermissionRelation> findRolePermissionRelationByPermissonId(Integer id);
-}

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/RolePermissionRelationServiceImpl.java

@@ -1,149 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.service.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.Assert;
-
-import cn.com.qmth.examcloud.core.basic.dao.RolePermissionRelationRepo;
-import cn.com.qmth.examcloud.core.basic.dao.entity.Permission;
-import cn.com.qmth.examcloud.core.basic.dao.entity.RolePermissionRelation;
-import cn.com.qmth.examcloud.core.basic.dao.enums.PermissionType;
-
-
-/**
- * 
- * @author  	chenken
- * @date    	2017年6月15日下午3:15:53
- * @company 	QMTH
- * @description
- */
-//@Service("rolePermissionRelationService")
-@Deprecated
-public class RolePermissionRelationServiceImpl implements RolePermissionRelationService{
-
-	@Autowired
-	private RolePermissionRelationRepo rolePermissionRelationRepo;
-	@Autowired
-	private PermissionService permissionService;
-	
-	@Override
-	public Map<String,List<Permission>> findPermissionByRole(RolePermissionRelation rolePermissionRelation) {
-		Map<String,List<Permission>> returnMap = new HashMap<String, List<Permission>>();
-		String menuType = PermissionType.MENU.name();
-		returnMap.put(menuType,findMenuPermissionByRole(rolePermissionRelation));
-		String pageType = PermissionType.PAGE.name();
-		returnMap.put(pageType,findPagePermissionByRole(rolePermissionRelation));
-		return returnMap;
-	}
-	
-	/**
-	 * 查询菜单权限
-	 * @param rolePermissionRelation
-	 * @return
-	 */
-	private List<Permission> findMenuPermissionByRole(RolePermissionRelation rolePermissionRelation){ 
-		List<String> roleCodes = rolePermissionRelation.getRoleCodes();
-		List<RolePermissionRelation> relations = new ArrayList<RolePermissionRelation>();
-		for(String roleCode:roleCodes){
-			String systemName = rolePermissionRelation.getSystemName();
-			String permissionType = PermissionType.MENU.name();
-			relations.addAll(rolePermissionRelationRepo.findByRoleCodeAndSystemNameAndPermissionType(roleCode, systemName,permissionType));
-		}
-		Set<Integer> permissionIds = new HashSet<Integer>();
-		for(RolePermissionRelation relation:relations){
-			permissionIds.add(relation.getPermissionId());
-		}
-		List<Integer> ids = new ArrayList<Integer>(permissionIds);
-		List<Permission> permissions = permissionService.findPermissionByIds(ids);
-		//组装树形关系结构
-		Map<Integer,Permission> permissionMap = new HashMap<Integer, Permission>();
-		for(Permission permission:permissions){
-			permissionMap.put(permission.getId(), permission);
-		}
-		for(Permission p:permissions){
-			Permission permission = permissionMap.get(p.getParentId());
-			if(permission!=null){
-				if(permission.getSubPermissions()==null){
-					permission.setSubPermissions(new ArrayList<Permission>());
-				}
-				permission.getSubPermissions().add(p);
-			}
-		}
-		 // 返回一级节点
-		List<Permission> permissionNodes = new ArrayList<Permission>();
-		for(Permission permission:permissions){
-			if(permission.getParentId()==null){
-				permissionNodes.add(permission);
-			}
-		}
-		return permissionNodes;
-	}
-
-	/**
-	 * 查询菜单权限
-	 * @param rolePermissionRelation
-	 * @return
-	 */
-	private List<Permission> findPagePermissionByRole(RolePermissionRelation rolePermissionRelation){ 
-		List<String> roleCodes = rolePermissionRelation.getRoleCodes();
-		List<RolePermissionRelation> relations = new ArrayList<RolePermissionRelation>();
-		for(String roleCode:roleCodes){
-			String systemName = rolePermissionRelation.getSystemName();
-			String permissionType = PermissionType.PAGE.name();
-			relations.addAll(rolePermissionRelationRepo.findByRoleCodeAndSystemNameAndPermissionType(roleCode, systemName,permissionType));
-		}
-		Set<Integer> permissionIds = new HashSet<Integer>();
-		for(RolePermissionRelation relation:relations){
-			permissionIds.add(relation.getPermissionId());
-		}
-		List<Integer> ids = new ArrayList<Integer>(permissionIds);
-		List<Permission> permissions = permissionService.findPermissionByIds(ids);
-		return permissions;
-	}
-	
-	@Override
-	@Transactional
-	public void saveRolePermission(RolePermissionRelation rolePermissionRelation) {
-		String roleCode = rolePermissionRelation.getRoleCode();
-		String systemName = rolePermissionRelation.getSystemName();
-		String permissionType = rolePermissionRelation.getPermissionType();
-		deleteRolePermission(roleCode, systemName,permissionType);
-		List<RolePermissionRelation> relationList = new ArrayList<RolePermissionRelation>(); 
-		for(Integer permissionId:rolePermissionRelation.getPermissionIds()){
-			RolePermissionRelation relation = new RolePermissionRelation();
-			relation.setRoleCode(roleCode);
-			relation.setSystemName(systemName);
-			relation.setPermissionType(permissionType);
-			relation.setPermissionId(permissionId);
-			relationList.add(relation);
-		}
-		rolePermissionRelationRepo.save(relationList);
-	}
-
-	@Override
-	public void deleteRolePermission(String roleCode, String systemName,String permissionType) {
-		rolePermissionRelationRepo.deleteByRoleCodeAndSystemNameAndPermissionType(roleCode, systemName,permissionType);
-	}
-
-	@Override
-	public List<RolePermissionRelation> findPermission(String systemName,String roleCode,String permissionType) {
-		Assert.hasLength(systemName, "systemName 不能为空");		
-		Assert.hasLength(roleCode, "roleCode 不能为空");		
-		return rolePermissionRelationRepo.findByRoleCodeAndSystemNameAndPermissionType(roleCode, systemName, permissionType);
-	}
-
-	//by weiwenhai 根据权限id查询权限角色
-	@Override
-	public List<RolePermissionRelation> findRolePermissionRelationByPermissonId(Integer id) {
-		return rolePermissionRelationRepo.findByPermissionId(id);
-	}
-	
-}

examcloud-core-basic-service/src/main/java/cn/com/qmth/examcloud/core/basic/service/impl/UserRoleService.java

@@ -1,87 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.service.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import cn.com.qmth.examcloud.commons.web.security.entity.Role;
-import cn.com.qmth.examcloud.commons.web.security.entity.RolesService;
-import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
-import cn.com.qmth.examcloud.core.basic.dao.UserRoleRepo;
-
-/**
- * 用户角色服务类 Created by songyue on 17/2/22.
- */
-@Service
-public class UserRoleService {
-
-	@Autowired
-	UserRoleRepo userRoleRepo;
-
-	/**
-	 * 获取全部角色
-	 * 
-	 * @return
-	 */
-	public List<Role> findAllRoles() {
-		return RolesService.ROLE_LIST;
-	}
-
-	public List<Role> findMarkerRoles() {
-		List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
-		tempRoles = tempRoles.stream().filter(role -> role.getCode().equals(RoleMeta.MARKER.name()))
-				.collect(Collectors.toList());
-		return tempRoles;
-	}
-
-	public List<Role> findNonMarkerRoles() {
-		List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
-		tempRoles = tempRoles.stream()
-				.filter(role -> !role.getCode().equals(RoleMeta.MARKER.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.SALES_MANAGER.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.IMPLEMENTERS_MANAGER.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.PROJECT_MANAGER.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.PRINT_MANAGER.name()))
-				.collect(Collectors.toList());
-		return tempRoles;
-	}
-
-	public List<Role> findAdminRoles() {
-		List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
-		tempRoles = tempRoles.stream()
-				.filter(role -> !role.getCode().equals(RoleMeta.MARKER.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.LC_USER.name()))
-				.collect(Collectors.toList());
-		return tempRoles;
-	}
-
-	public List<Role> findQmthRoles() {
-		List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
-		tempRoles = tempRoles.stream()
-				.filter(role -> !role.getCode().equals(RoleMeta.LC_USER.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.MARKING_ADMIN.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.MARKER.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.QUESTION_ADMIN.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.OE_ADMIN.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.PRINT_MANAGER.name()))
-				.collect(Collectors.toList());
-		return tempRoles;
-	}
-
-	public List<Role> findSchoolRoles() {
-		List<Role> tempRoles = new ArrayList<>(RolesService.ROLE_LIST);
-		tempRoles = tempRoles.stream()
-				.filter(role -> !role.getCode().equals(RoleMeta.MARKER.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.LC_USER.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.SALES_MANAGER.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.IMPLEMENTERS_MANAGER.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.PROJECT_MANAGER.name()))
-				.filter(role -> !role.getCode().equals(RoleMeta.PRINT_MANAGER.name()))
-				.collect(Collectors.toList());
-		return tempRoles;
-	}
-
-}