merge from release_v4.0.2

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

@@ -4,12 +4,14 @@ import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.core.basic.api.StudentCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.CountStudentReq;
+import cn.com.qmth.examcloud.core.basic.api.request.GetStudentListByIdsReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetStudentReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveStudentReq;
 import cn.com.qmth.examcloud.core.basic.api.request.UnbindStudentCodeReq;
 import cn.com.qmth.examcloud.core.basic.api.request.UpdatePasswordReq;
 import cn.com.qmth.examcloud.core.basic.api.request.UpdateStudentStatusReq;
 import cn.com.qmth.examcloud.core.basic.api.response.CountStudentResp;
+import cn.com.qmth.examcloud.core.basic.api.response.GetStudentListByIdsResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetStudentResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveStudentResp;
 import cn.com.qmth.examcloud.core.basic.api.response.UnbindStudentCodeResp;
@@ -53,4 +55,9 @@ public class StudentCloudServiceClient extends AbstractCloudClientSupport
 		return post("student/countStudent", req, CountStudentResp.class);
 	}
 
+	@Override
+	public GetStudentListByIdsResp getStudentListByIds(GetStudentListByIdsReq req) {
+		return post("student/getStudentListByIds", req, GetStudentListByIdsResp.class);
+	}
+
 }

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

@@ -0,0 +1,32 @@
+package cn.com.qmth.examcloud.core.basic.api.client;
+
+import cn.com.qmth.examcloud.core.basic.api.UserDataRuleCloudService;
+import cn.com.qmth.examcloud.core.basic.api.request.AddUserDataRuleReq;
+import cn.com.qmth.examcloud.core.basic.api.request.CheckUserDataRuleReq;
+import cn.com.qmth.examcloud.core.basic.api.request.QueryUserDataRuleReq;
+import cn.com.qmth.examcloud.core.basic.api.response.AddUserDataRuleResp;
+import cn.com.qmth.examcloud.core.basic.api.response.CheckUserDataRuleResp;
+import cn.com.qmth.examcloud.core.basic.api.response.QueryUserDataRuleResp;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserDataRuleCloudServiceClient extends AbstractCloudClientSupport implements UserDataRuleCloudService {
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public QueryUserDataRuleResp queryUserDataRule(QueryUserDataRuleReq req) {
+        return post("user/data/rule/query", req, QueryUserDataRuleResp.class);
+    }
+
+    @Override
+    public CheckUserDataRuleResp checkUserDataRule(CheckUserDataRuleReq req) {
+        return post("user/data/rule/check", req, CheckUserDataRuleResp.class);
+    }
+
+    @Override
+    public AddUserDataRuleResp addUserDataRule(AddUserDataRuleReq req) {
+        return post("user/data/rule/add", req, AddUserDataRuleResp.class);
+    }
+
+}

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

@@ -2,12 +2,14 @@ package cn.com.qmth.examcloud.core.basic.api;
 
 import cn.com.qmth.examcloud.api.commons.CloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.CountStudentReq;
+import cn.com.qmth.examcloud.core.basic.api.request.GetStudentListByIdsReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetStudentReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveStudentReq;
 import cn.com.qmth.examcloud.core.basic.api.request.UnbindStudentCodeReq;
 import cn.com.qmth.examcloud.core.basic.api.request.UpdatePasswordReq;
 import cn.com.qmth.examcloud.core.basic.api.request.UpdateStudentStatusReq;
 import cn.com.qmth.examcloud.core.basic.api.response.CountStudentResp;
+import cn.com.qmth.examcloud.core.basic.api.response.GetStudentListByIdsResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetStudentResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveStudentResp;
 import cn.com.qmth.examcloud.core.basic.api.response.UnbindStudentCodeResp;
@@ -77,4 +79,6 @@ public interface StudentCloudService extends CloudService {
 	 */
 	CountStudentResp countStudent(CountStudentReq req);
 
+	GetStudentListByIdsResp getStudentListByIds(GetStudentListByIdsReq req);
+
 }

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

@@ -0,0 +1,24 @@
+package cn.com.qmth.examcloud.core.basic.api;
+
+import cn.com.qmth.examcloud.api.commons.CloudService;
+import cn.com.qmth.examcloud.core.basic.api.request.AddUserDataRuleReq;
+import cn.com.qmth.examcloud.core.basic.api.request.CheckUserDataRuleReq;
+import cn.com.qmth.examcloud.core.basic.api.request.QueryUserDataRuleReq;
+import cn.com.qmth.examcloud.core.basic.api.response.AddUserDataRuleResp;
+import cn.com.qmth.examcloud.core.basic.api.response.CheckUserDataRuleResp;
+import cn.com.qmth.examcloud.core.basic.api.response.QueryUserDataRuleResp;
+
+/**
+ * 用户数据权限相关接口
+ *
+ * @since: 2020/12/18
+ */
+public interface UserDataRuleCloudService extends CloudService {
+
+    QueryUserDataRuleResp queryUserDataRule(QueryUserDataRuleReq req);
+
+    CheckUserDataRuleResp checkUserDataRule(CheckUserDataRuleReq req);
+
+    AddUserDataRuleResp addUserDataRule(AddUserDataRuleReq req);
+
+}

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

@@ -0,0 +1,60 @@
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.api.commons.enums.DataRuleType;
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @since: 2020/12/18
+ */
+public class AddUserDataRuleReq extends BaseRequest {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    @ApiModelProperty(value = "权限类型")
+    private DataRuleType type;
+
+    @ApiModelProperty(value = "关联ID")
+    private List<Long> refIds;
+
+    public AddUserDataRuleReq() {
+
+    }
+
+    public AddUserDataRuleReq(Long userId, DataRuleType type, Long... refIds) {
+        this.userId = userId;
+        this.type = type;
+        this.refIds = Arrays.asList(refIds);
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public DataRuleType getType() {
+        return type;
+    }
+
+    public void setType(DataRuleType type) {
+        this.type = type;
+    }
+
+    public List<Long> getRefIds() {
+        return refIds;
+    }
+
+    public void setRefIds(List<Long> refIds) {
+        this.refIds = refIds;
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.api.commons.enums.DataRuleType;
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @since: 2020/12/18
+ */
+public class CheckUserDataRuleReq extends BaseRequest {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    @ApiModelProperty(value = "权限类型")
+    private DataRuleType type;
+
+    @ApiModelProperty(value = "关联ID")
+    private Long refId;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public DataRuleType getType() {
+        return type;
+    }
+
+    public void setType(DataRuleType type) {
+        this.type = type;
+    }
+
+    public Long getRefId() {
+        return refId;
+    }
+
+    public void setRefId(Long refId) {
+        this.refId = refId;
+    }
+
+}

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

@@ -0,0 +1,35 @@
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+public class GetStudentListByIdsReq extends BaseRequest {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 287437981018350014L;
+
+	private Long rootOrgId;
+
+	private List<Long> studentIdList;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public List<Long> getStudentIdList() {
+		return studentIdList;
+	}
+
+	public void setStudentIdList(List<Long> studentIdList) {
+		this.studentIdList = studentIdList;
+	}
+
+
+}

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

@@ -0,0 +1,36 @@
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.api.commons.enums.DataRuleType;
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @since: 2020/12/18
+ */
+public class QueryUserDataRuleReq extends BaseRequest {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "用户ID")
+    private Long userId;
+
+    @ApiModelProperty(value = "权限类型")
+    private DataRuleType type;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public DataRuleType getType() {
+        return type;
+    }
+
+    public void setType(DataRuleType type) {
+        this.type = type;
+    }
+
+}

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

@@ -0,0 +1,12 @@
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+
+/**
+ * @since: 2020/12/18
+ */
+public class AddUserDataRuleResp extends BaseResponse {
+
+    private static final long serialVersionUID = 1L;
+
+}

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

@@ -0,0 +1,24 @@
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @since: 2020/12/18
+ */
+public class CheckUserDataRuleResp extends BaseResponse {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "是否通过")
+    private boolean pass;
+
+    public boolean isPass() {
+        return pass;
+    }
+
+    public void setPass(boolean pass) {
+        this.pass = pass;
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+import cn.com.qmth.examcloud.core.basic.api.bean.StudentBean;
+
+public class GetStudentListByIdsResp extends BaseResponse {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6042888959046562679L;
+	private List<StudentBean> studentBeanList;
+
+	public List<StudentBean> getStudentBeanList() {
+		return studentBeanList;
+	}
+
+	public void setStudentBeanList(List<StudentBean> studentBeanList) {
+		this.studentBeanList = studentBeanList;
+	}
+
+}

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

@@ -0,0 +1,37 @@
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Set;
+
+/**
+ * @since: 2020/12/18
+ */
+public class QueryUserDataRuleResp extends BaseResponse {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "“默认全部”状态")
+    private Boolean globalStatus;
+
+    @ApiModelProperty(value = "关联ID列表")
+    private Set<Long> refIds;
+
+    public Boolean getGlobalStatus() {
+        return globalStatus;
+    }
+
+    public void setGlobalStatus(Boolean globalStatus) {
+        this.globalStatus = globalStatus;
+    }
+
+    public Set<Long> getRefIds() {
+        return refIds;
+    }
+
+    public void setRefIds(Set<Long> refIds) {
+        this.refIds = refIds;
+    }
+
+}

examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/ExamCloudServiceClient.java

@@ -106,8 +106,8 @@ public class ExamCloudServiceClient extends AbstractCloudClientSupport implement
     }
 
     @Override
-    public GetExamNamesResp getExamNames(GetExamNamesReq req) {
-        return post("exam/getExamNames", req, GetExamNamesResp.class);
+    public GetExamMapsResp getExamMaps(GetExamMapsReq req) {
+        return post("exam/getExamMaps", req, GetExamMapsResp.class);
     }
 
 }

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/ExamCloudService.java

@@ -163,6 +163,6 @@ public interface ExamCloudService extends CloudService {
      */
     SaveStudentSpecialSettingsResp saveStudentSpecialSettings(SaveStudentSpecialSettingsReq req);
 
-    GetExamNamesResp getExamNames(GetExamNamesReq req);
+    GetExamMapsResp getExamMaps(GetExamMapsReq req);
 
 }

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/GetExamNamesReq.java → examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/GetExamMapsReq.java

@@ -4,7 +4,7 @@ import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 
 import java.util.Set;
 
-public class GetExamNamesReq extends BaseRequest {
+public class GetExamMapsReq extends BaseRequest {
 
     private static final long serialVersionUID = 8427775553678919877L;
 

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/response/GetExamMapsResp.java

@@ -0,0 +1,22 @@
+package cn.com.qmth.examcloud.examwork.api.response;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
+
+import java.util.Map;
+
+public class GetExamMapsResp extends BaseResponse {
+
+    private static final long serialVersionUID = 8427775553678919877L;
+
+    private Map<Long, ExamBean> examMaps;
+
+    public Map<Long, ExamBean> getExamMaps() {
+        return examMaps;
+    }
+
+    public void setExamMaps(Map<Long, ExamBean> examMaps) {
+        this.examMaps = examMaps;
+    }
+
+}

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/response/GetExamNamesResp.java

@@ -1,21 +0,0 @@
-package cn.com.qmth.examcloud.examwork.api.response;
-
-import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
-
-import java.util.Map;
-
-public class GetExamNamesResp extends BaseResponse {
-
-    private static final long serialVersionUID = 8427775553678919877L;
-
-    private Map<Long, String> examNames;
-
-    public Map<Long, String> getExamNames() {
-        return examNames;
-    }
-
-    public void setExamNames(Map<Long, String> examNames) {
-        this.examNames = examNames;
-    }
-
-}

examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordCloudServiceClient.java

@@ -56,4 +56,9 @@ public class ExamRecordCloudServiceClient extends AbstractCloudClientSupport
 	public GetPagedToBeMarkExamRecordResp getPagedToBeMarkExamRecord(GetPagedToBeMarkExamRecordReq req) {
 		return post("examRecord/getPagedToBeMarkExamRecord", req, GetPagedToBeMarkExamRecordResp.class);
 	}
+
+	@Override
+	public GetAwaitingAuditCountResp getGetAwaitingAuditCount(GetAwaitingAuditCountReq req) {
+		return post("examRecord/getGetAwaitingAuditCount", req, GetAwaitingAuditCountResp.class);
+	}
 }

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/ExamRecordCloudService.java

@@ -60,4 +60,10 @@ public interface ExamRecordCloudService extends CloudService{
 	 * @return
 	 */
 	GetPagedToBeMarkExamRecordResp getPagedToBeMarkExamRecord(GetPagedToBeMarkExamRecordReq req);
+	
+	/**获取考试监考待审记录数
+	 * @param req
+	 * @return
+	 */
+	GetAwaitingAuditCountResp getGetAwaitingAuditCount(GetAwaitingAuditCountReq req);
 }

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/GetAwaitingAuditCountReq.java

@@ -0,0 +1,35 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+public class GetAwaitingAuditCountReq extends BaseRequest {
+
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3759366509042229904L;
+
+	private Long rootOrgId;
+	
+	private Long examId;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+
+	
+}

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/response/GetAwaitingAuditCountResp.java

@@ -0,0 +1,24 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.response;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+public class GetAwaitingAuditCountResp extends BaseResponse {
+
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2784533221031465090L;
+	
+	private Long count;
+
+	public Long getCount() {
+		return count;
+	}
+
+	public void setCount(Long count) {
+		this.count = count;
+	}
+
+
+	
+}