Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-client-api/pom.xml

@@ -0,0 +1,26 @@
+<?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>com.ym</groupId>
+    <artifactId>mec</artifactId>
+    <version>1.0</version>
+  </parent>
+  <groupId>com.ym</groupId>
+  <artifactId>mec-client-api</artifactId>
+  <version>1.0</version>
+  <name>mec-client-api</name>
+  <url>http://maven.apache.org</url>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

mec-client-api/src/main/java/com/ym/App.java

@@ -0,0 +1,13 @@
+package com.ym;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}

mec-client-api/src/test/java/com/ym/AppTest.java

@@ -0,0 +1,38 @@
+package com.ym;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}

mec-web/src/main/java/com/ym/mec/web/dal/entity/ClassGroup.java

@@ -49,7 +49,7 @@ public class ClassGroup {
 	private java.util.Date updateTime;
 
 	/** 班级类型(普通班级、合奏班级) */
-	@ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级)", required = true)
+	@ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级、试听课)", required = true)
 	private ClassGroupTypeEnum type;
 
 	/** 班级类型(普通班级、合奏班级) */

mec-web/src/main/java/com/ym/mec/web/dal/entity/VipGroup.java

@@ -1,6 +1,9 @@
 package com.ym.mec.web.dal.entity;
 
+import java.util.Date;
+
 import io.swagger.annotations.ApiModelProperty;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -10,121 +13,132 @@ public class VipGroup {
 
 	/**  */
 	private Long id;
-	
+
 	/**  */
-	@ApiModelProperty(value = "用户编号",required = false)
+	@ApiModelProperty(value = "用户编号", required = false)
 	private Integer userId;
-	
+
 	/** 单节课时 */
-	@ApiModelProperty(value = "单节课时",required = false)
+	@ApiModelProperty(value = "单节课时", required = false)
 	private Integer singleClassMinutes;
-	
+
 	/** 缴费截止时间 */
-	@ApiModelProperty(value = "缴费截止时间",required = false)
+	@ApiModelProperty(value = "缴费截止时间", required = false)
 	private java.util.Date paymentExpireDate;
-	
+
 	/** 课程结束日期 */
-	@ApiModelProperty(value = "课程结束日期",required = false)
+	@ApiModelProperty(value = "课程结束日期", required = false)
 	private java.util.Date coursesExpireDate;
-	
+
+	@ApiModelProperty(value = "报名开始时间", required = false)
+	private Date registrationStartTime;
+
 	/**  */
 	private java.util.Date createTime;
-	
+
 	/**  */
 	private java.util.Date updateTime;
-	
+
 	/** 教学点 */
-	@ApiModelProperty(value = "教学点",required = false)
+	@ApiModelProperty(value = "教学点", required = false)
 	private Long teacherSchoolId;
-	
+
 	/** 线上课课时数 */
-	@ApiModelProperty(value = "线上课课时数",required = false)
+	@ApiModelProperty(value = "线上课课时数", required = false)
 	private Integer onlineClassesNum;
-	
+
 	/** 线下课课时数 */
-	@ApiModelProperty(value = "线下课课时数",required = false)
+	@ApiModelProperty(value = "线下课课时数", required = false)
 	private Integer offlineClassesNum;
-	
-	public void setId(Long id){
+
+	public void setId(Long id) {
 		this.id = id;
 	}
-	
-	public Long getId(){
+
+	public Long getId() {
 		return this.id;
 	}
-			
-	public void setUserId(Integer userId){
+
+	public void setUserId(Integer userId) {
 		this.userId = userId;
 	}
-	
-	public Integer getUserId(){
+
+	public Integer getUserId() {
 		return this.userId;
 	}
-			
-	public void setSingleClassMinutes(Integer singleClassMinutes){
+
+	public void setSingleClassMinutes(Integer singleClassMinutes) {
 		this.singleClassMinutes = singleClassMinutes;
 	}
-	
-	public Integer getSingleClassMinutes(){
+
+	public Integer getSingleClassMinutes() {
 		return this.singleClassMinutes;
 	}
-			
-	public void setPaymentExpireDate(java.util.Date paymentExpireDate){
+
+	public void setPaymentExpireDate(java.util.Date paymentExpireDate) {
 		this.paymentExpireDate = paymentExpireDate;
 	}
-	
-	public java.util.Date getPaymentExpireDate(){
+
+	public java.util.Date getPaymentExpireDate() {
 		return this.paymentExpireDate;
 	}
-			
-	public void setCoursesExpireDate(java.util.Date coursesExpireDate){
+
+	public void setCoursesExpireDate(java.util.Date coursesExpireDate) {
 		this.coursesExpireDate = coursesExpireDate;
 	}
-	
-	public java.util.Date getCoursesExpireDate(){
+
+	public java.util.Date getCoursesExpireDate() {
 		return this.coursesExpireDate;
 	}
-			
-	public void setCreateTime(java.util.Date createTime){
+
+	public void setCreateTime(java.util.Date createTime) {
 		this.createTime = createTime;
 	}
-	
-	public java.util.Date getCreateTime(){
+
+	public java.util.Date getCreateTime() {
 		return this.createTime;
 	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
+
+	public void setUpdateTime(java.util.Date updateTime) {
 		this.updateTime = updateTime;
 	}
-	
-	public java.util.Date getUpdateTime(){
+
+	public java.util.Date getUpdateTime() {
 		return this.updateTime;
 	}
-			
-	public void setTeacherSchoolId(Long teacherSchoolId){
+
+	public void setTeacherSchoolId(Long teacherSchoolId) {
 		this.teacherSchoolId = teacherSchoolId;
 	}
-	
-	public Long getTeacherSchoolId(){
+
+	public Long getTeacherSchoolId() {
 		return this.teacherSchoolId;
 	}
-			
-	public void setOnlineClassesNum(Integer onlineClassesNum){
+
+	public void setOnlineClassesNum(Integer onlineClassesNum) {
 		this.onlineClassesNum = onlineClassesNum;
 	}
-	
-	public Integer getOnlineClassesNum(){
+
+	public Integer getOnlineClassesNum() {
 		return this.onlineClassesNum;
 	}
-			
-	public void setOfflineClassesNum(Integer offlineClassesNum){
+
+	public void setOfflineClassesNum(Integer offlineClassesNum) {
 		this.offlineClassesNum = offlineClassesNum;
 	}
-	
-	public Integer getOfflineClassesNum(){
+
+	public Integer getOfflineClassesNum() {
 		return this.offlineClassesNum;
 	}
-			
+
+	public Date getRegistrationStartTime() {
+		return registrationStartTime;
+	}
+
+	public void setRegistrationStartTime(Date registrationStartTime) {
+		this.registrationStartTime = registrationStartTime;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-web/src/main/java/com/ym/mec/web/dal/enums/ClassGroupTypeEnum.java

@@ -3,10 +3,10 @@ package com.ym.mec.web.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 /**
- * 班级类型(普通班级、合奏班级)
+ * 班级类型
  */
 public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
-	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"), VIP("VIP", "小课");
+	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"), VIP("VIP", "vip课"), TRIAL("trial", "试听课");
 
 	private String code;
 

mec-web/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -12,6 +12,7 @@
         <result column="single_class_minutes_" property="singleClassMinutes"/>
         <result column="payment_expire_date_" property="paymentExpireDate"/>
         <result column="courses_expire_date_" property="coursesExpireDate"/>
+        <result column="registration_start_time_" property="registrationStartTime"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="teacher_school_id_" property="teacherSchoolId"/>
@@ -38,8 +39,8 @@
         </selectKey>
         -->
         INSERT INTO vip_group
-        (id_,user_id_,single_class_minutes_,payment_expire_date_,courses_expire_date_,create_time_,update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_)
-        VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},#{onlineClassesNum},#{offlineClassesNum})
+        (id_,user_id_,single_class_minutes_,payment_expire_date_,courses_expire_date_,create_time_,update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_,registration_start_time_)
+        VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},#{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -70,6 +71,9 @@
             <if test="coursesExpireDate != null">
                 courses_expire_date_ = #{coursesExpireDate},
             </if>
+            <if test="registrationStartTime != null">
+                registration_start_time_ = #{registrationStartTime},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

pom.xml

@@ -23,7 +23,7 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<!--支持Spring Boot 2.1.X -->
+			<!--支锟斤拷Spring Boot 2.1.X -->
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
@@ -80,7 +80,7 @@
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-server</artifactId>
 				<version>${zipkin.version}</version>
-				<!--排除log4j2 避免和logback冲突警告 -->
+				<!--锟脚筹拷log4j2 锟斤拷锟斤拷锟絣ogback锟斤拷突锟斤拷锟斤拷 -->
 				<exclusions>
 					<exclusion>
 						<groupId>org.springframework.boot</groupId>
@@ -95,14 +95,14 @@
 				<version>${zipkin.version}</version>
 			</dependency>
 
-			<!-- 使用消息的方式收集数据（使用rabbitmq） -->
+			<!-- 使锟斤拷锟斤拷息锟侥凤拷式锟秸硷拷锟斤拷锟捷ｏ拷使锟斤拷rabbitmq锟斤拷 -->
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-autoconfigure-collector-rabbitmq</artifactId>
 				<version>${zipkin.version}</version>
 			</dependency>
 
-			<!-- 采用 elasticsearch 存储数据 -->
+			<!-- 锟斤拷锟斤拷 elasticsearch 锟芥储锟斤拷锟斤拷 -->
 			<dependency>
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin-autoconfigure-storage-elasticsearch-http</artifactId>
@@ -205,12 +205,12 @@
 	</pluginRepositories>
 
 	<dependencies>
-		<!-- SpringBoot整合Web组件 -->
+		<!-- SpringBoot锟斤拷锟斤拷Web锟斤拷锟� -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-		<!--自省和监控的集成功能 -->
+		<!--锟斤拷省锟酵硷拷氐募锟斤拷晒锟斤拷锟� -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -221,13 +221,13 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- SpringBoot整合config组件 -->
+		<!-- SpringBoot锟斤拷锟斤拷config锟斤拷锟� -->
 		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-config</artifactId> 
 			</dependency> -->
-		<!--注册中心 -->
+		<!--注锟斤拷锟斤拷锟斤拷 -->
 		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> 
 			</dependency> -->
-		<!--断路器 -->
+		<!--锟斤拷路锟斤拷 -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
@@ -236,19 +236,19 @@
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-security</artifactId> 
 			</dependency> -->
 
-		<!--集群监控消息队列 -->
+		<!--锟斤拷群锟斤拷锟斤拷锟较�拷锟斤拷锟� -->
 		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-netflix-hystrix-stream</artifactId> 
 			</dependency> -->
-		<!--日志跟踪 -->
+		<!--锟斤拷志锟斤拷锟斤拷 -->
 		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-zipkin</artifactId> 
 			</dependency> -->
-		<!--消息总线 -->
+		<!--锟斤拷息锟斤拷锟斤拷 -->
 		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-bus-amqp</artifactId> 
 			</dependency> -->
-		<!--热加载 -->
+		<!--锟饺硷拷锟斤拷 -->
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId> 
 			<scope>runtime</scope> <optional>true</optional> </dependency> -->
-		<!--测试框架 -->
+		<!--锟斤拷锟皆匡拷锟� -->
 		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> 
 			<scope>test</scope> </dependency> -->
 		<dependency>
@@ -319,5 +319,6 @@
 		<module>workflowy</module>
 	  <module>mec-workflow</module>
     <module>mec-thirdpart</module>
+    <module>mec-client-api</module>
   </modules>
 </project>