1.重构短信发送模块代码

2.新加获取试卷结构接口
3.添加多学号支持
4.违纪列表添加学习中心字段
5.添加获取试卷结构信息的RPC接口

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

@@ -7,6 +7,8 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.client;
 
+import cn.com.qmth.examcloud.core.oe.admin.api.request.UnbindExamStudentReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.UnbindExamStudentResp;
 import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.core.oe.admin.api.OeExamStudentCloudService;
@@ -44,4 +46,9 @@ public class OeExamStudentCloudServiceClient extends AbstractCloudClientSupport
 		return post("exam/student/findExamStudentInfoBy", req, FindExamStudentInfoResp.class);
 	}
 
+	@Override
+	public UnbindExamStudentResp unbindExamStudent(UnbindExamStudentReq req) {
+		return post("exam/student/unbindExamStudent", req, UnbindExamStudentResp.class);
+	}
+
 }

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

@@ -8,6 +8,8 @@
 package cn.com.qmth.examcloud.core.oe.admin.api;
 
 import cn.com.qmth.examcloud.api.commons.CloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.UnbindExamStudentReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.UnbindExamStudentResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.ExamStudentSyncAllDataReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.ExamStudentSyncPartDataReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.FindExamStudentInfoReq;
@@ -40,4 +42,10 @@ public interface OeExamStudentCloudService extends CloudService {
 	 */
 	public FindExamStudentInfoResp findExamStudentInfoBy(FindExamStudentInfoReq req);
 
+    /**
+     * 解绑考生学号
+     * @param req
+     * @return
+     */
+    UnbindExamStudentResp unbindExamStudent(UnbindExamStudentReq req);
 }

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

@@ -0,0 +1,32 @@
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+import java.util.List;
+
+public class UnbindExamStudentReq extends BaseRequest {
+    /**
+     * 身份证号码
+     */
+    private String identityNumber;
+    /**
+     * 学生code集合
+     */
+    private List<String> studentCodeList;
+
+    public String getIdentityNumber() {
+        return identityNumber;
+    }
+
+    public void setIdentityNumber(String identityNumber) {
+        this.identityNumber = identityNumber;
+    }
+
+    public List<String> getStudentCodeList() {
+        return studentCodeList;
+    }
+
+    public void setStudentCodeList(List<String> studentCodeList) {
+        this.studentCodeList = studentCodeList;
+    }
+}

examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/response/UnbindExamStudentResp.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 UnbindExamStudentResp extends BaseResponse {
+private Boolean success;
+private String msg;
+
+    public Boolean getSuccess() {
+        return success;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/OeExamPaperStructServiceClient.java

@@ -0,0 +1,19 @@
+package cn.com.qmth.examcloud.core.oe.student.api.client;
+
+import cn.com.qmth.examcloud.core.oe.student.api.OeExamPaperStructCloudService;
+import cn.com.qmth.examcloud.core.oe.student.api.request.GetExamRecordPaperStructReq;
+import cn.com.qmth.examcloud.core.oe.student.api.response.GetExamRecordPaperStructResp;
+import org.springframework.stereotype.Service;
+
+@Service("OeExamStudentCloudService")
+public class OeExamPaperStructServiceClient extends AbstractCloudClientSupport
+		implements
+		OeExamPaperStructCloudService {
+
+	private static final long serialVersionUID = 3904195239759933649L;
+
+	@Override
+	public GetExamRecordPaperStructResp GetExamRecordPaperStruct(GetExamRecordPaperStructReq req) {
+		return post("examRecordPaperStruct/getExamRecordPaperStruct",req,GetExamRecordPaperStructResp.class);
+	}
+}

examcloud-core-oe-student-api/pom.xml

@@ -13,5 +13,17 @@
 			<artifactId>examcloud-api-commons</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud.question</groupId>
+            <artifactId>examcloud-question-commons</artifactId>
+            <version>2019-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud.question</groupId>
+            <artifactId>examcloud-question-commons</artifactId>
+            <version>2019-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 </project>

examcloud-core-oe-student-api/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/OeExamPaperStructCloudService.java

@@ -0,0 +1,14 @@
+package cn.com.qmth.examcloud.core.oe.student.api;
+
+import cn.com.qmth.examcloud.api.commons.CloudService;
+import cn.com.qmth.examcloud.core.oe.student.api.request.GetExamRecordPaperStructReq;
+import cn.com.qmth.examcloud.core.oe.student.api.response.GetExamRecordPaperStructResp;
+
+public interface OeExamPaperStructCloudService extends CloudService {
+    /**
+     * 获取网考中保存的试卷结构
+     * @param req
+     * @return
+     */
+    GetExamRecordPaperStructResp GetExamRecordPaperStruct(GetExamRecordPaperStructReq req);
+}

examcloud-core-oe-student-api/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/request/GetExamRecordPaperStructReq.java

@@ -0,0 +1,20 @@
+package cn.com.qmth.examcloud.core.oe.student.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+import java.util.List;
+
+public class GetExamRecordPaperStructReq extends BaseRequest {
+    /**
+     * 考试记录id
+     */
+    private Long examRecordDataId;
+
+    public Long getExamRecordDataId() {
+        return examRecordDataId;
+    }
+
+    public void setExamRecordDataId(Long examRecordDataId) {
+        this.examRecordDataId = examRecordDataId;
+    }
+}

examcloud-core-oe-student-api/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/response/GetExamRecordPaperStructResp.java

@@ -0,0 +1,16 @@
+package cn.com.qmth.examcloud.core.oe.student.api.response;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+import cn.com.qmth.examcloud.question.commons.core.paper.DefaultPaper;
+
+public class GetExamRecordPaperStructResp extends BaseResponse {
+    private DefaultPaper defaultPaper;
+
+    public DefaultPaper getDefaultPaper() {
+        return defaultPaper;
+    }
+
+    public void setDefaultPaper(DefaultPaper defaultPaper) {
+        this.defaultPaper = defaultPaper;
+    }
+}

examcloud-exchange-inner-api-client/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/client/SendSmsServiceClient.java

@@ -1,3 +1,4 @@
+/*
 package cn.com.qmth.examcloud.exchange.inner.api.client;
 
 import org.springframework.stereotype.Service;
@@ -5,17 +6,19 @@ import org.springframework.stereotype.Service;
 import cn.com.qmth.examcloud.exchange.inner.api.SendSmsCloudService;
 import cn.com.qmth.examcloud.exchange.inner.api.request.CaptureFailedAlarmReq;
 import cn.com.qmth.examcloud.exchange.inner.api.request.CheckSmsCodeReq;
-import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsReq;
+import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsReq1;
 import cn.com.qmth.examcloud.exchange.inner.api.response.CheckIdentifyingCodeResp;
 import cn.com.qmth.examcloud.exchange.inner.api.response.SendSmsResp;
 
+*/
 /**
  * 
  * @author chenken
  * @date 2018年7月3日 下午4:01:56
  * @company QMTH
  * @description SendSmsServiceClient.java
- */
+ *//*
+
 @Service
 public class SendSmsServiceClient extends AbstractCloudClientSupport
 		implements
@@ -24,7 +27,7 @@ public class SendSmsServiceClient extends AbstractCloudClientSupport
 	private static final long serialVersionUID = -2880611326177571371L;
 
 	@Override
-	public SendSmsResp sendIdentifyingCode(SendSmsReq sendSmsReq) {
+	public SendSmsResp sendIdentifyingCode(SendSmsReq1 sendSmsReq) {
 		return post("/sendSms/sendIdentifyingCode", sendSmsReq, SendSmsResp.class);
 	}
 
@@ -39,3 +42,4 @@ public class SendSmsServiceClient extends AbstractCloudClientSupport
 		post("/sendSms/captureFailedAlarm", captureFailedAlarmReq, null);
 	}
 }
+*/

examcloud-exchange-inner-api-client/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/client/SmsServiceClient.java

@@ -0,0 +1,41 @@
+package cn.com.qmth.examcloud.exchange.inner.api.client;
+
+import cn.com.qmth.examcloud.exchange.inner.api.SmsCloudService;
+import cn.com.qmth.examcloud.exchange.inner.api.request.CheckSmsCodeReq;
+import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsCodeReq;
+import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsReq;
+import cn.com.qmth.examcloud.exchange.inner.api.response.CheckIdentifyingCodeResp;
+import cn.com.qmth.examcloud.exchange.inner.api.response.SendSmsCodeResp;
+import cn.com.qmth.examcloud.exchange.inner.api.response.SendSmsResp;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author chenken
+ * @date 2018年7月3日 下午4:01:56
+ * @company QMTH
+ * @description SendSmsServiceClient.java
+ */
+@Service
+public class SmsServiceClient extends AbstractCloudClientSupport
+        implements
+        SmsCloudService {
+
+    private static final long serialVersionUID = -2880611326177571371L;
+
+
+    @Override
+    public SendSmsResp sendSms(SendSmsReq req) {
+
+        return post("/sms/sendSms", req, SendSmsResp.class);
+    }
+
+    @Override
+    public SendSmsCodeResp sendIdentifyingCode(SendSmsCodeReq req) {
+        return post("/sms/sendIdentifyingCode", req, SendSmsCodeResp.class);
+    }
+
+    @Override
+    public CheckIdentifyingCodeResp checkIdentifyingCode(CheckSmsCodeReq req) {
+        return post("/sms/checkIdentifyingCode", req, CheckIdentifyingCodeResp.class);
+    }
+}

examcloud-exchange-inner-api/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/SendSmsCloudService.java

@@ -1,37 +1,47 @@
+/*
 package cn.com.qmth.examcloud.exchange.inner.api;
 
 import cn.com.qmth.examcloud.api.commons.CloudService;
 import cn.com.qmth.examcloud.exchange.inner.api.request.CaptureFailedAlarmReq;
 import cn.com.qmth.examcloud.exchange.inner.api.request.CheckSmsCodeReq;
-import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsReq;
+import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsReq1;
 import cn.com.qmth.examcloud.exchange.inner.api.response.CheckIdentifyingCodeResp;
 import cn.com.qmth.examcloud.exchange.inner.api.response.SendSmsResp;
 
+*/
 /**
  * 短信发送
  * @author  	chenken
  * @date    	2018年7月3日 下午3:32:52
  * @company 	QMTH
  * @description SendSmsCloudService.java
- */
+ *//*
+
 public interface SendSmsCloudService extends CloudService{
 	
-	/**
+	*/
+/**
 	 * 发送验证码
-	 */
-	public SendSmsResp sendIdentifyingCode(SendSmsReq sendSmsReq);
+	 *//*
+
+	public SendSmsResp sendIdentifyingCode(SendSmsReq1 sendSmsReq);
 	
-	/**
+	*/
+/**
 	 * 校验验证码
 	 * @param phone
 	 * @param code
-	 */
+	 *//*
+
 	public CheckIdentifyingCodeResp checkIdentifyingCode(CheckSmsCodeReq checkSmsCodeReq);
 	
-	/**
+	*/
+/**
 	 * 抓拍失败报警
-	 */
+	 *//*
+
 	public void captureFailedAlarm(CaptureFailedAlarmReq captureFailedAlarmReq) throws Exception;
 }
 
 
+*/

examcloud-exchange-inner-api/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/SmsCloudService.java

@@ -0,0 +1,38 @@
+package cn.com.qmth.examcloud.exchange.inner.api;
+
+import cn.com.qmth.examcloud.api.commons.CloudService;
+import cn.com.qmth.examcloud.exchange.inner.api.request.CheckSmsCodeReq;
+import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsCodeReq;
+import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsReq;
+import cn.com.qmth.examcloud.exchange.inner.api.response.CheckIdentifyingCodeResp;
+import cn.com.qmth.examcloud.exchange.inner.api.response.SendSmsCodeResp;
+import cn.com.qmth.examcloud.exchange.inner.api.response.SendSmsResp;
+
+
+/**
+ * 发送短信服务
+ */
+public interface SmsCloudService extends CloudService {
+
+    /**
+     * 发送短信
+     *
+     * @param req
+     * @return
+     * @author WANGWEI
+     */
+    SendSmsResp sendSms(SendSmsReq req);
+
+    /**
+     * 发送验证码
+     */
+    SendSmsCodeResp sendIdentifyingCode(SendSmsCodeReq sendSmsCodeReq);
+
+    /**
+     * 校验验证码
+     *
+     * @param phone
+     * @param code
+     */
+    CheckIdentifyingCodeResp checkIdentifyingCode(CheckSmsCodeReq checkSmsCodeReq);
+}

examcloud-exchange-inner-api/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/request/CheckSmsCodeReq.java

@@ -1,6 +1,9 @@
 package cn.com.qmth.examcloud.exchange.inner.api.request;
 
 import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
 
 public class CheckSmsCodeReq  extends BaseRequest{
 
@@ -9,8 +12,17 @@ public class CheckSmsCodeReq  extends BaseRequest{
 	 */
 	private static final long serialVersionUID = -5177345026766086276L;
 
+	/**
+	 * 手机号码
+	 */
+	@NotBlank(message = "手机号码不能为空")
+	@ApiModelProperty(value = "手机号码", example = "1370000001", required = true)
 	private String phone;
-	
+	/**
+	 * 短信验证码
+	 */
+	@NotBlank(message = "短信验证码不能为空")
+	@ApiModelProperty(value = "短信验证码", example = "8888", required = true)
 	private String code;
 
 	public String getPhone() {

examcloud-exchange-inner-api/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/request/SendSmsCodeReq.java

@@ -0,0 +1,46 @@
+package cn.com.qmth.examcloud.exchange.inner.api.request;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 发送短信验证码请求类
+ */
+public class SendSmsCodeReq extends BaseRequest{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8002846980120664036L;
+	
+	/**
+	 * 手机号码 
+	 */
+	@NotBlank(message = "手机号码不能为空")
+	@ApiModelProperty(value = "手机号码", example = "1370000001", required = true)
+	private String phone;
+	/**
+	 * 短信验证码
+	 */
+	@NotBlank(message = "短信验证码不能为空")
+	@ApiModelProperty(value = "短信验证码", example = "8888", required = true)
+	private String code;
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+}

examcloud-exchange-inner-api/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/request/SendSmsReq.java

@@ -1,85 +1,49 @@
 package cn.com.qmth.examcloud.exchange.inner.api.request;
-
 import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+import io.swagger.annotations.ApiModelProperty;
 
-public class SendSmsReq extends BaseRequest{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 8002846980120664036L;
-	
-	/**
-	 * 手机号码 
-	 */
-	private String phone;
-	/**
-	 * 验证码
-	 */
-	private String code;
-	/**
-	 * 签名
-	 */
-	private String sign;
-	/**
-	 * 模板code
-	 */
-	private String templateCode;
-	/**
-	 * 允许请求的间隔时间
-	 */
-	private Integer intervalSeconds;
-	/**
-	 * 验证码有效时间   秒
-	 */
-	private Integer effectiveTime;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+import java.util.Map;
 
-	public String getPhone() {
-		return phone;
-	}
+public class SendSmsReq extends BaseRequest {
 
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
+	private static final long serialVersionUID = 2927297232175851242L;
 
-	public String getCode() {
-		return code;
-	}
+	@NotEmpty(message = "phoneList不能为空")
+	@ApiModelProperty(value = "接受短信的手机号集合", example = "", required = true)
+	private List<String> phoneList;
 
-	public void setCode(String code) {
-		this.code = code;
-	}
+	@NotBlank(message = "smsAssemblyCode不能为空")
+	@ApiModelProperty(value = "短信配置编码", example = "T001", required = true)
+	private String smsAssemblyCode;
 
-	public String getTemplateCode() {
-		return templateCode;
-	}
+	@ApiModelProperty(value = "短信参数", example = "", required = false)
+	private Map<String, String> params;
 
-	public void setTemplateCode(String templateCode) {
-		this.templateCode = templateCode;
+	public List<String> getPhoneList() {
+		return phoneList;
 	}
 
-	public String getSign() {
-		return sign;
+	public void setPhoneList(List<String> phoneList) {
+		this.phoneList = phoneList;
 	}
 
-	public void setSign(String sign) {
-		this.sign = sign;
+	public String getSmsAssemblyCode() {
+		return smsAssemblyCode;
 	}
 
-	public Integer getEffectiveTime() {
-		return effectiveTime;
+	public void setSmsAssemblyCode(String smsAssemblyCode) {
+		this.smsAssemblyCode = smsAssemblyCode;
 	}
 
-	public void setEffectiveTime(Integer effectiveTime) {
-		this.effectiveTime = effectiveTime;
+	public Map<String, String> getParams() {
+		return params;
 	}
 
-	public Integer getIntervalSeconds() {
-		return intervalSeconds;
+	public void setParams(Map<String, String> params) {
+		this.params = params;
 	}
 
-	public void setIntervalSeconds(Integer intervalSeconds) {
-		this.intervalSeconds = intervalSeconds;
-	}
-	
 }

examcloud-exchange-inner-api/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/response/SendSmsCodeResp.java

@@ -0,0 +1,32 @@
+package cn.com.qmth.examcloud.exchange.inner.api.response;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+
+public class SendSmsCodeResp extends BaseResponse{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -7527034551594325879L;
+
+	private boolean success;
+	
+	private String returnMsg;
+	
+	public boolean isSuccess() {
+		return success;
+	}
+
+	public void setSuccess(boolean success) {
+		this.success = success;
+	}
+
+	public String getReturnMsg() {
+		return returnMsg;
+	}
+
+	public void setReturnMsg(String returnMsg) {
+		this.returnMsg = returnMsg;
+	}
+
+}

examcloud-exchange-inner-api/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/response/SendSmsResp.java

@@ -2,17 +2,13 @@ package cn.com.qmth.examcloud.exchange.inner.api.response;
 
 import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
 
-public class SendSmsResp extends BaseResponse{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -7527034551594325879L;
+public class SendSmsResp extends BaseResponse {
 
+	private static final long serialVersionUID = -3758698142658281704L;
 	private boolean success;
-	
+
 	private String returnMsg;
-	
+
 	public boolean isSuccess() {
 		return success;
 	}
@@ -28,5 +24,4 @@ public class SendSmsResp extends BaseResponse{
 	public void setReturnMsg(String returnMsg) {
 		this.returnMsg = returnMsg;
 	}
-
 }