WANG 6 gadi atpakaļ
vecāks
revīzija
2d1f97d130

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/ScoreController.java → examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/SydxScoreController.java

@@ -29,7 +29,7 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @RequestMapping("/api/ecs_outlet/sydx/score")
-public class ScoreController  extends ControllerSupport{
+public class SydxScoreController  extends ControllerSupport{
 
     @Autowired
     private OutletScoreService outletScoreService;

+ 17 - 17
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/StudentExamInfoController.java → examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/SydxStudentExamInfoController.java

@@ -32,10 +32,10 @@ import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 import cn.com.qmth.examcloud.exchange.base.enums.CourseLevel;
-import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.ExamStudentImportRequest;
-import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.FailureRecordDomain;
-import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.OutletExam;
-import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.OutletExamStudent;
+import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.SydxImportDomain;
+import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.SydxFailureRecordDomain;
+import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.SydxExam;
+import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.SydxExamStudent;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
 
 /**
@@ -48,7 +48,7 @@ import cn.com.qmth.examcloud.web.support.ControllerSupport;
  */
 @RestController
 @RequestMapping("/api/ecs_outlet/sydx/import_exam_student_info")
-public class StudentExamInfoController extends ControllerSupport {
+public class SydxStudentExamInfoController extends ControllerSupport {
 
 	@Autowired
 	StudentCloudService studentCloudService;
@@ -67,11 +67,11 @@ public class StudentExamInfoController extends ControllerSupport {
 	 * @return
 	 */
 	@PostMapping
-	public ResponseEntity<?> post(@RequestBody ExamStudentImportRequest outerReq) {
+	public ResponseEntity<?> post(@RequestBody SydxImportDomain outerReq) {
 
 		tranTimes(outerReq);
 
-		OutletExam exam = outerReq.getExam();
+		SydxExam exam = outerReq.getExam();
 
 		User accessUser = getAccessUser();
 		Long rootOrgId = accessUser.getRootOrgId();
@@ -104,12 +104,12 @@ public class StudentExamInfoController extends ControllerSupport {
 		Long examId = resp.getId();
 		ExamBean examBean = resp.getExamBean();
 		String examName = examBean.getName();
-		List<OutletExamStudent> examStudentList = outerReq.getExamStudentList();
+		List<SydxExamStudent> examStudentList = outerReq.getExamStudentList();
 
 		List<Long> examStudentIdList = Lists.newArrayList();
-		List<FailureRecordDomain> failureRecordList = Lists.newArrayList();
+		List<SydxFailureRecordDomain> failureRecordList = Lists.newArrayList();
 
-		for (OutletExamStudent cur : examStudentList) {
+		for (SydxExamStudent cur : examStudentList) {
 
 			SaveStudentReq saveStudentReq = new SaveStudentReq();
 			saveStudentReq.setIdentityNumber(cur.getIdentityNumber());
@@ -168,7 +168,7 @@ public class StudentExamInfoController extends ControllerSupport {
 				ExamStudentBean examStudentBean = savedExamStudent.getExamStudentBean();
 				examStudentIdList.add(examStudentBean.getId());
 			} catch (StatusException e) {
-				FailureRecordDomain fr = new FailureRecordDomain();
+				SydxFailureRecordDomain fr = new SydxFailureRecordDomain();
 				fr.setCode(e.getCode());
 				fr.setDesc(e.getDesc());
 				fr.setCourseCode(cur.getCourseCode());
@@ -178,7 +178,7 @@ public class StudentExamInfoController extends ControllerSupport {
 				fr.setStudentCode(cur.getStudentCode());
 				failureRecordList.add(fr);
 			} catch (Exception e) {
-				FailureRecordDomain fr = new FailureRecordDomain();
+				SydxFailureRecordDomain fr = new SydxFailureRecordDomain();
 				fr.setCode("EX-210001");
 				fr.setDesc(e.getMessage());
 				fr.setCourseCode(cur.getCourseCode());
@@ -203,8 +203,8 @@ public class StudentExamInfoController extends ControllerSupport {
 	 * @author WANGWEI
 	 * @param examStudentImportDTO
 	 */
-	private void tranTimes(ExamStudentImportRequest examStudentImportDTO) {
-		OutletExam exam = examStudentImportDTO.getExam();
+	private void tranTimes(SydxImportDomain examStudentImportDTO) {
+		SydxExam exam = examStudentImportDTO.getExam();
 
 		String beginTime = exam.getBeginTime();
 		if (StringUtils.isNotBlank(beginTime)) {
@@ -220,11 +220,11 @@ public class StudentExamInfoController extends ControllerSupport {
 			exam.setEndTime(endTime);
 		}
 
-		List<OutletExamStudent> examStudentList = examStudentImportDTO.getExamStudentList();
+		List<SydxExamStudent> examStudentList = examStudentImportDTO.getExamStudentList();
 		if (CollectionUtils.isNotEmpty(examStudentList)) {
 
-			for (OutletExamStudent cur : examStudentList) {
-				OutletExam curExam = cur.getExam();
+			for (SydxExamStudent cur : examStudentList) {
+				SydxExam curExam = cur.getExam();
 				if (null == curExam) {
 					continue;
 				}

+ 2 - 2
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/OutletExam.java → examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/SydxExam.java

@@ -9,7 +9,7 @@ import cn.com.qmth.examcloud.api.commons.enums.ExamType;
 import cn.com.qmth.examcloud.exchange.base.enums.MarkingType;
 import cn.com.qmth.examcloud.exchange.base.enums.PracticeType;
 
-public class OutletExam implements Serializable {
+public class SydxExam implements Serializable {
 
 	private static final long serialVersionUID = -1674026406657304645L;
 
@@ -523,6 +523,6 @@ public class OutletExam implements Serializable {
 		this.faceVerifyEndMinute = faceVerifyEndMinute;
 	}
 
-	public OutletExam() {
+	public SydxExam() {
 	}
 }

+ 5 - 8
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/OutletExamStudent.java → examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/SydxExamStudent.java

@@ -2,18 +2,15 @@ package cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean;
 
 import java.io.Serializable;
 
-public class OutletExamStudent implements Serializable {
+public class SydxExamStudent implements Serializable {
 
-    /**
-	 * 
-	 */
 	private static final long serialVersionUID = 4647883873040374983L;
 
 	private long id;
 
     private String name;
 
-    private OutletExam exam;
+    private SydxExam exam;
     /**
      * 学校id
      */
@@ -128,7 +125,7 @@ public class OutletExamStudent implements Serializable {
      */
     private Boolean canUpload;
 
-	public OutletExamStudent() {}
+	public SydxExamStudent() {}
 	
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -150,11 +147,11 @@ public class OutletExamStudent implements Serializable {
         this.name = name;
     }
 
-    public OutletExam getExam() {
+    public SydxExam getExam() {
         return exam;
     }
 
-    public void setExam(OutletExam exam) {
+    public void setExam(SydxExam exam) {
         this.exam = exam;
     }
 

+ 95 - 95
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/FailureRecordDomain.java → examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/SydxFailureRecordDomain.java

@@ -1,95 +1,95 @@
-package cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean;
-
-import java.io.Serializable;
-
-public class FailureRecordDomain implements Serializable {
-
-	private static final long serialVersionUID = -6794614626330803366L;
-
-	/**
-	 * 状态码
-	 */
-	private String code;
-
-	/**
-	 * 状态描述
-	 */
-	private String desc;
-
-	private String name;
-
-	private String studentCode;
-
-	private String identityNumber;
-
-	private String courseCode;
-
-	private String courseName;
-
-	private String courseLevel;
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getDesc() {
-		return desc;
-	}
-
-	public void setDesc(String desc) {
-		this.desc = desc;
-	}
-
-	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;
-	}
-
-	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;
-	}
-
-}
+package cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean;
+
+import java.io.Serializable;
+
+public class SydxFailureRecordDomain implements Serializable {
+
+	private static final long serialVersionUID = -6794614626330803366L;
+
+	/**
+	 * 状态码
+	 */
+	private String code;
+
+	/**
+	 * 状态描述
+	 */
+	private String desc;
+
+	private String name;
+
+	private String studentCode;
+
+	private String identityNumber;
+
+	private String courseCode;
+
+	private String courseName;
+
+	private String courseLevel;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+
+	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;
+	}
+
+	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;
+	}
+
+}

+ 7 - 7
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/ExamStudentImportRequest.java → examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/SydxImportDomain.java

@@ -7,27 +7,27 @@ import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
 /**
  * Created by yuanpan on 2017/4/25.
  */
-public class ExamStudentImportRequest implements JsonSerializable {
+public class SydxImportDomain implements JsonSerializable {
 
 	private static final long serialVersionUID = 7067803176577343830L;
 
-	private OutletExam exam;
+	private SydxExam exam;
 
-	private List<OutletExamStudent> examStudentList;
+	private List<SydxExamStudent> examStudentList;
 
-	public OutletExam getExam() {
+	public SydxExam getExam() {
 		return exam;
 	}
 
-	public void setExam(OutletExam exam) {
+	public void setExam(SydxExam exam) {
 		this.exam = exam;
 	}
 
-	public List<OutletExamStudent> getExamStudentList() {
+	public List<SydxExamStudent> getExamStudentList() {
 		return examStudentList;
 	}
 
-	public void setExamStudentList(List<OutletExamStudent> examStudentList) {
+	public void setExamStudentList(List<SydxExamStudent> examStudentList) {
 		this.examStudentList = examStudentList;
 	}
 }