Merge remote-tracking branch 'origin/master'

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

@@ -334,23 +334,25 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					//减去第一节课时长
 					int firstMinutes = courseScheduleDao.getSingleClassMinutes(courseScheduleId.longValue());
 					totalMinutes -= firstMinutes;
-					String courseClassDate;
-					String courseStartDateTime;
-					String courseEndDateTime;
-					for (CourseSchedule e:courseSchedules) {
-						//获取当前课程的单节课时长
-						int signClassMinutes = courseScheduleDao.getSingleClassMinutes(e.getId());
-						totalMinutes -= signClassMinutes;
-						if(totalMinutes >= 0){
-							//补充签到签退时间
-							courseClassDate = DateUtil.format(e.getClassDate(), DateUtil.DEFAULT_PATTERN);
-							courseStartDateTime = DateUtil.format(e.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
-							courseEndDateTime = DateUtil.format(e.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
-							Date startDateTime = DateUtil.stringToDate(courseClassDate + " " + courseStartDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
-							Date endDateTime = DateUtil.stringToDate(courseClassDate + " " + courseEndDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
-							teacherAttendanceDao.cuntinueCourseSign(e.getId(),startDateTime,endDateTime);
-						}else {
-							break;
+					if(totalMinutes > 0){
+						String courseClassDate;
+						String courseStartDateTime;
+						String courseEndDateTime;
+						for (CourseSchedule e:courseSchedules) {
+							//获取当前课程的单节课时长
+							int signClassMinutes = courseScheduleDao.getSingleClassMinutes(e.getId());
+							totalMinutes -= signClassMinutes;
+							if(totalMinutes >= 0){
+								//补充签到签退时间
+								courseClassDate = DateUtil.format(e.getClassDate(), DateUtil.DEFAULT_PATTERN);
+								courseStartDateTime = DateUtil.format(e.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+								courseEndDateTime = DateUtil.format(e.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+								Date startDateTime = DateUtil.stringToDate(courseClassDate + " " + courseStartDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
+								Date endDateTime = DateUtil.stringToDate(courseClassDate + " " + courseEndDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
+								teacherAttendanceDao.cuntinueCourseSign(e.getId(),startDateTime,endDateTime);
+							}else {
+								break;
+							}
 						}
 					}
 				}
@@ -362,16 +364,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			}
 			teacherAttendance.setSignOutTime(date);
 			teacherAttendanceDao.update(teacherAttendance);
-			//教师签退后，给未签到学员添加旷课记录
-//			List<StudentAttendance> studentAttendances = studentAttendanceDao.queryNoSignStudentRecord(courseScheduleId);
-//			if(studentAttendances != null && studentAttendances.size() > 0){
-//				studentAttendances.forEach(e->{
-//					e.setTeacherId(userId);
-//					e.setStatus(StudentAttendanceStatusEnum.TRUANT);
-//					e.setRemark("学员未到，自动补旷课");
-//				});
-//				studentAttendanceDao.addStudentAttendances(studentAttendances);
-//			}
 		}
 	}
 

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

@@ -112,7 +112,12 @@ hystrix:
       execution:
         isolation:
           thread:
+            #发生熔断的超时时间
             timeoutInMilliseconds: 60000
+          semaphore:
+            maxConcurrentRequests: 500
+          circuitBreaker:
+            sleepWindowInMilliseconds: 5000
 
 
 #spring boot admin 相关配置