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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMessageServiceImpl.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dao.SysMessageDao;
 import com.ym.mec.biz.dal.dao.WaitSendMessageDao;
 import com.ym.mec.biz.dal.dto.Mapper;
@@ -62,6 +63,9 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	private WaitSendMessageDao waitSendMessageDao;
 
 	@Autowired
+	private SysConfigDao sysConfigDao;
+
+	@Autowired
 	private ImFeignService imFeignService;
 
 	@Autowired
@@ -277,7 +281,11 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			if(type != STUDENT_PUSH_VIP_BUY){
 				int hour = DateUtil.getHour(new Date());
 				//如果当前时间在22点之后
-				if(hour > 21){
+				String messageTime = sysConfigDao.findConfigValue("wait_send_message_time");
+				if(StringUtils.isEmpty(messageTime)){
+					messageTime = "22";
+				}
+				if(hour > Integer.parseInt(messageTime)-1){
 					//保存推送信息
 					WaitSendMessage waitSendMessage = new WaitSendMessage();
 					if(args != null){

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

@@ -384,7 +384,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			Date add1Minutes = DateUtil.addMinutes(classStartDateTime, -1);
 			int secondsBetween = DateUtil.secondsBetween(date, add1Minutes);
 
-			if(yesOrNoEnum != YesOrNoEnum.YES && secondsBetween <= 60){
+			if(yesOrNoEnum != YesOrNoEnum.YES && secondsBetween <= 0){
 				teacherAttendance.setSignInStatus(YesOrNoEnum.NO);
 			}
 			teacherAttendanceDao.update(teacherAttendance);