工作流代码提交

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/component/FileDealComp.java

@@ -497,7 +497,7 @@ public class FileDealComp {
                             }
 
                             music.setGenre(tag.getFirst(FieldKey.GENRE));
-                            music.setComment(tag.getFirst(FieldKey.COMMENT));
+                            music.setComment1(tag.getFirst(FieldKey.COMMENT));
                             music.setLyrics(tag.getFirst(FieldKey.LYRICS));
                             music.setComposer(tag.getFirst(FieldKey.COMPOSER));
                             music.setAlbumArtist(tag.getFirst(FieldKey.ALBUM_ARTIST));
@@ -515,7 +515,7 @@ public class FileDealComp {
                         music.setYear(StringUtils.join(tag.getFields(FieldKey.YEAR), ","));
                         music.setTrack(StringUtils.join(tag.getFields(FieldKey.TRACK), ","));
                         music.setGenre(StringUtils.join(tag.getFields(FieldKey.GENRE), ","));
-                        music.setComment(StringUtils.join(tag.getFields(FieldKey.COMMENT), ","));
+                        music.setComment1(StringUtils.join(tag.getFields(FieldKey.COMMENT), ","));
                         music.setLyrics(StringUtils.join(tag.getFields(FieldKey.LYRICS), ","));
                         music.setComposer(StringUtils.join(tag.getFields(FieldKey.COMPOSER), ","));
                         music.setAlbumArtist(StringUtils.join(tag.getFields(FieldKey.ALBUM_ARTIST), ","));

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/Music.java

@@ -36,8 +36,8 @@ public class Music {
     private String year;
     @Column
     private String genre;
-    @Column
-    private String comment;
+    @Column(columnDefinition="varchar(255) comment '注释'")
+    private String comment1;
     @Column(columnDefinition="varchar(10000) comment '歌词'")
     private String lyrics;
     @Column

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/FileService.java

@@ -141,13 +141,13 @@ public class FileService extends ServiceImpl<FileMapper, FileBean> implements IF
     public FileDetailVO getFileDetail(String userFileId) {
         UserFile userFile = userFileMapper.selectById(userFileId);
         FileBean fileBean = fileMapper.selectById(userFile.getFileId());
-        Music music = musicMapper.selectOne(new QueryWrapper<Music>().eq("fileId", userFile.getFileId()));
-        Image image = imageMapper.selectOne(new QueryWrapper<Image>().eq("fileId", userFile.getFileId()));
+        Music music = musicMapper.selectOne(new QueryWrapper<Music>().eq("file_id", userFile.getFileId()));
+        Image image = imageMapper.selectOne(new QueryWrapper<Image>().eq("file_id", userFile.getFileId()));
 
         if ("mp3".equalsIgnoreCase(userFile.getExtendName()) || "flac".equalsIgnoreCase(userFile.getExtendName())) {
             if (music == null) {
                 fileDealComp.parseMusicFile(userFile.getExtendName(), fileBean.getStorageType(), fileBean.getFileUrl(), fileBean.getFileId());
-                music = musicMapper.selectOne(new QueryWrapper<Music>().eq("fileId", userFile.getFileId()));
+                music = musicMapper.selectOne(new QueryWrapper<Music>().eq("file_id", userFile.getFileId()));
             }
         }