|
@@ -1,7 +1,9 @@
|
|
package com.xyzc.start.service.impl;
|
|
package com.xyzc.start.service.impl;
|
|
|
|
|
|
|
|
+import cn.hutool.core.date.DateUtil;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.xyzc.common.core.exception.ErrorCode;
|
|
import com.xyzc.common.core.exception.ErrorCode;
|
|
import com.xyzc.common.core.exception.ServerException;
|
|
import com.xyzc.common.core.exception.ServerException;
|
|
import com.xyzc.common.web.security.user.SecurityUser;
|
|
import com.xyzc.common.web.security.user.SecurityUser;
|
|
@@ -9,8 +11,10 @@ import com.xyzc.start.domain.*;
|
|
import com.xyzc.start.mapper.*;
|
|
import com.xyzc.start.mapper.*;
|
|
import com.xyzc.start.service.INpCommitService;
|
|
import com.xyzc.start.service.INpCommitService;
|
|
import com.xyzc.start.service.INpQueryService;
|
|
import com.xyzc.start.service.INpQueryService;
|
|
|
|
+import com.xyzc.start.utils.SnowflakeIdWorker;
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
+import org.apache.logging.log4j.util.Strings;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.context.annotation.Lazy;
|
|
import org.springframework.context.annotation.Lazy;
|
|
import org.springframework.http.HttpEntity;
|
|
import org.springframework.http.HttpEntity;
|
|
@@ -19,10 +23,7 @@ import org.springframework.stereotype.Service;
|
|
import org.springframework.web.client.RestTemplate;
|
|
import org.springframework.web.client.RestTemplate;
|
|
|
|
|
|
import java.security.NoSuchAlgorithmException;
|
|
import java.security.NoSuchAlgorithmException;
|
|
-import java.util.ArrayList;
|
|
|
|
-import java.util.Arrays;
|
|
|
|
-import java.util.LinkedHashMap;
|
|
|
|
-import java.util.List;
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
@Service
|
|
@Service
|
|
@RequiredArgsConstructor
|
|
@RequiredArgsConstructor
|
|
@@ -50,6 +51,10 @@ public class NpQueryServiceImpl implements INpQueryService {
|
|
|
|
|
|
private final NpMaterialMapper materialMapper;
|
|
private final NpMaterialMapper materialMapper;
|
|
|
|
|
|
|
|
+ private final NpTemplateDraftMapper npTemplateDraftMapper;
|
|
|
|
+
|
|
|
|
+ private final NpVideoDraftMapper videoDraftMapper;
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
public void NpCommitServiceImpl(@Lazy INpCommitService commitService) {
|
|
public void NpCommitServiceImpl(@Lazy INpCommitService commitService) {
|
|
this.commitService = commitService;
|
|
this.commitService = commitService;
|
|
@@ -244,30 +249,79 @@ public class NpQueryServiceImpl implements INpQueryService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public List<NpSound> queryCompanySound(Integer type, Integer page, Integer size){
|
|
|
|
|
|
+ public Page<NpSound> queryCompanySound(Integer type, String name, Integer pageNum, Integer size){
|
|
if (type == null) {
|
|
if (type == null) {
|
|
|
|
|
|
}
|
|
}
|
|
- if (page == null || page == 0) {
|
|
|
|
- page = 1;
|
|
|
|
|
|
+ if (pageNum == null || pageNum == 0) {
|
|
|
|
+ pageNum = 1;
|
|
}
|
|
}
|
|
if (size == null || size < 0) {
|
|
if (size == null || size < 0) {
|
|
size = 10;
|
|
size = 10;
|
|
}
|
|
}
|
|
- int start = page*size - size;
|
|
|
|
-// int end = page*size;
|
|
|
|
- List<NpSound> npSoundList = null;
|
|
|
|
|
|
+ Page<NpSound> npSoundList = null;
|
|
|
|
+ Page<NpSound> page = new Page<>(pageNum, size);
|
|
|
|
+ if (!Strings.isBlank(name)) {
|
|
|
|
+ npSoundList = numPersonMapper.queryCompanySound(SecurityUser.getUserId(), type, name, page);
|
|
|
|
+ return npSoundList;
|
|
|
|
+ }
|
|
if (1 == type) {
|
|
if (1 == type) {
|
|
- npSoundList = numPersonMapper.queryCompanySound(null, type, start, size);
|
|
|
|
|
|
+ npSoundList = numPersonMapper.queryCompanySound(null, type, null, page);
|
|
}
|
|
}
|
|
if (2 == type) {
|
|
if (2 == type) {
|
|
Long baseUserId = SecurityUser.getUserId();
|
|
Long baseUserId = SecurityUser.getUserId();
|
|
- npSoundList = numPersonMapper.queryCompanySound(baseUserId, type, start, size);
|
|
|
|
|
|
+ npSoundList = numPersonMapper.queryCompanySound(baseUserId, type,null, page);
|
|
}
|
|
}
|
|
return npSoundList;
|
|
return npSoundList;
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
|
+ public Page<NpFormwork> getCommonTemplate(Integer type, Integer pageNum, Integer size) {
|
|
|
|
+ if (type == null) {
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ if (pageNum == null || pageNum == 0) {
|
|
|
|
+ pageNum = 1;
|
|
|
|
+ }
|
|
|
|
+ if (size == null || size < 0) {
|
|
|
|
+ size = 10;
|
|
|
|
+ }
|
|
|
|
+ Page<NpFormwork> formworkPage = null;
|
|
|
|
+ Page<NpFormwork> page = new Page<>(pageNum, size);
|
|
|
|
+// if (1 == type) {
|
|
|
|
+ formworkPage = npTemplateDraftMapper.getCommonTemplate(null, type, page);
|
|
|
|
+// }
|
|
|
|
+// if (2 == type) {
|
|
|
|
+// Long baseUserId = SecurityUser.getUserId();
|
|
|
|
+// formworkPage = npTemplateDraftMapper.getCommonTemplate(baseUserId, type, page);
|
|
|
|
+// }
|
|
|
|
+ return formworkPage;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public Page<NpTemplateDraft> sortDraftByUpdate(Integer pageNum, Integer size) {
|
|
|
|
+// if (type == null) {
|
|
|
|
+//
|
|
|
|
+// }
|
|
|
|
+ if (pageNum == null || pageNum == 0) {
|
|
|
|
+ pageNum = 1;
|
|
|
|
+ }
|
|
|
|
+ if (size == null || size < 0) {
|
|
|
|
+ size = 10;
|
|
|
|
+ }
|
|
|
|
+ Page<NpTemplateDraft> templateDraftPage = null;
|
|
|
|
+ Page<NpTemplateDraft> page = new Page<>(pageNum, size);
|
|
|
|
+// if (1 == type) {
|
|
|
|
+ templateDraftPage = npTemplateDraftMapper.sortDraftByUpdate(SecurityUser.getUserId(), page);
|
|
|
|
+// }
|
|
|
|
+// if (2 == type) {
|
|
|
|
+// Long baseUserId = SecurityUser.getUserId();
|
|
|
|
+// formworkPage = npTemplateDraftMapper.getCommonTemplate(baseUserId, type, page);
|
|
|
|
+// }
|
|
|
|
+ return templateDraftPage;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
public List<NpTemplate> queryCommonTemplate(Integer page, Integer size) {
|
|
public List<NpTemplate> queryCommonTemplate(Integer page, Integer size) {
|
|
if (page == null || page == 0) {
|
|
if (page == null || page == 0) {
|
|
page = 1;
|
|
page = 1;
|
|
@@ -284,20 +338,53 @@ public class NpQueryServiceImpl implements INpQueryService {
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public List<NpCommitTrain> queryTrainingModel(Integer page, Integer size) {
|
|
|
|
- if (page == null || page == 0) {
|
|
|
|
- page = 1;
|
|
|
|
|
|
+ public Page<NpCommitTrain> queryTrainingModel(Integer type, String name, Integer pageNum, Integer size) {
|
|
|
|
+ if (pageNum == null || pageNum == 0) {
|
|
|
|
+ pageNum = 1;
|
|
}
|
|
}
|
|
if (size == null || size < 0) {
|
|
if (size == null || size < 0) {
|
|
size = 10;
|
|
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;
|
|
|
|
|
|
+
|
|
|
|
+ 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;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public NpTemplateDraft getTemplateDraft(String templateId) {
|
|
|
|
+ if (Strings.isBlank(templateId)) {
|
|
|
|
+ NpTemplateDraft npTemplateDraft = new NpTemplateDraft();
|
|
|
|
+ NpFormwork templateDraft = npTemplateDraftMapper.getTemplateDraft("1");
|
|
|
|
+ npTemplateDraft.setNodes(templateDraft.getNodes());
|
|
|
|
+ // 生成id
|
|
|
|
+ SnowflakeIdWorker idGenerator = new SnowflakeIdWorker(1, 1);
|
|
|
|
+ npTemplateDraft.setId(idGenerator.generateId());
|
|
|
|
+ npTemplateDraft.setBaseUserId(SecurityUser.getUserId());
|
|
|
|
+ String yyyyMMddHHmmss = DateUtil.format(new Date(), "yyyyMMddHHmmss");
|
|
|
|
+ npTemplateDraft.setDraftName("未命名-" + yyyyMMddHHmmss);
|
|
|
|
+ npTemplateDraftMapper.insert(npTemplateDraft);
|
|
|
|
+// log.info("插入成功");
|
|
|
|
+ return npTemplateDraft;
|
|
|
|
+ }
|
|
|
|
+ // 查询草稿
|
|
|
|
+ NpTemplateDraft npTemplateDraft = npTemplateDraftMapper.selectOne(new QueryWrapper<NpTemplateDraft>().eq("id", templateId));
|
|
|
|
+ return npTemplateDraft;
|
|
|
|
+ }
|
|
|
|
+
|
|
// public List<NpCommitTrain> queryTrainingModel() {
|
|
// public List<NpCommitTrain> queryTrainingModel() {
|
|
//// // TODO 必须再加上baseuserId
|
|
//// // TODO 必须再加上baseuserId
|
|
//// Long baseUserId = SecurityUser.getUserId();
|
|
//// Long baseUserId = SecurityUser.getUserId();
|
|
@@ -330,7 +417,7 @@ public class NpQueryServiceImpl implements INpQueryService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<NpMusic> queryMusic(NpMusic npMusic) {
|
|
public List<NpMusic> queryMusic(NpMusic npMusic) {
|
|
- List<NpMusic> npMusics = npMusicMapper.queryMusic(npMusic);
|
|
|
|
|
|
+ List<NpMusic> npMusics = npMusicMapper.queryMusic(SecurityUser.getUserId(), npMusic);
|
|
return npMusics;
|
|
return npMusics;
|
|
}
|
|
}
|
|
|
|
|