Bläddra i källkod

update oe admim api.

deason 6 år sedan
förälder
incheckning
47e7597814

+ 4 - 4
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/ExamStudentCloudService.java

@@ -8,8 +8,8 @@
 package cn.com.qmth.examcloud.core.oe.admin.api;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
-import cn.com.qmth.examcloud.core.oe.admin.api.request.SaveExamStudentReq;
-import cn.com.qmth.examcloud.core.oe.admin.api.response.SaveExamStudentResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.SyncExamStudentReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.SyncExamStudentResp;
 
 /**
  * 考生信息接口
@@ -20,8 +20,8 @@ import cn.com.qmth.examcloud.core.oe.admin.api.response.SaveExamStudentResp;
 public interface ExamStudentCloudService extends CloudService {
 
     /**
-     * 保存考生信息
+     * 同步考生数据
      */
-    SaveExamStudentResp saveExamStudent(SaveExamStudentReq req);
+    SyncExamStudentResp syncExamStudent(SyncExamStudentReq req);
 
 }

+ 238 - 10
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/bean/ExamStudentBean.java

@@ -14,25 +14,109 @@ import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
  * @since: 2018/8/15
  */
 public class ExamStudentBean implements JsonSerializable {
-    private Long id;
-    private Long rootOrgId;
+    /**
+     * 考生ID
+     */
+    private Long examStudentId;
+    /**
+     * 考试ID
+     */
+    private Long examId;
+    /**
+     * 学生ID
+     */
     private Long studentId;
+    /**
+     * 学生code
+     */
+    private String studentCode;
+    /**
+     * 学生姓名
+     */
     private String studentName;
+    /**
+     * 身份证号码
+     */
+    private String identityNumber;
+    /**
+     * 课程ID
+     */
+    private Long courseId;
+    /**
+     * 课程Code
+     */
+    private String courseCode;
+    /**
+     * 课程名称
+     */
+    private String courseName;
+    /**
+     * 课程层次
+     */
+    private String courseLevel;
+    /**
+     * 学习中心ID
+     */
+    private Long orgId;
+    /**
+     * 学习中心代码
+     */
+    private String orgCode;
+    /**
+     * 学习中心名称
+     */
+    private String orgName;
+    /**
+     * 顶级机构ID
+     */
+    private Long rootOrgId;
+    /**
+     * 专业code
+     */
+    private String specialtyCode;
+    /**
+     * 专业名称
+     */
+    private String specialtyName;
+    /**
+     * 试卷类型
+     */
+    private String paperType;
+    /**
+     * 采集人
+     */
+    private String infoCollector;
+    /**
+     * 是否完成考试
+     */
+    private Boolean finished;
+    /**
+     * 正常考试次数
+     */
+    private Integer normalExamTimes;
+    /**
+     * 是否重考
+     */
+    private Boolean isReExamine;
+    /**
+     * 重考是否已完成
+     */
+    private Boolean reExamineCompleted;
 
-    public Long getId() {
-        return id;
+    public Long getExamStudentId() {
+        return examStudentId;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public void setExamStudentId(Long examStudentId) {
+        this.examStudentId = examStudentId;
     }
 
-    public Long getRootOrgId() {
-        return rootOrgId;
+    public Long getExamId() {
+        return examId;
     }
 
-    public void setRootOrgId(Long rootOrgId) {
-        this.rootOrgId = rootOrgId;
+    public void setExamId(Long examId) {
+        this.examId = examId;
     }
 
     public Long getStudentId() {
@@ -43,6 +127,14 @@ public class ExamStudentBean implements JsonSerializable {
         this.studentId = studentId;
     }
 
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
     public String getStudentName() {
         return studentName;
     }
@@ -51,4 +143,140 @@ public class ExamStudentBean implements JsonSerializable {
         this.studentName = studentName;
     }
 
+    public String getIdentityNumber() {
+        return identityNumber;
+    }
+
+    public void setIdentityNumber(String identityNumber) {
+        this.identityNumber = identityNumber;
+    }
+
+    public Long getCourseId() {
+        return courseId;
+    }
+
+    public void setCourseId(Long courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public String getCourseLevel() {
+        return courseLevel;
+    }
+
+    public void setCourseLevel(String courseLevel) {
+        this.courseLevel = courseLevel;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public Long getRootOrgId() {
+        return rootOrgId;
+    }
+
+    public void setRootOrgId(Long rootOrgId) {
+        this.rootOrgId = rootOrgId;
+    }
+
+    public String getSpecialtyCode() {
+        return specialtyCode;
+    }
+
+    public void setSpecialtyCode(String specialtyCode) {
+        this.specialtyCode = specialtyCode;
+    }
+
+    public String getSpecialtyName() {
+        return specialtyName;
+    }
+
+    public void setSpecialtyName(String specialtyName) {
+        this.specialtyName = specialtyName;
+    }
+
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+
+    public String getInfoCollector() {
+        return infoCollector;
+    }
+
+    public void setInfoCollector(String infoCollector) {
+        this.infoCollector = infoCollector;
+    }
+
+    public Boolean getFinished() {
+        return finished;
+    }
+
+    public void setFinished(Boolean finished) {
+        this.finished = finished;
+    }
+
+    public Integer getNormalExamTimes() {
+        return normalExamTimes;
+    }
+
+    public void setNormalExamTimes(Integer normalExamTimes) {
+        this.normalExamTimes = normalExamTimes;
+    }
+
+    public Boolean getReExamine() {
+        return isReExamine;
+    }
+
+    public void setReExamine(Boolean reExamine) {
+        isReExamine = reExamine;
+    }
+
+    public Boolean getReExamineCompleted() {
+        return reExamineCompleted;
+    }
+
+    public void setReExamineCompleted(Boolean reExamineCompleted) {
+        this.reExamineCompleted = reExamineCompleted;
+    }
+
 }

+ 1 - 1
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/SaveExamStudentReq.java → examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/request/SyncExamStudentReq.java

@@ -15,7 +15,7 @@ import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
  * @author: fengdesheng
  * @since: 2018/8/15
  */
-public class SaveExamStudentReq extends BaseRequest {
+public class SyncExamStudentReq extends BaseRequest {
     /**
      * 考生ID
      */

+ 14 - 7
examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/response/SaveExamStudentResp.java → examcloud-core-oe-admin-api/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/response/SyncExamStudentResp.java

@@ -8,21 +8,28 @@
 package cn.com.qmth.examcloud.core.oe.admin.api.response;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamStudentBean;
 
 /**
  * @author: fengdesheng
  * @since: 2018/8/15
  */
-public class SaveExamStudentResp extends BaseResponse {
-    private ExamStudentBean examStudentBean;
+public class SyncExamStudentResp extends BaseResponse {
+    private boolean success;
 
-    public ExamStudentBean getExamStudentBean() {
-        return examStudentBean;
+    public SyncExamStudentResp(boolean success) {
+        this.success = success;
     }
 
-    public void setExamStudentBean(ExamStudentBean examStudentBean) {
-        this.examStudentBean = examStudentBean;
+    public SyncExamStudentResp() {
+
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
     }
 
 }

+ 4 - 4
examcloud-core-oe-admin-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamStudentCloudServiceClient.java

@@ -9,8 +9,8 @@ package cn.com.qmth.examcloud.core.oe.admin.client;
 
 import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamStudentCloudService;
-import cn.com.qmth.examcloud.core.oe.admin.api.request.SaveExamStudentReq;
-import cn.com.qmth.examcloud.core.oe.admin.api.response.SaveExamStudentResp;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.SyncExamStudentReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.SyncExamStudentResp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
@@ -30,8 +30,8 @@ public class ExamStudentCloudServiceClient extends AdminCloudClientSupport imple
     private RedisClient redisClient;
 
     @Override
-    public SaveExamStudentResp saveExamStudent(SaveExamStudentReq examStudentReq) {
-        return post("exam/student/save", examStudentReq, SaveExamStudentResp.class);
+    public SyncExamStudentResp syncExamStudent(SyncExamStudentReq examStudent) {
+        return post("exam/student/sync/data", examStudent, SyncExamStudentResp.class);
     }
 
     @Override