WANG 6 år sedan
förälder
incheckning
59fd2180e4
27 ändrade filer med 13 tillägg och 1336 borttagningar
  1. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/swufe/ExamController.java
  2. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/swufe/StudentInfoController.java
  3. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/swufe/bean/ExamReq.java
  4. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/swufe/bean/StudentInfoReq.java
  5. 3 3
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/StudentExamInfoController.java
  6. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/ExamStudentImportDTO.java
  7. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/OutletExam.java
  8. 1 1
      examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/OutletExamStudent.java
  9. 0 18
      examcloud-exchange-outer-dao/pom.xml
  10. 0 20
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/ExamRecordDao.java
  11. 0 18
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/ExamScoreDao.java
  12. 0 65
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/OutletScoreDao.java
  13. 0 52
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/CreateFacesetResponse.java
  14. 0 69
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/ExamScore.java
  15. 0 26
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/Face.java
  16. 0 46
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/FaceDetectResponse.java
  17. 0 43
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/FaceRectangle.java
  18. 0 115
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletCourse.java
  19. 0 251
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletOrg.java
  20. 0 151
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletStudent.java
  21. 0 86
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/ExamRecordDaoImpl.java
  22. 0 52
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/ExamScoreDaoImpl.java
  23. 0 288
      examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/OutletScoreDaoImpl.java
  24. 1 1
      examcloud-exchange-outer-service/pom.xml
  25. 0 19
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/StudentInfoService.java
  26. 0 4
      examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/OutletScoreServiceImpl.java
  27. 2 2
      pom.xml

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/swufe/ExamController.java

@@ -21,7 +21,7 @@ import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
-import cn.com.qmth.examcloud.exchange.dao.bean.ExamReq;
+import cn.com.qmth.examcloud.exchange.outer.api.controller.swufe.bean.ExamReq;
 import io.swagger.annotations.ApiOperation;
 
 /**

+ 1 - 1
examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/swufe/StudentInfoController.java

@@ -27,7 +27,7 @@ import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 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.dao.bean.StudentInfoReq;
+import cn.com.qmth.examcloud.exchange.outer.api.controller.swufe.bean.StudentInfoReq;
 import io.swagger.annotations.ApiOperation;
 
 /**

+ 1 - 1
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/ExamReq.java → examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/swufe/bean/ExamReq.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.exchange.dao.bean;
+package cn.com.qmth.examcloud.exchange.outer.api.controller.swufe.bean;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
 

+ 1 - 1
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/StudentInfoReq.java → examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/swufe/bean/StudentInfoReq.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.exchange.dao.bean;
+package cn.com.qmth.examcloud.exchange.outer.api.controller.swufe.bean;
 
 import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
 

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

@@ -32,9 +32,9 @@ import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
 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.dao.bean.ExamStudentImportDTO;
-import cn.com.qmth.examcloud.exchange.dao.bean.OutletExam;
-import cn.com.qmth.examcloud.exchange.dao.bean.OutletExamStudent;
+import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.ExamStudentImportDTO;
+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 io.swagger.annotations.ApiOperation;
 
 /**

+ 1 - 1
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/ExamStudentImportDTO.java → examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/ExamStudentImportDTO.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.exchange.dao.bean;
+package cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.exchange.dao.bean;
+package cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.exchange.dao.bean;
+package cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean;
 
 import java.io.Serializable;
 

+ 0 - 18
examcloud-exchange-outer-dao/pom.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn.com.qmth.examcloud.exchange</groupId>
-		<artifactId>examcloud-exchange</artifactId>
-		<version>master-SNAPSHOT</version>
-	</parent>
-	<artifactId>examcloud-exchange-outer-dao</artifactId>
-
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.exchange</groupId>
-			<artifactId>examcloud-exchange-base</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-	</dependencies>
-</project>

+ 0 - 20
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/ExamRecordDao.java

@@ -1,20 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao;
-
-import java.util.List;
-
-import cn.com.qmth.examcloud.common.dto.em.ExamRecord;
-
-/**
- * @author  	chenken
- * @date    	2018年4月3日 下午3:53:42
- * @company 	QMTH
- * @description ExamRecordDao.java
- */
-public interface ExamRecordDao {
-
-	/*List<ExamRecord> findByExamStudentId(Long examStudentId);
-	
-	public ExamRecord findByScoreId(Long scoreId);*/
-
-}
-

+ 0 - 18
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/ExamScoreDao.java

@@ -1,18 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao;
-
-import java.util.List;
-
-import cn.com.qmth.examcloud.common.dto.em.ExamScore;
-
-/**
- * @author  	chenken
- * @date    	2018年4月3日 下午3:54:16
- * @company 	QMTH
- * @description ExamScoreDao.java
- */
-public interface ExamScoreDao {
-
-	/*List<ExamScore> findByExamRecordIdIn(List<Long> examRecordIds);*/
-
-}
-

+ 0 - 65
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/OutletScoreDao.java

@@ -1,65 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao;
-
-
-/**
- * @author  	chenken
- * @date    	2018年1月3日 下午4:02:01
- * @company 	QMTH
- * @description OutletScoreRepo.java
- */
-public interface OutletScoreDao {
-	
-	/**
-	 * 按考试,学号,课程查询成绩明细
-	 * @param rootOrgId
-	 * @param examName
-	 * @param studentCode
-	 * @param courseCode
-	 * @return
-	 */
-	//List<OutletScore> queryExamScoreBy(Long rootOrgId,Long examId,String studentCode,String courseCode);
-	/**
-	 * 石油大学:按scoreId查询成绩
-	 * @param scoreId
-	 * @return
-	 */
-	//List<OutletScore> sydxGetExamScoreById(Long scoreId);
-    /**
-	 * 按scoreId查询成绩
-	 * @param scoreId
-	 * @return
-	 */
-	//List<OutletScore> getExamScoreById(Long scoreId);
-    /**
-     * 按照examRemark,examStuRemark,examOrgId查询考生
-     * @param examRemark
-     * @param examStuRemark
-     * @param examOrgId
-     * @return
-     */
-   // public List<ExamStudent> findExamStudents(Long examId);
-    /**
-     * 根据身份证号查询查询考生
-     * @param identityNumbers
-     * @param examOrgId
-     * @return
-     */
-    //public List<ExamStudent> findExamStudents(List<String> identityNumbers, Long rootOrgId);
-    /**
-     * 根据考试名称身份证号查询查询考生
-     * @param identityNumbers
-     * @param examOrgId
-     * @return
-     */
-    //public List<ExamStudent> findExamStudents(Long examId,List<String> identityNumbers);
-    /**
-     * 根据机构ID,批次名称,课程code,学号List查询考生
-     * @param batchName
-     * @param courseCode
-     * @param studentCodes
-     * @return
-     */
-	//List<ExamStudent> findExamStudents(Long examId, String courseCode,List<String> studentCodes);
-    
-}
-

+ 0 - 52
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/CreateFacesetResponse.java

@@ -1,52 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao.bean;
-
-/**
- * Created by yuanpan on 2017/5/15.
- */
-public class CreateFacesetResponse {
-    private String request_id;
-    private String faceset_token;
-    private String outer_id;
-    private int face_added;
-    private int face_count;
-
-    public String getRequest_id() {
-        return request_id;
-    }
-
-    public void setRequest_id(String request_id) {
-        this.request_id = request_id;
-    }
-
-    public String getFaceset_token() {
-        return faceset_token;
-    }
-
-    public void setFaceset_token(String faceset_token) {
-        this.faceset_token = faceset_token;
-    }
-
-    public String getOuter_id() {
-        return outer_id;
-    }
-
-    public void setOuter_id(String outer_id) {
-        this.outer_id = outer_id;
-    }
-
-    public int getFace_added() {
-        return face_added;
-    }
-
-    public void setFace_added(int face_added) {
-        this.face_added = face_added;
-    }
-
-    public int getFace_count() {
-        return face_count;
-    }
-
-    public void setFace_count(int face_count) {
-        this.face_count = face_count;
-    }
-}

+ 0 - 69
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/ExamScore.java

@@ -1,69 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao.bean;
-
-
-
-/**
- * Created by yuanpan on 2017/4/27.
- */
-/*@Entity
-@SqlResultSetMapping(
-        name = "OutletScoreMapping",
-        classes = {
-                @ConstructorResult(
-                        targetClass = OutletScore.class,
-                        columns = {
-                                @ColumnResult(name = "score_id", type = Long.class),
-                                @ColumnResult(name = "student_name", type = String.class),
-                                @ColumnResult(name = "student_code", type = String.class),
-                                @ColumnResult(name = "identity_number", type = String.class),
-                                @ColumnResult(name = "total_score", type = Double.class),
-                                @ColumnResult(name = "objective_score", type = Double.class),
-                                @ColumnResult(name = "subjective_score", type = Double.class),
-                                @ColumnResult(name = "course_name", type = String.class),
-                                @ColumnResult(name = "course_code", type = String.class),
-                                @ColumnResult(name = "exam_remark", type = String.class),
-                                @ColumnResult(name = "student_remark", type = String.class),
-                                @ColumnResult(name = "end_time", type = String.class)
-                        }
-                )
-        }
-)
-@NamedNativeQueries({
-        @NamedNativeQuery(name = "ExamScore.sydxQuery", query = "select \n" +
-                "s.id `score_id`, stu.`name` `student_name`, stu.student_code,stu.identity_number,\n" +
-                "s.total_score,s.objective_score,s.subjective_score,\n" +
-                "stu.course_name,stu.course_code,e.remark `exam_remark`,stu.remark `student_remark`,\n" +
-                "r.end_time\n" +
-                "from oe_exam_score s \n" +
-                "left join oe_exam_record r on s.exam_record_id = r.id\n" +
-                "left join ecs_exam_student stu on stu.id = r.exam_student_id\n" +
-                "left join ecs_exam e on e.id = r.batch_id\n" +
-                "where e.remark = ?1 and stu.remark = ?2 and e.org_id = ?3", resultSetMapping = "OutletScoreMapping"),
-        @NamedNativeQuery(name = "ExamScore.sydxGet", query = "select \n" +
-                "s.id `score_id`, stu.`name` `student_name`, stu.student_code,stu.identity_number,\n" +
-                "s.total_score,s.objective_score,s.subjective_score,\n" +
-                "stu.course_name,stu.course_code,e.remark `exam_remark`,stu.remark `student_remark`,\n" +
-                "r.end_time\n" +
-                "from oe_exam_score s \n" +
-                "left join oe_exam_record r on s.exam_record_id = r.id\n" +
-                "left join ecs_exam_student stu on stu.id = r.exam_student_id\n" +
-                "left join ecs_exam e on e.id = r.batch_id\n" +
-                "where s.id = ?1 ", resultSetMapping = "OutletScoreMapping"),
-        @NamedNativeQuery(name = "ExamScore.sydxQueryScoreByIdentityNumber", query = "select \n" +
-                "s.id `score_id`, stu.`name` `student_name`, stu.student_code,stu.identity_number,\n" +
-                "s.total_score,s.objective_score,s.subjective_score,\n" +
-                "stu.course_name,stu.course_code,e.remark `exam_remark`,stu.remark `student_remark`,\n" +
-                "r.end_time\n" +
-                "from oe_exam_score s \n" +
-                "left join oe_exam_record r on s.exam_record_id = r.id\n" +
-                "left join ecs_exam_student stu on stu.id = r.exam_student_id\n" +
-                "left join ecs_exam e on e.id = r.batch_id\n" +
-                "where r.identity_number in (?1) and e.org_id = ?2", resultSetMapping = "OutletScoreMapping")
-})
-@Table(name = "oe_exam_score")
-public class ExamScore {
-
-    @Id
-    private Long id;
-}
-*/

+ 0 - 26
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/Face.java

@@ -1,26 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao.bean;
-
-/**
- * Created by yuanpan on 2017/5/15.
- */
-public class Face {
-    private String face_token;
-
-    private FaceRectangle face_rectangle;
-
-    public String getFace_token() {
-        return face_token;
-    }
-
-    public void setFace_token(String face_token) {
-        this.face_token = face_token;
-    }
-
-    public FaceRectangle getFace_rectangle() {
-        return face_rectangle;
-    }
-
-    public void setFace_rectangle(FaceRectangle face_rectangle) {
-        this.face_rectangle = face_rectangle;
-    }
-}

+ 0 - 46
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/FaceDetectResponse.java

@@ -1,46 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao.bean;
-
-import java.util.List;
-
-/**
- * Created by yuanpan on 2017/5/15.
- */
-public class FaceDetectResponse {
-    private String image_id;
-    private String request_id;
-    private int time_used;
-    private List<Face> faces;
-
-
-    public String getImage_id() {
-        return image_id;
-    }
-
-    public void setImage_id(String image_id) {
-        this.image_id = image_id;
-    }
-
-    public String getRequest_id() {
-        return request_id;
-    }
-
-    public void setRequest_id(String request_id) {
-        this.request_id = request_id;
-    }
-
-    public int getTime_used() {
-        return time_used;
-    }
-
-    public void setTime_used(int time_used) {
-        this.time_used = time_used;
-    }
-
-    public List<Face> getFaces() {
-        return faces;
-    }
-
-    public void setFaces(List<Face> faces) {
-        this.faces = faces;
-    }
-}

+ 0 - 43
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/FaceRectangle.java

@@ -1,43 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao.bean;
-
-/**
- * Created by yuanpan on 2017/5/15.
- */
-public class FaceRectangle {
-    private int width;
-    private int top;
-    private int left;
-    private int height;
-
-    public int getWidth() {
-        return width;
-    }
-
-    public void setWidth(int width) {
-        this.width = width;
-    }
-
-    public int getTop() {
-        return top;
-    }
-
-    public void setTop(int top) {
-        this.top = top;
-    }
-
-    public int getLeft() {
-        return left;
-    }
-
-    public void setLeft(int left) {
-        this.left = left;
-    }
-
-    public int getHeight() {
-        return height;
-    }
-
-    public void setHeight(int height) {
-        this.height = height;
-    }
-}

+ 0 - 115
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletCourse.java

@@ -1,115 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao.bean;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
-
-/**
- * 
- * @Description: 课程
- * @author ting.yin
- * @date 2017年1月5日
- */
-public class OutletCourse implements Serializable{
-
-	
-    /**
-	 * 
-	 */
-	private static final long serialVersionUID = 3402653478406795762L;
-
-	private Long id;
-
-	private String code;
-
-    private String name;
-
-	private Long orgId;
-	
-	private CourseLevel level;
-
-	private Date createTime;
-
-	private Date updateTime;
-
-	private Boolean enable;
-
-	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 Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-    public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public CourseLevel getLevel() {
-		return level;
-	}
-
-	public void setLevel(CourseLevel level) {
-		this.level = level;
-	}
-
-	public OutletCourse() {
-	}
-
-	public OutletCourse(String name, String code) {
-		this.name = name;
-		this.code = code;
-		this.createTime = new Date();
-		this.enable = true;
-	}
-}

+ 0 - 251
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletOrg.java

@@ -1,251 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao.bean;
-
-import javax.validation.constraints.NotNull;
-
-import cn.com.qmth.examcloud.exchange.base.enums.OutletOrgType;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class OutletOrg implements Serializable{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 8250086189391122785L;
-	private Long id;
-    /**
-     * 顶级机构id,无上级时为0;eg.学校即是顶级
-     */
-    private Long rootId;
-    /**
-     * 父级机构id,无上级时为0;eg.学习中心的父级为学校
-     */
-    private Long parentId;
-
-    private Integer level;
-    
-    private String name;
-    
-    /**
-     * 学习中心代码
-     */
-    private String code;
-
-    private String logo;
-
-    private String address;
-
-    /**
-     * 可使用的应用模块
-     */
-    private String apps;
-
-    @NotNull
-    private Boolean enable;
-    
-    /**
-     * 联系电话
-     */
-    private String telphone;
-    /**
-     * 联系人
-     */
-    private String contacts;
-
-    private Date createTime;
-
-    private Date updateTime;
-    
-    /**
-     * 机构类型:学校,启明,印刷
-     */
-    private OutletOrgType type;
-    
-    /**
-     * 机器数量
-     */
-    private Integer macNumber;
-    
-    /**
-     * 是否提供人员
-     */
-    private Boolean isProvide;
-    
-    /**
-     * 备注
-     */
-    private String remark;
-    
-    /**
-     * 网考端系统名称
-     */
-    private String examSysName;
-    
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getRootId() {
-        return rootId;
-    }
-
-    public void setRootId(Long rootId) {
-        this.rootId = rootId;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public Integer getLevel() {
-        return level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getLogo() {
-        return logo;
-    }
-
-    public void setLogo(String logo) {
-        this.logo = logo;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getApps() {
-        return apps;
-    }
-
-    public void setApps(String apps) {
-        this.apps = apps;
-    }
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-	public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getTelphone() {
-		return telphone;
-	}
-
-	public void setTelphone(String telphone) {
-		this.telphone = telphone;
-	}
-
-	public String getContacts() {
-		return contacts;
-	}
-
-	public void setContacts(String contacts) {
-		this.contacts = contacts;
-	}
-
-
-	public OutletOrgType getType() {
-		return type;
-	}
-
-	public void setType(OutletOrgType type) {
-		this.type = type;
-	}
-	
-	public Integer getMacNumber() {
-		return macNumber;
-	}
-
-	public void setMacNumber(Integer macNumber) {
-		this.macNumber = macNumber;
-	}
-
-	public Boolean getIsProvide() {
-		return isProvide;
-	}
-
-	public void setIsProvide(Boolean isProvide) {
-		this.isProvide = isProvide;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-	
-	public String getExamSysName() {
-		return examSysName;
-	}
-
-	public void setExamSysName(String examSysName) {
-		this.examSysName = examSysName;
-	}
-
-	public OutletOrg(String name, String code, String contacts,String telphone) {
-        this.name = name;
-        this.code = code;
-        this.telphone = telphone;
-        this.contacts = contacts;
-    }
-
-    public OutletOrg() {
-    }
-}

+ 0 - 151
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/bean/OutletStudent.java

@@ -1,151 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao.bean;
-
-import cn.com.qmth.examcloud.common.dto.core.User;
-
-import javax.validation.constraints.NotNull;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Created by songyue on 17/1/13.
- */
-public class OutletStudent implements Serializable {
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3879026866880289468L;
-
-	private Long id;
-
-	private User user;
-
-	@NotNull
-	private String name;
-
-	private String studentCode;
-
-	private String identityNumber;
-
-	private String photoPath;
-
-	private String remark;
-
-	private Boolean enable;
-
-	private Date createTime;
-
-	private Date updateTime;
-
-	private Long orgId;
-
-	private Long rootOrgId;
-
-	public static long getSerialVersionUID() {
-		return serialVersionUID;
-	}
-	
-	public OutletStudent() {
-	}
-
-	public OutletStudent(Long studentId) {
-		this.id = studentId;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public User getUser() {
-		return user;
-	}
-
-	public void setUser(User user) {
-		this.user = user;
-	}
-
-	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 getPhotoPath() {
-		return photoPath;
-	}
-
-	public void setPhotoPath(String photoPath) {
-		this.photoPath = photoPath;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-}

+ 0 - 86
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/ExamRecordDaoImpl.java

@@ -1,86 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao.impl;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Component;
-
-import cn.com.qmth.examcloud.common.dto.em.ExamRecord;
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamRecordStatus;
-import cn.com.qmth.examcloud.exchange.dao.ExamRecordDao;
-
-/**
- * @author  	chenken
- * @date    	2018年4月3日 下午3:54:00
- * @company 	QMTH
- * @description ExamRecordDaoImpl.java
- */
-@Component("examRecordDao")
-public class ExamRecordDaoImpl implements ExamRecordDao {
-	
-	private JdbcTemplate jdbcTemplate;
-
-	//@Override
-	public List<ExamRecord> findByExamStudentId(Long examStudentId) {
-		String sql = "select "
-						+ " t1.id id,"
-						+ " t2.root_org_id,"
-						+ " t2.exam_student_id,"
-						+ " t1.is_illegality,"
-						+ " t1.is_audit,"
-						+ " t1.is_warn,"
-						+ " t1.status "
-				 + " from      ec_oe_exam_record_data t1"
-				 + " left join ec_oe_exam_record t2 on t1.exam_record_id = t2.id "
-				 + " where t2.exam_student_id = "+examStudentId;
-		return jdbcTemplate.query(sql.toString(), new RowMapper<ExamRecord>() {
-			@Override
-			public ExamRecord mapRow(ResultSet rs, int arg1) throws SQLException {
-				ExamRecord examRecord = new ExamRecord();
-				examRecord.setId(rs.getLong("id"));
-				examRecord.setExamStudentId(rs.getLong("exam_student_id"));
-				examRecord.setInvigilatorOperation(rs.getInt("is_illegality"));
-				examRecord.setIsAudit(rs.getBoolean("is_audit"));
-				examRecord.setIsWarn(rs.getBoolean("is_warn"));
-				examRecord.setStatus(ExamRecordStatus.valueOf(rs.getString("status")));
-				examRecord.setOrgId(rs.getLong("org_id"));
-				return examRecord;
-			}
-		});
-	}
-
-	//@Override
-	public ExamRecord findByScoreId(Long scoreId) {
-		String sql = "select"
-						+ " t1.id,"
-						+ " t1.is_illegality,"
-						+ " t1.is_audit,"
-						+ " t1.is_warn,"
-						+ " t1.org_id,"
-						+ " t1.status,"
-						+ " t1.end_time,"
-						+ " t1.clean_time"
-				 + " from ec_oe_exam_record_data t1 "
-				 + " left join ec_oe_exam_score t2 on t1.id = t2.exam_record_data_id"
-				 + " where t2.id = "+scoreId;
-		return jdbcTemplate.queryForObject(sql.toString(), new RowMapper<ExamRecord>() {
-			@Override
-			public ExamRecord mapRow(ResultSet rs, int arg1) throws SQLException {
-				ExamRecord examRecord = new ExamRecord();
-				examRecord.setId(rs.getLong("id"));
-				examRecord.setInvigilatorOperation(rs.getInt("is_illegality"));
-				examRecord.setIsAudit(rs.getBoolean("is_audit"));
-				examRecord.setIsWarn(rs.getBoolean("is_warn"));
-				examRecord.setStatus(ExamRecordStatus.valueOf(rs.getString("status")));
-				examRecord.setOrgId(rs.getLong("org_id"));
-				examRecord.setEndTime(rs.getTimestamp("end_time"));
-				examRecord.setCleanTime(rs.getTimestamp("clean_time"));
-				return examRecord;
-			}
-		});
-	}
-}
-

+ 0 - 52
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/ExamScoreDaoImpl.java

@@ -1,52 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao.impl;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Component;
-
-import cn.com.qmth.examcloud.common.dto.em.ExamScore;
-import cn.com.qmth.examcloud.exchange.dao.ExamScoreDao;
-
-/**
- * @author  	chenken
- * @date    	2018年4月3日 下午3:54:23
- * @company 	QMTH
- * @description ExamScoreDaoImpl.java
- */
-@Component("examScoreDao")
-public class ExamScoreDaoImpl implements ExamScoreDao{
-	
-	private JdbcTemplate jdbcTemplate;
-
-	//@Override
-	public List<ExamScore> findByExamRecordIdIn(List<Long> examRecordIds) {
-		StringBuffer examRecordIdsString = new StringBuffer();
-		for(Long number:examRecordIds){
-			examRecordIdsString.append(number+",");
-		}
-		String examRecordIdString = examRecordIdsString.toString();
-		examRecordIdString = examRecordIdString.substring(0, examRecordIdString.lastIndexOf(","));
-		String sql = "select t1.id,t1.objective_score,t1.subjective_score,t1.total_score "
-				  + " from ec_oe_exam_score t1 "
-				  + " left join ec_oe_exam_record_data t2 on t1.exam_record_data_id = t2.id "
-				  + " where t2.id IN ("+examRecordIdString+")";
-		
-		return this.jdbcTemplate.query(sql,new RowMapper<ExamScore>() {
-			@Override
-			public ExamScore mapRow(ResultSet rs, int arg1) throws SQLException {
-				ExamScore examScore = new ExamScore();
-				examScore.setId(rs.getLong("id"));
-				examScore.setObjectiveScore(rs.getDouble("objective_score"));
-				examScore.setSubjectiveScore(rs.getDouble("subjective_score"));
-				examScore.setTotalScore(rs.getDouble("total_score"));
-				return examScore;
-			}
-		});
-	}
-
-}
-

+ 0 - 288
examcloud-exchange-outer-dao/src/main/java/cn/com/qmth/examcloud/exchange/dao/impl/OutletScoreDaoImpl.java

@@ -1,288 +0,0 @@
-package cn.com.qmth.examcloud.exchange.dao.impl;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Repository;
-
-import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
-import cn.com.qmth.examcloud.exchange.dao.OutletScoreDao;
-
-/**
- * @author  	chenken
- * @date    	2018年1月3日 下午4:02:31
- * @company 	QMTH
- * @description OutletScoreRepoImpl.java
- */
-@Repository("outletScoreDao")
-public class OutletScoreDaoImpl implements OutletScoreDao{
-
-	private static final Logger log = LoggerFactory.getLogger(OutletScoreDaoImpl.class);
-	
-	//@Autowired
-	public JdbcTemplate jdbcTemplate;
-	
-	//@Override
-	/*public List<OutletScore> sydxGetExamScoreById(Long scoreId) {
-		StringBuffer sql = new StringBuffer();
-		sql.append("select "
-                +" score.id 					score_id,"
-                +" score.total_score 			total_score,"
-                +" score.objective_score 		objective_score,"
-                +" score.subjective_score 		subjective_score," 
-                +" record.student_name 			student_name,"
-                +" record.student_code 			student_code,"
-                +" record.identity_number 		identity_number," 
-                +" stu.course_name 				course_name,"
-                +" stu.course_code 				course_code,"
-                +" data.end_time 				end_time " 
-                +" from ec_oe_exam_score score " 
-                +" left join ec_oe_exam_record_data data on score.exam_record_data_id = data.id" 
-                +" left join ec_oe_exam_record record on data.exam_record_id = record.id"
-                +" left join ec_oe_exam_student stu on record.exam_student_id = stu.id"
-                +" where score.id = "+scoreId);
-		log.info(sql.toString());
-		return  jdbcTemplate.query(sql.toString(), new RowMapper<OutletScore>() {
-			@Override
-			public OutletScore mapRow(ResultSet rs, int arg1) throws SQLException {
-				return getOutletScoreByResultSet(rs);
-			}
-		});
-	}*/
-	
-
-	//@Override
-	/*public List<OutletScore> getExamScoreById(Long scoreId) {
-		StringBuffer sql = new StringBuffer();
-		sql.append("select "
-	                +" score.id 				 score_id,"
-	                +" score.total_score 		 total_score,"
-	                +" score.objective_score 	 objective_score,"
-	                +" score.subjective_score 	 subjective_score," 
-	                +" record.student_name 		 student_name,"
-	                +" record.student_code 		 student_code,"
-	                +" record.identity_number 	 identity_number," 
-	                +" stu.course_name 		 	 course_name,"
-	                +" stu.course_code 		 	 course_code,"
-	                +" data.start_time			 start_time,"
-	                +" data.end_time 			 end_time," 
-	                +" data.face_success_percent succ_percent,"
-	                +" data.is_illegality 		 is_illegality "
-	                +" from ec_oe_exam_score score"
-	                +" left join ec_oe_exam_record_data data on score.exam_record_data_id = data.id" 
-	                +" left join ec_oe_exam_record record on data.exam_record_id = record.id" 
-	                +" left join ec_oe_exam_student stu on record.exam_student_id = stu.id"
-	                +" where score.id = "+scoreId);
-		log.info(sql.toString());
-		return  jdbcTemplate.query(sql.toString(), new RowMapper<OutletScore>() {
-			@Override
-			public OutletScore mapRow(ResultSet rs, int arg1) throws SQLException {
-				return getExamScoreByIdResult(rs);
-			}
-		});
-	}*/
-
-	/*private OutletScore getExamScoreByIdResult(ResultSet rs) throws SQLException{
-		OutletScore outletScore = new OutletScore();
-		outletScore.setScoreId(rs.getLong("score_id"));
-		outletScore.setStudentName(rs.getString("student_name"));
-		outletScore.setStudentCode(rs.getString("student_code"));
-		outletScore.setIdentityNumber(rs.getString("identity_number"));
-		outletScore.setCourseName(rs.getString("course_name"));
-		outletScore.setCourseCode(rs.getString("course_code"));
-		
-		outletScore.setTotalScore(rs.getDouble("total_score"));
-		outletScore.setObjectiveScore(rs.getDouble("objective_score"));
-		outletScore.setSubjectiveScore(rs.getDouble("subjective_score"));
-		
-		outletScore.setStartTime(rs.getString("start_time"));
-		outletScore.setEndTime(rs.getString("end_time"));
-		outletScore.setSuccessRate(rs.getDouble("succ_percent"));
-		Integer isIllegality = rs.getInt("is_illegality");
-		outletScore.setIsBreachThePrinciple(isIllegality == 1?true:false);
-		return outletScore;
-	}*/
-
-	/*private OutletScore getOutletScoreByResultSet(ResultSet rs) throws SQLException{
-		OutletScore outletScore = new OutletScore();
-		outletScore.setScoreId(rs.getLong("score_id"));
-		outletScore.setStudentName(rs.getString("student_name"));
-		outletScore.setStudentCode(rs.getString("student_code"));
-		outletScore.setIdentityNumber(rs.getString("identity_number"));
-		outletScore.setTotalScore(rs.getDouble("total_score"));
-		outletScore.setObjectiveScore(rs.getDouble("objective_score"));
-		outletScore.setSubjectiveScore(rs.getDouble("subjective_score"));
-		outletScore.setCourseName(rs.getString("course_name"));
-		outletScore.setCourseCode(rs.getString("course_code"));
-		outletScore.setEndTime(rs.getString("end_time"));
-		return outletScore;
-	}*/
-
-	//@Override
-	/*public List<ExamStudent> findExamStudents(Long examId) {
-		StringBuffer sql = new StringBuffer();
-		sql.append("select "+
-						 " stu.id 				id,"+
-						 " stu.exam_id			exam_id,"+
-						 " stu.student_name		student_name,"+
-						 " stu.student_code 	student_code,"+
-						 " stu.identity_number 	identity_number,"+
-						 " stu.course_name 		course_name,"+
-						 " stu.course_code 		course_code,"+
-						 " stu.finished			finished"+
-					" from ec_oe_exam_student stu "+
-					" where stu.exam_id = "+examId);
-		log.info(sql.toString());
-		return  jdbcTemplate.query(sql.toString(), new RowMapper<ExamStudent>() {
-			@Override
-			public ExamStudent mapRow(ResultSet rs, int arg1) throws SQLException {
-				return getExamStudentByResultSet(rs);
-			}
-		});
-	}*/
-	
-	/*private ExamStudent getExamStudentByResultSet(ResultSet rs) throws SQLException{
-		ExamStudent examStudent = new ExamStudent();
-		examStudent.setId(rs.getLong("id"));
-		examStudent.setExamId(rs.getLong("exam_id"));
-		examStudent.setName(rs.getString("student_name"));
-		examStudent.setStudentCode(rs.getString("student_code"));
-		examStudent.setIdentityNumber(rs.getString("identity_number"));
-		examStudent.setCourseCode(rs.getString("course_code"));
-		examStudent.setCourseName(rs.getString("course_name"));
-		examStudent.setFinished(rs.getBoolean("finished"));
-		return examStudent;
-	}*/
-
-	//@Override
-	/*public List<ExamStudent> findExamStudents(List<String> identityNumbers,Long rootOrgId) {
-		StringBuffer sql = new StringBuffer();
-		sql.append("select "+
-						 " stu.id 				id,"+
-						 " stu.exam_id 			exam_id,"+
-						 " stu.student_name 	student_name,"+
-						 " stu.student_code 	student_code,"+
-						 " stu.identity_number 	identity_number,"+
-						 " stu.course_name 		course_name,"+
-						 " stu.course_code 		course_code,"+
-						 " stu.finished			finished"+
-					" from ec_oe_exam_student stu "+
-					" where 1=1 ");
-		StringBuffer numberString = new StringBuffer();
-		for(String number:identityNumbers){
-			numberString.append("'"+number+"',");
-		}
-		String numbers = numberString.toString();
-		numbers = numbers.substring(0, numbers.lastIndexOf(","));
-		sql.append(" and stu.identity_number in ("+numbers+") and stu.root_org_id = "+rootOrgId );
-		log.info(sql.toString());
-		return  jdbcTemplate.query(sql.toString(), new RowMapper<ExamStudent>() {
-			@Override
-			public ExamStudent mapRow(ResultSet rs, int arg1) throws SQLException {
-				return getExamStudentByResultSet(rs);
-			}
-		});
-	}*/
-
-	//@Override
-	/*public List<ExamStudent> findExamStudents(Long examId,String courseCode, List<String> studentCodes) {
-		StringBuffer sql = new StringBuffer();
-		sql.append("select "+
-					     " stu.id 				id,"+
-					     " stu.exam_id			exam_id,"+
-						 " stu.student_name 	student_name,"+
-						 " stu.student_code 	student_code,"+
-						 " stu.identity_number 	identity_number,"+
-						 " stu.course_name 		course_name,"+
-						 " stu.course_code 		course_code,"+
-						 " stu.finished			finished"+
-					" from ec_oe_exam_student stu "+
-					" where stu.exam_id='"+examId);
-		StringBuffer studentCodesStringBuffer = new StringBuffer();
-		for(String studentCode:studentCodes){
-			studentCodesStringBuffer.append("'"+studentCode+"',");
-		}
-		String studentCodesString = studentCodesStringBuffer.toString();
-		studentCodesString = studentCodesString.substring(0, studentCodesString.lastIndexOf(","));
-		sql.append(" and stu.student_code IN ("+studentCodesString+")");
-		
-		sql.append(" and stu.course_code LIKE '%"+courseCode+"'");
-		log.info(sql.toString());
-		return  jdbcTemplate.query(sql.toString(), new RowMapper<ExamStudent>() {
-			@Override
-			public ExamStudent mapRow(ResultSet rs, int arg1) throws SQLException {
-				return getExamStudentByResultSet(rs);
-			}
-		});
-	}*/
-
-	//@Override
-	/*public List<ExamStudent> findExamStudents(Long examId,List<String> identityNumbers) {
-		StringBuffer sql = new StringBuffer();
-		sql.append("select "+
-						 " stu.id 				id,"+
-						 " stu.exam_id			exam_id,"+
-						 " stu.student_name 	student_name,"+
-						 " stu.student_code 	student_code,"+
-						 " stu.identity_number 	identity_number,"+
-						 " stu.course_name 		course_name,"+
-						 " stu.course_code 		course_code,"+
-						 " stu.finished			finished"+
-					" from ec_oe_exam_student stu "+
-					" where stu.exam_id = "+examId);
-		StringBuffer numberString = new StringBuffer();
-		for(String number:identityNumbers){
-			numberString.append("'"+number+"',");
-		}
-		String numbers = numberString.toString();
-		numbers = numbers.substring(0, numbers.lastIndexOf(","));
-		sql.append(" and stu.identity_number in ("+numbers+")");
-		log.info(sql.toString());
-		return  jdbcTemplate.query(sql.toString(), new RowMapper<ExamStudent>() {
-			@Override
-			public ExamStudent mapRow(ResultSet rs, int arg1) throws SQLException {
-				return getExamStudentByResultSet(rs);
-			}
-		});
-	}*/
-
-
-	//@Override
-/*	public List<OutletScore> queryExamScoreBy(Long rootOrgId, Long examId,String studentCode, String courseCode) {
-		StringBuffer sql = new StringBuffer();
-		sql.append("select "
-	                +" s.id 						score_id,"
-	                +" stu.student_name 			student_name,"
-	                +" stu.student_code 			student_code,"
-	                +" stu.identity_number 			identity_number," 
-	                +" score.total_score 			total_score,"
-	                +" score.objective_score 		objective_score,"
-	                +" score.subjective_score 		subjective_score," 
-	                +" data.start_time				start_time,"
-	                +" data.end_time 				end_time," 
-	                +" data.face_success_percent 	succ_percent,"
-	                +" data.is_illegality 			is_illegality "
-	                +" from  ec_oe_exam_student stu" 
-	                +" left join ec_oe_exam_record record on stu.exam_student_id = record.exam_student_id" 
-	                +" left join ec_oe_exam_record_data data on record.id = data.exam_record_id" 
-	                +" left join ec_oe_exam_score score on data.id = score.exam_record_data_id" 
-	                +" where stu.exam_id = "+examId
-	                +"	and	 stu.student_code='"+studentCode+"'"
-	                +"	and	 stu.course_code LIKE '%"+courseCode+"'");
-		log.info(sql.toString());
-		return  jdbcTemplate.query(sql.toString(), new RowMapper<OutletScore>() {
-			@Override
-			public OutletScore mapRow(ResultSet rs, int arg1) throws SQLException {
-				return getExamScoreByIdResult(rs);
-			}
-		});
-	}*/
-	
-}
-

+ 1 - 1
examcloud-exchange-outer-service/pom.xml

@@ -11,7 +11,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>cn.com.qmth.examcloud.exchange</groupId>
-			<artifactId>examcloud-exchange-outer-dao</artifactId>
+			<artifactId>examcloud-exchange-base</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 

+ 0 - 19
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/StudentInfoService.java

@@ -1,19 +0,0 @@
-package cn.com.qmth.examcloud.exchange.outer.service;
-
-import java.util.List;
-
-import cn.com.qmth.examcloud.exchange.dao.bean.StudentInfoReq;
-
-
-/**
- * @author  	chenken
- * @date    	2018年5月7日 下午4:33:13
- * @company 	QMTH
- * @description StudentInfoService.java
- */
-public interface StudentInfoService {
-
-	public void saveStudentInfo(List<StudentInfoReq> studentInfoReqs,String userToken,Long rootOrgId) throws Exception ;
-	
-}
-

+ 0 - 4
examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/OutletScoreServiceImpl.java

@@ -38,7 +38,6 @@ import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamPropertyResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
-import cn.com.qmth.examcloud.exchange.dao.OutletScoreDao;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
 import cn.com.qmth.examcloud.exchange.outer.service.bean.OutletScore;
 
@@ -51,9 +50,6 @@ import cn.com.qmth.examcloud.exchange.outer.service.bean.OutletScore;
 @Service("outletScoreService")
 public class OutletScoreServiceImpl implements OutletScoreService{
 
-	@Autowired
-	private OutletScoreDao outletScoreDao;
-	
 	@Autowired
 	private ExamCloudService examCloudService;
 	

+ 2 - 2
pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>cn.com.qmth.examcloud</groupId>
@@ -18,7 +19,6 @@
 		<module>examcloud-exchange-outer-api</module>
 		<module>examcloud-exchange-outer-api-provider</module>
 		<module>examcloud-exchange-outer-service</module>
-		<module>examcloud-exchange-outer-dao</module>
 	</modules>
 
 </project>