update

mec-biz/src/main/java/com/ym/mec/biz/service/StudentAttendanceService.java

@@ -19,7 +19,7 @@ public interface StudentAttendanceService extends BaseService<Long, StudentAtten
 	 * @Date: 2019/9/11
 	 * 批量插入学生上课签到信息
 	 */
-	void addStudentAttendances(StudentAttendanceDto studentAttendanceInfo);
+	Map addStudentAttendances(StudentAttendanceDto studentAttendanceInfo);
 
 	/**
 	 * @describe 获取当前课程的学生

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

@@ -66,7 +66,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void addStudentAttendances(StudentAttendanceDto studentAttendanceInfos) {
+	public Map addStudentAttendances(StudentAttendanceDto studentAttendanceInfos) {
 		List<StudentAttendance> studentAttendances=studentAttendanceInfos.getStudentAttendances();
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if(Objects.isNull(sysUser)){
@@ -139,7 +139,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 		TeacherAttendance teacherAttendance = new TeacherAttendance(courseSchedule.getId(), 0);
 		teacherAttendance.setSignInLongitudeLatitude(studentAttendanceInfos.getSignInLongitudeLatitude());
 		teacherSignOutDto.setTeacherAttendanceInfo(teacherAttendance);
-		teacherAttendanceService.addTeacherAttendanceRecord(teacherSignOutDto);
+		return teacherAttendanceService.addTeacherAttendanceRecord(teacherSignOutDto);
 	}
 
 	@Override

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

@@ -80,9 +80,9 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 		TeacherAttendance teacherAttendance=teacherAttendanceDao.findByTeacherAttendanceInfo(user.getId().longValue(),teacherSignOutDto.getTeacherAttendanceInfo().getCourseScheduleId());
 
-		if(StringUtils.isBlank(teacherSignOutDto.getTeacherAttendanceInfo().getSignInLongitudeLatitude())){
-			throw new BizException("未获取到您的位置");
-		}
+//		if(StringUtils.isBlank(teacherSignOutDto.getTeacherAttendanceInfo().getSignInLongitudeLatitude())){
+//			throw new BizException("未获取到您的位置");
+//		}
 
 		Date date = new Date();
 		if(Objects.isNull(teacherAttendance)){
@@ -119,18 +119,18 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 		//是否在范围内
 		boolean isInScore = true;
-		if(StringUtils.isBlank(school.getLongitudeLatitude())){
-			school.setLongitudeLatitude(teacherSignOutDto.getTeacherAttendanceInfo().getSignInLongitudeLatitude());
-			schoolDao.update(school);
-		}else{
-			SysConfig sysConfig = sysConfigService.findByParamName(SysConfigService.ATTENDANCE_RANGE);
-			double attendanceRange = Double.valueOf(sysConfig.getParanValue());
-			double distance = MapUtil.distance(teacherSignOutDto.getTeacherAttendanceInfo().getSignInLongitudeLatitude(),
-					school.getLongitudeLatitude());
-			if(distance>attendanceRange){
-				isInScore=false;
-			}
-		}
+//		if(StringUtils.isBlank(school.getLongitudeLatitude())){
+//			school.setLongitudeLatitude(teacherSignOutDto.getTeacherAttendanceInfo().getSignInLongitudeLatitude());
+//			schoolDao.update(school);
+//		}else{
+//			SysConfig sysConfig = sysConfigService.findByParamName(SysConfigService.ATTENDANCE_RANGE);
+//			double attendanceRange = Double.valueOf(sysConfig.getParanValue());
+//			double distance = MapUtil.distance(teacherSignOutDto.getTeacherAttendanceInfo().getSignInLongitudeLatitude(),
+//					school.getLongitudeLatitude());
+//			if(distance>attendanceRange){
+//				isInScore=false;
+//			}
+//		}
 
 		String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
 		String startClassTime = DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);

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

@@ -47,7 +47,6 @@ public class TeacherAttendanceController extends BaseController {
     @ApiOperation(value = "点名")
     @PostMapping("/addStudentAttendances")
     public Object addStudentAttendances(@RequestBody StudentAttendanceDto studentAttendanceInfo){
-        studentAttendanceService.addStudentAttendances(studentAttendanceInfo);
-        return succeed();
+        return succeed(studentAttendanceService.addStudentAttendances(studentAttendanceInfo));
     }
 }