Merge remote-tracking branch 'origin/master'

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

@@ -199,7 +199,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
         Date date=new Date();
         MusicGroup musicGroup = musicGroupService.get(musicGroupId);
         //老师默认的课酬
-        Map<String, TeacherDefaultMusicGroupSalary> teacherDefaultSalary = new HashMap<>();
+//        Map<String, TeacherDefaultMusicGroupSalary> teacherDefaultSalary = new HashMap<>();
         for (CourseSchedule classGroupNoStartCourseSchedule : courseSchedules) {
             List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList = new ArrayList<>();
             List<TeacherAttendance> teacherAttendances=new ArrayList<>();

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

@@ -1036,8 +1036,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if (courseScheduleIdList.size() > 0) {
 			// vip课自动签退
 			teacherAttendanceDao.updateViPSignOutStatus(courseScheduleIdList.stream().map(a -> a.toString()).collect(Collectors.joining(",")));
-			//教师考勤当前课时+1
-
 		}
 		
 		return true;

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

@@ -71,7 +71,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 				employee.setUserType(SysUserType.SYSTEM);
 				teacherDao.updateUser(employee);
 			}else{
-				new BizException("员工已存在");
+				throw new BizException("员工已存在");
 			}
 			return;
 		}

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

@@ -74,10 +74,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			throw new BizException("请选择课程!");
 		}
 
-
-//		SysConfig byParamName = sysConfigService.findByParamName(SysConfigService.ADVANCE_SIGN_IN_MINUTES);
-//		Integer advanceSignInMinutes=Integer.parseInt(byParamName.getParanValue());
-
 		Map<String,Object> result=new HashMap<>();
 
 		TeacherAttendance teacherAttendance=teacherAttendanceDao.findByTeacherAttendanceInfo(user.getId().longValue(),teacherSignOutDto.getTeacherAttendanceInfo().getCourseScheduleId());
@@ -98,11 +94,11 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 		teacherAttendance.setMusicGroupId(currentCourseDetail.getMusicGroupId());
 		teacherAttendance.setClassGroupId(currentCourseDetail.getClassId());
-		teacherAttendance.setGroupType(teacherAttendance.getGroupType());
 		teacherAttendance.setRemark(teacherSignOutDto.getTeacherAttendanceInfo().getRemark());
 		int advanceSignMinutes = Integer.parseInt(sysConfigDao.findConfigValue(SysConfigService.ADVANCE_SIGN_IN_MINUTES));
 
 		CourseSchedule courseSchedule = courseScheduleDao.get(teacherAttendance.getCourseScheduleId());
+		teacherAttendance.setGroupType(courseSchedule.getGroupType());
 		if(courseSchedule == null){
 			throw new BizException("课程信息不存在");
 		}
@@ -132,7 +128,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			if(yesOrNoEnum == YesOrNoEnum.YES){
 				//连堂课
 			}else if(DateUtil.minutesBetween(add60Minutes,date) >= 0 && DateUtil.minutesBetween(date,add20Minutes) >= 0){
-				//正常签到范围(开始前20分钟  ~  开始之前)
+				//正常签到范围(开始前60分钟  ~  开始之前20分钟)
 			}else if(DateUtil.minutesBetween(add20Minutes,date) > 0){
 				if(StringUtils.isEmpty(teacherAttendance.getRemark())){
 					//当前为异常签到，请填写原因!
@@ -152,8 +148,13 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			}
 			return result;
 		}else if(teacherAttendance.getSignOutTime() == null && teacherSignOutDto.getTeacherAttendanceInfo().getStatus().equals(SignStatusEnum.SIGN_OUT.getCode())){
+			if(teacherAttendance.getSignInTime() == null){
+				throw new BizException("当前课程未签到");
+			}
 			//正常签退范围（结束后1小时内）
 			teacherAttendance.setSignOutTime(date);
+			ClassGroup classGroup = classGroupDao.get(courseSchedule.getClassGroupId());
+			teacherAttendance.setCurrentClassTimes(classGroup.getCurrentClassTimes() + 1);
 			if(DateUtil.minutesBetween(classEndDateTime,date) >= 0 && DateUtil.minutesBetween(date,classEndDateAdd60Minutes) >= 0){
 				teacherAttendance.setSignOutStatus(YesOrNoEnum.YES);
 				result.put("signInStatus",0);
@@ -168,11 +169,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			}else{
 				teacherAttendanceDao.insert(teacherAttendance);
 			}
-			//修改当前课时
-//			classGroup.setId(teacherAttendance.getClassGroupId());
-//			classGroup.setCurrentClassTimes(teacherAttendance.getCurrentClassTimes() + 1);
-//			classGroup.setUpdateTime(date);
-//			classGroupDao.update(classGroup);
 			//新增课堂作业
 			CourseHomework courseHomework=teacherSignOutDto.getCourseHomeworkInfo();
 			courseHomework.setCourseScheduleId(teacherAttendance.getCourseScheduleId());

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

@@ -101,8 +101,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	@Autowired
 	private TeacherAttendanceDao teacherAttendanceDao;
 	@Autowired
-	private ContractService contractService;
-	@Autowired
 	private ClassGroupService classGroupService;
 
 	@Override

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/storage/provider/AliyunOssStoragePlugin.java

@@ -18,8 +18,11 @@ import com.ym.mec.thirdparty.storage.StoragePlugin;
 @Component
 public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean, DisposableBean {
 
-	@Value("${storage.oss.endpoint:oss-cn-beijing.aliyuncs.com}")
-	private String endpoint;
+	@Value("${storage.oss.outerEndpoint:oss-cn-beijing.aliyuncs.com}")
+	private String outerEndpoint;
+	
+	@Value("${storage.oss.innerEndpoint:oss-cn-beijing-internal.aliyuncs.com}")
+	private String innerEndpoint;
 
 	@Value("${storage.oss.accessKeyId:LTAI4Fdhxwfo7FsBDZKK8Wfv}")
 	private String accessKeyId;
@@ -56,7 +59,7 @@ public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean,
 		// 设置是否支持将自定义域名作为Endpoint，默认支持。
 		conf.setSupportCname(true);
 
-		ossClient = new OSSClient(endpoint, accessKeyId, accessKeySecret, conf);
+		ossClient = new OSSClient(innerEndpoint, accessKeyId, accessKeySecret, conf);
 	}
 
 	@Override
@@ -71,7 +74,7 @@ public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean,
 
 		ossClient.putObject(bucketName, folderName + "/" + file.getName(), file);
 
-		return "https://" + bucketName + "." + endpoint + "/" + folderName + "/" + file.getName();
+		return "https://" + bucketName + "." + outerEndpoint + "/" + folderName + "/" + file.getName();
 	}
 
 	@Override
@@ -93,8 +96,12 @@ public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean,
 		}
 	}
 
-	public void setEndpoint(String endpoint) {
-		this.endpoint = endpoint;
+	public void setOuterEndpoint(String outerEndpoint) {
+		this.outerEndpoint = outerEndpoint;
+	}
+
+	public void setInnerEndpoint(String innerEndpoint) {
+		this.innerEndpoint = innerEndpoint;
 	}
 
 	public void setAccessKeyId(String accessKeyId) {
@@ -111,10 +118,11 @@ public class AliyunOssStoragePlugin implements StoragePlugin, InitializingBean,
 
 	public static void main(String[] args) throws Exception {
 		AliyunOssStoragePlugin aliyunOssStorageService = new AliyunOssStoragePlugin();
-		aliyunOssStorageService.setAccessKeyId("LTAIwZW9XqrfsZ4r");
-		aliyunOssStorageService.setAccessKeySecret("5uDsNZmHMxcnxav8w9byII4zcPpu5G");
-		aliyunOssStorageService.setBucketName("yooma-test");
-		aliyunOssStorageService.setEndpoint("oss-cn-beijing.aliyuncs.com");
+		aliyunOssStorageService.setAccessKeyId("LTAI4Fdhxwfo7FsBDZKK8Wfv");
+		aliyunOssStorageService.setAccessKeySecret("ERRma4P9VWbD98n93gspnZXmoq7rn5");
+		aliyunOssStorageService.setBucketName("daya-online");
+		aliyunOssStorageService.setOuterEndpoint("oss-cn-beijing.aliyuncs.com");
+		aliyunOssStorageService.setInnerEndpoint("oss-cn-beijing-internal.aliyuncs.com");
 		aliyunOssStorageService.afterPropertiesSet();
 
 		File file = new File("e:/var/2.jpg");