update

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

@@ -63,14 +63,20 @@ public class TeacherSalaryComplaintsServiceImpl extends BaseServiceImpl<Long, Te
 	@Transactional(rollbackFor = Exception.class)
 	public synchronized Object add(TeacherSalaryComplaints complaints) {
 		String settlementMonth = complaints.getSalarySettlementMonth();
-		Integer teacherId = complaints.getTeacherId();
-		if(StringUtils.isEmpty(settlementMonth) || teacherId == null){
+		String reason = complaints.getReason();
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			throw new BizException("用户信息获取失败");
+		}
+		Integer teacherId = sysUser.getId();
+		if(StringUtils.isEmpty(settlementMonth) || StringUtils.isEmpty(reason)){
 			throw new BizException("数据提交失败");
 		}
 		TeacherSalaryComplaints salaryComplaints = teacherSalaryComplaintsDao.findByMonthAndTeacherId(settlementMonth,teacherId,PENDING);
 		if(salaryComplaints != null){
 			throw new BizException("申述已提交");
 		}
+		complaints.setTeacherId(teacherId);
 		return teacherSalaryComplaintsDao.insert(complaints);
 	}
 

mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -29,6 +29,12 @@ public class RoomController{
         return new BaseResponse<>(roomResult);
     }
 
+    @RequestMapping(value = "/signIn", method = RequestMethod.POST)
+    public Object signIn(String roomId){
+        roomService.signIn(roomId);
+        return new BaseResponse<>();
+    }
+
     @RequestMapping(value = "/leave", method = RequestMethod.POST)
     public Object leaveRoom(@RequestBody ReqUserData data)
             throws ApiException, Exception {

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -213,6 +213,26 @@ public class RoomServiceImpl implements RoomService {
         return roomResult;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void signIn(String roomId) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        String userId = sysUser.getId().toString();
+        log.info("roomSignIn: roomId={}, userId={}", roomId, userId);
+        Integer parseInt = Integer.parseInt(roomId.substring(1));
+        Teacher teacher = teacherDao.get(Integer.parseInt(userId));
+        CourseSchedule courseSchedule = courseScheduleDao.get(parseInt.longValue());
+        try {
+            if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
+                teacherAttendanceService.addTeacherAttendanceRecord(parseInt,courseSchedule.getActualTeacherId(), SignStatusEnum.SIGN_IN,true);
+            }else {
+                studentAttendanceService.addStudentAttendanceRecord(parseInt,Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_IN);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
     private void saveRoom(String roomId, String roomName, Date createTime, String display) {
         Room room = new Room();
         room.setRid(roomId);

mec-im/src/main/java/com/ym/service/RoomService.java

@@ -15,6 +15,8 @@ public interface RoomService {
     //everyone
     public RoomResult joinRoom(String userName, String roomId, boolean isAudience, boolean isDisableCamera) throws ApiException, Exception;
 
+    void signIn(String roomId);
+
     public Boolean leaveRoom(String roomId) throws ApiException, Exception;
 
     //only host
@@ -65,4 +67,5 @@ public interface RoomService {
     public void userIMOfflineKick(String userId);
 
     boolean statusSync(String roomId,String userId) throws Exception;
+
 }