瀏覽代碼

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

# Conflicts:
#	mec-education/src/main/java/com/ym/mec/education/req/ClassGroupReq.java
chengpeng 5 年之前
父節點
當前提交
e9f7924146
共有 28 個文件被更改,包括 1374 次插入33 次删除
  1. 2 2
      mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java
  2. 1 1
      mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java
  3. 8 1
      mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupStudentFeeDao.java
  4. 9 0
      mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysConfigDao.java
  5. 12 0
      mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseListDto.java
  6. 26 1
      mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupStudentFee.java
  7. 86 0
      mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysConfig.java
  8. 8 0
      mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java
  9. 10 5
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java
  10. 23 0
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysConfigServiceImpl.java
  11. 14 2
      mec-biz/src/main/resources/config/mybatis/MusicGroupStudentFeeMapper.xml
  12. 78 0
      mec-biz/src/main/resources/config/mybatis/SysConfigMapper.xml
  13. 10 4
      mec-common/common-core/src/main/java/com/ym/mec/common/config/RequestHeaderConfiguration.java
  14. 1 2
      mec-education/src/main/java/com/ym/mec/education/controller/ClassGroupController.java
  15. 2 2
      mec-education/src/main/java/com/ym/mec/education/controller/StudentAttendanceController.java
  16. 36 0
      mec-education/src/main/java/com/ym/mec/education/controller/StudentRegistrationController.java
  17. 1 1
      mec-education/src/main/java/com/ym/mec/education/mapper/StudentRegistrationMapper.java
  18. 3 1
      mec-education/src/main/java/com/ym/mec/education/req/ClassGroupReq.java
  19. 25 0
      mec-education/src/main/java/com/ym/mec/education/resp/StudentRegistrationResp.java
  20. 4 1
      mec-education/src/main/java/com/ym/mec/education/service/IStudentRegistrationService.java
  21. 5 5
      mec-education/src/main/java/com/ym/mec/education/service/impl/ClassGroupServiceImpl.java
  22. 3 2
      mec-education/src/main/java/com/ym/mec/education/service/impl/StudentAttendanceServiceImpl.java
  23. 41 1
      mec-education/src/main/java/com/ym/mec/education/service/impl/StudentRegistrationServiceImpl.java
  24. 1 1
      mec-student/src/main/java/com/ym/mec/student/controller/CourseController.java
  25. 874 0
      mec-util/src/main/java/com/ym/mec/util/date/DateUtil.java
  26. 14 0
      mec-web/src/main/java/com/ym/mec/web/WebApplication.java
  27. 0 1
      mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java
  28. 77 0
      mec-web/src/main/java/com/ym/mec/web/controller/SysConfigController.java

+ 2 - 2
mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/client/SysUserFeignService.java

@@ -18,8 +18,8 @@ public interface SysUserFeignService {
 	@GetMapping(value = "user/queryUserByPhone")
 	public SysUser getUserByMobile(@RequestParam("mobile") String mobile);
 
-	@RequestMapping(value = "user/add",method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public Object addUser(@RequestBody SysUser user);
+	@PostMapping(value = "user/add", consumes = MediaType.APPLICATION_JSON_VALUE)
+	public Object addUser(SysUser user);
 
 	@GetMapping(value = "task/test")
 	public Object test();

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

@@ -61,7 +61,7 @@ public class UserController extends BaseController {
 	}
 
 	@ApiOperation(value = "新增用户")
-	@RequestMapping(value = "/add",method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
+	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_JSON_VALUE)
 	public Object add(@RequestBody SysUser sysUser) {
 //		sysUser.setPassword(new BCryptPasswordEncoder().encode(sysUser.getPassword()));
 		sysUserService.insert(sysUser);

+ 8 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupStudentFeeDao.java

@@ -2,8 +2,15 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudentFee> {
 
-	
+
+    /**
+     * 根据乐团编号和学员编号获取乐团费用信息
+     * @param userId
+     * @return
+     */
+    MusicGroupStudentFee findByUser(@Param("userId") Integer userId,@Param("musicGroupId") String musicGroupId);
 }

+ 9 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysConfigDao.java

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

+ 12 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseListDto.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dto;
 
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
@@ -33,6 +34,17 @@ public class CourseListDto {
     @ApiModelProperty(value = "单节课时",required = true)
     private Integer singleClassMinutes;
 
+    @ApiModelProperty(value = "0待续费,1已续费",required = true)
+    private Integer renewStatus = 0;
+
+    public Integer getRenewStatus() {
+        return renewStatus;
+    }
+
+    public void setRenewStatus(Integer renewStatus) {
+        this.renewStatus = renewStatus;
+    }
+
     public Integer getSingleClassMinutes() {
         return singleClassMinutes;
     }

+ 26 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupStudentFee.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 对应数据库表(music_group_student_fee_):
@@ -24,13 +25,37 @@ public class MusicGroupStudentFee {
 	/** 课程费用 */
 	@ApiModelProperty(value = "课程费用",required = false)
 	private BigDecimal courseFee;
+
+	/** 课程费用 */
+	@ApiModelProperty(value = "下次缴费日期",required = false)
+	private Date nextPaymentDate;
+
+	/** 课程费用 */
+	@ApiModelProperty(value = "最近缴费时间",required = false)
+	private Date latestPaidTime;
 	
 	/**  */
 	private java.util.Date createTime;
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	public Date getNextPaymentDate() {
+		return nextPaymentDate;
+	}
+
+	public void setNextPaymentDate(Date nextPaymentDate) {
+		this.nextPaymentDate = nextPaymentDate;
+	}
+
+	public Date getLatestPaidTime() {
+		return latestPaidTime;
+	}
+
+	public void setLatestPaidTime(Date latestPaidTime) {
+		this.latestPaidTime = latestPaidTime;
+	}
+
 	public void setId(Long id){
 		this.id = id;
 	}

+ 86 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysConfig.java

@@ -0,0 +1,86 @@
+package com.ym.mec.biz.dal.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(sys_config):
+ */
+public class SysConfig {
+
+	/**  */
+	private Long id;
+	
+	/** 参数名称 */
+	@ApiModelProperty(value = "参数名称", required = true)
+	private String paramName;
+	
+	/** 参数值 */
+	@ApiModelProperty(value = "参数值", required = true)
+	private String paranValue;
+	
+	/** 描述 */
+	@ApiModelProperty(value = "描述", required = true)
+	private String description;
+	
+	/** 创建时间 */
+	private java.util.Date createOn;
+	
+	/** 修改时间 */
+	private java.util.Date modifyOn;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setParamName(String paramName){
+		this.paramName = paramName;
+	}
+	
+	public String getParamName(){
+		return this.paramName;
+	}
+			
+	public void setParanValue(String paranValue){
+		this.paranValue = paranValue;
+	}
+	
+	public String getParanValue(){
+		return this.paranValue;
+	}
+			
+	public void setDescription(String description){
+		this.description = description;
+	}
+	
+	public String getDescription(){
+		return this.description;
+	}
+			
+	public void setCreateOn(java.util.Date createOn){
+		this.createOn = createOn;
+	}
+	
+	public java.util.Date getCreateOn(){
+		return this.createOn;
+	}
+			
+	public void setModifyOn(java.util.Date modifyOn){
+		this.modifyOn = modifyOn;
+	}
+	
+	public java.util.Date getModifyOn(){
+		return this.modifyOn;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

+ 8 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

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

+ 10 - 5
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
 import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
+import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
@@ -13,6 +14,7 @@ import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
+import com.ym.mec.util.date.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -46,6 +48,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     private StudentRegistrationService studentRegistrationService;
     @Autowired
     private ClassGroupTeacherSalaryService classGroupTeacherSalaryService;
+    @Autowired
+    private MusicGroupStudentFeeDao musicGroupStudentFeeDao;
 
     @Override
     public BaseDAO<Integer, ClassGroup> getDAO() {
@@ -333,16 +337,17 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 e.setStudentNames(classGroupDao.findVipStuNames(e.getMusicGroupId()));
             }else {
                 //获取学员乐团课的续费状态
-
-                //获取当前乐团缴费周期
-                List<MusicGroupPaymentCalender> musicGroupPaymentCalenders = musicGroupPaymentCalenderDao.findByMusicGroupId(e.getMusicGroupId());
-
-
+                MusicGroupStudentFee musicGroupStudentFee = musicGroupStudentFeeDao.findByUser(userId,e.getMusicGroupId());
+                if(musicGroupStudentFee != null){
+                    int i = DateUtil.daysBetween(new Date(),musicGroupStudentFee.getNextPaymentDate());
+                    e.setRenewStatus(i < 8?0:1);
+                }
             }
         });
         return classGroupDao.queryCoursePage(userId);
     }
 
+
     @Override
     public List<ImGroupModel> queryUserGroups(Integer userId) {
         return classGroupDao.queryUserGroups(userId);

+ 23 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysConfigServiceImpl.java

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.entity.SysConfig;
+import com.ym.mec.biz.service.SysConfigService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class SysConfigServiceImpl extends BaseServiceImpl<Long, SysConfig>  implements SysConfigService {
+	
+	@Autowired
+	private SysConfigDao sysConfigDao;
+
+	@Override
+	public BaseDAO<Long, SysConfig> getDAO() {
+		return sysConfigDao;
+	}
+	
+}

+ 14 - 2
mec-biz/src/main/resources/config/mybatis/MusicGroupStudentFeeMapper.xml

@@ -11,6 +11,8 @@
         <result column="music_group_id_" property="musicGroupId"/>
         <result column="user_id_" property="userId"/>
         <result column="course_fee_" property="courseFee"/>
+        <result column="next_payment_date_" property="nextPaymentDate"/>
+        <result column="latest_paid_time_" property="latestPaidTime"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
     </resultMap>
@@ -28,8 +30,8 @@
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupStudentFee" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
-		INSERT INTO music_group_student_fee_ (id_,music_group_id_,user_id_,course_fee_,create_time_,update_time_)
-		VALUES(#{id},#{musicGroupId},#{userId},#{courseFee},now(),now())
+		INSERT INTO music_group_student_fee_ (id_,music_group_id_,user_id_,course_fee_,create_time_,update_time_,next_payment_date_,latest_paid_time_)
+		VALUES(#{id},#{musicGroupId},#{userId},#{courseFee},now(),now(),#{nextPaymentDate},#{latestPaidTime})
 	</insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -48,6 +50,12 @@
             <if test="musicGroupId != null">
                 music_group_id_ = #{musicGroupId},
             </if>
+            <if test="nextPaymentDate != null">
+                next_payment_date_ = #{nextPaymentDate},
+            </if>
+            <if test="latestPaidTime != null">
+                latest_paid_time_ = #{latestPaidTime},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>
@@ -67,4 +75,8 @@
     <select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM music_group_student_fee_
 	</select>
+
+    <select id="findByUser" resultMap="MusicGroupStudentFee">
+        SELECT * FROM music_group_student_fee_ WHERE music_group_id_ = #{musicGroupId} AND user_id_ = #{userId}
+    </select>
 </mapper>

+ 78 - 0
mec-biz/src/main/resources/config/mybatis/SysConfigMapper.xml

@@ -0,0 +1,78 @@
+<?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.biz.dal.dao.SysConfigDao">
+
+	<resultMap type="com.ym.mec.biz.dal.entity.SysConfig" id="SysConfig">
+		<result column="id" property="id" />
+		<result column="param_name_" property="paramName" />
+		<result column="paran_value_" property="paranValue" />
+		<result column="description_" property="description" />
+		<result column="create_on_" property="createOn" />
+		<result column="modify_on_" property="modifyOn" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="SysConfig">
+		SELECT * FROM sys_config WHERE id = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="SysConfig">
+		SELECT * FROM sys_config ORDER BY
+		id
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysConfig"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO sys_config
+		(id,param_name_,paran_value_,description_,create_on_,modify_on_)
+		VALUES(#{id},#{paramName},#{paranValue},#{description},#{createOn},#{modifyOn})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysConfig">
+		UPDATE sys_config
+		<set>
+			<if test="modifyOn != null">
+				modify_on_ = #{modifyOn},
+			</if>
+			<if test="paranValue != null">
+				paran_value_ = #{paranValue},
+			</if>
+			<if test="description != null">
+				description_ = #{description},
+			</if>
+			<if test="id != null">
+				id = #{id},
+			</if>
+			<if test="createOn != null">
+				create_on_ = #{createOn},
+			</if>
+			<if test="paramName != null">
+				param_name_ = #{paramName},
+			</if>
+		</set>
+		WHERE id = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM sys_config WHERE id = #{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="SysConfig" parameterType="map">
+		SELECT * FROM sys_config ORDER BY id
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM
+		sys_config
+	</select>
+</mapper>

+ 10 - 4
mec-common/common-core/src/main/java/com/ym/mec/common/config/RequestHeaderConfiguration.java

@@ -1,9 +1,8 @@
 package com.ym.mec.common.config;
 
-import java.util.Enumeration;
-
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -19,7 +18,14 @@ public class RequestHeaderConfiguration implements RequestInterceptor {
 			return;
 		}
 		HttpServletRequest request = attributes.getRequest();
-		Enumeration<String> headerNames = request.getHeaderNames();
+		
+		String authorization = request.getHeader("Authorization");
+
+		if (StringUtils.isNotBlank(authorization)) {
+			template.header("Authorization", authorization);
+		}
+		
+		/*Enumeration<String> headerNames = request.getHeaderNames();
 		if (headerNames != null) {
 			while (headerNames.hasMoreElements()) {
 				String name = headerNames.nextElement();
@@ -27,7 +33,7 @@ public class RequestHeaderConfiguration implements RequestInterceptor {
 				template.header(name, values);
 
 			}
-		}
+		}*/
 	}
 
 }

+ 1 - 2
mec-education/src/main/java/com/ym/mec/education/controller/ClassGroupController.java

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import java.util.Objects;
 
 /**
@@ -33,7 +32,7 @@ public class ClassGroupController {
     @PostMapping("/info")
     @ApiOperation("班级详情")
     public BaseResponse getInfo(@RequestBody ClassGroupReq classGroupReq) {
-        if (Objects.nonNull(classGroupReq.getClassGroupId())) {
+        if (Objects.nonNull(classGroupReq.getGroupId())) {
             BaseResponse baseResponse = new BaseResponse();
             baseResponse.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
             baseResponse.setMessage(ReturnCodeEnum.CODE_206.getValue());

+ 2 - 2
mec-education/src/main/java/com/ym/mec/education/controller/StudentAttendanceController.java

@@ -27,9 +27,9 @@ public class StudentAttendanceController {
     @Autowired
     private IStudentAttendanceService studentAttendanceService;
 
-    @PostMapping("/page")
+    @PostMapping("/list")
     @ApiOperation("点名记录列表")
-    public PageResponse page(@RequestBody StudentAttendanceReq studentAttendanceReq) {
+    public PageResponse list(@RequestBody StudentAttendanceReq studentAttendanceReq) {
         return studentAttendanceService.getPage(studentAttendanceReq);
     }
 

+ 36 - 0
mec-education/src/main/java/com/ym/mec/education/controller/StudentRegistrationController.java

@@ -0,0 +1,36 @@
+package com.ym.mec.education.controller;
+
+import com.ym.mec.education.base.PageResponse;
+import com.ym.mec.education.req.ClassGroupReq;
+import com.ym.mec.education.service.IStudentRegistrationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @program: mec
+ * @description: 学员名单
+ * @author: xw
+ * @create: 2019-09-26 19:40
+ */
+@RestController
+@RequestMapping("api/studentRegistration")
+@Api(tags = "学员名单")
+@Slf4j
+public class StudentRegistrationController {
+
+    @Autowired
+    private IStudentRegistrationService studentRegistrationService;
+
+    @PostMapping("/list")
+    @ApiOperation("学员名单列表")
+    public PageResponse list(@RequestBody ClassGroupReq classGroupReq) {
+        return studentRegistrationService.getPage(classGroupReq);
+    }
+
+}

+ 1 - 1
mec-education/src/main/java/com/ym/mec/education/mapper/StudentRegistrationMapper.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.education.entity.StudentRegistration;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
  * <p>

+ 3 - 1
mec-education/src/main/java/com/ym/mec/education/req/ClassGroupReq.java

@@ -2,8 +2,8 @@ package com.ym.mec.education.req;
 
 import com.ym.mec.education.base.BaseQuery;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.io.Serializable;
 
 /**
@@ -15,6 +15,8 @@ import java.io.Serializable;
 @Data
 @ApiModel(description = "班级入参")
 public class ClassGroupReq extends BaseQuery implements Serializable {
+
+    @ApiModelProperty(value = "班级id",required = true)
     private Integer groupId;
 
     private Integer type = 0;

+ 25 - 0
mec-education/src/main/java/com/ym/mec/education/resp/StudentRegistrationResp.java

@@ -0,0 +1,25 @@
+package com.ym.mec.education.resp;
+
+import com.ym.mec.education.base.BaseQuery;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @program: mec
+ * @description: 学员名单出参
+ * @author: xw
+ * @create: 2019-09-26 19:42
+ */
+@Data
+@ApiModel(description = "学员名单出参")
+@Accessors(chain = true)
+public class StudentRegistrationResp extends BaseQuery {
+
+    @ApiModelProperty(value = "学员名称",required = true)
+    private String studentName;
+
+    @ApiModelProperty(value = "学员迟到情况",required = true)
+    private String studentAttendance;
+}

+ 4 - 1
mec-education/src/main/java/com/ym/mec/education/service/IStudentRegistrationService.java

@@ -1,7 +1,9 @@
 package com.ym.mec.education.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.StudentRegistration;
-import com.baomidou.mybatisplus.service.IService;
+import com.ym.mec.education.req.ClassGroupReq;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.service.IService;
  */
 public interface IStudentRegistrationService extends IService<StudentRegistration> {
 
+     PageResponse getPage(ClassGroupReq classGroupReq);
 }

+ 5 - 5
mec-education/src/main/java/com/ym/mec/education/service/impl/ClassGroupServiceImpl.java

@@ -6,6 +6,7 @@ import com.ym.mec.education.base.BaseResponse;
 import com.ym.mec.education.entity.ClassGroup;
 import com.ym.mec.education.entity.ClassGroupTeacherMapper;
 import com.ym.mec.education.enums.ReturnCodeEnum;
+import com.ym.mec.education.enums.TeachTypeEnum;
 import com.ym.mec.education.mapper.ClassGroupMapper;
 import com.ym.mec.education.req.ClassGroupReq;
 import com.ym.mec.education.resp.ClassGroupResp;
@@ -15,7 +16,6 @@ import com.ym.mec.education.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-
 import java.util.List;
 import java.util.Objects;
 
@@ -38,21 +38,21 @@ public class ClassGroupServiceImpl extends ServiceImpl<ClassGroupMapper, ClassGr
     @Override
     public BaseResponse<ClassGroupResp> getInfo(ClassGroupReq classGroupReq) {
         BaseResponse<ClassGroupResp> baseResponse = new BaseResponse<>();
-        ClassGroup classGroup = getById(classGroupReq.getClassGroupId());
+        ClassGroup classGroup = getById(classGroupReq.getGroupId());
         if (Objects.isNull(classGroup)) {
             baseResponse.setReturnCode(ReturnCodeEnum.CODE_207.getCode());
             baseResponse.setMessage(ReturnCodeEnum.CODE_207.getValue());
             return baseResponse;
         }
         QueryWrapper<ClassGroupTeacherMapper> teacherMapperQueryWrapper = new QueryWrapper<>();
-        teacherMapperQueryWrapper.lambda().eq(true, ClassGroupTeacherMapper::getClassGroupId, classGroupReq.getClassGroupId());
+        teacherMapperQueryWrapper.lambda().eq(true, ClassGroupTeacherMapper::getClassGroupId, classGroupReq.getGroupId());
         ClassGroupResp classGroupResp = new ClassGroupResp();
         List<ClassGroupTeacherMapper> teacherMapperList = classGroupTeacherMapperService.list(teacherMapperQueryWrapper);
         if (!CollectionUtils.isEmpty(teacherMapperList)) {
-            teacherMapperList.stream().filter(item -> "TEACHING".equals(item.getTeacherRole())).findFirst().
+            teacherMapperList.stream().filter(item -> TeachTypeEnum.TEACHING.getCode().equals(item.getTeacherRole())).findFirst().
                     ifPresent(classGroupTeacherMapper -> classGroupResp.
                             setTeacher(userService.getById(classGroupTeacherMapper.getUserId()).getUsername()));
-            teacherMapperList.stream().filter(item -> "BISHOP".equals(item.getTeacherRole())).findFirst().
+            teacherMapperList.stream().filter(item -> TeachTypeEnum.BISHOP.getCode().equals(item.getTeacherRole())).findFirst().
                     ifPresent(classGroupTeacherMapper -> classGroupResp.
                             setAssistant(userService.getById(classGroupTeacherMapper.getUserId()).getUsername()));
         }

+ 3 - 2
mec-education/src/main/java/com/ym/mec/education/service/impl/StudentAttendanceServiceImpl.java

@@ -9,6 +9,7 @@ import com.ym.mec.education.base.PageResponse;
 import com.ym.mec.education.entity.ClassGroup;
 import com.ym.mec.education.entity.CourseSchedule;
 import com.ym.mec.education.entity.StudentAttendance;
+import com.ym.mec.education.enums.StudentAttendanceStatusEnum;
 import com.ym.mec.education.mapper.StudentAttendanceMapper;
 import com.ym.mec.education.req.StudentAttendanceReq;
 import com.ym.mec.education.resp.StudentAttendanceResq;
@@ -56,12 +57,12 @@ public class StudentAttendanceServiceImpl extends ServiceImpl<StudentAttendanceM
         //请假
         leaveWrapper.lambda().eq(true, StudentAttendance::getMusicGroupId, studentAttendanceReq.getMusicGroupId())
                 .eq(true, StudentAttendance::getClassGroupId, studentAttendanceReq.getClassGroupId())
-                .eq(true, StudentAttendance::getStatus, "LEAVE");
+                .eq(true, StudentAttendance::getStatus, StudentAttendanceStatusEnum.LEAVE.getCode());
         Integer leaveCount = count(leaveWrapper);
         //正常
         normalWrapper.lambda().eq(true, StudentAttendance::getMusicGroupId, studentAttendanceReq.getMusicGroupId())
                 .eq(true, StudentAttendance::getClassGroupId, studentAttendanceReq.getClassGroupId())
-                .eq(true, StudentAttendance::getStatus, "NORMAL");
+                .eq(true, StudentAttendance::getStatus, StudentAttendanceStatusEnum.NORMAL.getCode());
         Integer normalCount = count(normalWrapper);
         page.getRecords().forEach(item ->{
             StudentAttendanceResq studentAttendanceResq = new StudentAttendanceResq();

+ 41 - 1
mec-education/src/main/java/com/ym/mec/education/service/impl/StudentRegistrationServiceImpl.java

@@ -1,11 +1,25 @@
 package com.ym.mec.education.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.ym.mec.education.base.PageResponse;
+import com.ym.mec.education.entity.StudentAttendance;
 import com.ym.mec.education.entity.StudentRegistration;
+import com.ym.mec.education.enums.StudentAttendanceStatusEnum;
 import com.ym.mec.education.mapper.StudentRegistrationMapper;
+import com.ym.mec.education.req.ClassGroupReq;
+import com.ym.mec.education.resp.StudentRegistrationResp;
+import com.ym.mec.education.service.IStudentAttendanceService;
 import com.ym.mec.education.service.IStudentRegistrationService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 学生报名表 服务实现类
@@ -17,4 +31,30 @@ import org.springframework.stereotype.Service;
 @Service
 public class StudentRegistrationServiceImpl extends ServiceImpl<StudentRegistrationMapper, StudentRegistration> implements IStudentRegistrationService {
 
+    @Autowired
+    private IStudentAttendanceService studentAttendanceService;
+
+    @Override
+    public PageResponse getPage(ClassGroupReq classGroupReq) {
+        Page<StudentRegistration> studentRegistrationPage = new Page<>(classGroupReq.getPageNo(), classGroupReq.getPageSize());
+        QueryWrapper<StudentRegistration> studentRegistrationQueryWrapper = new QueryWrapper<>();
+        studentRegistrationQueryWrapper.lambda().eq(true, StudentRegistration::getClassGroupId, classGroupReq.getGroupId());
+        IPage<StudentRegistration> page = page(studentRegistrationPage, studentRegistrationQueryWrapper);
+        Page<StudentRegistrationResp> studentRegistrationRespPage = new Page<>();
+        BeanUtils.copyProperties(page, studentRegistrationRespPage);
+        List<StudentRegistrationResp> list = Lists.newArrayList();
+        page.getRecords().forEach(item -> {
+            QueryWrapper<StudentAttendance> queryWrapper = new QueryWrapper<>();
+            //请假 旷课正常上课次数
+            queryWrapper.lambda().eq(true, StudentAttendance::getUserId, item.getUserId())
+                    .in(true, StudentAttendance::getStatus, StudentAttendanceStatusEnum.TRUANT.getCode(),
+                            StudentAttendanceStatusEnum.LEAVE.getCode());
+            int count = studentAttendanceService.count(queryWrapper);
+            StudentRegistrationResp studentRegistrationResp = new StudentRegistrationResp()
+                    .setStudentName(item.getName()).setStudentAttendance("连续缺到" + count + "次");
+            list.add(studentRegistrationResp);
+        });
+        studentRegistrationRespPage.setRecords(list);
+        return PageResponse.success(studentRegistrationRespPage);
+    }
 }

+ 1 - 1
mec-student/src/main/java/com/ym/mec/student/controller/CourseController.java

@@ -31,7 +31,7 @@ public class CourseController extends BaseController {
         return succeed(classGroupService.queryCoursePage(sysUser.getId()));
     }
 
-    @ApiOperation("获取学员所有群组")
+    @ApiOperation("获取学员所有聊天群组")
     @GetMapping(value = "/queryUserGroups")
     public Object queryUserGroups(){
         SysUser sysUser = sysUserFeignService.queryUserInfo();

+ 874 - 0
mec-util/src/main/java/com/ym/mec/util/date/DateUtil.java

@@ -0,0 +1,874 @@
+package com.ym.mec.util.date;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * 与日期、时间操作有关的工具类。
+ * <p>
+ * <strong>注意:某些方法会将输入时间转换成格林威治时间,时区默认为东八区。可以通过方法 <code>DateUtil#setTimeZone</code>改变默认时区。 </strong>
+ * </p>
+ */
+public class DateUtil {
+
+	public static final String DEFAULT_PATTERN = "yyyy-MM-dd";
+
+	/**
+	 * 默认使用的Locale。默认Locale为 US
+	 */
+	public static final Locale DEFAULT_LOCALE = Locale.US;
+	// ~ 静态属性及初始化 /////////////////////////////////////////////
+
+	/** 默认的时区,一般是使用东八区。即比标准的格林威治时间快8个小时。 */
+	public static TimeZone TIME_ZONE = TimeZone.getDefault();
+
+	/**
+	 * ISO8601基本日期格式 yyyyMMdd ,如:20021225 代表2002年12月25日。
+	 */
+	public static final String ISO_DATE_FORMAT = "yyyyMMdd";
+
+	/**
+	 * ISO8601扩展日期格式 yyyy-MM-dd ,如:2002-12-25 代表2002年12月25日。
+	 */
+	public static final String ISO_EXPANDED_DATE_FORMAT = "yyyy-MM-dd";
+
+	/**
+	 * ISO8601基本时间格式 HHmmssSSSzzz ,如:143212333-0500 代表西5区,14点32分12秒333毫秒 24小时制
+	 */
+	public static final String ISO_TIME_FORMAT = "HHmmssSSSzzz";
+
+	/**
+	 * ISO8601基本时间格式 HH:mm:ss,SSSzzz ,如:14:32:12,333-0500 代表西5区,14点32分12秒333毫秒 24小时制
+	 */
+	public static final String ISO_EXPANDED_TIME_FORMAT = "HH:mm:ss,SSSzzz";
+
+	/**
+	 * ISO8601基本日期格式 yyyyMMddTHHmmssSSSzzz ,如:20021225T143212333-0500 代表西5区 2002年12月25日 14点32分12秒333毫秒
+	 */
+	public static final String ISO_DATE_TIME_FORMAT = "yyyyMMdd'T'HHmmssSSSzzz";
+
+	/**
+	 * ISO8601基本日期格式 yyyy-MM-ddTHH:mm:ss,SSSzzz ,如:2002-12-25T14:32:12,333-0500 代表西5区 2002年12月25日 14点32分12秒333毫秒
+	 */
+	public static final String ISO_EXPANDED_DATE_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss,SSSzzz";
+
+	/**
+	 * 基本时间格式 HHmmss ,如:143212 代表14点32分12秒 24小时制
+	 */
+	public static final String TIME_FORMAT = "HHmmss";
+
+	/**
+	 * 基本时间格式 HH:mm:ss ,如:14:32:12 代表14点32分12秒 24小时制
+	 */
+	public static final String EXPANDED_TIME_FORMAT = "HH:mm:ss";
+
+	/**
+	 * 日期格式 yyyyMMdd HHmmss ,如:20021225 143212 代表 2002年12月25日 14点32分12秒
+	 */
+	public static final String DATE_TIME_FORMAT = "yyyyMMdd HHmmss";
+
+	/**
+	 * 日期格式 yyyy-MM-dd HH:mm:ss ,如:2002-12-25 14:32:12 代表 2002年12月25日 14点32分12秒
+	 */
+	public static final String EXPANDED_DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+	/**
+	 * 西方国家的日期格式 MMM dd, yyyy ,如:February 3, 1982 代表1982年2月3日
+	 */
+	public static final String ENGLISH_DATE = "MMM dd, yyyy";
+
+	/**
+	 * 西方国家的时间格式 MMM dd, yyyy H:mm:ss.SSS ,如:February 3, 1982 12:12:12.005 代表1982年2月3日 12点12分12秒5毫秒
+	 */
+	public static final String ENGLISH_DATE_TIME = "MMM dd, yyyy H:mm:ss.SSS";
+
+	/**
+	 * 美国日期格式 yyyy.MM.dd G 'at' HH:mm:ss z ,如:2001.07.04 AD at 12:08:56 PDT 代表2001年7月4日 12点8分56秒
+	 */
+	public static final String US_DATE_TIME_1 = "yyyy.MM.dd G 'at' HH:mm:ss z";
+
+	/**
+	 * 美国日期格式 yyyyy.MMMMM.dd GGG hh:mm aaa ,如:02001.July.04 AD 12:08 PM 代表2001年7月4日 12点8分
+	 */
+	public static final String US_DATE_TIME_2 = "yyyyy.MMMMM.dd GGG hh:mm aaa";
+
+	/**
+	 * 美国日期格式 EEE, d MMM yyyy HH:mm:ss Z ,如:Wed, 4 Jul 2001 12:08:56 -0700 代表2001年7月4日 12点8分56秒 星期三
+	 */
+	public static final String US_DATE_TIME_3 = "EEE, d MMM yyyy HH:mm:ss Z";
+
+	// 第1年1月1日 (格里高利历)
+	public static final int JAN_1_1_JULIAN_DAY = 1721426;
+
+	// 1970年1月1日 (格里高利历)
+	public static final int EPOCH_JULIAN_DAY = 2440588;
+
+	public static final int EPOCH_YEAR = 1970;
+
+	// 一周、一天、一小时、一分钟、一秒,换算成毫秒的全局变量。
+	public static final int ONE_SECOND = 1000;
+
+	public static final int ONE_MINUTE = 60 * ONE_SECOND;
+
+	public static final int ONE_HOUR = 60 * ONE_MINUTE;
+
+	public static final long ONE_DAY = 24 * ONE_HOUR;
+
+	public static final long ONE_WEEK = 7 * ONE_DAY;
+
+	// ~ 方法 ////////////////////////////////////////////////////////////////
+
+	/**
+	 * 设置系统默认的<code>java.util.TimeZone</code>
+	 * 
+	 * @param timeZone <code>java.util.TimeZone</code>
+	 */
+	public static void setTimeZone(TimeZone timeZone) {
+		TIME_ZONE = timeZone;
+	}
+
+	public static Date toDateTime(String isoDateString) {
+		return stringToDate(isoDateString, EXPANDED_DATE_TIME_FORMAT);
+	}
+
+	public static Date toDate(String isoDateString) {
+		return stringToDate(isoDateString, ISO_EXPANDED_DATE_FORMAT);
+	}
+
+	public static Date stringToDate(String isoDateString) {
+		return stringToDate(isoDateString, EXPANDED_DATE_TIME_FORMAT);
+	}
+
+	public static Date stringToDate(String isoDateString, String pattern) {
+		if (StringUtils.isBlank(pattern)) {
+			return null;
+			// throw new IllegalArgumentException("匹配模式不能为空!");
+		}
+
+		return stringToDate(isoDateString, new SimpleDateFormat(pattern));
+	}
+
+	public static Date stringToDate(String isoDateString, SimpleDateFormat simpleDateFormat) {
+		if (StringUtils.isBlank(isoDateString)) {
+			// throw new IllegalArgumentException("日期字符串不能为空!");
+			return null;
+		}
+		try {
+			return simpleDateFormat.parse(isoDateString);
+		} catch (ParseException e) {
+			// throw new RuntimeException(e);
+		}
+		return null;
+	}
+
+	public static String getDateTime(Date date) {
+		return format(date, EXPANDED_DATE_TIME_FORMAT);
+	}
+
+	public static String getDate(Date date) {
+		return format(date, ISO_EXPANDED_DATE_FORMAT);
+	}
+
+	public static String getDATEFORMAT(Date date) {
+		return format(date, ISO_DATE_FORMAT);
+	}
+
+	public static String format(Date date, String pattern) {
+		return format(date, new SimpleDateFormat(pattern));
+	}
+
+	/**
+	 * 将<code>java.util.Date</code>按照给定的模式转换成日期字符串。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param formatter 给定的模式
+	 * @return 转换后的日期字符串
+	 */
+	public static String getDate(Date date, SimpleDateFormat formatter) {
+		if (date == null || formatter == null) {
+			return null;
+			// throw new RuntimeException("日期和模式不能为空!");
+		}
+		formatter.setTimeZone(TIME_ZONE);
+		return formatter.format(date);
+	}
+
+	/**
+	 * 将<code>java.util.Date</code>按照给定的模式转换成日期字符串。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param formatter 给定的模式
+	 * @return 转换后的日期字符串
+	 */
+	public static String format(Date date, SimpleDateFormat formatter) {
+		return getDate(date, formatter);
+	}
+
+	// 获取年份
+	public static String getYear(Date date) {
+		return format(date, ISO_EXPANDED_DATE_FORMAT).split("-")[0];
+	}
+
+	// 获取月份
+	public static String getMonth(Date date) {
+		return format(date, ISO_EXPANDED_DATE_FORMAT).split("-")[1];
+	}
+
+	// 获取日期
+	public static String getDay(Date date) {
+		return format(date, ISO_EXPANDED_DATE_FORMAT).split("-")[2];
+	}
+
+	// 获取时分秒
+	public static String getTime(Date date) {
+		return format(date, EXPANDED_DATE_TIME_FORMAT).split(" ")[1];
+	}
+
+	/**
+	 * 确定给定的年份是否为闰年。
+	 * 
+	 * <pre>
+	 * </pre>
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @return True 如果是闰年
+	 */
+	public static boolean isLeapYear(Date date) {
+		if (date == null) {
+			throw new RuntimeException("输入日期不能为空!");
+		}
+		GregorianCalendar cal = new GregorianCalendar();
+		cal.setTime(date);
+
+		return cal.isLeapYear(cal.get(Calendar.YEAR));
+	}
+
+	public static int getHour(Date date) {
+		if (date == null) {
+			return -1;
+		}
+
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(date);
+		return calendar.get(Calendar.HOUR_OF_DAY);
+	}
+
+	public static int geMinute(Date date) {
+		if (date == null) {
+			return -1;
+		}
+
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(date);
+		return calendar.get(Calendar.MINUTE);
+	}
+
+	/**
+	 * 根据日历的规则,为给定的日历字段添加或减去指定的时间量。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param field 给定的日历字段
+	 * @param amount 数量
+	 * @return 运算后的 <code>java.util.Date</code>
+	 */
+	public static Date add(Date date, int field, int amount) {
+		if (date == null) {
+			throw new RuntimeException("日期不能为空!");
+		}
+		Calendar cal = GregorianCalendar.getInstance(TIME_ZONE);
+		cal.setTime(date);
+		cal.add(field, amount);
+
+		return cal.getTime();
+	}
+
+	/**
+	 * 增加或减少指定数量的年份。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param amount 数量
+	 * @return 运算后的 <code>java.util.Date</code>
+	 */
+	public static Date addYears(Date date, int amount) {
+		return add(date, Calendar.YEAR, amount);
+	}
+
+	/**
+	 * 增加或减少指定数量的月份。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param amount 数量
+	 * @return 运算后的 <code>java.util.Date</code>
+	 */
+	public static Date addMonths(Date date, int amount) {
+		return add(date, Calendar.MONTH, amount);
+	}
+
+	/**
+	 * 修改周,时间按周的量增加或减少。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param amount 数量
+	 * @return 运算后的 <code>java.util.Date</code>
+	 */
+	public static Date addWeeks(Date date, int amount) {
+		return add(date, Calendar.WEEK_OF_YEAR, amount);
+	}
+
+	/**
+	 * 增加或减少指定数量的日数。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param amount 数量
+	 * @return 运算后的 <code>java.util.Date</code>
+	 */
+	public static Date addDays(Date date, int amount) {
+		return add(date, Calendar.DAY_OF_MONTH, amount);
+	}
+
+	/**
+	 * 增加或减少指定数量的小时数。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param amount 数量
+	 * @return 运算后的 <code>java.util.Date</code>
+	 */
+	public static Date addHours(Date date, int amount) {
+		return add(date, Calendar.HOUR_OF_DAY, amount);
+	}
+
+	/**
+	 * 增加或减少指定数量的分钟数。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param amount 数量
+	 * @return 运算后的 <code>java.util.Date</code>
+	 */
+	public static Date addMinutes(Date date, int amount) {
+		return add(date, Calendar.MINUTE, amount);
+	}
+
+	/**
+	 * 增加或减少指定数量的秒钟数。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param amount 数量
+	 * @return 运算后的 <code>java.util.Date</code>
+	 */
+	public static Date addSeconds(Date date, int amount) {
+		return add(date, Calendar.SECOND, amount);
+	}
+
+	/**
+	 * 增加或减少指定数量的毫秒数。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param amount 数量
+	 * @return 运算后的 <code>java.util.Date</code>
+	 */
+	public static Date addMilliseconds(Date date, int amount) {
+		return add(date, Calendar.MILLISECOND, amount);
+	}
+
+	/**
+	 * 在给定的日历字段上添加或减去(上/下)单个时间单元,不更改更大的字段。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param field 给定的日历字段
+	 * @param up 添加或减去(上/下)
+	 * @return 运算后的 <code>java.util.Date</code>
+	 */
+	public static Date roll(Date date, int field, boolean up) {
+		Calendar cal = GregorianCalendar.getInstance(TIME_ZONE);
+		cal.setTime(date);
+		cal.roll(field, up);
+
+		return cal.getTime();
+	}
+
+	/**
+	 * 向指定日历字段添加指定(有符号的)时间量,不更改更大的字段。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param field 给定的日历字段
+	 * @param amount 数量
+	 * @return 运算后的 <code>java.util.Date</code>
+	 */
+	public static Date roll(Date date, int field, int amount) {
+		Calendar cal = GregorianCalendar.getInstance(TIME_ZONE);
+		cal.setTime(date);
+		cal.roll(field, amount);
+
+		return cal.getTime();
+	}
+
+	/**
+	 * 将毫秒时间戳转换成格里高利历的日数。日数是只从格里高利历第1年1月1日算起的日数。
+	 * 
+	 * @param millis 给定的毫秒时间戳
+	 * @return 格里高利历的日数
+	 */
+	public static int millisToJulianDay(long millis) {
+		return EPOCH_JULIAN_DAY - JAN_1_1_JULIAN_DAY + (int) (millis / ONE_DAY);
+	}
+
+	/**
+	 * 将<code>java.util.Date</code>转换成格里高利历的日数。 日数是只从格里高利历第1年1月1日算起的日数。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @return 格里高利历的日数
+	 */
+	public static int dateToJulianDay(Date date) {
+		return millisToJulianDay(date.getTime());
+	}
+
+	/**
+	 * 计算两个日期之间相差的秒钟数。如果第一个日期在第二个日期之前,则返回正,反之返回负。
+	 * 
+	 * @param early 第一个日期
+	 * @param late 第二个日期
+	 * @return 两个日期之间相差的秒钟数
+	 */
+	public static int secondsBetween(Date early, Date late) {
+		return (int) ((late.getTime() / ONE_SECOND) - (early.getTime() / ONE_SECOND));
+	}
+
+	/**
+	 * 计算两个日期之间相差的分钟数。如果第一个日期在第二个日期之前,则返回正,反之返回负。
+	 * 
+	 * @param early 第一个日期
+	 * @param late 第二个日期
+	 * @return 两个日期之间相差的分钟数
+	 */
+	public static int minutesBetween(Date early, Date late) {
+		Calendar c1 = Calendar.getInstance();
+		Calendar c2 = Calendar.getInstance();
+		c1.setTime(early);
+		c2.setTime(late);
+
+		return (int) ((late.getTime() / ONE_MINUTE) - (early.getTime() / ONE_MINUTE));
+	}
+
+	/**
+	 * 计算两个日期之间相差的小时数。如果第一个日期在第二个日期之前,则返回正,反之返回负。
+	 * 
+	 * @param early 第一个日期
+	 * @param late 第二个日期
+	 * @return 两个日期之间相差的小时数
+	 */
+	public static int hoursBetween(Date early, Date late) {
+		return (int) ((late.getTime() / ONE_HOUR) - (early.getTime() / ONE_HOUR));
+	}
+
+	/**
+	 * 计算两个日期之间相差的天数。如果第一个日期在第二个日期之前,则返回正,反之返回负。
+	 * 
+	 * @param early 第一个日期
+	 * @param late 第二个日期
+	 * @return 两个日期之间相差的天数
+	 */
+	public static int daysBetween(Date early, Date late) {
+		Calendar c1 = Calendar.getInstance();
+		Calendar c2 = Calendar.getInstance();
+		c1.setTime(early);
+		c2.setTime(late);
+		return dateToJulianDay(c2.getTime()) - dateToJulianDay(c1.getTime());
+	}
+
+	/**
+	 * 计算两个日期之间相差的月数。如果第一个日期在第二个日期之前,则返回正,反之返回负。
+	 * 
+	 * @param early 第一个日期
+	 * @param late 第二个日期
+	 * @return 两个日期之间相差的月数
+	 */
+	public static int monthsBetween(Date early, Date late) {
+		Calendar c1 = Calendar.getInstance();
+		Calendar c2 = Calendar.getInstance();
+		c1.setTime(early);
+		c2.setTime(late);
+		return ((c2.get(Calendar.YEAR) * 12) + c2.get(Calendar.MONTH)) - ((c1.get(Calendar.YEAR) * 12) + c1.get(Calendar.MONTH));
+	}
+
+	/**
+	 * 计算两个日期之间相差的年数。如果第一个日期在第二个日期之前,则返回正,反之返回负。
+	 * 
+	 * @param early 第一个日期
+	 * @param late 第二个日期
+	 * @return 两个日期之间相差的年数
+	 */
+	public static int yearsBetween(Date early, Date late) {
+		Calendar c1 = Calendar.getInstance();
+		Calendar c2 = Calendar.getInstance();
+		c1.setTime(early);
+		c2.setTime(late);
+		return c2.get(Calendar.YEAR) - c1.get(Calendar.YEAR);
+	}
+
+	/**
+	 * 将格里高利历日数转换成 <code>java.sql.Date</code>
+	 * 
+	 * @param julian 格里高利历日数
+	 * @return <code>java.sql.Date</code>
+	 */
+	public static java.sql.Date julianDayToSqlDate(long julian) {
+		return new java.sql.Date(julianDayToMillis(julian));
+	}
+
+	/**
+	 * 将格里高利历日数转换成 <code>java.util.Date</code>
+	 * 
+	 * @param julian 格里高利历日数
+	 * @return <code>java.util.Date</code>
+	 */
+	public static Date julianDayToDate(long julian) {
+		return new Date(julianDayToMillis(julian));
+	}
+
+	/**
+	 * 将格里高利历日数转换成毫秒时间戳。
+	 * 
+	 * @param julian 格里高利历日数
+	 * @return 毫秒时间戳
+	 */
+	public static long julianDayToMillis(long julian) {
+		return (julian - EPOCH_JULIAN_DAY + JAN_1_1_JULIAN_DAY) * ONE_DAY;
+	}
+
+	/**
+	 * 将日历转换成儒略历日期。算法参见: <a href="http://quasar.as.utexas.edu/BillInfo/JulianDatesG.html">Julian Day Calculations
+	 * (Gregorian Calendar)</a>, 由 Bill Jeffrys 提供。
+	 * 
+	 * @param c 日历实例
+	 * @return 儒略历日期
+	 */
+	public static float toJulian(Calendar c) {
+		int Y = c.get(Calendar.YEAR);
+		int M = c.get(Calendar.MONTH);
+		int D = c.get(Calendar.DATE);
+		int A = Y / 100;
+		int B = A / 4;
+		int C = 2 - A + B;
+		float E = (int) (365.25f * (Y + 4716));
+		float F = (int) (30.6001f * (M + 1));
+		float JD = (C + D + E + F) - 1524.5f;
+
+		return JD;
+	}
+
+	/**
+	 * 将日期转换成儒略历日期。算法参见: <a href="http://quasar.as.utexas.edu/BillInfo/JulianDatesG.html">Julian Day Calculations
+	 * (Gregorian Calendar)</a>, 由 Bill Jeffrys 提供。
+	 * 
+	 * @param date 日期
+	 * @return 儒略历日期
+	 */
+	public static float toJulian(Date date) {
+		Calendar c = Calendar.getInstance();
+		c.setTime(date);
+
+		return toJulian(c);
+	}
+
+	protected static float normalizedJulian(float JD) {
+		float f = Math.round(JD + 0.5f) - 0.5f;
+
+		return f;
+	}
+
+	/**
+	 * 给定此 <code>java.util.Date</code> 的时间值,返回指定日历字段可能拥有的最大值。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param field 日历字段
+	 * @return 对于此 <code>java.util.Date</code> 的时间值而言,给定日历字段的最大值
+	 */
+	public static Date getActualMaximum(Date date, int field) {
+		Calendar c = Calendar.getInstance();
+		c.setTime(date);
+		c.set(field, c.getActualMaximum(field));
+
+		return c.getTime();
+	}
+
+	/**
+	 * 给定此 <code>java.util.Date</code> 的时间值,返回指定日历字段可能拥有的最小值。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @param field 日历字段
+	 * @return 对于此 <code>java.util.Date</code> 的时间值而言,给定日历字段的最小值
+	 */
+	public static Date getActualMinimum(Date date, int field) {
+		Calendar c = Calendar.getInstance();
+		c.setTime(date);
+		c.set(field, c.getActualMinimum(field));
+
+		return c.getTime();
+	}
+
+	/**
+	 * 截取日期,只保留年、月、日部分。
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @return 截取后的<code>java.util.Date</code>
+	 */
+	public static Date trunc(Date date) {
+		if (date != null) {
+			Calendar c1 = Calendar.getInstance();
+			c1.setTime(date);
+			Calendar c2 = (Calendar) c1.clone();
+			c1.clear();
+			c1.set(Calendar.YEAR, c2.get(Calendar.YEAR));
+			c1.set(Calendar.MONTH, c2.get(Calendar.MONTH));
+			c1.set(Calendar.DAY_OF_MONTH, c2.get(Calendar.DAY_OF_MONTH));
+			return c1.getTime();
+		}
+		return null;
+	}
+
+	/**
+	 * 返回当天的最后一秒
+	 * 
+	 * @param date <code>java.util.Date</code>
+	 * @return 截取后的<code>java.util.Date</code>
+	 */
+	public static Date dayEnd(Date date) {
+		Calendar c1 = Calendar.getInstance();
+		c1.setTime(date);
+		Calendar c2 = (Calendar) c1.clone();
+		c1.clear();
+		c1.set(Calendar.YEAR, c2.get(Calendar.YEAR));
+		c1.set(Calendar.MONTH, c2.get(Calendar.MONTH));
+		c1.set(Calendar.DAY_OF_MONTH, c2.get(Calendar.DAY_OF_MONTH));
+		// 23:59:59
+		c1.set(Calendar.HOUR_OF_DAY, 23);
+		c1.set(Calendar.MINUTE, 59);
+		c1.set(Calendar.SECOND, 59);
+		return c1.getTime();
+	}
+
+	/**
+	 * 判断两个日期是否是同一天,精确到天。
+	 * 
+	 * @param date1 <code>java.util.Date</code>
+	 * @param date2 <code>java.util.Date</code>
+	 * @return true 如果两个日期是同一天
+	 */
+	public static boolean isSameDay(Date date1, Date date2) {
+		if (date1 == null || date2 == null) {
+			throw new RuntimeException("日期不能为空!");
+		}
+		Calendar cal1 = Calendar.getInstance();
+		cal1.setTime(date1);
+		Calendar cal2 = Calendar.getInstance();
+		cal2.setTime(date2);
+		return isSameDay(cal1, cal2);
+	}
+
+	/**
+	 * 判断两个日期是否是同一天,精确到天。
+	 * 
+	 * @param cal1 <code>java.util.Calendar</code>
+	 * @param cal2 <code>java.util.Calendar</code>
+	 * @return true 如果两个日期是同一天
+	 */
+	public static boolean isSameDay(Calendar cal1, Calendar cal2) {
+		if (cal1 == null || cal2 == null) {
+			throw new RuntimeException("日期不能为空!");
+		}
+		return (cal1.get(Calendar.ERA) == cal2.get(Calendar.ERA) && cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) && cal1.get(Calendar.DAY_OF_YEAR) == cal2
+				.get(Calendar.DAY_OF_YEAR));
+	}
+
+	/**
+	 * 判断两个时间是否完全相等,精确到毫秒。
+	 * 
+	 * @param date1 <code>java.util.Date</code>
+	 * @param date2 <code>java.util.Date</code>
+	 * @return true 如果两个时间完全相等
+	 */
+	public static boolean isSameLocalTime(Date date1, Date date2) {
+		if (date1 == null || date2 == null) {
+			throw new RuntimeException("日期不能为空!");
+		}
+		Calendar cal1 = Calendar.getInstance();
+		cal1.setTime(date1);
+		Calendar cal2 = Calendar.getInstance();
+		cal2.setTime(date2);
+		return isSameLocalTime(cal1, cal2);
+	}
+
+	/**
+	 * 判断两个时间是否完全相等,精确到毫秒。
+	 * 
+	 * @param cal1 <code>java.util.Calendar</code>
+	 * @param cal2 <code>java.util.Calendar</code>
+	 * @return true 如果两个时间完全相等
+	 */
+	public static boolean isSameLocalTime(Calendar cal1, Calendar cal2) {
+		if (cal1 == null || cal2 == null) {
+			throw new RuntimeException("日期不能为空!");
+		}
+		return (cal1.get(Calendar.MILLISECOND) == cal2.get(Calendar.MILLISECOND) && cal1.get(Calendar.SECOND) == cal2.get(Calendar.SECOND)
+				&& cal1.get(Calendar.MINUTE) == cal2.get(Calendar.MINUTE) && cal1.get(Calendar.HOUR) == cal2.get(Calendar.HOUR)
+				&& cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR) && cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR)
+				&& cal1.get(Calendar.ERA) == cal2.get(Calendar.ERA) && cal1.getClass() == cal2.getClass());
+	}
+
+	public static String formatHuman(Date date) {
+		if (date != null) {
+			Long seconds = (System.currentTimeMillis() - date.getTime()) / 1000;
+
+			if (seconds <= 0) {
+				return "刚刚";
+			}
+
+			if (seconds < 60) {
+				return seconds + "秒前";
+			}
+
+			Long min = seconds / 60;
+			if (min < 60) {
+				return min + "分钟前";
+			}
+
+			Long hour = seconds / 3600;
+			if (hour < 12) {
+				return hour + "小时前";
+			}
+
+			return format(date, "yyyy-MM-dd HH:mm:ss");
+		} else {
+			return "";
+		}
+
+	}
+
+	public static String formatHumanShort(Date date) {
+
+		Long seconds = (System.currentTimeMillis() - date.getTime()) / 1000;
+
+		if (seconds <= 0) {
+			return "刚刚";
+		}
+
+		if (seconds < 60) {
+			return seconds + "秒前";
+		}
+
+		Long min = seconds / 60;
+		if (min < 60) {
+			return min + "分钟前";
+		}
+
+		Long hour = seconds / 3600;
+		if (hour < 12) {
+			return hour + "小时前";
+		}
+
+		return format(date, "yyyy-MM-dd");
+	}
+
+	/**
+	 * 解析毫秒时间格式
+	 * 
+	 * @param millis
+	 * @return
+	 */
+	public static Date parseMillis(Long millis) {
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTimeInMillis(millis);
+		return calendar.getTime();
+	}
+
+	/**
+	 * 返回date所在月的第一天
+	 * 
+	 * @return
+	 */
+	public static Date getFirstDayOfMonth(Date date) {
+		String str = DateUtil.getYear(date) + "-" + DateUtil.getMonth(date) + "-01";
+		return DateUtil.stringToDate(str, DateUtil.ISO_EXPANDED_DATE_FORMAT);
+	}
+
+	// 取最近的时间
+	public static Date getMaxDate(Date lastDate, Date newDate) {
+		if (lastDate != null && newDate != null) {
+			if (newDate.after(lastDate)) {
+				return newDate;
+			} else {
+				return lastDate;
+			}
+		} else if (lastDate != null) {
+			return lastDate;
+		} else {
+			return newDate;
+		}
+	}
+
+	// 取最老的时间
+	public static Date getMinDate(Date lastDate, Date newDate) {
+		if (lastDate != null && newDate != null) {
+			if (newDate.before(lastDate)) {
+				return newDate;
+			} else {
+				return lastDate;
+			}
+		} else if (lastDate != null) {
+			return lastDate;
+		} else {
+			return newDate;
+		}
+	}
+
+	/**
+	 * 将字符串转换为指定格式的日期
+	 * 
+	 * @param dateStr
+	 * @param pattern
+	 * @return
+	 */
+	public static Date strToDate(String dateStr, String pattern) {
+		Date date = null;
+		try {
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern, DEFAULT_LOCALE);
+			date = simpleDateFormat.parse(dateStr);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		return date; // null if parse faile
+	}
+
+	/**
+	 * 时间转字符串
+	 * @param date
+	 * @return
+	 */
+	public static String dateToString(Date date) {
+		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+		return df.format(date);
+	}
+
+	/**
+	 * 时间转字符串
+	 * @param date
+	 * @return
+	 */
+	public static String dateToString(Date date, SimpleDateFormat df) {
+		return df.format(date);
+	}
+
+	public static void main(String[] args) throws ParseException {
+		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+		// DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		System.out.println(daysBetween(df.parse("2017-07-20 10:07:42"), df.parse(df.format(new Date()))));
+	}
+}

+ 14 - 0
mec-web/src/main/java/com/ym/mec/web/WebApplication.java

@@ -1,17 +1,21 @@
 package com.ym.mec.web;
 
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.client.RestTemplate;
 
 import com.spring4all.swagger.EnableSwagger2Doc;
+import com.ym.mec.common.redis.service.RedisCache;
 
 @SpringBootApplication
 @EnableDiscoveryClient
@@ -21,6 +25,10 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 @Configuration
 @EnableSwagger2Doc
 public class WebApplication {
+
+	@Autowired
+	private RedisTemplate<String, Object> redisTemplate;
+	
 	public static void main(String[] args) {
 		SpringApplication.run(WebApplication.class, args);
 	}
@@ -30,4 +38,10 @@ public class WebApplication {
 	public RestTemplate restTemplate() {
 		return new RestTemplate();
 	}
+
+	@Bean
+	@ConditionalOnBean(RedisTemplate.class)
+	public RedisCache<String, Object> redisCache() {
+		return new RedisCache<String, Object>(redisTemplate);
+	}
 }

+ 0 - 1
mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -1,7 +1,6 @@
 package com.ym.mec.web.controller;
 
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 

+ 77 - 0
mec-web/src/main/java/com/ym/mec/web/controller/SysConfigController.java

@@ -0,0 +1,77 @@
+package com.ym.mec.web.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.biz.dal.entity.SysConfig;
+import com.ym.mec.biz.service.SysConfigService;
+import com.ym.mec.common.controller.BaseController;
+
+/** 
+ * 系统配置控制层
+ */
+@RestController
+@Api(tags = "系统参数设置")
+@RequestMapping(value = "sysConfig")
+public class SysConfigController extends BaseController {
+
+	@Autowired
+	private SysConfigService sysConfigService;
+
+	@ApiOperation(value = "参数列表")
+	@GetMapping(value = "list")
+	public Object configList() {
+		List<SysConfig> configs = sysConfigService.findAll(null);
+		Map<String, Object> map = new HashMap<String, Object>();
+		if (configs != null && configs.size() > 0) {
+			for (SysConfig config : configs) {
+				map.put(config.getParamName(), config.getParanValue());
+			}
+		}
+		return succeed(map);
+	}
+
+	@ApiOperation(value = "修改参数")
+	@PostMapping(value = "update")
+	public Object update(SysConfig config) {
+		config.setModifyOn(new Date());
+		sysConfigService.update(config);
+		return succeed();
+	}
+
+	@ApiOperation(value = "新增参数")
+	@PostMapping(value = "add")
+	public Object addConfig(SysConfig config) {
+		if (config == null)
+			return failed("参数无效");
+		if (StringUtils.isBlank(config.getParamName())) {
+			return failed("参数名称不能为空");
+		}
+		if (StringUtils.isBlank(config.getParanValue())) {
+			return failed("参数值不能为空");
+		}
+		config.setCreateOn(new Date());
+		config.setModifyOn(new Date());
+		return sysConfigService.insert(config) > 0 ? succeed() : failed("添加失败");
+	}
+
+	@ApiOperation(value = "查询参数")
+	@GetMapping(value = "get")
+	public Object getConfig(Long id) {
+		if (id == null || id <= 0)
+			return failed("请检查输入的ID");
+		return succeed(sysConfigService.get(id));
+	}
+}