数字人接口修改bug

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

@@ -4,6 +4,7 @@ package com.xyzc.start.controller;
 import com.xyzc.common.core.utils.Result;
 import com.xyzc.start.domain.*;
 import com.xyzc.start.domain.vo.ComfyuiWorkflowVo;
+import com.xyzc.start.request.NpRequestParams;
 import com.xyzc.start.service.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -39,13 +40,14 @@ public class NumPersonController {
     public void commitTrainVideo(@RequestBody NpCommitTrain npCommitTrain){
         npCommitService.commitTrainVideo(npCommitTrain);
     }
+
     /**
      * 训练数字人的查询
      */
     @PostMapping("/queryTrainVideo")
     @ResponseBody
-    public Result<List<NpCommitTrain>> queryTrainVideo(@RequestParam("page") Integer page,  @RequestParam("size") Integer size){
-        List<NpCommitTrain> npCommitTrains = npQueryService.queryTrainVideo(page, size);
+    public Result<List<NpCommitTrain>> queryTrainVideo(@RequestBody NpRequestParams npRequestParams){
+        List<NpCommitTrain> npCommitTrains = npQueryService.queryTrainVideo(npRequestParams.getPage(), npRequestParams.getSize());
 
         return Result.ok(npCommitTrains);
     }
@@ -81,6 +83,34 @@ public class NumPersonController {
                 "}";
     }
 
+
+    /**
+     * 获取公共模特
+     *
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/queryCommonTemplate")
+    @ResponseBody
+    public Result<List<NpTemplate>> queryCommonTemplate(@RequestBody NpRequestParams npRequestParams) throws Exception {
+        List<NpTemplate> npTemplateList = npQueryService.queryCommonTemplate( npRequestParams.getPage(), npRequestParams.getSize());
+        return Result.ok(npTemplateList);
+    }
+
+    /**
+     * 查询用户底下的数字人
+     *
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/queryTrainingModel")
+    @ResponseBody
+    public Result<List<NpCommitTrain>> queryTrainingModel(@RequestBody NpRequestParams npRequestParams) throws Exception {
+        List<NpCommitTrain> npTemplateList = npQueryService.queryTrainingModel(npRequestParams.getPage(), npRequestParams.getSize());
+        return Result.ok(npTemplateList);
+    }
+
+
     /**
      *上传素材
      * @param file form-data/file	文件
@@ -110,9 +140,9 @@ public class NumPersonController {
      */
     @PostMapping("/queryMaterial")
     @ResponseBody
-    public Result<List<NpMaterial>> queryMaterial( @RequestParam("rootId") String rootId,  @RequestParam("page") Integer page,  @RequestParam("size") Integer size){
+    public Result<List<NpMaterial>> queryMaterial(@RequestBody NpRequestParams npRequestParams){
 //        npCommitService.queryMaterial(rootId, page, size);
-        List<NpMaterial> materials = npQueryService.queryMaterial(rootId, page, size);
+        List<NpMaterial> materials = npQueryService.queryMaterial(npRequestParams.getRootId(), npRequestParams.getPage(), npRequestParams.getSize());
         return Result.ok(materials);
     }
 
@@ -137,25 +167,25 @@ public class NumPersonController {
         return Result.ok(npMusics);
     }
 
-    /**
-     *上传音乐
-     */
-    @PostMapping("/uploadText")
-    @ResponseBody
-    public Result<String> uploadText(NpText npText){
-        npCommitService.uploadText(npText);
-        return Result.ok("上传成功");
-    }
+//    /**
+//     *上传音乐
+//     */
+//    @PostMapping("/uploadText")
+//    @ResponseBody
+//    public Result<String> uploadText(NpText npText){
+//        npCommitService.uploadText(npText);
+//        return Result.ok("上传成功");
+//    }
 
-    /**
-     * 查询音乐
-     */
-    @PostMapping("/queryText")
-    @ResponseBody
-    public Result<List<NpText>> queryText(NpText npText){
-        List<NpText> npTextList = npQueryService.queryNpText(npText);
-        return Result.ok(npTextList);
-    }
+//    /**
+//     * 查询音乐
+//     */
+//    @PostMapping("/queryText")
+//    @ResponseBody
+//    public Result<List<NpText>> queryText(NpText npText){
+//        List<NpText> npTextList = npQueryService.queryNpText(npText);
+//        return Result.ok(npTextList);
+//    }
 
 
     /**
@@ -175,36 +205,11 @@ public class NumPersonController {
      */
     @PostMapping("/queryCompanySound")
     @ResponseBody
-    public Result<List<NpSound>> queryCompanySound(Integer type, Integer page, Integer size) throws Exception {
-        List<NpSound> companySoundList = npQueryService.queryCompanySound(type, page, size);
+    public Result<List<NpSound>> queryCompanySound(@RequestBody NpRequestParams npRequestParams) throws Exception {
+        List<NpSound> companySoundList = npQueryService.queryCompanySound(npRequestParams.getType(), npRequestParams.getPage(), npRequestParams.getSize());
         return Result.ok(companySoundList);
     }
 
-    /**
-     * 获取公共模特
-     *
-     * @return
-     * @throws Exception
-     */
-    @PostMapping("/queryCommonTemplate")
-    @ResponseBody
-    public Result<List<NpTemplate>> queryCommonTemplate() throws Exception {
-        List<NpTemplate> npTemplateList = numPersonService.queryCommonTemplate();
-        return Result.ok(npTemplateList);
-    }
-
-    /**
-     * 查询用户底下的数字人
-     *
-     * @return
-     * @throws Exception
-     */
-    @PostMapping("/queryTrainingModel")
-    @ResponseBody
-    public Result<List<NpCommitTrain>> queryTrainingModel() throws Exception {
-        List<NpCommitTrain> npTemplateList = numPersonService.queryTrainingModel();
-        return Result.ok(npTemplateList);
-    }
 
     /**
      * 数字人异步通知

xyzc-start/src/main/java/com/xyzc/start/domain/NpText.java

@@ -1,51 +1,51 @@
-package com.xyzc.start.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.xyzc.common.mybatis.core.domain.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serial;
-
-/**
- * 文字-贴图对象 xy_np_text
- *
- * @author wyz
- * @date 2024-08-14
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("xy_np_text")
-public class NpText extends BaseEntity {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 
-     */
-    @TableId(value = "id")
-    private Long id;
-
-    /**
-     * 文本
-     */
-    private String text;
-
-    /**
-     * 图片地址
-     */
-    private String imgUrl;
-
-    /**
-     * 1:文字；2:贴图
-     */
-    private Integer type;
-
-    /**
-     * 1:文字；2:贴图
-     */
-    private Long baseUserId;
-
-
-}
+//package com.xyzc.start.domain;
+//
+//import com.baomidou.mybatisplus.annotation.*;
+//import com.xyzc.common.mybatis.core.domain.BaseEntity;
+//import lombok.Data;
+//import lombok.EqualsAndHashCode;
+//
+//import java.io.Serial;
+//
+///**
+// * 文字-贴图对象 xy_np_text
+// *
+// * @author wyz
+// * @date 2024-08-14
+// */
+//@Data
+//@EqualsAndHashCode(callSuper = true)
+//@TableName("xy_np_text")
+//public class NpText extends BaseEntity {
+//
+//    @Serial
+//    private static final long serialVersionUID = 1L;
+//
+//    /**
+//     *
+//     */
+//    @TableId(value = "id")
+//    private Long id;
+//
+//    /**
+//     * 文本
+//     */
+//    private String text;
+//
+//    /**
+//     * 图片地址
+//     */
+//    private String imgUrl;
+//
+//    /**
+//     * 1:文字；2:贴图
+//     */
+//    private Integer type;
+//
+//    /**
+//     * 1:文字；2:贴图
+//     */
+//    private Long baseUserId;
+//
+//
+//}

xyzc-start/src/main/java/com/xyzc/start/domain/bo/NpTemplateBo.java

@@ -0,0 +1,95 @@
+//package com.xyzc.start.domain.bo;
+//
+//import org.xyzc.system.domain.NpTemplate;
+//import io.github.linpeilie.annotations.AutoMapper;
+//import lombok.Data;
+//import org.xyzc.common.core.validate.*;
+//import jakarta.validation.constraints.*;
+//
+///**
+// * 数字人业务对象 xy_np_template
+// *
+// * @author wyz
+// * @date 2024-08-14
+// */
+//@Data
+//@AutoMapper(target = NpTemplate.class, reverseConvertGenerate = false)
+//public class NpTemplateBo {
+//
+//    /**
+//     *
+//     */
+//    @NotNull(message = "不能为空", groups = {EditGroup.class})
+//    private Long id;
+//
+//    /**
+//     * 模型id
+//     */
+//    @NotNull(message = "模型id不能为空", groups = {AddGroup.class, EditGroup.class})
+//    private Integer modelId;
+//
+//    /**
+//     * 模型名称
+//     */
+//    @NotBlank(message = "模型名称不能为空", groups = {AddGroup.class, EditGroup.class})
+//    private String robotName;
+//
+//    /**
+//     * 模型描述
+//     */
+//    @NotBlank(message = "模型描述不能为空", groups = {AddGroup.class, EditGroup.class})
+//    private String robotDesc;
+//
+//    /**
+//     * 图片地址
+//     */
+//    @NotBlank(message = "图片地址不能为空", groups = {AddGroup.class, EditGroup.class})
+//    private String coverUrl;
+//
+//    /**
+//     * 性别1男 2女
+//性别1男 2女
+//性别1男 2女
+//1:男，2:女
+//     */
+//    @NotNull(message = "性别1男 2女
+//性别1男 2女
+//性别1男 2女
+//1:男，2:女不能为空", groups = {AddGroup.class, EditGroup.class})
+//    private Integer gender;
+//
+//    /**
+//     * 年龄
+//     */
+//    @NotNull(message = "年龄不能为空", groups = {AddGroup.class, EditGroup.class})
+//    private Integer age;
+//
+//    /**
+//     * 星座
+//1:'白羊座', 2:'金牛座', 3:'双子座', 4:'巨蟹座', 5:'狮子座', 6:'处女座',
+//7:'天秤座', 8:'天蝎座', 9:'射手座', 10:'摩羯座', 11:'水瓶座', 12:'双鱼座'
+//     */
+//    @NotNull(message = "星座
+//1:'白羊座', 2:'金牛座', 3:'双子座', 4:'巨蟹座', 5:'狮子座', 6:'处女座',
+//7:'天秤座', 8:'天蝎座', 9:'射手座', 10:'摩羯座', 11:'水瓶座', 12:'双鱼座'不能为空", groups = {AddGroup.class, EditGroup.class})
+//    private Integer starSigns;
+//
+//    /**
+//     *
+//     */
+//    @NotNull(message = "不能为空", groups = {AddGroup.class, EditGroup.class})
+//    private Integer face;
+//
+//    /**
+//     * 发言人Id
+//     */
+//    @NotNull(message = "发言人Id不能为空", groups = {AddGroup.class, EditGroup.class})
+//    private Integer speackerId;
+//
+//    /**
+//     * 场景list,暂存json
+//     */
+//    @NotBlank(message = "场景list,暂存json不能为空", groups = {AddGroup.class, EditGroup.class})
+//    private String sceneList;
+//
+//}

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

@@ -1,15 +1,15 @@
-package com.xyzc.start.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xyzc.start.domain.NpMusic;
-import com.xyzc.start.domain.NpText;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface NpTextMapper extends BaseMapper<NpText> {
-
-    List<NpText> queryText(NpText npText);
-}
+//package com.xyzc.start.mapper;
+//
+//
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+//import com.xyzc.start.domain.NpMusic;
+//import com.xyzc.start.domain.NpText;
+//import org.springframework.stereotype.Repository;
+//
+//import java.util.List;
+//
+//@Repository
+//public interface NpTextMapper extends BaseMapper<NpText> {
+//
+//    List<NpText> queryText(NpText npText);
+//}

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

@@ -1,7 +1,7 @@
 package com.xyzc.start.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xyzc.start.domain.NpText;
+//import com.xyzc.start.domain.NpText;
 import com.xyzc.start.domain.NpVideoConflate;
 import org.springframework.stereotype.Repository;
 

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

@@ -20,5 +20,5 @@ public interface NumPersonMapper extends BaseMapper<NpSound> {
          * 查询公共模特
          * @return
          */
-        List<NpTemplate> queryCommonTemplate();
+        List<NpTemplate> queryCommonTemplate(Integer start, Integer end);
 }

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

@@ -2,7 +2,6 @@ package com.xyzc.start.service;
 
 import com.xyzc.start.domain.NpCommitTrain;
 import com.xyzc.start.domain.NpMusic;
-import com.xyzc.start.domain.NpText;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -21,5 +20,5 @@ public interface INpCommitService {
 
     void uploadMusic(NpMusic npMusic);
 
-    void uploadText(NpText npText);
+//    void uploadText(NpText npText);
 }

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

@@ -15,6 +15,13 @@ public interface INpQueryService {
 
     List<NpSound> queryCompanySound(Integer type, Integer page, Integer size);
 
+    /**
+     * 查询共同模板
+     * @return
+     */
+    List<NpTemplate> queryCommonTemplate(Integer page, Integer size);
+    List<NpCommitTrain> queryTrainingModel(Integer page, Integer size);
+
     public List<NpCommitTrain> queryTrainVideo(Integer page, Integer size);
 
     /**
@@ -24,7 +31,7 @@ public interface INpQueryService {
     List<NpMusic> queryMusic(NpMusic npMusic);
 
 
-    List<NpText> queryNpText(NpText npText);
+//    List<NpText> queryNpText(NpText npText);
 
 
     public List<NpMaterial> queryMaterial(String rootId, Integer page, Integer size);

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

@@ -15,17 +15,12 @@ public interface INumPersonService {
 
     void freeModelListQuery();
 
-    /**
-     * 查询共同模板
-     * @return
-     */
-    List<NpTemplate> queryCommonTemplate();
 
     /**
      * 查询用户下的数字人模板
      * @return
      */
-    List<NpCommitTrain> queryTrainingModel();
+//    List<NpCommitTrain> queryTrainingModel();
 
     /**
      * 数字人训练的异步通知

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

@@ -2,19 +2,16 @@ package com.xyzc.start.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xyzc.common.core.exception.ErrorCode;
 import com.xyzc.common.core.exception.ServerException;
 import com.xyzc.common.web.security.user.SecurityUser;
 import com.xyzc.start.domain.NpCommitTrain;
 import com.xyzc.start.domain.NpMaterial;
 import com.xyzc.start.domain.NpMusic;
-import com.xyzc.start.domain.NpText;
 import com.xyzc.start.mapper.NpCommitTrainMapper;
 import com.xyzc.start.mapper.NpMaterialMapper;
 import com.xyzc.start.mapper.NpMusicMapper;
-import com.xyzc.start.mapper.NpTextMapper;
+//import com.xyzc.start.mapper.NpTextMapper;
 import com.xyzc.start.service.INpCommitService;
 import com.xyzc.start.service.INpQueryService;
 import lombok.RequiredArgsConstructor;
@@ -34,12 +31,8 @@ import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import static com.xyzc.start.utils.EncryptUtil.getMD5Byparam;
 
@@ -66,7 +59,7 @@ public class NpCommitServiceImpl implements INpCommitService {
 
     private final NpMusicMapper npMusicMapper;
 
-    private final NpTextMapper npTextMapper;
+//    private final NpTextMapper npTextMapper;
 
     private INpQueryService queryService;
 
@@ -366,24 +359,29 @@ public class NpCommitServiceImpl implements INpCommitService {
 
     }
 
-    @Override
-    public void uploadText(NpText npText) {
-        if (Strings.isBlank(npText.getText())) {
-            log.error("请输入文本");
-            throw new ServerException(ErrorCode.NUMERSON_NO_TEXT);
-        }
-        if (Strings.isBlank(npText.getImgUrl())) {
-            log.error("请输入地址");
-            throw new ServerException(ErrorCode.NUMERSON_NO_URL);
-        }
-        if (Strings.isBlank(npText.getImgUrl())) {
-            log.error("请输入地址");
-            throw new ServerException(ErrorCode.NUMERSON_NO_TYPE);
-        }
+//    @Override
+//    public void uploadText(NpText npText) {
+//
+//    }
 
-        npText.setBaseUserId(SecurityUser.getUserId());
-        npTextMapper.insert(npText);
-    }
+//    @Override
+//    public void uploadText(NpText npText) {
+//        if (Strings.isBlank(npText.getText())) {
+//            log.error("请输入文本");
+//            throw new ServerException(ErrorCode.NUMERSON_NO_TEXT);
+//        }
+//        if (Strings.isBlank(npText.getImgUrl())) {
+//            log.error("请输入地址");
+//            throw new ServerException(ErrorCode.NUMERSON_NO_URL);
+//        }
+//        if (Strings.isBlank(npText.getImgUrl())) {
+//            log.error("请输入地址");
+//            throw new ServerException(ErrorCode.NUMERSON_NO_TYPE);
+//        }
+//
+//        npText.setBaseUserId(SecurityUser.getUserId());
+//        npTextMapper.insert(npText);
+//    }
 
     /**
      * 3.6 创建视频合成任务-音频合成

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

@@ -44,7 +44,7 @@ public class NpQueryServiceImpl implements INpQueryService {
 
     private final NpMusicMapper npMusicMapper;
 
-    private final NpTextMapper npTextMapper;
+//    private final NpTextMapper npTextMapper;
 
     private INpCommitService commitService;
 
@@ -255,24 +255,62 @@ public class NpQueryServiceImpl implements INpQueryService {
             size = 10;
         }
         int start = page*size - size;
-        int end = page*size;
+//        int end = page*size;
         List<NpSound> npSoundList = null;
         if (1 == type) {
-            npSoundList = numPersonMapper.queryCompanySound(null, type, start, end);
+            npSoundList = numPersonMapper.queryCompanySound(null, type, start, size);
         }
         if (2 == type) {
             Long baseUserId = SecurityUser.getUserId();
-            npSoundList = numPersonMapper.queryCompanySound(baseUserId, type, start, end);
+            npSoundList = numPersonMapper.queryCompanySound(baseUserId, type, start, size);
         }
         return npSoundList;
     }
 
+    @Override
+    public List<NpTemplate> queryCommonTemplate(Integer page, Integer size) {
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        if (size == null || size < 0) {
+            size = 10;
+        }
+        int start = page*size - size;
+//        int end = page * size;
+        List<NpTemplate> npTemplateList = numPersonMapper.queryCommonTemplate(start, size);
+        //        List<NpCommitTrain> npCommitTrains = npCommitTrainMapper.selectList(new QueryWrapper<NpCommitTrain>().eq("base_user_id", baseUserId).eq("status", "2").last("limit " + start + "," + end)
+//                .select("id, cover_url, scene_id, title"));
+        return npTemplateList;
+    }
+
+    @Override
+    public List<NpCommitTrain> queryTrainingModel(Integer page, Integer size) {
+        if (page == null || page == 0) {
+            page = 1;
+        }
+        if (size == null || size < 0) {
+            size = 10;
+        }
+        int start = page*size - size;
+        List<NpCommitTrain> npCommitTrains = npCommitTrainMapper.selectList(new QueryWrapper<NpCommitTrain>().eq("base_user_id", SecurityUser.getUserId()).eq("status", "2")
+                .last("limit " + start + "," + size).select("model_id, video_url,title, cover_url, scene_id, robot_json"));
+        return npCommitTrains;
+    }
+
+
+//    public List<NpCommitTrain> queryTrainingModel() {
+////        // TODO 必须再加上baseuserId
+////        Long baseUserId = SecurityUser.getUserId();
+////        List<NpMaterial> npMaterials = materialMapper.selectList(new QueryWrapper<NpMaterial>().eq("base_user_id", baseUserId)
+////                .eq("material_type", rootId).eq("del_flag", "0").last("limit " + start + "," + end)
+////                .select("material_id, url, description, background_name"));
+//        List<NpCommitTrain> npCommitTrains = npCommitTrainMapper.selectList(new QueryWrapper<NpCommitTrain>().eq("base_user_id", SecurityUser.getUserId()).eq("status", "2")
+//                .select("model_id, video_url,title, cover_url, scene_id, robot_json"));
+//        return npCommitTrains;
+//    }
+
     /**
-     * 查询公共模特
-     * @param rootId
-     * @param page
-     * @param size
-     * @return
+     * 训练数字人的查询
      */
     @Override
     public List<NpCommitTrain> queryTrainVideo(Integer page, Integer size) {
@@ -283,9 +321,9 @@ public class NpQueryServiceImpl implements INpQueryService {
             size = 10;
         }
         int start = page*size - size;
-        int end = page * size;
+//        int end = page * size;
         Long baseUserId = SecurityUser.getUserId();
-        List<NpCommitTrain> npCommitTrains = npCommitTrainMapper.selectList(new QueryWrapper<NpCommitTrain>().eq("base_user_id", baseUserId).eq("status", "2").last("limit " + start + "," + end)
+        List<NpCommitTrain> npCommitTrains = npCommitTrainMapper.selectList(new QueryWrapper<NpCommitTrain>().eq("base_user_id", baseUserId).eq("status", "2").last("limit " + start + "," + size)
                 .select("id, cover_url, scene_id, title"));
         return npCommitTrains;
     }
@@ -296,12 +334,20 @@ public class NpQueryServiceImpl implements INpQueryService {
         return npMusics;
     }
 
-    @Override
-    public List<NpText> queryNpText(NpText npText) {
-        List<NpText> npTextList = npTextMapper.queryText(npText);
-        return npTextList;
-    }
+//    @Override
+//    public List<NpText> queryNpText(NpText npText) {
+//        List<NpText> npTextList = npTextMapper.queryText(npText);
+//        return npTextList;
+//    }
+
 
+    /**
+     * 查询素材
+     * @param rootId
+     * @param page
+     * @param size
+     * @return
+     */
     @Override
     public List<NpMaterial> queryMaterial(String rootId, Integer page, Integer size) {
         if (null == rootId) {
@@ -315,10 +361,10 @@ public class NpQueryServiceImpl implements INpQueryService {
             size = 10;
         }
         int start = page*size - size;
-        int end = page*size;
+//        int end = page*size;
         Long baseUserId = SecurityUser.getUserId();
         List<NpMaterial> npMaterials = materialMapper.selectList(new QueryWrapper<NpMaterial>().eq("base_user_id", baseUserId)
-                .eq("material_type", rootId).eq("del_flag", "0").last("limit " + start + "," + end)
+                .eq("material_type", rootId).eq("del_flag", "0").last("limit " + start + "," + size)
                 .select("material_id, url, description, background_name"));
         return npMaterials;
     }

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

@@ -157,16 +157,10 @@ public class NumPersonServiceImpl implements INumPersonService {
 
 
 
-    public List<NpTemplate> queryCommonTemplate() {
-        return numPersonMapper.queryCommonTemplate();
-    }
+//    public List<NpTemplate> queryCommonTemplate(Integer page, Integer size) {
+//        return numPersonMapper.queryCommonTemplate();
+//    }
 
-    public List<NpCommitTrain> queryTrainingModel() {
-        // TODO 必须再加上baseuserId
-        List<NpCommitTrain> npCommitTrains = npCommitTrainMapper.selectList(new QueryWrapper<NpCommitTrain>().eq("base_user_id", SecurityUser.getUserId()).eq("status", "2")
-                .select("model_id, video_url,title, cover_url, scene_id, robot_json"));
-        return npCommitTrains;
-    }
 
     public String getToken() throws NoSuchAlgorithmException {
 //        String input = "password123";

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

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xyzc.start.mapper.NpTextMapper">
-
-    <select id="queryText" resultType="com.xyzc.start.domain.NpText">
-        SELECT
-               `id`
-             , `text`
-             , `img_url`
-             , `type`
-             , `base_user_id`
-        FROM xy_np_text
-        <where>
-            <if test="text != null and text != ''">
-                and text like concat('%',#{text},'%')
-            </if>
-            <if test="imgUrl != null and imgUrl != ''">
-                and img_url = #{imgUrl}
-            </if>
-            <if test="type != null and type != ''">
-                and type = #{type}
-            </if>
-            and base_user_id = #{baseUserId}
-        </where>
-    </select>
-</mapper>

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

@@ -46,5 +46,6 @@
              , `popularity`
              , `speaker_id`
         from xy_np_template
+        limit #{start},#{end}
     </select>
 </mapper>