Merge branch 'master' of https://gitee.com/zouxuan/mec

mec-gateway/mec-gateway-web/src/main/resources/application.yml

@@ -11,6 +11,8 @@ eureka:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
 
 ribbon:
+  eureka:
+    enable: true
   ReadTimeout: 10000
   SocketTimeout: 3000      
 

mec-web/src/main/java/com/ym/mec/web/dal/dao/TeacherClassFeeDao.java

@@ -1,9 +0,0 @@
-package com.ym.mec.web.dal.dao;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.TeacherClassFee;
-
-public interface TeacherClassFeeDao extends BaseDAO<Long, TeacherClassFee> {
-
-	
-}

mec-web/src/main/java/com/ym/mec/web/dal/dao/TeacherSalaryDao.java

@@ -1,9 +0,0 @@
-package com.ym.mec.web.dal.dao;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.TeacherSalary;
-
-public interface TeacherSalaryDao extends BaseDAO<Long, TeacherSalary> {
-
-	
-}

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

@@ -1,110 +0,0 @@
-package com.ym.mec.web.dal.entity;
-
-import com.ym.mec.web.dal.enums.TeachTypeEnum;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(teacher_class_fee):
- */
-public class TeacherClassFee {
-
-	/**  */
-	private Long id;
-	
-	/**  */
-	@ApiModelProperty(value = "乐团编号",required = false)
-	private Integer musicGroupId;
-	
-	/**  */
-	@ApiModelProperty(value = "课程组编号",required = false)
-	private Integer classGroupId;
-	
-	/**  */
-	@ApiModelProperty(value = "教师编号",required = false)
-	private Integer teacherId;
-	
-	/** 职务类型（助教、主教） */
-	@ApiModelProperty(value = "职务类型",required = false)
-	private TeachTypeEnum jobType;
-	
-	/**  */
-	@ApiModelProperty(value = "教师编号",required = false)
-	private long classFee;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setMusicGroupId(Integer musicGroupId){
-		this.musicGroupId = musicGroupId;
-	}
-	
-	public Integer getMusicGroupId(){
-		return this.musicGroupId;
-	}
-			
-	public void setClassGroupId(Integer classGroupId){
-		this.classGroupId = classGroupId;
-	}
-	
-	public Integer getClassGroupId(){
-		return this.classGroupId;
-	}
-			
-	public void setTeacherId(Integer teacherId){
-		this.teacherId = teacherId;
-	}
-	
-	public Integer getTeacherId(){
-		return this.teacherId;
-	}
-
-	public TeachTypeEnum getJobType() {
-		return jobType;
-	}
-
-	public void setJobType(TeachTypeEnum jobType) {
-		this.jobType = jobType;
-	}
-
-	public void setClassFee(long classFee){
-		this.classFee = classFee;
-	}
-	
-	public long getClassFee(){
-		return this.classFee;
-	}
-			
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

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

@@ -1,76 +0,0 @@
-package com.ym.mec.web.dal.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import java.math.BigDecimal;
-
-/**
- * 对应数据库表(teacher_salary):
- */
-public class TeacherSalary {
-
-	/**  */
-	private Long id;
-	
-	/**  */
-	@ApiModelProperty(value = "学员编号",required = false)
-	private Integer userId;
-	
-	/**  */
-	@ApiModelProperty(value = "科目编号",required = false)
-	private Integer subjectId;
-	
-	/** 课酬 */
-	@ApiModelProperty(value = "课酬",required = false)
-	private BigDecimal salary;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setUserId(Integer userId){
-		this.userId = userId;
-	}
-	
-	public Integer getUserId(){
-		return this.userId;
-	}
-			
-	public void setSubjectId(Integer subjectId){
-		this.subjectId = subjectId;
-	}
-	
-	public Integer getSubjectId(){
-		return this.subjectId;
-	}
-
-	public BigDecimal getSalary() {
-		return salary;
-	}
-
-	public void setSalary(BigDecimal salary) {
-		this.salary = salary;
-	}
-
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

mec-web/src/main/java/com/ym/mec/web/service/TeacherClassFeeService.java

@@ -1,8 +0,0 @@
-package com.ym.mec.web.service;
-
-import com.ym.mec.common.service.BaseService;
-import com.ym.mec.web.dal.entity.TeacherClassFee;
-
-public interface TeacherClassFeeService extends BaseService<Long, TeacherClassFee> {
-
-}

mec-web/src/main/java/com/ym/mec/web/service/TeacherSalaryService.java

@@ -1,8 +0,0 @@
-package com.ym.mec.web.service;
-
-import com.ym.mec.common.service.BaseService;
-import com.ym.mec.web.dal.entity.TeacherSalary;
-
-public interface TeacherSalaryService extends BaseService<Long, TeacherSalary> {
-
-}

mec-web/src/main/java/com/ym/mec/web/service/impl/TeacherClassFeeServiceImpl.java

@@ -1,23 +0,0 @@
-package com.ym.mec.web.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.web.dal.dao.TeacherClassFeeDao;
-import com.ym.mec.web.dal.entity.TeacherClassFee;
-import com.ym.mec.web.service.TeacherClassFeeService;
-
-@Service
-public class TeacherClassFeeServiceImpl extends BaseServiceImpl<Long, TeacherClassFee>  implements TeacherClassFeeService {
-	
-	@Autowired
-	private TeacherClassFeeDao teacherClassFeeDao;
-
-	@Override
-	public BaseDAO<Long, TeacherClassFee> getDAO() {
-		return teacherClassFeeDao;
-	}
-	
-}

mec-web/src/main/java/com/ym/mec/web/service/impl/TeacherSalaryServiceImpl.java

@@ -1,23 +0,0 @@
-package com.ym.mec.web.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.web.dal.dao.TeacherSalaryDao;
-import com.ym.mec.web.dal.entity.TeacherSalary;
-import com.ym.mec.web.service.TeacherSalaryService;
-
-@Service
-public class TeacherSalaryServiceImpl extends BaseServiceImpl<Long, TeacherSalary>  implements TeacherSalaryService {
-	
-	@Autowired
-	private TeacherSalaryDao teacherSalaryDao;
-
-	@Override
-	public BaseDAO<Long, TeacherSalary> getDAO() {
-		return teacherSalaryDao;
-	}
-	
-}

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

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
-<mapper namespace="com.ym.mec.web.dal.dao.TeacherClassFeeDao">
-
-	<resultMap type="com.ym.mec.web.dal.entity.TeacherClassFee"
-		id="TeacherClassFee">
-		<result column="id_" property="id" />
-		<result column="music_group_id_" property="musicGroupId" />
-		<result column="class_group_id_" property="classGroupId" />
-		<result column="teacher_id_" property="teacherId" />
-		<result column="job_type_" property="jobType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-		<result column="class_fee_" property="classFee" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="TeacherClassFee">
-		SELECT * FROM
-		teacher_class_fee WHERE id_ = #{id}
-	</select>
-
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="TeacherClassFee">
-		SELECT * FROM teacher_class_fee
-		ORDER BY id_
-	</select>
-
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.TeacherClassFee"
-		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
-			AS ID FROM DUAL </selectKey> -->
-		INSERT INTO teacher_class_fee
-		(id_,music_group_id_,class_group_id_,teacher_id_,job_type_,class_fee_,create_time_,update_time_)
-		VALUES(#{id},#{musicGroupId},#{classGroupId},#{teacherId},#{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{classFee},now(),now)
-	</insert>
-
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.TeacherClassFee">
-		UPDATE teacher_class_fee
-		<set>
-			<if test="jobType != null">
-				job_type_ = #{jobType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-			</if>
-			<if test="classGroupId != null">
-				class_group_id_ = #{classGroupId},
-			</if>
-			<if test="teacherId != null">
-				teacher_id_ = #{teacherId},
-			</if>
-			<if test="updateTime != null">
-				update_time_ = #{updateTime},
-			</if>
-			<if test="classFee != null">
-				class_fee_ = #{classFee},
-			</if>
-			<if test="musicGroupId != null">
-				music_group_id_ = #{musicGroupId},
-			</if>
-		</set>
-		WHERE id_ = #{id}
-	</update>
-
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete">
-		DELETE FROM teacher_class_fee WHERE id_ =
-		#{id}
-	</delete>
-
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="TeacherClassFee"
-		parameterType="map">
-		SELECT * FROM teacher_class_fee ORDER BY id_
-		<include refid="global.limit" />
-	</select>
-
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM
-		teacher_class_fee
-	</select>
-</mapper>

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

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<!--
-这个文件是自动生成的。
-不要修改此文件。所有改动将在下次重新自动生成时丢失。
--->
-<mapper namespace="com.ym.mec.web.dal.dao.TeacherSalaryDao">
-
-    <resultMap type="com.ym.mec.web.dal.entity.TeacherSalary" id="TeacherSalary">
-        <result column="id_" property="id"/>
-        <result column="user_id_" property="userId"/>
-        <result column="subject_id_" property="subjectId"/>
-        <result column="salary_" property="salary"/>
-        <result column="create_time_" property="createTime"/>
-    </resultMap>
-
-    <!-- 根据主键查询一条记录 -->
-    <select id="get" resultMap="TeacherSalary">
-		SELECT * FROM teacher_salary WHERE id_ = #{id} 
-	</select>
-
-    <!-- 全查询 -->
-    <select id="findAll" resultMap="TeacherSalary">
-		SELECT * FROM teacher_salary ORDER BY id_
-	</select>
-
-    <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.web.dal.entity.TeacherSalary" useGeneratedKeys="true" keyColumn="id"
-            keyProperty="id">
-        <!--
-        <selectKey resultClass="int" keyProperty="id" >
-        SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
-        </selectKey>
-        -->
-        INSERT INTO teacher_salary (id_,user_id_,subject_id_,salary_,create_time_)
-        VALUES(#{id},#{userId},#{subjectId},#{salary},#{createTime})
-    </insert>
-
-    <!-- 根据主键查询一条记录 -->
-    <update id="update" parameterType="com.ym.mec.web.dal.entity.TeacherSalary">
-        UPDATE teacher_salary
-        <set>
-            <if test="subjectId != null">
-                subject_id_ = #{subjectId},
-            </if>
-            <if test="userId != null">
-                user_id_ = #{userId},
-            </if>
-            <if test="salary != null">
-                salary_ = #{salary},
-            </if>
-        </set>
-        WHERE id_ = #{id}
-    </update>
-
-    <!-- 根据主键删除一条记录 -->
-    <delete id="delete">
-		DELETE FROM teacher_salary WHERE id_ = #{id} 
-	</delete>
-
-    <!-- 分页查询 -->
-    <select id="queryPage" resultMap="TeacherSalary" parameterType="map">
-        SELECT * FROM teacher_salary ORDER BY id_
-        <include refid="global.limit"/>
-    </select>
-
-    <!-- 查询当前表的总记录数 -->
-    <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM teacher_salary
-	</select>
-</mapper>