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

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiOperation;
 import java.util.Date;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,21 +28,21 @@ public class NewsController extends BaseController {
 	private SysNewsInformationService sysNewsInformationService;
 
 	@ApiOperation("资讯列表分页查询")
-	@GetMapping("/list")
+	@GetMapping(value = "/list", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	public Object getList(NewsInformationQueryInfo queryInfo) {
 		return succeed(sysNewsInformationService.queryPage(queryInfo));
 	}
 
 	@ApiOperation("查询资讯详情")
 	@ApiImplicitParam(name = "id", value = "资讯ID编号", required = true, dataType = "Long", paramType = "path")
-	@GetMapping("/query/{id}")
+	@GetMapping(value = "/query/{id}", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	public Object query(@PathVariable("id") Long id) {
 
 		return succeed(sysNewsInformationService.get(id));
 	}
 
 	@ApiOperation("新增资讯")
-	@PostMapping("/add")
+	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	public Object add(SysNewsInformation newsInfo) {
 		Date date = new Date();
 		newsInfo.setCreateTime(date);
@@ -51,7 +52,7 @@ public class NewsController extends BaseController {
 	}
 
 	@ApiOperation("更新资讯")
-	@PostMapping("/update")
+	@PostMapping(value = "/update", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	public Object update(SysNewsInformation newsInfo) {
 		Date date = new Date();
 		newsInfo.setUpdateTime(date);

mec-thirdpart/pom.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <artifactId>mec</artifactId>
+    <groupId>com.ym</groupId>
+    <version>1.0</version>
+  </parent>
+
+  <groupId>com.ym</groupId>
+  <artifactId>mec-thirdpart</artifactId>
+  <version>1.0</version>
+
+  <name>mec-thirdpart</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.7.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

mec-thirdpart/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-thirdpart/src/test/java/com/ym/AppTest.java

@@ -0,0 +1,20 @@
+package com.ym;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.web.dal.entity.CourseHomeworkTemplate;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import com.ym.mec.web.dal.page.CourseHomeWorkTemplateQueryInfo;
+import com.ym.mec.web.service.CourseHomeworkTemplateService;
+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.*;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/18
+ */
+@RequestMapping("courseHomeworkTemplate")
+@Api(tags = "作业模板")
+@RestController
+public class CourseHomeworkTemplateController extends BaseController {
+
+
+    @Autowired
+    private CourseHomeworkTemplateService courseHomeworkTemplateService;
+
+    @ApiOperation(value = "新增作业模板")
+    @PostMapping("/add")
+    public Object add(@RequestBody CourseHomeworkTemplate courseHomeworkTemplate){
+        courseHomeworkTemplate.setDelFlag(YesOrNoEnum.NO);
+        courseHomeworkTemplateService.insert(courseHomeworkTemplate);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除作业模板")
+    @DeleteMapping("/del/{id}")
+    public Object del(@ApiParam(value = "科目编号", required = true) @PathVariable("id") Integer id){
+        courseHomeworkTemplateService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "修改作业模板")
+    @PutMapping("/update")
+    public Object update(@RequestBody CourseHomeworkTemplate courseHomeworkTemplate){
+        courseHomeworkTemplateService.update(courseHomeworkTemplate);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询作业模板列表")
+    @PostMapping("/queryPage")
+    public Object queryPage(@RequestBody CourseHomeWorkTemplateQueryInfo queryInfo){
+        return succeed(courseHomeworkTemplateService.queryPage(queryInfo));
+    }
+
+}

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

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
+
 /**
  * @Author Joburgess
  * @Date 2019/9/17
@@ -23,7 +25,7 @@ public class EmployeeController extends BaseController {
 
     @ApiOperation(value = "根据部门获取下面的员工")
     @GetMapping("/queryEmployByOrganId")
-    public Object queryEmployByOrganId(@RequestParam EmployeeQueryInfo queryInfo){
+    public Object queryEmployByOrganId(@RequestBody EmployeeQueryInfo queryInfo) throws IOException {
         return employeeService.queryEmployByOrganId(queryInfo);
     }
 

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

@@ -23,7 +23,7 @@ public class OrganizationController extends BaseController {
     @ApiOperation(value = "分页查询组织机构树状列表")
     @PostMapping("/queryPage")
     public Object queryPage(@RequestBody OrganizationQueryInfo queryInfo){
-        return organizationService.queryTreePage(queryInfo);
+        return succeed(organizationService.queryTreePage(queryInfo));
     }
 
     @ApiOperation(value = "新增机构")

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

@@ -1,7 +1,7 @@
 package com.ym.mec.web.controller;
 
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.web.dal.entity.TeacherAttendance;
+import com.ym.mec.web.dal.dto.TeacherSignOutDto;
 import com.ym.mec.web.dal.page.TeacherAttendanceQueryInfo;
 import com.ym.mec.web.service.TeacherAttendanceService;
 import io.swagger.annotations.Api;
@@ -19,8 +19,8 @@ public class TeacherAttendanceController extends BaseController {
 
     @ApiOperation(value = "新增教师签到")
     @PostMapping("/add")
-    public Object add(@RequestBody TeacherAttendance teacherAttendance) {
-        teacherAttendanceService.addTeacherAttendanceRecord(teacherAttendance);
+    public Object add(@RequestBody TeacherSignOutDto teacherSignOutDto) {
+        teacherAttendanceService.addTeacherAttendanceRecord(teacherSignOutDto);
         return succeed();
     }
 

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

@@ -0,0 +1,16 @@
+package com.ym.mec.web.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.web.dal.entity.CourseHomeworkTemplate;
+import org.apache.ibatis.annotations.Param;
+
+public interface CourseHomeworkTemplateDao extends BaseDAO<Integer, CourseHomeworkTemplate> {
+
+    /**
+     * @Author: Joburgess
+     * @Date: 2019/9/18
+     * 根据课程计划ID获取所属科目ID
+     */
+    String getSubjectIDs(@Param("courseScheduleID") Long courseScheduleID);
+	
+}

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

@@ -24,7 +24,6 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      */
     int queryEmployByOrganIdCount(Map<String,Object> params);
 
-
     /**
      * 修改密码
      * @param userID

mec-web/src/main/java/com/ym/mec/web/dal/dto/TeacherAttendanceDto.java

@@ -33,9 +33,6 @@ public class TeacherAttendanceDto {
     @ApiModelProperty(value = "班级类型",required = false)
     private String classType;
 
-    @ApiModelProperty(value = "科目ID",required = false)
-    private Long subjectId;
-
     @ApiModelProperty(value = "乐团ID",required = false)
     private Long musicGroupId;
 
@@ -61,14 +58,6 @@ public class TeacherAttendanceDto {
     @ApiModelProperty(value = "教师正常签到提前时间(分钟)",required = false)
     private ParamEnum teacherAttendanceTimeGap;
 
-    public Long getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(Long subjectId) {
-        this.subjectId = subjectId;
-    }
-
     public ParamEnum getTeacherAttendanceTimeGap() {
         return teacherAttendanceTimeGap;
     }

mec-web/src/main/java/com/ym/mec/web/dal/dto/TeacherSignOutDto.java

@@ -0,0 +1,34 @@
+package com.ym.mec.web.dal.dto;
+
+import com.ym.mec.web.dal.entity.CourseHomework;
+import com.ym.mec.web.dal.entity.TeacherAttendance;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/18
+ */
+public class TeacherSignOutDto {
+
+    @ApiModelProperty(value = "教师签退信息",required = true)
+    private TeacherAttendance teacherAttendanceInfo;
+
+    @ApiModelProperty(value = "课后作业信息")
+    private CourseHomework courseHomeworkInfo;
+
+    public TeacherAttendance getTeacherAttendanceInfo() {
+        return teacherAttendanceInfo;
+    }
+
+    public void setTeacherAttendanceInfo(TeacherAttendance teacherAttendanceInfo) {
+        this.teacherAttendanceInfo = teacherAttendanceInfo;
+    }
+
+    public CourseHomework getCourseHomeworkInfo() {
+        return courseHomeworkInfo;
+    }
+
+    public void setCourseHomeworkInfo(CourseHomework courseHomeworkInfo) {
+        this.courseHomeworkInfo = courseHomeworkInfo;
+    }
+}

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

@@ -14,7 +14,7 @@ public class CourseHomework {
 	private Long courseScheduleId;
 	
 	/** 图片地址（多个用逗号分隔） */
-	private String images;
+	private String attachments;
 	
 	/** 作业内容 */
 	private String content;
@@ -46,15 +46,15 @@ public class CourseHomework {
 	public Long getCourseScheduleId(){
 		return this.courseScheduleId;
 	}
-			
-	public void setImages(String images){
-		this.images = images;
+
+	public String getAttachments() {
+		return attachments;
 	}
-	
-	public String getImages(){
-		return this.images;
+
+	public void setAttachments(String attachments) {
+		this.attachments = attachments;
 	}
-			
+
 	public void setContent(String content){
 		this.content = content;
 	}

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

@@ -0,0 +1,114 @@
+package com.ym.mec.web.dal.entity;
+
+import com.ym.mec.web.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(course_homework_template):
+ */
+public class CourseHomeworkTemplate {
+
+	/**  */
+	@ApiModelProperty(value = "模板ID",required = false)
+	private Integer id;
+	
+	/** 模板名称 */
+	@ApiModelProperty(value = "模板名称",required = true)
+	private String name;
+	
+	/** 模板内容 */
+	@ApiModelProperty(value = "模板内容",required = true)
+	private String content;
+
+	/** 是否删除  -1：已删除  0：正常 */
+	@ApiModelProperty(value = "是否删除  1：已删除  0：正常",required = false)
+	private YesOrNoEnum delFlag;
+	
+	/**  */
+	@ApiModelProperty(value = "创建日期",required = false)
+	private java.util.Date createTime;
+	
+	/**  */
+	@ApiModelProperty(value = "更新日期",required = false)
+	private java.util.Date updateTime;
+
+	/** 班级类型(普通班级、合奏班级) */
+	@ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级)",required = true)
+	private ClassGroupTypeEnum classGroupType;
+	
+	/**  */
+	@ApiModelProperty(value = "声部ID",required = true)
+	private Integer subjectId;
+	
+	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 setContent(String content){
+		this.content = content;
+	}
+	
+	public String getContent(){
+		return this.content;
+	}
+
+	public YesOrNoEnum getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(YesOrNoEnum delFlag) {
+		this.delFlag = 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 ClassGroupTypeEnum getClassGroupType() {
+		return classGroupType;
+	}
+
+	public void setClassGroupType(ClassGroupTypeEnum classGroupType) {
+		this.classGroupType = classGroupType;
+	}
+
+	public void setSubjectId(Integer subjectId){
+		this.subjectId = subjectId;
+	}
+	
+	public Integer getSubjectId(){
+		return this.subjectId;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -16,10 +16,6 @@ public class StudentAttendance {
 	@ApiModelProperty(value = "乐团",required = false)
 	private Integer musicGroupId;
 	
-	/** 科目 */
-	@ApiModelProperty(value = "科目",required = false)
-	private Integer subjectId;
-	
 	/** 班级 */
 	@ApiModelProperty(value = "班级",required = false)
 	private Integer classGroupId;
@@ -63,14 +59,6 @@ public class StudentAttendance {
 		return this.musicGroupId;
 	}
 			
-	public void setSubjectId(Integer subjectId){
-		this.subjectId = subjectId;
-	}
-	
-	public Integer getSubjectId(){
-		return this.subjectId;
-	}
-			
 	public void setClassGroupId(Integer classGroupId){
 		this.classGroupId = classGroupId;
 	}

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

@@ -1,7 +1,6 @@
 package com.ym.mec.web.dal.entity;
 
 import com.ym.mec.web.dal.enums.SignStatusEnum;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -24,10 +23,6 @@ public class TeacherAttendance {
 	private Long musicGroupId;
 	
 	/**  */
-	@ApiModelProperty(value = "科目编号",required = false)
-	private Long subjectId;
-	
-	/**  */
 	@ApiModelProperty(value = "班级编号",required = false)
 	private Long classGroupId;
 	
@@ -74,14 +69,6 @@ public class TeacherAttendance {
 		this.musicGroupId = musicGroupId;
 	}
 
-	public Long getSubjectId() {
-		return subjectId;
-	}
-
-	public void setSubjectId(Long subjectId) {
-		this.subjectId = subjectId;
-	}
-
 	public Long getClassGroupId() {
 		return classGroupId;
 	}

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

@@ -9,6 +9,7 @@ import com.ym.mec.common.enums.BaseEnum;
 public enum  ParamEnum implements BaseEnum<Integer, ParamEnum> {
 
     ONE(1,""),
+    INIT_PASSWORD(123456,"初始密码"),
     TEACHER_ATTENDANCE_TIME_GAP(-20,"教师正常签到时差");
 
     private Integer code;

mec-web/src/main/java/com/ym/mec/web/dal/page/CourseHomeWorkTemplateQueryInfo.java

@@ -0,0 +1,33 @@
+package com.ym.mec.web.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/9/18
+ */
+public class CourseHomeWorkTemplateQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value = "科目ID集合",required = false)
+    private String[] subjectIDs;
+
+    @ApiModelProperty(value = "课程计划ID",required = false)
+    private Long courseScheduleID;
+
+    public String[] getSubjectIDs() {
+        return subjectIDs;
+    }
+
+    public void setSubjectIDs(String[] subjectIDs) {
+        this.subjectIDs = subjectIDs;
+    }
+
+    public Long getCourseScheduleID() {
+        return courseScheduleID;
+    }
+
+    public void setCourseScheduleID(Long courseScheduleID) {
+        this.courseScheduleID = courseScheduleID;
+    }
+}

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

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

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

@@ -6,6 +6,8 @@ import com.ym.mec.web.dal.entity.Employee;
 import com.ym.mec.web.dal.enums.EmployeeOperateEnum;
 import com.ym.mec.web.dal.page.EmployeeQueryInfo;
 
+import java.io.IOException;
+
 public interface EmployeeService extends BaseService<Integer, Employee> {
 
     /**
@@ -13,7 +15,7 @@ public interface EmployeeService extends BaseService<Integer, Employee> {
      * @Date: 2019/9/17
      * 根据部门获取下面的员工
      */
-    PageInfo queryEmployByOrganId(EmployeeQueryInfo queryInfo);
+    PageInfo queryEmployByOrganId(EmployeeQueryInfo queryInfo) throws IOException;
 
     /**
      * @Author: Joburgess

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

@@ -2,6 +2,7 @@ package com.ym.mec.web.service;
 
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
+import com.ym.mec.web.dal.dto.TeacherSignOutDto;
 import com.ym.mec.web.dal.entity.TeacherAttendance;
 import com.ym.mec.web.dal.page.TeacherAttendanceQueryInfo;
 
@@ -12,7 +13,7 @@ public interface TeacherAttendanceService extends BaseService<Long, TeacherAtten
      * @Date: 2019/9/10
      * 添加教师签到记录
      */
-    void addTeacherAttendanceRecord(TeacherAttendance teacherAttendance);
+    void addTeacherAttendanceRecord(TeacherSignOutDto teacherSignOutDto);
 
     /**
      * 获取教师个人的签到记录

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

@@ -0,0 +1,34 @@
+package com.ym.mec.web.service.impl;
+
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
+import com.ym.mec.web.dal.page.CourseHomeWorkTemplateQueryInfo;
+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.CourseHomeworkTemplateDao;
+import com.ym.mec.web.dal.entity.CourseHomeworkTemplate;
+import com.ym.mec.web.service.CourseHomeworkTemplateService;
+
+@Service
+public class CourseHomeworkTemplateServiceImpl extends BaseServiceImpl<Integer, CourseHomeworkTemplate>  implements CourseHomeworkTemplateService {
+	
+	@Autowired
+	private CourseHomeworkTemplateDao courseHomeworkTemplateDao;
+
+	@Override
+	public BaseDAO<Integer, CourseHomeworkTemplate> getDAO() {
+		return courseHomeworkTemplateDao;
+	}
+
+	@Override
+	public PageInfo<CourseHomeworkTemplate> queryPage(QueryInfo queryInfo) {
+		CourseHomeWorkTemplateQueryInfo templateQueryInfo= (CourseHomeWorkTemplateQueryInfo) queryInfo;
+		if(null!=templateQueryInfo.getCourseScheduleID()){
+			templateQueryInfo.setSubjectIDs(courseHomeworkTemplateDao.getSubjectIDs(templateQueryInfo.getCourseScheduleID()).split(","));
+		}
+		return super.queryPage(templateQueryInfo);
+	}
+}

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

@@ -1,18 +1,26 @@
 package com.ym.mec.web.service.impl;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.security.SecurityUtils;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.web.dal.dao.EmployeeDao;
 import com.ym.mec.web.dal.dto.EmployeeDto;
 import com.ym.mec.web.dal.entity.Employee;
 import com.ym.mec.web.dal.enums.EmployeeOperateEnum;
+import com.ym.mec.web.dal.enums.ParamEnum;
 import com.ym.mec.web.dal.page.EmployeeQueryInfo;
 import com.ym.mec.web.service.EmployeeService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
+import java.io.IOException;
 import java.util.*;
 
 @Service
@@ -21,14 +29,34 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	@Autowired
 	private EmployeeDao employeeDao;
 
+	@Autowired
+	private RestTemplate restTemplate;
+
+	@Autowired
+	private ObjectMapper objectMapper;
+
 	@Override
 	public BaseDAO<Integer, Employee> getDAO() {
 		return employeeDao;
 	}
 
 	@Override
-	public PageInfo queryEmployByOrganId(EmployeeQueryInfo queryInfo) {
-		queryInfo.setOrganId(1L);
+	public PageInfo queryEmployByOrganId(EmployeeQueryInfo queryInfo) throws IOException {
+		String url = "http://auth-server/queryUserInfo";
+
+		String base64ClientCredentials = Base64.getEncoder().encodeToString("app:app".getBytes());
+
+		HttpHeaders headers = new HttpHeaders();
+		headers.add("Authorization", "bearer " + SecurityUtils.getToken());
+		headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+
+		HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<MultiValueMap<String, String>>(null, headers);
+
+		ResponseEntity<String> resp = restTemplate.exchange(url, HttpMethod.GET, entity, String.class);
+
+		Map map = objectMapper.readValue(resp.getBody(), Map.class);
+
+		queryInfo.setOrganId(Long.valueOf(map.get("organId").toString()));
 		PageInfo<EmployeeDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
@@ -51,7 +79,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 	public void employeeOperate(Long employeeId, EmployeeOperateEnum operate) {
 		switch (operate){
 			case RESET_PASSWORD:
-				employeeDao.updatePassword(employeeId,"$10$9qP1IKnbSx/wUOzo2qbGrOOf0LXPmHjp85vU2PxZvlkKRtsVbCwry");
+				employeeDao.updatePassword(employeeId,new BCryptPasswordEncoder().encode(ParamEnum.INIT_PASSWORD.getCode().toString()));
 				break;
 			case LOCK_UNLOCK:
 				employeeDao.updateUserLockStatus(employeeId);

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

@@ -8,15 +8,19 @@ import com.ym.mec.web.dal.dao.CourseScheduleDao;
 import com.ym.mec.web.dal.dao.TeacherAttendanceDao;
 import com.ym.mec.web.dal.dto.TeacherAttendanceDto;
 import com.ym.mec.web.dal.dto.TeacherPersonalAttendanceDto;
+import com.ym.mec.web.dal.dto.TeacherSignOutDto;
+import com.ym.mec.web.dal.entity.CourseHomework;
 import com.ym.mec.web.dal.entity.CourseSchedule;
 import com.ym.mec.web.dal.entity.TeacherAttendance;
 import com.ym.mec.web.dal.enums.CourseStatusEnum;
 import com.ym.mec.web.dal.enums.ParamEnum;
 import com.ym.mec.web.dal.enums.SignStatusEnum;
 import com.ym.mec.web.dal.page.TeacherAttendanceQueryInfo;
+import com.ym.mec.web.service.CourseHomeworkService;
 import com.ym.mec.web.service.TeacherAttendanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -29,14 +33,18 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 	private TeacherAttendanceDao teacherAttendanceDao;
 	@Autowired
 	private CourseScheduleDao courseScheduleDao;
+	@Autowired
+	private CourseHomeworkService courseHomeworkService;
 
 	@Override
 	public BaseDAO<Long, TeacherAttendance> getDAO() {
 		return teacherAttendanceDao;
 	}
 
+	@Transactional(rollbackFor = Exception.class)
 	@Override
-	public void addTeacherAttendanceRecord(TeacherAttendance teacherAttendance) {
+	public void addTeacherAttendanceRecord(TeacherSignOutDto teacherSignOutDto) {
+		TeacherAttendance teacherAttendance=teacherSignOutDto.getTeacherAttendanceInfo();
 		CourseSchedule courseSchedule=new CourseSchedule();
 		TeacherAttendanceDto currentCourseDetail = courseScheduleDao.getCurrentCourseDetail(teacherAttendance.getCourseScheduleId());
 		courseSchedule.setId(currentCourseDetail.getCourseScheduleId());
@@ -64,11 +72,17 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		}
 		courseScheduleDao.update(courseSchedule);
 		teacherAttendance.setMusicGroupId(currentCourseDetail.getMusicGroupId());
-		teacherAttendance.setSubjectId(currentCourseDetail.getSubjectId());
 		teacherAttendance.setClassGroupId(currentCourseDetail.getClassId());
 		teacherAttendance.setSignInTime(date);
 		teacherAttendance.setCreateTime(date);
 		teacherAttendanceDao.insert(teacherAttendance);
+		if(teacherAttendance.getStatus()==SignStatusEnum.YES_QUIT){
+			CourseHomework courseHomework=teacherSignOutDto.getCourseHomeworkInfo();
+			courseHomework.setCourseScheduleId(teacherAttendance.getCourseScheduleId());
+			courseHomework.setMusicGroupId(currentCourseDetail.getMusicGroupId().intValue());
+			courseHomework.setClassGroupId(currentCourseDetail.getClassId().intValue());
+			courseHomeworkService.insert(courseHomework);
+		}
 	}
 
 	@Override

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

@@ -9,7 +9,7 @@
 	<resultMap type="com.ym.mec.web.dal.entity.CourseHomework" id="CourseHomework">
 		<result column="id_" property="id" />
 		<result column="course_schedule_id_" property="courseScheduleId" />
-		<result column="images_" property="images" />
+		<result column="attachments_" property="attachments" />
 		<result column="content_" property="content" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
@@ -34,14 +34,14 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO course_homework (id_,course_schedule_id_,images_,content_,create_time_,update_time_,music_group_id_,class_group_id_) VALUES(#{id},#{courseScheduleId},#{images},#{content},#{createTime},#{updateTime},#{musicGroupId},#{classGroupId})
+		INSERT INTO course_homework (id_,course_schedule_id_,attachments_,content_,create_time_,update_time_,music_group_id_,class_group_id_) VALUES(#{id},#{courseScheduleId},#{attachments},#{content},now(),now(),#{musicGroupId},#{classGroupId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.web.dal.entity.CourseHomework">
 		UPDATE course_homework <set>
-<if test="images != null">
-images_ = #{images},
+<if test="attachments != null">
+	attachments_ = #{attachments},
 </if>
 <if test="id != null">
 id_ = #{id},

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

@@ -0,0 +1,108 @@
+<?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.CourseHomeworkTemplateDao">
+	
+	<resultMap type="com.ym.mec.web.dal.entity.CourseHomeworkTemplate" id="CourseHomeworkTemplate">
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="content_" property="content" />
+		<result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+		<result column="class_group_type_" property="classGroupType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+		<result column="subject_id_" property="subjectId" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="CourseHomeworkTemplate" >
+		SELECT * FROM course_homework_template WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="CourseHomeworkTemplate">
+		SELECT * FROM course_homework_template ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.web.dal.entity.CourseHomeworkTemplate" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!--
+		<selectKey resultClass="int" keyProperty="id" > 
+		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
+		</selectKey>
+		-->
+		INSERT INTO course_homework_template (id_,name_,content_,del_flag_,create_time_,update_time_,class_group_type_,subject_id_) VALUES(#{id},#{name},#{content},#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),now(),#{classGroupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectId})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.web.dal.entity.CourseHomeworkTemplate">
+		UPDATE course_homework_template <set>
+<if test="delFlag != null">
+del_flag_ = #{delFlag},
+</if>
+<if test="subjectId != null">
+subject_id_ = #{subjectId},
+</if>
+<if test="id != null">
+id_ = #{id},
+</if>
+<if test="updateTime != null">
+update_time_ = now(),
+</if>
+<if test="content != null">
+content_ = #{content},
+</if>
+<if test="classGroupType != null">
+class_group_type_ = #{classGroupType},
+</if>
+<if test="name != null">
+name_ = #{name},
+</if>
+<if test="createTime != null">
+create_time_ = #{createTime},
+</if>
+</set> WHERE id_ = #{id} 
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM course_homework_template WHERE id_ = #{id} 
+	</delete>
+
+	<sql id="queryCondition">
+		<where>
+			<if test="subjectIDs != null">
+				and subject_id_ IN
+				<foreach collection="subjectIDs" item="subjectID" open="(" close=")" separator=",">
+					#{subjectID}
+				</foreach>
+			</if>
+		</where>
+	</sql>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="CourseHomeworkTemplate" parameterType="map">
+		SELECT * FROM course_homework_template
+		<include refid="queryCondition"/>
+		ORDER BY id_
+		<include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM course_homework_template
+	</select>
+
+	<select id="getSubjectIDs" resultType="java.lang.String">
+		SELECT
+			cg.subject_id_list_
+		FROM
+			course_schedule cs
+		LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
+		WHERE cs.id_=#{courseScheduleID}
+	</select>
+
+</mapper>

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

@@ -135,7 +135,6 @@
         <result property="endClassTime" column="end_class_time_"/>
         <result property="courseStatus" column="course_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="classId" column="class_id"/>
-        <result property="subjectId" column="subject_id_"/>
         <result property="className" column="class_name"/>
         <result property="classType" column="class_type"/>
         <result property="musicGroupId" column="music_group_id"/>
@@ -154,7 +153,6 @@
             cs.end_class_time_,
             cs.status_ course_status_,
             cg.id_ class_id,
-            cg.subject_id_,
             cg.name_ class_name,
             cg.type_ class_type,
             mg.id_ music_group_id,

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

@@ -167,6 +167,6 @@
 			sys_user su
 		LEFT JOIN employee e ON su.id_=e.user_id_
 		LEFT JOIN sys_user_role sur ON su.id_=sur.user_id_
-		LEFT JOIN sys_role sr ON sur.rol
+		LEFT JOIN sys_role sr ON sur.role_id_=sr.id_
 	</select>
 </mapper>

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

@@ -9,7 +9,6 @@
     <resultMap type="com.ym.mec.web.dal.entity.StudentAttendance" id="StudentAttendance">
         <result column="id_" property="id"/>
         <result column="music_group_id_" property="musicGroupId"/>
-        <result column="subject_id_" property="subjectId"/>
         <result column="class_group_id_" property="classGroupId"/>
         <result column="course_schedule_id_" property="courseScheduleId"/>
         <result column="user_id_" property="userId"/>
@@ -38,15 +37,15 @@
         </selectKey>
         -->
         INSERT INTO student_attendance
-        (id_,music_group_id_,subject_id_,class_group_id_,course_schedule_id_,user_id_,teacher_id_,status_,create_time_,remark_)
-        VALUES(#{id},#{musicGroupId},#{subjectId},#{classGroupId},#{courseScheduleId},#{userId},#{teacherId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),#{remark})
+        (id_,music_group_id_,class_group_id_,course_schedule_id_,user_id_,teacher_id_,status_,create_time_,remark_)
+        VALUES(#{id},#{musicGroupId},#{classGroupId},#{courseScheduleId},#{userId},#{teacherId},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),#{remark})
     </insert>
 
     <insert id="addStudentAttendances" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
-      INSERT INTO student_attendance ( music_group_id_, subject_id_, class_group_id_, course_schedule_id_, user_id_, teacher_id_, status_, create_time_, remark_ )
+      INSERT INTO student_attendance ( music_group_id_, class_group_id_, course_schedule_id_, user_id_, teacher_id_, status_, create_time_, remark_ )
       VALUES
 	  <foreach collection="list" item="studentAttendance" separator=",">
-          (#{studentAttendance.musicGroupId},#{studentAttendance.subjectId},#{studentAttendance.classGroupId},#{studentAttendance.courseScheduleId},#{studentAttendance.userId},#{studentAttendance.teacherId},#{studentAttendance.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),#{studentAttendance.remark})
+          (#{studentAttendance.musicGroupId},#{studentAttendance.classGroupId},#{studentAttendance.courseScheduleId},#{studentAttendance.userId},#{studentAttendance.teacherId},#{studentAttendance.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},now(),#{studentAttendance.remark})
       </foreach>
     </insert>
 
@@ -54,9 +53,6 @@
     <update id="update" parameterType="com.ym.mec.web.dal.entity.StudentAttendance">
         UPDATE student_attendance
         <set>
-            <if test="subjectId != null">
-                subject_id_ = #{subjectId},
-            </if>
             <if test="status != null">
                 status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>

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

@@ -10,7 +10,6 @@
         <result column="id_" property="id"/>
         <result column="teacher_id_" property="teacherId"/>
         <result column="music_group_id_" property="musicGroupId"/>
-        <result column="subject_id_" property="subjectId"/>
         <result column="class_group_id_" property="classGroupId"/>
         <result column="course_schedule_id_" property="courseScheduleId"/>
         <result column="sign_in_time_" property="signInTime"/>
@@ -38,17 +37,14 @@
         </selectKey>
         -->
         INSERT INTO teacher_attendance
-        (id_,teacher_id_,music_group_id_,subject_id_,class_group_id_,course_schedule_id_,sign_in_time_,status_,remark_,create_time_)
-        VALUES(#{id},#{teacherId},#{musicGroupId},#{subjectId},#{classGroupId},#{courseScheduleId},#{signInTime},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},now())
+        (id_,teacher_id_,music_group_id_,class_group_id_,course_schedule_id_,sign_in_time_,status_,remark_,create_time_)
+        VALUES(#{id},#{teacherId},#{musicGroupId},#{classGroupId},#{courseScheduleId},#{signInTime},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{remark},now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.ym.mec.web.dal.entity.TeacherAttendance">
         UPDATE teacher_attendance
         <set>
-            <if test="subjectId != null">
-                subject_id_ = #{subjectId},
-            </if>
             <if test="status != null">
                 status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
@@ -130,6 +126,7 @@
         LEFT JOIN class_group cg ON ta.class_group_id_=cg.id_
         <include refid="queryCondition"/>
         ORDER BY class_date_ DESC
+        <include refid="global.limit"/>
     </select>
 
     <select id="getTeacherPersonalAttendancesCount" resultType="int">

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 閬垮厤鍜宭ogback鍐茬獊璀﹀憡 -->
+				<!--排除log4j2 避免和logback冲突警告 -->
 				<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>
@@ -318,5 +318,6 @@
 		<module>mec-im</module>
 		<module>workflowy</module>
 	  <module>mec-workflow</module>
+    <module>mec-thirdpart</module>
   </modules>
 </project>