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

cms/pom.xml

@@ -0,0 +1,21 @@
+<?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>
+	<artifactId>cms</artifactId>
+	<name>cms</name>
+	<url>http://maven.apache.org</url>
+	
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	
+	<dependencies>
+	</dependencies>
+</project>

mec-auth/mec-auth-server/pom.xml

@@ -51,6 +51,11 @@
 		</dependency>
 
 		<dependency>
+			<groupId>com.github.xiaoymin</groupId>
+			<artifactId>swagger-bootstrap-ui</artifactId>
+		</dependency>
+
+		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid-spring-boot-starter</artifactId>
 		</dependency>

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/MenuController.java

@@ -13,7 +13,7 @@ import java.util.Date;
 
 @RestController()
 @RequestMapping("menu")
-@Api(description = "菜单服务")
+@Api(tags = "菜单服务")
 public class MenuController extends BaseController {
 
     @Autowired

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/RoleController.java

@@ -14,7 +14,7 @@ import java.util.Date;
 
 @RestController()
 @RequestMapping("role")
-@Api(description = "角色服务")
+@Api(tags = "角色服务")
 public class RoleController extends BaseController {
 
     @Autowired

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/SmsCodeController.java

@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
 
 @RestController
 @RequestMapping("code")
-@Api(description = "验证码服务")
+@Api(tags = "验证码服务")
 public class SmsCodeController extends BaseController {
 
     @Autowired

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -17,7 +17,7 @@ import java.util.Date;
 
 @RestController()
 @RequestMapping("user")
-@Api(description = "会员服务")
+@Api(tags = "会员服务")
 public class UserController extends BaseController {
 
 	@Autowired

mec-gateway/mec-gateway-web/pom.xml

@@ -18,27 +18,23 @@
 
 	<dependencies>
 		<!--api网关 -->
-		<!-- <dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-gateway</artifactId>
-		</dependency> -->
-		
+		<!-- <dependency> <groupId>org.springframework.cloud</groupId> <artifactId>spring-cloud-starter-gateway</artifactId> 
+			</dependency> -->
+
 		<!--redis限流 -->
-		<!-- <dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-redis-reactive</artifactId>
-		</dependency> -->
+		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis-reactive</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-zuul</artifactId>
 		</dependency>
-		
+
 		<!-- swagger-spring-boot -->
 		<dependency>
 			<groupId>com.spring4all</groupId>
@@ -46,6 +42,11 @@
 		</dependency>
 
 		<dependency>
+			<groupId>com.github.xiaoymin</groupId>
+			<artifactId>swagger-bootstrap-ui</artifactId>
+		</dependency>
+
+		<dependency>
 			<groupId>de.codecentric</groupId>
 			<artifactId>spring-boot-admin-starter-client</artifactId>
 		</dependency>

mec-web/src/main/java/com/ym/mec/web/controller/CourseTypeController.java

@@ -1,46 +0,0 @@
-package com.ym.mec.web.controller;
-
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.web.dal.entity.CourseType;
-import com.ym.mec.web.service.CourseTypeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-
-@RequestMapping
-@Api(description = "课程类型服务")
-@RestController
-public class CourseTypeController extends BaseController {
-
-    @Autowired
-    private CourseTypeService courseTypeService;
-
-    @ApiOperation("新增课程类型")
-    @PutMapping("/add")
-    public Object addCourseType(CourseType courseType) {
-        return succeed(courseTypeService.insert(courseType));
-    }
-
-    @ApiOperation("删除课程类型")
-    @DeleteMapping("/del/{id}")
-    public Object delCourseType(@ApiParam(value = "课程类型编号", required = true) @PathVariable("id") Integer id) {
-        return succeed(courseTypeService.delete(id));
-    }
-
-    @ApiOperation("修改课程类型")
-    @PutMapping("/update")
-    public Object update(CourseType courseType) {
-        courseType.setUpdateTime(new Date());
-        return succeed(courseTypeService.update(courseType));
-    }
-
-    @ApiOperation("查询课程类型")
-    @PutMapping("/query/{id}")
-    public Object getCourseType(@ApiParam(value = "课程类型编号", required = true) @PathVariable("id") Integer id) {
-        return succeed(courseTypeService.get(id));
-    }
-}

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

@@ -1,11 +0,0 @@
-package com.ym.mec.web.dal.dao;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.web.dal.entity.CourseType;
-import org.springframework.stereotype.Component;
-
-@Component
-public interface CourseTypeDao extends BaseDAO<Integer, CourseType> {
-
-	
-}

mec-web/src/main/java/com/ym/mec/web/dal/dao/CourseTypeFeeDetailDao.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.CourseTypeFeeDetail;
-
-public interface CourseTypeFeeDetailDao extends BaseDAO<Integer, CourseTypeFeeDetail> {
-
-	
-}

mec-web/src/main/java/com/ym/mec/web/dal/dao/LearningStationDao.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.LearningStation;
-
-public interface LearningStationDao extends BaseDAO<Integer, LearningStation> {
-
-	
-}

mec-web/src/main/java/com/ym/mec/web/dal/dao/LearningSubjectDao.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.LearningSubject;
-
-public interface LearningSubjectDao extends BaseDAO<Integer, LearningSubject> {
-
-	
-}

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

@@ -1,103 +0,0 @@
-package com.ym.mec.web.dal.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(course_type):
- */
-public class CourseType {
-
-	/**  */
-	private Integer id;
-	
-	/**  */
-	private Integer organId;
-	
-	/**  */
-	private String name;
-	
-	/** 支持的课时时间（多个用|分隔） */
-	private String supportPeriods;
-	
-	/**  */
-	private String delFlag;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	/**  */
-	private String description;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setOrganId(Integer organId){
-		this.organId = organId;
-	}
-	
-	public Integer getOrganId(){
-		return this.organId;
-	}
-			
-	public void setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-			
-	public void setSupportPeriods(String supportPeriods){
-		this.supportPeriods = supportPeriods;
-	}
-	
-	public String getSupportPeriods(){
-		return this.supportPeriods;
-	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
-	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
-	}
-			
-	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;
-	}
-			
-	public void setDescription(String description){
-		this.description = description;
-	}
-	
-	public String getDescription(){
-		return this.description;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

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

@@ -1,114 +0,0 @@
-package com.ym.mec.web.dal.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(course_type_fee_detail):
- */
-public class CourseTypeFeeDetail {
-
-	/**  */
-	private Integer id;
-	
-	/** course_type表的id */
-	private Integer courseTypeId;
-	
-	/** course_fee_type表的id */
-	private Integer courseFeeTypeId;
-	
-	/** 课时（单位：分钟） */
-	private Integer classHour;
-	
-	/** 单价 */
-	private long unitPrice;
-	
-	/** 折扣单价 */
-	private long discountUnitPrice;
-	
-	/**  */
-	private String delFlag;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setCourseTypeId(Integer courseTypeId){
-		this.courseTypeId = courseTypeId;
-	}
-	
-	public Integer getCourseTypeId(){
-		return this.courseTypeId;
-	}
-			
-	public void setCourseFeeTypeId(Integer courseFeeTypeId){
-		this.courseFeeTypeId = courseFeeTypeId;
-	}
-	
-	public Integer getCourseFeeTypeId(){
-		return this.courseFeeTypeId;
-	}
-			
-	public void setClassHour(Integer classHour){
-		this.classHour = classHour;
-	}
-	
-	public Integer getClassHour(){
-		return this.classHour;
-	}
-			
-	public void setUnitPrice(long unitPrice){
-		this.unitPrice = unitPrice;
-	}
-	
-	public long getUnitPrice(){
-		return this.unitPrice;
-	}
-			
-	public void setDiscountUnitPrice(long discountUnitPrice){
-		this.discountUnitPrice = discountUnitPrice;
-	}
-	
-	public long getDiscountUnitPrice(){
-		return this.discountUnitPrice;
-	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
-	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
-	}
-			
-	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/LearningStation.java

@@ -1,103 +0,0 @@
-package com.ym.mec.web.dal.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(learning_station):
- */
-public class LearningStation {
-
-	/**  */
-	private Integer id;
-	
-	/**  */
-	private String name;
-	
-	/**  */
-	private Integer organId;
-	
-	/**  */
-	private String adress;
-	
-	/**  */
-	private String contactPhone;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	/**  */
-	private String delFlag;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-			
-	public void setOrganId(Integer organId){
-		this.organId = organId;
-	}
-	
-	public Integer getOrganId(){
-		return this.organId;
-	}
-			
-	public void setAdress(String adress){
-		this.adress = adress;
-	}
-	
-	public String getAdress(){
-		return this.adress;
-	}
-			
-	public void setContactPhone(String contactPhone){
-		this.contactPhone = contactPhone;
-	}
-	
-	public String getContactPhone(){
-		return this.contactPhone;
-	}
-			
-	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;
-	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
-	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

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

@@ -1,92 +0,0 @@
-package com.ym.mec.web.dal.entity;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-/**
- * 对应数据库表(learning_subject):
- */
-public class LearningSubject {
-
-	/**  */
-	private Integer id;
-	
-	/**  */
-	private String name;
-	
-	/**  */
-	private String code;
-	
-	/**  */
-	private Integer parentSubjectId;
-	
-	/**  */
-	private java.util.Date createTime;
-	
-	/**  */
-	private java.util.Date updateTime;
-	
-	/**  */
-	private String delFlag;
-	
-	public void setId(Integer id){
-		this.id = id;
-	}
-	
-	public Integer getId(){
-		return this.id;
-	}
-			
-	public void setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-			
-	public void setCode(String code){
-		this.code = code;
-	}
-	
-	public String getCode(){
-		return this.code;
-	}
-			
-	public void setParentSubjectId(Integer parentSubjectId){
-		this.parentSubjectId = parentSubjectId;
-	}
-	
-	public Integer getParentSubjectId(){
-		return this.parentSubjectId;
-	}
-			
-	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;
-	}
-			
-	public void setDelFlag(String delFlag){
-		this.delFlag = delFlag;
-	}
-	
-	public String getDelFlag(){
-		return this.delFlag;
-	}
-			
-	@Override
-	public String toString() {
-		return ToStringBuilder.reflectionToString(this);
-	}
-
-}

mec-web/src/main/java/com/ym/mec/web/service/CourseTypeFeeDetailService.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.CourseTypeFeeDetail;
-
-public interface CourseTypeFeeDetailService extends BaseService<Integer, CourseTypeFeeDetail> {
-
-}

mec-web/src/main/java/com/ym/mec/web/service/CourseTypeService.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.CourseType;
-
-public interface CourseTypeService extends BaseService<Integer, CourseType> {
-
-}

mec-web/src/main/java/com/ym/mec/web/service/LearningStationService.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.LearningStation;
-
-public interface LearningStationService extends BaseService<Integer, LearningStation> {
-
-}

mec-web/src/main/java/com/ym/mec/web/service/LearningSubjectService.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.LearningSubject;
-
-public interface LearningSubjectService extends BaseService<Integer, LearningSubject> {
-
-}

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

@@ -1,22 +0,0 @@
-package com.ym.mec.web.service.impl;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.web.dal.dao.CourseTypeFeeDetailDao;
-import com.ym.mec.web.dal.entity.CourseTypeFeeDetail;
-import com.ym.mec.web.service.CourseTypeFeeDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class CourseTypeFeeDetailServiceImpl extends BaseServiceImpl<Integer, CourseTypeFeeDetail> implements CourseTypeFeeDetailService {
-	
-	@Autowired
-	private CourseTypeFeeDetailDao courseTypeFeeDetailDao;
-
-	@Override
-	public BaseDAO<Integer, CourseTypeFeeDetail> getDAO() {
-		return courseTypeFeeDetailDao;
-	}
-	
-}

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

@@ -1,22 +0,0 @@
-package com.ym.mec.web.service.impl;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.web.dal.dao.CourseTypeDao;
-import com.ym.mec.web.dal.entity.CourseType;
-import com.ym.mec.web.service.CourseTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class CourseTypeServiceImpl extends BaseServiceImpl<Integer, CourseType> implements CourseTypeService {
-	
-	@Autowired
-	private CourseTypeDao courseTypeDao;
-
-	@Override
-	public BaseDAO<Integer, CourseType> getDAO() {
-		return courseTypeDao;
-	}
-	
-}

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

@@ -1,22 +0,0 @@
-package com.ym.mec.web.service.impl;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.web.dal.dao.LearningStationDao;
-import com.ym.mec.web.dal.entity.LearningStation;
-import com.ym.mec.web.service.LearningStationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class LearningStationServiceImpl extends BaseServiceImpl<Integer, LearningStation> implements LearningStationService {
-	
-	@Autowired
-	private LearningStationDao learningStationDao;
-
-	@Override
-	public BaseDAO<Integer, LearningStation> getDAO() {
-		return learningStationDao;
-	}
-	
-}

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

@@ -1,22 +0,0 @@
-package com.ym.mec.web.service.impl;
-
-import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.web.dal.dao.LearningSubjectDao;
-import com.ym.mec.web.dal.entity.LearningSubject;
-import com.ym.mec.web.service.LearningSubjectService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class LearningSubjectServiceImpl extends BaseServiceImpl<Integer, LearningSubject> implements LearningSubjectService {
-	
-	@Autowired
-	private LearningSubjectDao learningSubjectDao;
-
-	@Override
-	public BaseDAO<Integer, LearningSubject> getDAO() {
-		return learningSubjectDao;
-	}
-	
-}

mec-web/src/main/resources/mybatis/CourseTypeFeeDetailMapper.xml

@@ -1,60 +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.CourseTypeFeeDetailDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.CourseTypeFeeDetail" id="CourseTypeFeeDetail">
-		<result column="id_" property="id" />
-		<result column="course_type_id_" property="courseTypeId" />
-		<result column="course_fee_type_id_" property="courseFeeTypeId" />
-		<result column="class_hour_" property="classHour" />
-		<result column="unit_price_" property="unitPrice" />
-		<result column="discount_unit_price_" property="discountUnitPrice" />
-		<result column="del_flag_" property="delFlag" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="CourseTypeFeeDetail" >
-		SELECT * FROM course_type_fee_detail WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="CourseTypeFeeDetail">
-		SELECT * FROM course_type_fee_detail ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseTypeFeeDetail" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO course_type_fee_detail (id_,course_type_id_,course_fee_type_id_,class_hour_,unit_price_,discount_unit_price_,del_flag_,create_time_,update_time_) VALUES(#{id},#{courseTypeId},#{courseFeeTypeId},#{classHour},#{unitPrice},#{discountUnitPrice},#{delFlag},#{createTime},#{updateTime})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.CourseTypeFeeDetail">
-		UPDATE course_type_fee_detail SET del_flag_ = #{delFlag},course_type_id_ = #{courseTypeId},id_ = #{id},unit_price_ = #{unitPrice},discount_unit_price_ = #{discountUnitPrice},update_time_ = #{updateTime},class_hour_ = #{classHour},course_fee_type_id_ = #{courseFeeTypeId},create_time_ = #{createTime} WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM course_type_fee_detail WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="CourseTypeFeeDetail" parameterType="map">
-		SELECT * FROM course_type_fee_detail ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM course_type_fee_detail
-	</select>
-</mapper>

mec-web/src/main/resources/mybatis/CourseTypeMapper.xml

@@ -1,59 +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.CourseTypeDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.CourseType" id="CourseType">
-		<result column="id_" property="id" />
-		<result column="organ_id_" property="organId" />
-		<result column="name_" property="name" />
-		<result column="support_periods_" property="supportPeriods" />
-		<result column="del_flag_" property="delFlag" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="description_" property="description" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="CourseType" >
-		SELECT * FROM course_type WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="CourseType">
-		SELECT * FROM course_type ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseType" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO course_type (id_,organ_id_,name_,support_periods_,del_flag_,create_time_,update_time_,description_) VALUES(#{id},#{organId},#{name},#{supportPeriods},#{delFlag},#{createTime},#{updateTime},#{description})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.CourseType">
-		UPDATE course_type SET del_flag_ = #{delFlag},organ_id_ = #{organId},id_ = #{id},update_time_ = #{updateTime},description_ = #{description},support_periods_ = #{supportPeriods},name_ = #{name},create_time_ = #{createTime} WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM course_type WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="CourseType" parameterType="map">
-		SELECT * FROM course_type ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM course_type
-	</select>
-</mapper>

mec-web/src/main/resources/mybatis/Global.mapper.xml

@@ -1,21 +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="global">
-
-	<sql id="limit">
-		<if test="offset != null">
-			 limit #{offset},#{rows}
-		</if>
-	</sql>
-
-	<sql id="orderby">
-		<if test="sort != null and sort != ''">
-			 ORDER BY ${sort}
-			 <if test="order != null and order != ''">
-			 	${order}
-			 </if>
-		</if>
-	</sql>	
- </mapper>

mec-web/src/main/resources/mybatis/LearningStationMapper.xml

@@ -1,59 +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.LearningStationDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.LearningStation" id="LearningStation">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="organ_id_" property="organId" />
-		<result column="adress_" property="adress" />
-		<result column="contact_phone_" property="contactPhone" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="LearningStation" >
-		SELECT * FROM learning_station WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="LearningStation">
-		SELECT * FROM learning_station ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.LearningStation" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO learning_station (id_,name_,organ_id_,adress_,contact_phone_,create_time_,update_time_,del_flag_) VALUES(#{id},#{name},#{organId},#{adress},#{contactPhone},#{createTime},#{updateTime},#{delFlag})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.LearningStation">
-		UPDATE learning_station SET del_flag_ = #{delFlag},organ_id_ = #{organId},id_ = #{id},update_time_ = #{updateTime},contact_phone_ = #{contactPhone},adress_ = #{adress},name_ = #{name},create_time_ = #{createTime} WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM learning_station WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="LearningStation" parameterType="map">
-		SELECT * FROM learning_station ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM learning_station
-	</select>
-</mapper>

mec-web/src/main/resources/mybatis/LearningSubjectMapper.xml

@@ -1,58 +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.LearningSubjectDao">
-	
-	<resultMap type="com.ym.mec.web.dal.entity.LearningSubject" id="LearningSubject">
-		<result column="id_" property="id" />
-		<result column="name_" property="name" />
-		<result column="code_" property="code" />
-		<result column="parent_subject_id_" property="parentSubjectId" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="del_flag_" property="delFlag" />
-	</resultMap>
-	
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="LearningSubject" >
-		SELECT * FROM learning_subject WHERE id_ = #{id} 
-	</select>
-	
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="LearningSubject">
-		SELECT * FROM learning_subject ORDER BY id_
-	</select>
-	
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.LearningSubject" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
-		INSERT INTO learning_subject (id_,name_,code_,parent_subject_id_,create_time_,update_time_,del_flag_) VALUES(#{id},#{name},#{code},#{parentSubjectId},#{createTime},#{updateTime},#{delFlag})
-	</insert>
-	
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.web.dal.entity.LearningSubject">
-		UPDATE learning_subject SET del_flag_ = #{delFlag},parent_subject_id_ = #{parentSubjectId},id_ = #{id},code_ = #{code},update_time_ = #{updateTime},name_ = #{name},create_time_ = #{createTime} WHERE id_ = #{id} 
-	</update>
-	
-	<!-- 根据主键删除一条记录 -->
-	<delete id="delete" >
-		DELETE FROM learning_subject WHERE id_ = #{id} 
-	</delete>
-	
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="LearningSubject" parameterType="map">
-		SELECT * FROM learning_subject ORDER BY id_ <include refid="global.limit"/>
-	</select>
-	
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM learning_subject
-	</select>
-</mapper>

pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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">
+<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>com.ym</groupId>
@@ -111,6 +112,12 @@
 			</dependency>
 
 			<dependency>
+				<groupId>com.github.xiaoymin</groupId>
+				<artifactId>swagger-bootstrap-ui</artifactId>
+				<version>1.9.5</version>
+			</dependency>
+
+			<dependency>
 				<groupId>com.alibaba</groupId>
 				<artifactId>druid-spring-boot-starter</artifactId>
 				<version>1.1.10</version>
@@ -303,6 +310,7 @@
 		<module>mec-util</module>
 		<module>mec-task</module>
 		<module>codegen</module>
-	<module>mec-web</module>
-  </modules>
+		<module>mec-web</module>
+		<module>cms</module>
+	</modules>
 </project>