|
@@ -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;
|
|
|
|
|
|
/**
|
|
|
* 查询素材
|