Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/handler/WebSocketHandler.java

@@ -166,7 +166,8 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
             int timeStamp = (int) (userSoundInfoMap.get(phone).getMeasureStartTime() + audioEvent.getTimeStamp()*1000);
             float pitch = pitchDetectionResult.getPitch();
             if(pitch>0 && userSoundInfoMap.get(phone).getOffsetTime() == -1){
-                calOffsetTime(phone, (int) (CollectionUtils.isEmpty(userSoundInfoMap.get(phone).getRecordMeasurePithInfo())?0:userSoundInfoMap.get(phone).getRecordMeasurePithInfo().get(userSoundInfoMap.get(phone).getRecordMeasurePithInfo().size()-1).getTimeStamp()));
+                int preTimeStamp = CollectionUtils.isEmpty(userSoundInfoMap.get(phone).getRecordMeasurePithInfo())?0:userSoundInfoMap.get(phone).getRecordMeasurePithInfo().get(userSoundInfoMap.get(phone).getRecordMeasurePithInfo().size()-1).getTimeStamp();
+                calOffsetTime(phone, timeStamp - (timeStamp - preTimeStamp)/2);
             }
 //            LOGGER.info("时间：{}, 频率：{}, 分贝：{}, 音分：{}", timeStamp, pitch, silenceDetecor.currentSPL(), cents);
             userSoundInfoMap.get(phone).getRecordMeasurePithInfo().add(new MusicPitchDetailDto(timeStamp, pitch, silenceDetecor.currentSPL()));
@@ -213,9 +214,9 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
         super.afterConnectionClosed(session, status);
         String phone = session.getPrincipal().getName().split(":")[1];
         LOGGER.info("{}离线", phone);
+        createHeader(phone);
         WS_CLIENTS.remove(phone);
         userSoundInfoMap.remove(phone);
-        createHeader(phone);
     }
 
     @Override

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

@@ -56,6 +56,7 @@ public class PhotoServiceImpl extends BaseServiceImpl<Integer, Photo>  implement
 				photoAlbum.setMusicGroupId(musicGroupId);
 				photoAlbum.setName("获奖证书");
 				photoAlbum.setClientShow(YesOrNoEnum.YES);
+				photoAlbum.setCoverUrl("https://daya.ks3-cn-beijing.ksyun.com/202107/Sdmx7vx.png");
 				photoAlbum.setType("SHOW");
 				photoAlbumDao.insert(photoAlbum);
 			}

mec-web/src/main/java/com/ym/mec/web/controller/PhotoAlbumController.java

@@ -6,6 +6,7 @@ import com.ym.mec.biz.service.PhotoAlbumService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,6 +28,9 @@ public class PhotoAlbumController extends BaseController {
 	@PostMapping(value = "add")
 	@PreAuthorize("@pcs.hasPermissions('photoAlbum/add')")
 	public Object add(PhotoAlbum photoAlbum) {
+		if(StringUtils.isEmpty(photoAlbum.getCoverUrl())){
+			photoAlbum.setCoverUrl("https://daya.ks3-cn-beijing.ksyun.com/202107/Sdmx7vx.png");
+		}
 		return succeed(photoAlbumService.insert(photoAlbum));
 	}
 

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicGroupTrainPlanController.java

@@ -7,18 +7,18 @@ import com.ym.mec.biz.dal.entity.MusicGroupTrainPlan;
 import com.ym.mec.biz.dal.entity.MusicGroupTrainPlanSaveDto;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.enums.GradeTypeEnum;
+import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.MusicGroupTrainPlanService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -40,6 +40,9 @@ public class EduMusicGroupTrainPlanController extends BaseController {
 	@Autowired
 	private StudentRegistrationDao studentRegistrationDao;
 
+	@Autowired
+	private ClassGroupService classGroupService;
+
 	@ApiOperation("新增乐团训练规划")
 	@PostMapping(value = "add")
 	public Object add(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
@@ -105,4 +108,10 @@ public class EduMusicGroupTrainPlanController extends BaseController {
 	public Object queryCourseType(@RequestBody MusicGroupTrainPlanSaveDto musicGroupTrainPlanSaveDto) {
 		return succeed(musicGroupTrainPlanService.queryCourseType(musicGroupTrainPlanSaveDto));
 	}
+
+	@ApiOperation(value = "乐团所有班级列表")
+	@GetMapping("/findAllClassGroupByMusicGroup")
+	public HttpResponseResult findAllClassGroupByMusicGroup(String musicGroupId, String type) {
+		return succeed(classGroupService.findAllClassGroupByMusicGroup(musicGroupId, type));
+	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/EduPhotoAlbumController.java

@@ -6,6 +6,7 @@ import com.ym.mec.biz.service.PhotoAlbumService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +27,9 @@ public class EduPhotoAlbumController extends BaseController {
 	@ApiOperation("新增")
 	@PostMapping(value = "add")
 	public Object add(PhotoAlbum photoAlbum) {
+		if(StringUtils.isEmpty(photoAlbum.getCoverUrl())){
+			photoAlbum.setCoverUrl("https://daya.ks3-cn-beijing.ksyun.com/202107/Sdmx7vx.png");
+		}
 		return succeed(photoAlbumService.insert(photoAlbum));
 	}