Skip to content

H
hxwza
提交 2d9603a7 authored 作者: liupengfei's avatar liupengfei
浏览文件
操作

--no commit message

上级 4f3e87cc
隐藏空白字符变更
内嵌 并排
正在显示 包含 53 行增加 和 0 行删除
app/resource/src/main/java/com/zrqx/resource/fg/service/audiolibrary/FgAudioLibrarySerivceImpl.java
浏览文件 @ 2d9603a7
......@@ -45,6 +45,7 @@ import com.zrqx.resource.commons.model.courcelibrary.CourseLibrary;
import com.zrqx.resource.commons.vo.fg.audiolibrary.FgAudioLibraryListVO;
import com.zrqx.resource.commons.vo.fg.audiolibrary.FgAudioLibraryVO;
import com.zrqx.resource.commons.vo.fg.authorlibrary.FgAboutEbookListVO;
import com.zrqx.resource.commons.vo.fg.authorlibrary.FgAuthorListVO;
import com.zrqx.resource.commons.vo.fg.videolibrary.FgVideoLibraryVO;
import com.zrqx.resource.fg.manage.memberconllection.FgMemberConllectionManage;
import com.zrqx.resource.fg.mapper.FgRelationAuthorMapper;
......@@ -441,6 +442,7 @@ public class FgAudioLibrarySerivceImpl extends
@Override
public PageInfo<FgAudioLibraryListVO> queryRecommendAudioList(FgQueryRecommedAudioForm form, PageParam pageParam) {
boolean isComplete = false; // 是否补全
boolean isEntity = false; // 推荐位是否为空
List<FgAudioLibraryListVO> lis = new ArrayList<FgAudioLibraryListVO>(); // 补充数据
List<FgAudioLibraryListVO> list = new ArrayList<FgAudioLibraryListVO>();
if(ArrayUtils.isNotEmpty(form.getIds())){
......@@ -454,6 +456,7 @@ public class FgAudioLibrarySerivceImpl extends
lis = mapper.queryOtherRecommendAudio(form);
if(list.size() == 0){
list = lis;
isEntity = true;
} else {
list.addAll(lis);
isComplete = true;
......@@ -465,6 +468,11 @@ public class FgAudioLibrarySerivceImpl extends
//TODO
});
PageInfo<FgAudioLibraryListVO> page = new PageInfo<FgAudioLibraryListVO>(list);
if (isEntity) {
startPage(pageParam);
List<FgAudioLibraryListVO> allList = mapper.queryOtherRecommendAudio(form);
page = new PageInfo<FgAudioLibraryListVO>(allList);
}
if(isComplete){
page.setSize(list.size());
page.setTotal(page.getTotal() + lis.size());
......
app/resource/src/main/java/com/zrqx/resource/fg/service/authorlibrary/FgAuthorLibraryServiceImpl.java
浏览文件 @ 2d9603a7
......@@ -33,6 +33,7 @@ import com.zrqx.resource.commons.vo.fg.authorlibrary.FgAboutEbookListVO;
import com.zrqx.resource.commons.vo.fg.authorlibrary.FgAuthorLibraryListVO;
import com.zrqx.resource.commons.vo.fg.authorlibrary.FgAuthorLibraryOneVO;
import com.zrqx.resource.commons.vo.fg.authorlibrary.FgAuthorListVO;
import com.zrqx.resource.commons.vo.fg.projectlibrary.FgProjectLibraryListVO;
import com.zrqx.resource.fg.manage.memberconllection.FgMemberConllectionManage;
import com.zrqx.resource.fg.mapper.FgRelationAuthorMapper;
import com.zrqx.resource.fg.mapper.FgResourceRelationMapper;
......@@ -317,6 +318,7 @@ public class FgAuthorLibraryServiceImpl extends BaseServiceImpl<AuthorLibrary, S
public PageInfo<FgAuthorListVO> getRecommendList(
FgQueryRecommedResourceForm form, PageParam pageParam) {
boolean isComplete = false; // 是否补全
boolean isEntity = false; // 推荐位是否为空
List<FgAuthorListVO> list = new ArrayList<FgAuthorListVO>();
List<FgAuthorListVO> lis = new ArrayList<FgAuthorListVO>(); // 补充数据
if(ArrayUtils.isNotEmpty(form.getIds())){
......@@ -344,6 +346,7 @@ public class FgAuthorLibraryServiceImpl extends BaseServiceImpl<AuthorLibrary, S
});
if(list.size() == 0){
list = lis;
isEntity = true;
} else {
list.addAll(lis);
isComplete = true;
......@@ -351,6 +354,11 @@ public class FgAuthorLibraryServiceImpl extends BaseServiceImpl<AuthorLibrary, S
}
regEx(list);
PageInfo<FgAuthorListVO> page = new PageInfo<FgAuthorListVO>(list);
if (isEntity) {
startPage(pageParam);
List<FgAuthorListVO> allList = authorLibraryMapper.getOtherRecommendList(form);
page = new PageInfo<FgAuthorListVO>(allList);
}
if(isComplete){
page.setSize(list.size());
page.setTotal(page.getTotal() + lis.size());
......
app/resource/src/main/java/com/zrqx/resource/fg/service/ebook/FgEbookServiceImpl.java
浏览文件 @ 2d9603a7
......@@ -104,6 +104,7 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
@Override
public PageInfo<FgEbookListVO> getRecommendList(FgQueryRecommedEbookForm form, PageParam pageParam) {
boolean isComplete = false; // 是否补全
boolean isEntity = false; // 推荐位是否为空
List<FgEbookListVO> list = new ArrayList<FgEbookListVO>();
List<FgEbookListVO> lis = new ArrayList<FgEbookListVO>(); // 补充数据
// 查询从推荐位传的id集合，查询医著信息
......@@ -118,6 +119,7 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
lis = ebookMapper.getOtherRecommendList(form);
if (list.size() == 0) {
list = lis;
isEntity = true;
} else {
list.addAll(lis);
isComplete = true;
......@@ -139,6 +141,11 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
// 去标签
regEx(list);
PageInfo<FgEbookListVO> page = new PageInfo<FgEbookListVO>(list);
if (isEntity) {
startPage(pageParam);
List<FgEbookListVO> allList = ebookMapper.getOtherRecommendList(form);
page = new PageInfo<FgEbookListVO>(allList);
}
if (isComplete) {
page.setSize(list.size());
page.setTotal(page.getTotal() + lis.size());
......@@ -725,6 +732,7 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
@Override
public PageInfo<FgEbookListVO> getDiyTypeRecommendList(FgQueryRecommedEbookForm form, PageParam pageParam) {
boolean isComplete = false; // 是否补全
boolean isEntity = false; // 推荐位是否为空
List<FgEbookListVO> list = new ArrayList<FgEbookListVO>();
List<FgEbookListVO> lis = new ArrayList<FgEbookListVO>(); // 补充数据
// 查询从推荐位传的id集合，查询医著信息
......@@ -739,6 +747,7 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
lis = ebookMapper.getDiyTypeOtherRecommendList(form);
if (list.size() == 0) {
list = lis;
isEntity = true;
} else {
list.addAll(lis);
isComplete = true;
......@@ -747,6 +756,11 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
// 去标签
regEx(list);
PageInfo<FgEbookListVO> page = new PageInfo<FgEbookListVO>(list);
if (isEntity) {
startPage(pageParam);
List<FgEbookListVO> allList = ebookMapper.getDiyTypeOtherRecommendList(form);
page = new PageInfo<FgEbookListVO>(allList);
}
if (isComplete) {
page.setSize(list.size());
page.setTotal(page.getTotal() + lis.size());
......
app/resource/src/main/java/com/zrqx/resource/fg/service/projectlibrary/FgProjectLibrarySerivceImpl.java
浏览文件 @ 2d9603a7
......@@ -115,6 +115,7 @@ public class FgProjectLibrarySerivceImpl extends
public PageInfo<FgProjectLibraryListVO> queryRecommendProjectList(
FgQueryRecommedResourceForm form, PageParam pageParam) {
boolean isComplete = false; // 是否补全
boolean isEntity = false; // 推荐位是否为空
List<FgProjectLibraryListVO> list = new ArrayList<FgProjectLibraryListVO>();
List<FgProjectLibraryListVO> lis = new ArrayList<FgProjectLibraryListVO>(); // 补充数据
if(ArrayUtils.isNotEmpty(form.getIds())){
......@@ -128,6 +129,7 @@ public class FgProjectLibrarySerivceImpl extends
lis = mapper.queryOtherRecommendProject(form);
if(list.size() == 0){
list = lis;
isEntity = true;
} else {
list.addAll(lis);
isComplete = true;
......@@ -135,6 +137,11 @@ public class FgProjectLibrarySerivceImpl extends
}
regEx(list);
PageInfo<FgProjectLibraryListVO> page = new PageInfo<FgProjectLibraryListVO>(list);
if (isEntity) {
startPage(pageParam);
List<FgProjectLibraryListVO> allList = mapper.queryOtherRecommendProject(form);
page = new PageInfo<FgProjectLibraryListVO>(allList);
}
if(isComplete){
page.setSize(list.size());
page.setTotal(page.getTotal() + lis.size());
......
app/resource/src/main/java/com/zrqx/resource/fg/service/videolibrary/FgVideoLibrarySerivceImpl.java
浏览文件 @ 2d9603a7
......@@ -51,7 +51,9 @@ import com.zrqx.resource.commons.model.videolibrary.TimeLengthRecord;
import com.zrqx.resource.commons.model.videolibrary.VideoLibrary;
import com.zrqx.resource.commons.model.videolibrary.VideoLibraryDiyType;
import com.zrqx.resource.commons.vo.fg.authorlibrary.FgAboutEbookListVO;
import com.zrqx.resource.commons.vo.fg.authorlibrary.FgAuthorListVO;
import com.zrqx.resource.commons.vo.fg.courselibrary.FgRecommendCourseVo;
import com.zrqx.resource.commons.vo.fg.projectlibrary.FgProjectLibraryListVO;
import com.zrqx.resource.commons.vo.fg.videolibrary.FgVideoLibraryListVO;
import com.zrqx.resource.commons.vo.fg.videolibrary.FgVideoLibraryVO;
import com.zrqx.resource.fg.manage.memberconllection.FgMemberConllectionManage;
......@@ -616,6 +618,7 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary, Str
@Override
public PageInfo<FgVideoLibraryListVO> queryRecommendVideoAndAudio(FgQueryRecommedVideoForm form, PageParam pageParam) {
boolean isComplete = false; // 是否补全
boolean isEntity = false; // 推荐位是否为空
List<FgVideoLibraryListVO> lis = new ArrayList<FgVideoLibraryListVO>(); // 补充数据
List<FgVideoLibraryListVO> list = new ArrayList<FgVideoLibraryListVO>();
if(ArrayUtils.isNotEmpty(form.getIds())){
......@@ -629,6 +632,7 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary, Str
lis = mapper.queryOtherRecommendVideoAndAudio(form);
if(list.size() == 0){
list = lis;
isEntity = true;
} else {
list.addAll(lis);
isComplete = true;
......@@ -636,6 +640,11 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary, Str
}
regEx(list);
PageInfo<FgVideoLibraryListVO> page = new PageInfo<FgVideoLibraryListVO>(list);
if (isEntity) {
startPage(pageParam);
List<FgVideoLibraryListVO> allList = mapper.queryOtherRecommendVideoAndAudio(form);
page = new PageInfo<FgVideoLibraryListVO>(allList);
}
if(isComplete){
page.setSize(list.size());
page.setTotal(page.getTotal() + lis.size());
......@@ -664,6 +673,7 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary, Str
@Override
public PageInfo<FgVideoLibraryListVO> queryRecommendVideo(FgQueryRecommedVideoForm form, PageParam pageParam) {
boolean isComplete = false; // 是否补全
boolean isEntity = false; // 推荐位是否为空
List<FgVideoLibraryListVO> lis = new ArrayList<FgVideoLibraryListVO>(); // 补充数据
List<FgVideoLibraryListVO> list = new ArrayList<FgVideoLibraryListVO>();
if(ArrayUtils.isNotEmpty(form.getIds())){
......@@ -677,6 +687,7 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary, Str
lis = mapper.queryOtherRecommendVideo(form);
if(list.size() == 0){
list = lis;
isEntity = true;
} else {
list.addAll(lis);
isComplete = true;
......@@ -684,6 +695,11 @@ public class FgVideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary, Str
}
regEx(list);
PageInfo<FgVideoLibraryListVO> page = new PageInfo<FgVideoLibraryListVO>(list);
if (isEntity) {
startPage(pageParam);
List<FgVideoLibraryListVO> allList = mapper.queryOtherRecommendVideo(form);
page = new PageInfo<FgVideoLibraryListVO>(allList);
}
if(isComplete){
page.setSize(list.size());
page.setTotal(page.getTotal() + lis.size());
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论