Merge remote-tracking branch 'origin/master'

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

@@ -2535,6 +2535,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         oldCourseSchedule.setClassDate(courseSchedule.getStartClassTime());
         oldCourseSchedule.setStartClassTime(courseSchedule.getStartClassTime());
         oldCourseSchedule.setEndClassTime(DateUtil.addMinutes(courseSchedule.getStartClassTime(),practiceCourseMinutes));
+        oldCourseSchedule.setStatus(CourseStatusEnum.NOT_START);
         List<CourseSchedule> courseSchedules=new ArrayList<>();
         courseSchedules.add(oldCourseSchedule);
         checkNewCourseSchedules(courseSchedules,false);

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

@@ -27,6 +27,9 @@ public class ResourceRespositoryServiceImpl extends BaseServiceImpl<Integer, Res
 		if(menuQueryInfo.getSubjectId() != null && menuQueryInfo.getSubjectId() == 5){
 			menuQueryInfo.setSubjectId(6);
 		}
+		if(menuQueryInfo.getSubjectId() != null && menuQueryInfo.getSubjectId() == 23){
+			menuQueryInfo.setSubjectId(18);
+		}
 		List<ResourceRespository> resourceRespositories = resourceRespositoryDao.findList(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getSubjectId());
 		for (ResourceRespository repository:resourceRespositories) {
 			repository = getTree(repository,menuQueryInfo.getDelFlag(),menuQueryInfo.getSubjectId());

mec-im/src/main/java/com/ym/dao/RoomDao.java

@@ -2,11 +2,13 @@ package com.ym.dao;
 
 import com.ym.pojo.Room;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Lock;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.persistence.LockModeType;
 import java.util.List;
 
 /**
@@ -14,6 +16,7 @@ import java.util.List;
  */
 @Repository
 public interface RoomDao extends JpaRepository<Room, Long> {
+    @Lock(value = LockModeType.PESSIMISTIC_WRITE)
     public List<Room> findByRid(String rid);
 
     @Transactional

mec-student/src/main/java/com/ym/mec/student/controller/ResourceRepositoryController.java

@@ -1,16 +1,17 @@
 package com.ym.mec.student.controller;
 
-import com.ym.mec.auth.api.dto.MenuQueryInfo;
-import com.ym.mec.biz.service.ResourceRespositoryService;
-import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.ym.mec.auth.api.dto.MenuQueryInfo;
+import com.ym.mec.biz.service.ResourceRespositoryService;
+import com.ym.mec.common.controller.BaseController;
+
 @RequestMapping("resourceRepository")
 @Api(tags = "资源服务")
 @RestController