Browse Source

加入数据对接模块

wangliang 1 tuần trước cách đây
mục cha
commit
abdb0650c9

+ 1 - 0
data-docking/src/main/java/com/qmth/data/docking/entity/YjxtKcxx.java

@@ -52,6 +52,7 @@ public class YjxtKcxx implements Serializable {
     }
 
     public void updateData(YjxtKcxx yjxtKcxx) {
+        this.code = yjxtKcxx.getCode();
         this.name = yjxtKcxx.getName();
         this.collegeName = yjxtKcxx.getCollegeName();
     }

+ 77 - 0
data-docking/src/main/java/com/qmth/data/docking/entity/YjxtKsxx.java

@@ -4,10 +4,14 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.data.docking.bean.result.ZufeExamResult;
+import com.qmth.teachcloud.exchange.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * <p>
@@ -101,6 +105,79 @@ public class YjxtKsxx implements Serializable {
     @TableField("teacherName")
     private String teacherName;
 
+    public YjxtKsxx() {
+
+    }
+
+    public YjxtKsxx(ZufeExamResult zufeExamResult) {
+        this.id = SystemConstant.getDbUuid();
+        this.xnm = zufeExamResult.getXNM();
+        this.xqm = zufeExamResult.getXQM();
+        this.courseCode = zufeExamResult.getKCH();
+        this.courseName = zufeExamResult.getKCMC();
+//        this.courseCollegeName = zufeExamResult
+        this.paperNumber = zufeExamResult.getSJBH();
+        this.studentName = zufeExamResult.getXM();
+        this.studentCode = zufeExamResult.getXH();
+//        this.siteNumber = zufeExamResult.get
+//        this.studentCollegeName = zufeExamResult
+//        this.majorName =
+        this.teachClassName = zufeExamResult.getJXBMC();
+//        this.className = zufeExamResult
+        String examStartDate = zufeExamResult.getKSKSSJ();
+        String examEndDate = zufeExamResult.getKSJSSJ();
+        String[] examStartDateStrs = StringUtils.split(examStartDate, " ");
+        String[] examEndDateStrs = StringUtils.split(examEndDate, " ");
+        if (Objects.nonNull(examStartDateStrs) && examStartDateStrs.length > 0
+                && Objects.nonNull(examEndDateStrs) && examEndDateStrs.length > 0) {
+            this.examDate = examStartDateStrs[0];
+            this.examTime = examStartDateStrs[1] + SystemConstant.HYPHEN + examEndDateStrs[1];
+        }
+        this.examPlace = zufeExamResult.getKSDD();
+//        this.examRoom =
+        this.teacherCode = zufeExamResult.getJGH();
+        this.teacherName = zufeExamResult.getJSXM();
+    }
+
+    public void updateData(YjxtKsxx yjxtKsxx) {
+        this.xnm = yjxtKsxx.getXnm();
+        this.xqm = yjxtKsxx.getXqm();
+        this.courseCode = yjxtKsxx.getCourseCode();
+        this.courseName = yjxtKsxx.getCourseName();
+        this.courseCollegeName = yjxtKsxx.getCourseCollegeName();
+        this.paperNumber = yjxtKsxx.getPaperNumber();
+        this.studentName = yjxtKsxx.getStudentName();
+        this.studentCode = yjxtKsxx.getStudentCode();
+        this.siteNumber = yjxtKsxx.getSiteNumber();
+        this.studentCollegeName = yjxtKsxx.getStudentCollegeName();
+        this.majorName = yjxtKsxx.getMajorName();
+        this.teachClassName = yjxtKsxx.getTeachClassName();
+        this.className = yjxtKsxx.getClassName();
+        this.examDate = yjxtKsxx.getExamDate();
+        this.examTime = yjxtKsxx.getExamTime();
+        this.examPlace = yjxtKsxx.getExamPlace();
+        this.examRoom = yjxtKsxx.getExamRoom();
+        this.teacherCode = yjxtKsxx.getTeacherCode();
+        this.teacherName = yjxtKsxx.getTeacherName();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        YjxtKsxx yjxtKsxx = (YjxtKsxx) o;
+        return xnm.equals(yjxtKsxx.xnm) && xqm.equals(yjxtKsxx.xqm) && courseCode.equals(yjxtKsxx.courseCode) && courseName.equals(yjxtKsxx.courseName) && Objects.equals(courseCollegeName, yjxtKsxx.courseCollegeName) && paperNumber.equals(yjxtKsxx.paperNumber) && studentName.equals(yjxtKsxx.studentName) && studentCode.equals(yjxtKsxx.studentCode) && Objects.equals(siteNumber, yjxtKsxx.siteNumber) && Objects.equals(studentCollegeName, yjxtKsxx.studentCollegeName) && Objects.equals(majorName, yjxtKsxx.majorName) && teachClassName.equals(yjxtKsxx.teachClassName) && Objects.equals(className, yjxtKsxx.className) && examDate.equals(yjxtKsxx.examDate) && examTime.equals(yjxtKsxx.examTime) && examPlace.equals(yjxtKsxx.examPlace) && Objects.equals(examRoom, yjxtKsxx.examRoom) && teacherCode.equals(yjxtKsxx.teacherCode) && teacherName.equals(yjxtKsxx.teacherName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(xnm, xqm, courseCode, courseName, courseCollegeName, paperNumber, studentName, studentCode, siteNumber, studentCollegeName, majorName, teachClassName, className, examDate, examTime, examPlace, examRoom, teacherCode, teacherName);
+    }
+
     public Long getId() {
         return id;
     }

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 80 - 12
data-docking/src/main/java/com/qmth/data/docking/util/zufe/ZufeDataDockingUtil.java


+ 1 - 0
teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/contant/SystemConstant.java

@@ -67,6 +67,7 @@ public class SystemConstant {
     public static final String GET_EQUAL = "=";
     public static final String PATH_MATCH = "*";
     public static final String PATH_SUBSTR = "/";
+    public static final String HYPHEN = "-";
     public static final String METHOD = "post";
     public static final String TEACH_CLOUD_PRINT = "teachcloudPrint";
     public static final String CAS_VUE_LOGIN_PATH = "/login-open";

+ 3 - 1
teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/enums/FieldUniqueEnum.java

@@ -13,7 +13,9 @@ public enum FieldUniqueEnum {
 
     t_s_token_unique("学校编码"),
 
-    YJXT_KCXX_UNIQUE("课程编码");
+    YJXT_KCXX_UNIQUE("课程编码"),
+
+    YJXT_KSXX_UNIQUE("考生编码");
 
     private String title;
 

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác