修改音乐数字人bug

xyzc-start/src/main/java/com/xyzc/start/controller/NumPersonController.java

@@ -168,8 +168,8 @@ public class NumPersonController {
      */
     @PostMapping("/queryMusic")
     @ResponseBody
-    public Result<List<NpMusic>> QueryMusic(@RequestBody NpMusic npMusic){
-        List<NpMusic> npMusics = npQueryService.queryMusic(npMusic);
+    public Result<Page<NpMusic>> QueryMusic(@RequestBody NpRequestParams npRequestParams){
+        Page<NpMusic> npMusics = npQueryService.queryMusic(npRequestParams.getType(), npRequestParams.getPage(), npRequestParams.getSize());
 
         return Result.ok(npMusics);
     }

xyzc-start/src/main/java/com/xyzc/start/mapper/NpMusicMapper.java

@@ -7,9 +7,10 @@ import com.xyzc.start.domain.NpMusic;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 @Repository
 public interface NpMusicMapper extends BaseMapper<NpMusic> {
 
-    List<NpMusic> queryMusic(long baseUserId, NpMusic npMusic);
+    Page<NpMusic> queryMusic(Long baseUserId, Integer type, String name, Page<NpMusic> page);
 }

xyzc-start/src/main/java/com/xyzc/start/service/INpQueryService.java

@@ -33,9 +33,8 @@ public interface INpQueryService {
 
     /**
      * 查询音乐
-     * @param npMusic
      */
-    List<NpMusic> queryMusic(NpMusic npMusic);
+    Page<NpMusic> queryMusic(Integer type, Integer pageNum, Integer size);
 
 
 //    List<NpText> queryNpText(NpText npText);

xyzc-start/src/main/java/com/xyzc/start/service/impl/NpQueryServiceImpl.java

@@ -346,21 +346,21 @@ public class NpQueryServiceImpl implements INpQueryService {
             size = 10;
         }
 
-    Page<NpCommitTrain> page = new Page<>(pageNum, size);
+        Page<NpCommitTrain> page = new Page<>(pageNum, size);
 
-    Page<NpCommitTrain> npCommitTrainPage = null;
-    // 根据查询名称
-    if (!Strings.isBlank(name)) {
-        npCommitTrainPage = npCommitTrainMapper.queryCommitTrain(SecurityUser.getUserId(), type, name, page);
-        return npCommitTrainPage;
-    }
+        Page<NpCommitTrain> npCommitTrainPage = null;
+        // 根据查询名称
+        if (!Strings.isBlank(name)) {
+            npCommitTrainPage = npCommitTrainMapper.queryCommitTrain(SecurityUser.getUserId(), type, name, page);
+            return npCommitTrainPage;
+        }
 
-    if (type == 1) {
-        npCommitTrainPage = npCommitTrainMapper.queryCommitTrain(null, type, null, page);
-    } else {
-        npCommitTrainPage = npCommitTrainMapper.queryCommitTrain(SecurityUser.getUserId(), type, null, page);
-    }
-    return npCommitTrainPage;
+        if (type == 1) {
+            npCommitTrainPage = npCommitTrainMapper.queryCommitTrain(null, type, null, page);
+        } else {
+            npCommitTrainPage = npCommitTrainMapper.queryCommitTrain(SecurityUser.getUserId(), type, null, page);
+        }
+        return npCommitTrainPage;
     }
 
 
@@ -368,6 +368,7 @@ public class NpQueryServiceImpl implements INpQueryService {
     public NpTemplateDraft getTemplateDraft(String templateId) {
         if (Strings.isBlank(templateId)) {
             NpTemplateDraft npTemplateDraft = new NpTemplateDraft();
+            // 获取草稿
             NpFormwork templateDraft = npTemplateDraftMapper.getTemplateDraft("1");
             npTemplateDraft.setNodes(templateDraft.getNodes());
             // 生成id
@@ -416,17 +417,56 @@ public class NpQueryServiceImpl implements INpQueryService {
     }
 
     @Override
-    public List<NpMusic> queryMusic(NpMusic npMusic) {
-        List<NpMusic> npMusics = npMusicMapper.queryMusic(SecurityUser.getUserId(), npMusic);
+    public Page<NpMusic> queryMusic(Integer type, Integer pageNum, Integer size) {
+        if (pageNum == null || pageNum == 0) {
+            pageNum = 1;
+        }
+        if (size == null || size < 0) {
+            size = 10;
+        }
+
+        Page<NpMusic> page = new Page<>(pageNum, size);
+
+        Page<NpMusic> npMusics = null;
+
+        //        // 根据查询名称
+//        if (!Strings.isBlank(name)) {
+//            npMusics = npMusicMapper.queryMusic(SecurityUser.getUserId(), type, name, page);
+//            return npMusics;
+//        }
+
+        if (type == 1) {// 公共
+            npMusics = npMusicMapper.queryMusic(null, type, null, page);
+        } else {
+            npMusics = npMusicMapper.queryMusic(SecurityUser.getUserId(), type, null, page);
+        }
         return npMusics;
     }
 
-//    @Override
-//    public List<NpText> queryNpText(NpText npText) {
-//        List<NpText> npTextList = npTextMapper.queryText(npText);
-//        return npTextList;
-//    }
-
+//
+//    public Page<NpCommitTrain> queryTrainingModel(Integer type, String name, Integer pageNum, Integer size) {
+//        if (pageNum == null || pageNum == 0) {
+//            pageNum = 1;
+//        }
+//        if (size == null || size < 0) {
+//            size = 10;
+//        }
+//
+//        Page<NpCommitTrain> page = new Page<>(pageNum, size);
+//
+//        Page<NpCommitTrain> npCommitTrainPage = null;
+//        // 根据查询名称
+//        if (!Strings.isBlank(name)) {
+//            npCommitTrainPage = npCommitTrainMapper.queryCommitTrain(SecurityUser.getUserId(), type, name, page);
+//            return npCommitTrainPage;
+//        }
+//
+//        if (type == 1) {
+//            npCommitTrainPage = npCommitTrainMapper.queryCommitTrain(null, type, null, page);
+//        } else {
+//            npCommitTrainPage = npCommitTrainMapper.queryCommitTrain(SecurityUser.getUserId(), type, null, page);
+//        }
+//        return npCommitTrainPage;
 
     /**
      * 查询素材

xyzc-start/src/main/resources/mapper/WebStart/NpMusicMapper.xml

@@ -15,15 +15,14 @@
              , `music_desc`
         FROM xy_np_music
         <where>
-            base_user_id = #{baseUserId}
-            <if test="npMusic.musicType != null and npMusic.musicType != ''">
-                and music_type = #{npMusic.musicType}
+            <if test="baseUserId != null and baseUserId != ''">
+                AND base_user_id = #{baseUserId}
             </if>
-            <if test="npMusic.musicName != null and npMusic.musicName != ''">
-                and music_name like concat('%',#{npMusic.musicName},'%')
+            <if test="type != null and type != ''">
+                and music_type = #{type}
             </if>
-            <if test="npMusic.musicDesc != null and npMusic.musicDesc != ''">
-                and music_desc like concat('%',#{npMusic.musicDesc},'%')
+            <if test="name != null and name != ''">
+                and music_name like concat('%',#{name},'%')
             </if>
         </where>
     </select>