|
@@ -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;
|
|
|
}
|