Selaa lähdekoodia

fix 增加ConverterEnum枚举转换器

shangke 8 kuukautta sitten
vanhempi
commit
b33d524feb

+ 2 - 2
mec-application/src/main/java/com/ym/mec/student/controller/MusicSheetController.java

@@ -51,7 +51,7 @@ public class MusicSheetController {
         @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/cbsDetail/{id}")
-    public R<MusicSheetVo.OpenMusicSheetDetail> cbsDetail(@PathVariable("id") Integer id) {
+    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Integer id) {
         CbsMusicSheetWrapper.MusicSheet musicSheet = musicSheetService.cbsDetail(id);
         musicSheet.setBizId(Long.valueOf(id));
 
@@ -80,7 +80,7 @@ public class MusicSheetController {
                 }
             }
         }
-        return R.from(MusicSheetVo.OpenMusicSheetDetail.from(musicSheetDetail.jsonString()));
+        return R.from(musicSheetDetail);
     }
 
 }

+ 2 - 2
mec-application/src/main/java/com/ym/mec/teacher/controller/MusicSheetController.java

@@ -51,7 +51,7 @@ public class MusicSheetController {
         @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/cbsDetail/{id}")
-    public R<MusicSheetVo.OpenMusicSheetDetail> cbsDetail(@PathVariable("id") Integer id) {
+    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Integer id) {
         CbsMusicSheetWrapper.MusicSheet musicSheet = musicSheetService.cbsDetail(id);
         musicSheet.setBizId(Long.valueOf(id));
 
@@ -80,7 +80,7 @@ public class MusicSheetController {
                 }
             }
         }
-        return R.from(MusicSheetVo.OpenMusicSheetDetail.from(musicSheetDetail.jsonString()));
+        return R.from(musicSheetDetail);
     }
 
 }

+ 1 - 1
mec-application/src/main/java/com/ym/mec/vo/MusicSheetVo.java

@@ -454,7 +454,7 @@ public class MusicSheetVo {
         private EMusicSourceType sourceType;
 
         @ApiModelProperty("音频类型(HOMEMODE: 自制 COMMON: 普通)")
-        private com.dayaedu.cbs.common.enums.music.EAudioType audioType;
+        private EAudioType audioType;
 
         @ApiModelProperty("曲目状态(0:停用,1:启用)")
         private Boolean status;

+ 2 - 2
mec-application/src/main/java/com/ym/mec/web/controller/MusicSheetController.java

@@ -51,7 +51,7 @@ public class MusicSheetController {
         @ApiImplicitParam(name = "id", value = "id", dataType = "long")
     })
     @GetMapping("/cbsDetail/{id}")
-    public R<MusicSheetVo.OpenMusicSheetDetail> cbsDetail(@PathVariable("id") Integer id) {
+    public R<MusicSheetVo.MusicSheetDetail> cbsDetail(@PathVariable("id") Integer id) {
         CbsMusicSheetWrapper.MusicSheet musicSheet = musicSheetService.cbsDetail(id);
         musicSheet.setBizId(Long.valueOf(id));
 
@@ -80,7 +80,7 @@ public class MusicSheetController {
                 }
             }
         }
-        return R.from(MusicSheetVo.OpenMusicSheetDetail.from(musicSheetDetail.jsonString()));
+        return R.from(musicSheetDetail);
     }
 
 }