Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-2/examcloud-rmi

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/RolePrivilegeCloudService.java

@@ -1,24 +1,21 @@
-package cn.com.qmth.examcloud.core.basic.api;
-
-import java.util.List;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
-import cn.com.qmth.examcloud.core.basic.api.bean.RoleBean;
-
-/**
- * 角色权限云服务
- * 
- * @author WANGWEI
- *
- */
-public interface RolePrivilegeCloudService extends CloudService {
-
-	/**
-	 * 获取所有角色
-	 *
-	 * @author WANGWEI
-	 * @return
-	 */
-	List<RoleBean> getAllRoles(Boolean withSuperAdmin);
-
-}
+package cn.com.qmth.examcloud.core.basic.api;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
+import cn.com.qmth.examcloud.core.basic.api.request.DeleteRoleReq;
+import cn.com.qmth.examcloud.core.basic.api.request.SaveRoleReq;
+import cn.com.qmth.examcloud.core.basic.api.response.DeleteRoleResp;
+import cn.com.qmth.examcloud.core.basic.api.response.SaveRoleResp;
+
+/**
+ * 角色权限云服务
+ * 
+ * @author WANGWEI
+ *
+ */
+public interface RolePrivilegeCloudService extends CloudService {
+
+	SaveRoleResp saveRole(SaveRoleReq req);
+
+	DeleteRoleResp deleteRole(DeleteRoleReq req);
+
+}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/DeleteRoleReq.java

@@ -0,0 +1,59 @@
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class DeleteRoleReq extends BaseRequest {
+
+	private static final long serialVersionUID = 1378679217589137402L;
+
+	private Long id;
+
+	private String code;
+
+	private String name;
+
+	private Long rootOrgId;
+
+	private boolean cascade;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public boolean isCascade() {
+		return cascade;
+	}
+
+	public void setCascade(boolean cascade) {
+		this.cascade = cascade;
+	}
+
+}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetStudentReq.java

@@ -1,48 +1,48 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class GetStudentReq extends BaseRequest {
-
-	private static final long serialVersionUID = 2135618523755240278L;
-
-	/**
-	 * 顶级机构ID
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 学生code
-	 */
-	private String studentCode;
-
-	/**
-	 * 身份证号码
-	 */
-	private String identityNumber;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+public class GetStudentReq extends BaseRequest {
+
+	private static final long serialVersionUID = 2135618523755240278L;
+
+	/**
+	 * 顶级机构ID
+	 */
+	private Long rootOrgId;
+
+	/**
+	 * 学生ID
+	 */
+	private Long studentId;
+
+	/**
+	 * 身份证号码
+	 */
+	private String identityNumber;
+
+	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;
+	}
+
+}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SaveRoleReq.java

@@ -0,0 +1,46 @@
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年9月3日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class SaveRoleReq extends BaseRequest {
+
+	private static final long serialVersionUID = 5909926191507766711L;
+
+	private String code;
+
+	private String name;
+
+	private Long rootOrgId;
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/DeleteRoleResp.java

@@ -0,0 +1,23 @@
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.core.basic.api.bean.RoleBean;
+
+public class DeleteRoleResp extends BaseResponse {
+
+	/**
+	 * 属性注释
+	 */
+	private static final long serialVersionUID = 3861498499053730038L;
+
+	private RoleBean roleBean;
+
+	public RoleBean getRoleBean() {
+		return roleBean;
+	}
+
+	public void setRoleBean(RoleBean roleBean) {
+		this.roleBean = roleBean;
+	}
+
+}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SaveRoleResp.java

@@ -0,0 +1,20 @@
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.core.basic.api.bean.RoleBean;
+
+public class SaveRoleResp extends BaseResponse {
+
+	private static final long serialVersionUID = -3697515955413916061L;
+
+	private RoleBean roleBean;
+
+	public RoleBean getRoleBean() {
+		return roleBean;
+	}
+
+	public void setRoleBean(RoleBean roleBean) {
+		this.roleBean = roleBean;
+	}
+
+}