Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-2/examcloud-rmi.git

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

@@ -0,0 +1,23 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>cn.com.qmth.examcloud</groupId>
+    <artifactId>examcloud-core-oe-admin-api</artifactId>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>cn.com.qmth.examcloud.rmi</groupId>
+        <artifactId>examcloud-rmi</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud.commons</groupId>
+            <artifactId>examcloud-commons-web</artifactId>
+            <version>${examcloud.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,27 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-15 14:15:53.
+ * *************************************************
+ */
+
+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.SaveExamStudentInfoReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.SaveExamStudentInfoResp;
+
+/**
+ * 考生信息接口
+ *
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+public interface ExamStudentInfoCloudService extends CloudService {
+
+    /**
+     * 保存考生信息
+     */
+    SaveExamStudentInfoResp saveExamStudentInfo(SaveExamStudentInfoReq req);
+
+}

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

@@ -0,0 +1,54 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-16 15:58:23.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.oe.admin.api.bean;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+
+/**
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+public class ExamStudentInfoBean implements JsonSerializable {
+    private Long id;
+    private Long rootOrgId;
+    private Long studentId;
+    private String studentName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getRootOrgId() {
+        return rootOrgId;
+    }
+
+    public void setRootOrgId(Long rootOrgId) {
+        this.rootOrgId = rootOrgId;
+    }
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+}

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

@@ -0,0 +1,45 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-16 15:58:12.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.oe.admin.api.request;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+
+/**
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+public class SaveExamStudentInfoReq extends BaseRequest {
+    private Long rootOrgId;
+    private Long studentId;
+    private String studentName;
+
+    public Long getRootOrgId() {
+        return rootOrgId;
+    }
+
+    public void setRootOrgId(Long rootOrgId) {
+        this.rootOrgId = rootOrgId;
+    }
+
+    public Long getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+}

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

@@ -0,0 +1,29 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-16 16:17:06.
+ * *************************************************
+ */
+
+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.ExamStudentInfoBean;
+
+/**
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+public class SaveExamStudentInfoResp extends BaseResponse {
+
+    private ExamStudentInfoBean examStudentInfoBean;
+
+    public ExamStudentInfoBean getExamStudentInfoBean() {
+        return examStudentInfoBean;
+    }
+
+    public void setExamStudentInfoBean(ExamStudentInfoBean examStudentInfoBean) {
+        this.examStudentInfoBean = examStudentInfoBean;
+    }
+
+}

examcloud-core-oe-admin-client/pom.xml

@@ -0,0 +1,23 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>cn.com.qmth.examcloud</groupId>
+    <artifactId>examcloud-core-oe-admin-client</artifactId>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>cn.com.qmth.examcloud.rmi</groupId>
+        <artifactId>examcloud-rmi</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud</groupId>
+            <artifactId>examcloud-core-oe-admin-api</artifactId>
+            <version>${examcloud.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

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

@@ -0,0 +1,23 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-16 16:20:56.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.oe.admin.client;
+
+import cn.com.qmth.examcloud.commons.web.support.CloudClientSupport;
+
+/**
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+public abstract class BasicCloudClientSupport extends CloudClientSupport {
+
+    @Override
+    public String getUrlPrefix() {
+        return "http://EXAMCLOUD-SERVICE-OE-ADMIN/api/core/oe/admin/";
+    }
+
+}

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

@@ -0,0 +1,47 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-08-16 16:19:24.
+ * *************************************************
+ */
+
+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.ExamStudentInfoCloudService;
+import cn.com.qmth.examcloud.core.oe.admin.api.request.SaveExamStudentInfoReq;
+import cn.com.qmth.examcloud.core.oe.admin.api.response.SaveExamStudentInfoResp;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * 考生信息接口
+ *
+ * @author: fengdesheng
+ * @since: 2018/8/15
+ */
+@Service
+public class ExamInfoCloudServiceClient extends BasicCloudClientSupport implements ExamStudentInfoCloudService {
+    private static final long serialVersionUID = -8874453764538303046L;
+    @Autowired
+    private RestTemplate restTemplate;
+    @Autowired
+    private RedisClient redisClient;
+
+    @Override
+    public SaveExamStudentInfoResp saveExamStudentInfo(SaveExamStudentInfoReq examStudentInfoReq) {
+        return post("examStudentInfo/save", examStudentInfoReq, SaveExamStudentInfoResp.class);
+    }
+
+    @Override
+    protected RedisClient getRedisClient() {
+        return redisClient;
+    }
+
+    @Override
+    protected RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+}

examcloud-core-questions-api-client/pom.xml

@@ -1,19 +1,19 @@
 <?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">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-        <artifactId>examcloud-core-questions</artifactId>
-        <groupId>cn.com.qmth.examcloud.core.questions</groupId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
+ 	<parent>
+		<groupId>cn.com.qmth.examcloud.rmi</groupId>
+		<artifactId>examcloud-rmi</artifactId>
+		<version>2.0-SNAPSHOT</version>
+	</parent>
 
-  <groupId>cn.com.qmth.examcloud.core.questions</groupId>
+  <groupId>cn.com.qmth.examcloud.rmi</groupId>
   <artifactId>examcloud-core-questions-api-client</artifactId>
   <packaging>jar</packaging>
 
  	<dependencies>
 		<dependency>
-			<groupId>cn.com.qmth.examcloud.core.questions</groupId>
+			<groupId>cn.com.qmth.examcloud.rmi</groupId>
 			<artifactId>examcloud-core-questions-api</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>

examcloud-core-questions-api/pom.xml

@@ -2,10 +2,10 @@
 <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>
-        <artifactId>examcloud-core-questions</artifactId>
-        <groupId>cn.com.qmth.examcloud.core.questions</groupId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
+		<groupId>cn.com.qmth.examcloud.rmi</groupId>
+		<artifactId>examcloud-rmi</artifactId>
+		<version>2.0-SNAPSHOT</version>
+	</parent>
   <artifactId>examcloud-core-questions-api</artifactId>
 
   <dependencies>

pom.xml

@@ -1,31 +1,34 @@
 <?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">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn.com.qmth.examcloud</groupId>
-		<artifactId>examcloud-parent</artifactId>
-		<version>2.0-SNAPSHOT</version>
-	</parent>
-	<groupId>cn.com.qmth.examcloud.rmi</groupId>
-	<artifactId>examcloud-rmi</artifactId>
-	<packaging>pom</packaging>
+<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>
+        <artifactId>examcloud-parent</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>cn.com.qmth.examcloud.rmi</groupId>
+    <artifactId>examcloud-rmi</artifactId>
+    <packaging>pom</packaging>
 
-	<modules>
-		<module>examcloud-core-basic-api</module>
-		<module>examcloud-core-basic-api-client</module>
+    <modules>
+        <module>examcloud-core-basic-api</module>
+        <module>examcloud-core-basic-api-client</module>
 
-		<module>examcloud-core-examwork-api</module>
-		<module>examcloud-core-examwork-api-client</module>
+        <module>examcloud-core-examwork-api</module>
+        <module>examcloud-core-examwork-api-client</module>
 
-		<module>examcloud-exchange-inner-api</module>
-		<module>examcloud-exchange-inner-api-client</module>
+        <module>examcloud-exchange-inner-api</module>
+        <module>examcloud-exchange-inner-api-client</module>
 
-		<module>examcloud-task-api</module>
-		<module>examcloud-task-api-client</module>
-		
-		<module>examcloud-core-questions-api</module>
-		<module>examcloud-core-questions-api-client</module>
+        <module>examcloud-task-api</module>
+        <module>examcloud-task-api-client</module>
 
-	</modules>
+        <module>examcloud-core-oe-admin-api</module>
+        <module>examcloud-core-oe-admin-client</module>
+
+        <module>examcloud-core-questions-api</module>
+        <module>examcloud-core-questions-api-client</module>
+    </modules>
 
 </project>