Merge branch 'master' of http://git.hchbox.com/yuyou/client into master

pom.xml

@@ -19,10 +19,10 @@
     </properties>
 
     <dependencies>
-        <!--<dependency>-->
+        <dependency>
-            <!--<groupId>org.springframework.boot</groupId>-->
+            <groupId>org.springframework.boot</groupId>
-            <!--<artifactId>spring-boot-starter-data-jpa</artifactId>-->
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        <!--</dependency>-->
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

src/main/java/com/yuyou/openapi/openapi/common/enums/GradeEnum.java

@@ -0,0 +1,39 @@
+package com.yuyou.openapi.openapi.common.enums;
+
+/**
+ * 年级映射
+ * @version 1.0
+ * @date 2020/8/10
+ */
+public enum GradeEnum {
+    FIRST_GRADE("X1", "一年级"),
+    SECOND_GRADE("X2","二年级"),
+    THIRD_GRADE("X3","三年级"),
+    FOURTH_GRADE("X4", "四年级"),
+    FIFTH_GRADE("X5", "五年级"),
+    SIXTH_GRADE("X6", "六年级"),
+    FIRST_MIDDLE("M1", "初一"),
+    SECOND_MIDDLE("M2", "初二"),
+    THIRD_MIDDLE("M3", "初三"),
+    FIRST_HIGH("H1", "高一"),
+    SECOND_HIGH("H2", "高二"),
+    THIRD_HIGH("H3", "高三"),
+    ;
+
+    private String code;
+
+    private String desc;
+
+    GradeEnum(String code, String desc){
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

src/main/java/com/yuyou/openapi/openapi/common/enums/SubjectEnum.java

@@ -0,0 +1,35 @@
+package com.yuyou.openapi.openapi.common.enums;
+
+/**
+ * 学科映射
+ * @version 1.0
+ * @date 2020/8/10
+ */
+public enum SubjectEnum {
+    CHINESE(1, "语文"),
+    MATH(2, "数学"),
+    ENGLISH(3,"英语"),
+    physics(4, "物理"),
+    chemistry(5, "化学"),
+    Biology(6, "生物"),
+    politics(7, "政治"),
+    history(8, "历史"),
+    Geography(9, "地理"),;
+
+    private Integer code;
+
+    private String desc;
+
+    SubjectEnum(Integer code, String desc){
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

src/main/java/com/yuyou/openapi/openapi/model/dataobject/ABMessageDO.java

@@ -0,0 +1,68 @@
+package com.yuyou.openapi.openapi.model.dataobject;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * AB表单数据层映射类
+ * @version 1.0
+ * @date 2020/8/6
+ */
+@Data
+@Table(name = "ab_message")
+public class ABMessageDO {
+
+    private Long id;
+
+    @Column(name = "gmt_create")
+    private Date gmtCreate;
+
+    @Column(name = "gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 记录id
+     */
+    @Column(name = "rec_id")
+    private Long recId;
+
+    /**
+     * 业务码
+     */
+    @Column(name = "pnum")
+    private String pnum;
+
+    /**
+     * 业务名
+     */
+    @Column(name = "act_name")
+    private String actName;
+
+    /**
+     * 业务开始时间
+     */
+    @Column(name = "start_time")
+    private Date startTime;
+
+    /**
+     * 业务类别(1:A,2:B,3:C,4:D,5:E,6:F)
+     */
+    @Column(name = "client_type")
+    private Integer clientType;
+
+    /**
+     * 上游推送用户id
+     */
+    @Column(name = "app_id")
+    private String appId;
+
+    /**
+     * 上游推送时间
+     */
+    @Column(name = "push_time")
+    private Date pushTime;
+
+}

src/main/java/com/yuyou/openapi/openapi/model/dataobject/ZhangmenOrder.java

@@ -0,0 +1,70 @@
+package com.yuyou.openapi.openapi.model.dataobject;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import java.util.Date;
+
+/**
+ * 掌门成单记录表
+ * @version 1.0
+ * @date 2020/8/10
+ */
+@Data
+@Table(name = "zhangmen_order")
+public class ZhangmenOrder {
+
+    /**
+     * id
+     */
+    private Long id;
+
+    @Column(name = "gmt_create")
+    private Date gmtCreate;
+
+    @Column(name = "gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 记录推送id
+     */
+    @Column(name = "rec_id")
+    private Long recId;
+
+    /**
+     * 报课学生名
+     */
+    @Column(name = "stu_name")
+    private String stuName;
+
+    /**
+     * 报课学生码
+     */
+    private String pnum;
+
+    /**
+     * 报课学生年级
+     */
+    @Column(name = "stu_grade")
+    private String stuGrade;
+
+    /**
+     * 报课学生学科
+     */
+    @Column(name = "stu_sub")
+    private Integer stuSub;
+
+    /**
+     * 上游推送用户id
+     */
+    @Column(name = "app_id")
+    private String appId;
+
+    /**
+     * 上游推送时间
+     */
+    @Column(name = "push_time")
+    private Date pushTime;
+}

src/main/java/com/yuyou/openapi/openapi/model/dataobject/appUser.java

@@ -0,0 +1,57 @@
+package com.yuyou.openapi.openapi.model.dataobject;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * app用户表
+ * @version 1.0
+ * @date 2020/8/7
+ */
+@Data
+@Entity
+@Table(name = "app_user")
+public class appUser {
+
+    private Long id;
+
+    /**
+     * 记录创建时间
+     */
+    @Column(name = "gmt_create")
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    @Column(name = "gmt_modified")
+    private Date gmtModified;
+
+    /**
+     * 用户名称
+     */
+    @Column(name = "app_name")
+    private String appName;
+
+    /**
+     * 用户id
+     */
+    @Column(name = "app_id")
+    private String appId;
+
+    /**
+     * 用户秘钥
+     */
+    @Column(name = "app_secret")
+    private String appSecret;
+
+    /**
+     * 用户状态:0:可用 1:不可用
+     */
+    @Column(name = "app_status")
+    private String appStatus;
+}