Skip to content

N
nrgl
提交 63bdd93f authored 作者: renjiancai's avatar renjiancai
浏览文件
操作

--no commit message

上级 9ac319c9
隐藏空白字符变更
内嵌 并排
正在显示 包含 82 行增加 和 32 行删除
com.zrqx.core/src/main/java/com/zrqx/core/enums/ResourceTypeEnum.java
浏览文件 @ 63bdd93f
......@@ -8,7 +8,7 @@ import java.util.HashMap;
* @date 2018年7月11日上午10:48:39
*/
public enum ResourceTypeEnum {
//1图书库 2文章库 3期刊库 4论文库 5图片库 6视频库 7音频库 8动画库 9课件库 10法规库 11标准库 12专利库 13成果库 14条文库 15课程库 15PDF库 16 专家库
//1图书库 2文章库 3期刊库 4论文库 5图片库 6视频库 7音频库 8动画库 9课件库 10法规库 11标准库 12专利库 13成果库 14条文库 15PDF库 16 专家库
/**
* 图书
*/
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/animationlibrary/AnimationLibraryController.java
浏览文件 @ 63bdd93f
......@@ -210,13 +210,6 @@ public class AnimationLibraryController {
}
return CallBack.success(new PageInfo<ResourceRelationVo>(resourceRelationService.queryRelationList(list)));
}
@ApiOperation(value = "选择弹窗中的列表" , notes ="查询选择弹窗中的列表")
@GetMapping(value =ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
public CallBack<PageInfo<AnimationLibraryListVO>> page(QueryResourceForPoPForm form, PageParam pageParam){
return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
}
@ApiOperation(value = "保存相关资源" , notes ="保存相关资源")
@PostMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.SAVE)
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity){
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/articlelibrary/ArticleLibraryController.java
浏览文件 @ 63bdd93f
......@@ -196,12 +196,6 @@ public class ArticleLibraryController {
return CallBack.success(new PageInfo<ResourceRelationVo>(resourceRelationService.queryRelationList(list)));
}
@ApiOperation(value = "选择弹窗中的列表", notes = "查询选择弹窗中的列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
public CallBack<PageInfo<ArticleLibraryListVO>> page(QueryResourceForPoPForm form, PageParam pageParam) {
return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
}
@ApiOperation(value = "保存相关资源", notes = "保存相关资源")
@PostMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.SAVE)
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity) {
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebooklibrary/EbookLibraryController.java
浏览文件 @ 63bdd93f
......@@ -34,6 +34,8 @@ import com.zrqx.core.form.resource.bg.ebook.SaveUpdateEbookForm;
import com.zrqx.core.form.resource.bg.ebook.UpdateEbookForm;
import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
import com.zrqx.core.model.resource.audiolibrary.AudioLibrary;
import com.zrqx.core.model.resource.clauseLibrary.ClauseLibrary;
import com.zrqx.core.model.resource.ebook.Book;
import com.zrqx.core.model.resource.ebook.BookDiyType;
import com.zrqx.core.model.resource.ebook.BookGoods;
......@@ -44,6 +46,8 @@ import com.zrqx.core.model.resource.ebook.BookResource;
import com.zrqx.core.model.resource.ebook.Ebook;
import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
import com.zrqx.core.model.resource.imagelibrary.ImageLibraryDiyType;
import com.zrqx.core.model.resource.patentLibrary.PatentLibrary;
import com.zrqx.core.model.resource.pdffilelibrary.PdfLibrary;
import com.zrqx.core.util.CallBack;
import com.zrqx.core.util.PageInfo;
import com.zrqx.core.util.PageParam;
......@@ -54,9 +58,18 @@ import com.zrqx.core.vo.resource.ResourceRelationVo;
import com.zrqx.core.vo.resource.ebook.EbookListVO;
import com.zrqx.core.vo.resource.ebook.EbookVO;
import com.zrqx.resource.bg.service.ResourceRelationService;
import com.zrqx.resource.bg.service.achievementLibrary.AchievementGoodsService;
import com.zrqx.resource.bg.service.achievementLibrary.AchievementLibraryService;
import com.zrqx.resource.bg.service.animationlibrary.AnimationLibraryService;
import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryDiyTypeService;
import com.zrqx.resource.bg.service.articlelibrary.ArticleLibraryService;
import com.zrqx.resource.bg.service.articlelibrary.ChapterLibraryService;
import com.zrqx.resource.bg.service.audiolibrary.AudioLibrarySerivceImpl;
import com.zrqx.resource.bg.service.audiolibrary.AudioLibraryService;
import com.zrqx.resource.bg.service.clauseLibrary.ClauseGoodsService;
import com.zrqx.resource.bg.service.clauseLibrary.ClauseLibraryService;
import com.zrqx.resource.bg.service.coursewarelibrary.CoursewareLibraryService;
import com.zrqx.resource.bg.service.criterionLibrary.CriterionLibraryService;
import com.zrqx.resource.bg.service.ebook.BookDiyTypeService;
import com.zrqx.resource.bg.service.ebook.BookGoodsAlbumService;
import com.zrqx.resource.bg.service.ebook.BookGoodsService;
......@@ -67,6 +80,14 @@ import com.zrqx.resource.bg.service.ebook.BookService;
import com.zrqx.resource.bg.service.ebook.EbookService;
import com.zrqx.resource.bg.service.imagelibrary.ImageLibraryDiyTypeRelationService;
import com.zrqx.resource.bg.service.imagelibrary.ImageLibraryService;
import com.zrqx.resource.bg.service.patentLibrary.PatentGoodsService;
import com.zrqx.resource.bg.service.patentLibrary.PatentLibraryService;
import com.zrqx.resource.bg.service.pdffilelibrary.PdfLibraryService;
import com.zrqx.resource.bg.service.periodical.PeriodVolumeService;
import com.zrqx.resource.bg.service.periodical.PeriodVolumeServiceImpl;
import com.zrqx.resource.bg.service.statuteLibrary.StatuteGoodsService;
import com.zrqx.resource.bg.service.statuteLibrary.StatuteLibraryService;
import com.zrqx.resource.bg.service.videolibrary.VideoLibraryService;
import com.zrqx.resource.commons.Redis;
/**
......@@ -110,6 +131,34 @@ public class EbookLibraryController {
private BookResourceService resourceService;
@Autowired
private ResourceRelationService resourceRelationService;
@Autowired
private ArticleLibraryService articleLibraryService;
@Autowired
private PatentLibraryService patentLibraryService;
@Autowired
private PeriodVolumeService periodVolumeService;
@Autowired
private ImageLibraryService imageLibraryService;
@Autowired
private VideoLibraryService videoLibraryService;
@Autowired
private AudioLibraryService audioLibraryService;
@Autowired
private AnimationLibraryService animationLibraryService;
@Autowired
private CoursewareLibraryService coursewareLibraryService;
@Autowired
private StatuteLibraryService statuteLibraryService;
@Autowired
private CriterionLibraryService criterionLibraryService;
@Autowired
private PatentLibraryService PatentLibraryService;
@Autowired
private AchievementLibraryService achievementLibraryService;
@Autowired
private ClauseLibraryService clauseLibraryService;
@Autowired
private PdfLibraryService pdfLibraryService;
@ApiOperation(value = "添加电子书", notes = "新增一个")
......@@ -350,7 +399,38 @@ public class EbookLibraryController {
@ApiOperation(value = "选择弹窗中的列表", notes = "查询选择弹窗中的列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
public CallBack<PageInfo<EbookListVO>> page(QueryResourceForPoPForm form, PageParam pageParam) {
return CallBack.success(ebookservice.pageByTitleAndDiyType(form, pageParam));
if(form.getResourceType().equals(1)){
ebookservice.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(2)){
articleLibraryService.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(3)){
patentLibraryService.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(4)){
patentLibraryService.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(5)){
imageLibraryService.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(6)){
videoLibraryService.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(7)){
audioLibraryService.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(8)){
animationLibraryService.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(9)){
coursewareLibraryService.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(10)){
statuteLibraryService.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(11)){
criterionLibraryService.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(12)){
PatentLibraryService.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(13)){
achievementLibraryService.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(14)){
clauseLibraryService.pageByTitleAndDiyType(form, pageParam);
}else if(form.getResourceType().equals(15)){
pdfLibraryService.pageByTitleAndDiyType(form, pageParam);
}
return CallBack.success();
}
@ApiOperation(value = "保存相关资源", notes = "保存相关资源")
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/imagelibrary/ImageLibraryController.java
浏览文件 @ 63bdd93f
......@@ -228,13 +228,6 @@ public class ImageLibraryController {
}
return CallBack.success(new PageInfo<ResourceRelationVo>(resourceRelationService.queryRelationList(list)));
}
@ApiOperation(value = "选择弹窗中的列表" , notes ="查询选择弹窗中的列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
public CallBack<PageInfo<ImageLibraryListVO>> page(QueryResourceForPoPForm form, PageParam pageParam){
return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
}
@ApiOperation(value = "保存相关资源" , notes ="保存相关资源")
@PostMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.SAVE)
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity){
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/pdffilelibrary/PdfLibraryController.java
浏览文件 @ 63bdd93f
......@@ -219,11 +219,6 @@ public class PdfLibraryController {
}
return CallBack.success(new PageInfo<ResourceRelationVo>(resourceRelationService.queryRelationList(list)));
}
@ApiOperation(value = "选择弹窗中的列表", notes = "查询选择弹窗中的列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
public CallBack<PageInfo<PdfLibraryListVO>> page(QueryResourceForPoPForm form, PageParam pageParam) {
return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
}
@ApiOperation(value = "保存相关资源" , notes ="保存相关资源")
@PostMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.SAVE)
public CallBack<Boolean> saveRelation(@RequestBody SaveResourceRelationForm entity){
......
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/videolibrary/VideoLibraryController.java
浏览文件 @ 63bdd93f
......@@ -204,11 +204,6 @@ public class VideoLibraryController {
}
return CallBack.success(service.page(form, pageParam));
}
@ApiOperation(value = "选择弹窗中的列表" , notes ="查询选择弹窗中的列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.POPPAGE)
public CallBack<PageInfo<VideoLibraryListVO>> page(QueryResourceForPoPForm form, PageParam pageParam){
return CallBack.success(service.pageByTitleAndDiyType(form, pageParam));
}
@ApiOperation("相关资源列表")
@GetMapping(value = ResourceRequestPath.RELATION_RESOURCE + ResourceRequestPath.PAGE)
public CallBack<PageInfo<ResourceRelationVo>> reousrceRelationPage(QueryResourceRelationForm entity,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论