|
@@ -1,18 +1,17 @@
|
|
|
package com.ym.mec.teacher.controller;
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.ym.mec.biz.dal.dto.MusicPitchDetailDto;
|
|
|
import com.ym.mec.biz.service.SoundService;
|
|
|
import com.ym.mec.common.controller.BaseController;
|
|
|
import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.util.List;
|
|
@@ -37,8 +36,12 @@ public class SoundController extends BaseController {
|
|
|
|
|
|
@ApiOperation(value = "小节评分")
|
|
|
@PostMapping("measureCompare")
|
|
|
- public HttpResponseResult measureCompare(List<MusicPitchDetailDto> musicXmlInfos, MultipartFile record){
|
|
|
- return soundService.measureCompare(musicXmlInfos, record);
|
|
|
+ public HttpResponseResult measureCompare(@RequestParam("musicXmlInfos") String musicXmlInfos,@RequestParam("record") MultipartFile record){
|
|
|
+ if(StringUtils.isBlank(musicXmlInfos)){
|
|
|
+ return failed();
|
|
|
+ }
|
|
|
+ List<MusicPitchDetailDto> musicXmlInfoList = JSON.parseArray(musicXmlInfos, MusicPitchDetailDto.class);
|
|
|
+ return soundService.measureCompare(musicXmlInfoList, record);
|
|
|
}
|
|
|
|
|
|
}
|