Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
zgzx
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
zgzx
Commits
2718e6fe
提交
2718e6fe
authored
12月 09, 2020
作者:
renjianyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
16d53e1e
全部展开
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
29 行增加
和
8 行删除
+29
-8
DiyTypeController.java
...rqx/resource/bg/controller/diytype/DiyTypeController.java
+0
-0
EbookController.java
...om/zrqx/resource/bg/controller/ebook/EbookController.java
+14
-2
ResourceRelationServiceImpl.java
...zrqx/resource/bg/service/ResourceRelationServiceImpl.java
+2
-2
AudioLibrarySerivceImpl.java
...urce/bg/service/audiolibrary/AudioLibrarySerivceImpl.java
+4
-0
EbookServiceImpl.java
.../com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java
+6
-1
VideoLibrarySerivceImpl.java
...urce/bg/service/videolibrary/VideoLibrarySerivceImpl.java
+3
-3
没有找到文件。
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/diytype/DiyTypeController.java
浏览文件 @
2718e6fe
差异被折叠。
点击展开。
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebook/EbookController.java
浏览文件 @
2718e6fe
...
...
@@ -525,6 +525,7 @@ public class EbookController {
}
return
CallBack
.
success
();
}
// 未导入,但已存在该isbn图书,则修改该图书及章节
BeanUtils
.
copyPropertiesIgnoreNotNull
(
ev
.
getBook
(),
book
,
book
);
bookservice
.
updateByPrimaryKeySelective
(
book
);
...
...
@@ -533,6 +534,10 @@ public class EbookController {
ebook
.
setUpdateTime
(
new
Date
());
ebookservice
.
updateByPrimaryKeySelective
(
ebook
);
// 插入文章及分类关联表
//查询图书关联的文章进行下架处理
ev
.
getArticleSet
().
forEach
(
article
->
{
...
...
@@ -541,7 +546,7 @@ public class EbookController {
article
.
setBookName
(
book
.
getName
());
article
.
setUploadTime
(
new
Date
());
article
.
setUpdateTime
(
new
Date
());
article
.
setStatus
(
0
);
article
.
setStatus
(
1
);
article
.
setSource
(
book
.
getName
());
article
.
setBrowseNum
(
50
);
// article.setNationsType(book.getNationsType());
...
...
@@ -621,6 +626,7 @@ public class EbookController {
ev
.
getChapterSet
().
forEach
(
chapter
->
{
chapter
.
setBookid
(
book
.
getId
());
chapter
.
setBookName
(
book
.
getName
());
if
(
chapter
.
getLevel
()>
0
)
{
//关联关系建立
Example
example1
=
alservice
.
createExample
();
example1
.
createCriteria
().
andEqualTo
(
"bookId"
,
book
.
getId
()).
andEqualTo
(
"markid"
,
chapter
.
getMarkid
());
...
...
@@ -635,6 +641,7 @@ public class EbookController {
relation1
.
setUploadTime
(
new
Date
());
resourceRelationService
.
insert
(
relation1
);
}
}
});
clservice
.
insertList
(
new
ArrayList
(
ev
.
getChapterSet
()));
...
...
@@ -689,7 +696,7 @@ public class EbookController {
article
.
setSource
(
ev
.
getBook
().
getName
());
article
.
setUploadTime
(
new
Date
());
article
.
setUpdateTime
(
new
Date
());
article
.
setStatus
(
0
);
article
.
setStatus
(
1
);
article
.
setBrowseNum
(
50
);
// article.setNationsType(ev.getBook().getNationsType());
article
.
setResourceType
(
AllResourceTypeEnum
.
ARTICLE
.
getCode
());
...
...
@@ -716,14 +723,18 @@ public class EbookController {
aldtservice
.
insertSelective
(
aldt
);
});
ev
.
getChapterSet
().
forEach
(
chapter
->
{
chapter
.
setBookid
(
ev
.
getBook
().
getId
());
chapter
.
setBookName
(
ev
.
getBook
().
getName
());
// clservice.insert(chapter);
//关联关系建立
if
(
chapter
.
getLevel
()>
0
)
{
Example
example2
=
alservice
.
createExample
();
example2
.
createCriteria
().
andEqualTo
(
"bookId"
,
ev
.
getBook
().
getId
()).
andEqualTo
(
"markid"
,
chapter
.
getMarkid
());
List
<
ArticleLibrary
>
list
=
alservice
.
selectByExample
(
example2
);
if
(
list
.
size
()>
0
)
{
ResourceRelation
relation
=
new
ResourceRelation
();
relation
.
setObjectId
(
ev
.
getBook
().
getId
());
relation
.
setResourceId
(
list
.
get
(
0
).
getId
());
...
...
@@ -733,6 +744,7 @@ public class EbookController {
relation
.
setUploadTime
(
new
Date
());
resourceRelationService
.
insert
(
relation
);
}
}
});
clservice
.
insertList
(
new
ArrayList
(
ev
.
getChapterSet
()));
// 删除当前对象与年份的关系
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ResourceRelationServiceImpl.java
浏览文件 @
2718e6fe
...
...
@@ -133,7 +133,7 @@ public class ResourceRelationServiceImpl extends BaseServiceImpl<ResourceRelatio
@Override
public
List
<
ResourceRelationVo
>
queryByIdAndResourceType
(
QueryResourceRelationForm
entity
,
PageParam
pageParam
)
{
if
(
null
!=
pageParam
&&
StringUtils
.
isBlank
(
pageParam
.
getOrderBy
())){
pageParam
.
setOrderBy
(
"sort
a
sc"
);
pageParam
.
setOrderBy
(
"sort
de
sc"
);
}
PageHelper
.
startPage
(
pageParam
);
return
mapper
.
queryByIdAndResourceType
(
entity
);
...
...
@@ -145,7 +145,7 @@ public class ResourceRelationServiceImpl extends BaseServiceImpl<ResourceRelatio
@Override
public
List
<
ResourceRelationVo
>
queryByIdAndGoodsType
(
QueryResourceRelationForm
entity
,
PageParam
pageParam
)
{
if
(
null
!=
pageParam
&&
StringUtils
.
isBlank
(
pageParam
.
getOrderBy
())){
pageParam
.
setOrderBy
(
"sort
a
sc,uploadTime desc"
);
pageParam
.
setOrderBy
(
"sort
de
sc,uploadTime desc"
);
}
PageHelper
.
startPage
(
pageParam
);
List
<
ResourceRelationVo
>
list
=
mapper
.
queryByIdAndGoodsType
(
entity
);
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioLibrarySerivceImpl.java
浏览文件 @
2718e6fe
...
...
@@ -3,6 +3,7 @@ package com.zrqx.resource.bg.service.audiolibrary;
import
java.util.Date
;
import
java.util.List
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -146,6 +147,9 @@ public class AudioLibrarySerivceImpl extends BaseServiceImpl<AudioLibrary,String
}
@Override
public
PageInfo
<
ResourceRelationListVo
>
pageByTitleAndDiyType
(
QueryResourceForPoPForm
form
,
PageParam
pageParam
)
{
if
(
pageParam
!=
null
&&
StringUtils
.
isBlank
(
pageParam
.
getOrderBy
())){
pageParam
.
setOrderBy
(
"a.uploadTime desc, a.id desc"
);
}
startPage
(
pageParam
);
List
<
ResourceRelationListVo
>
list
=
mapper
.
queryByTileAndDiyType
(
form
);
return
new
PageInfo
<
ResourceRelationListVo
>(
list
);
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java
浏览文件 @
2718e6fe
...
...
@@ -24,6 +24,7 @@ import com.zrqx.core.model.resource.ebook.Ebook;
import
com.zrqx.core.model.resource.ebook.EbookMainBody
;
import
com.zrqx.core.model.resource.ebook.EbookMainBodyRelation
;
import
com.zrqx.core.model.resource.pdffilelibrary.PdfLibrary
;
import
com.zrqx.core.model.resource.year.PeriodsLibrary
;
import
com.zrqx.core.model.resource.year.YearLibrary
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.core.util.page.PageInfo
;
...
...
@@ -35,6 +36,7 @@ import com.zrqx.resource.bg.mapper.ebook.EbookMainBodyMapper;
import
com.zrqx.resource.bg.mapper.ebook.EbookMainBodyRelationMapper
;
import
com.zrqx.resource.bg.mapper.ebook.EbookMapper
;
import
com.zrqx.resource.bg.mapper.pdffilelibrary.PdfLibraryMapper
;
import
com.zrqx.resource.bg.mapper.year.PeriodsLibraryMapper
;
import
com.zrqx.resource.bg.mapper.year.YearLibraryMapper
;
/**
...
...
@@ -57,6 +59,8 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
@Autowired
private
YearLibraryMapper
yearLibraryMapper
;
@Autowired
private
PeriodsLibraryMapper
periodsLibraryMapper
;
@Autowired
private
EbookMainBodyRelationMapper
ebookMainBodyRelationMapper
;
@Autowired
private
FileClient
client
;
...
...
@@ -166,8 +170,9 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
book
.
setYearId
(
str
);
book
.
setYear
(
year
.
getName
());
}
else
if
(
i
==
3
)
{
PeriodsLibrary
per
=
periodsLibraryMapper
.
selectByPrimaryKey
(
str
);
book
.
setPeriodsId
(
str
);
book
.
setPeriods
(
str
);
book
.
setPeriods
(
per
.
getName
()
);
}
}
}
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibrarySerivceImpl.java
浏览文件 @
2718e6fe
...
...
@@ -229,9 +229,9 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
*/
@Override
public
PageInfo
<
ResourceRelationListVo
>
pageByTitleAndDiyType
(
QueryResourceForPoPForm
form
,
PageParam
pageParam
)
{
//
if(pageParam != null && StringUtils.isBlank(pageParam.getOrderBy())){
// pageParam.setOrderBy("uploadTime desc,
id desc");
//
}
if
(
pageParam
!=
null
&&
StringUtils
.
isBlank
(
pageParam
.
getOrderBy
())){
pageParam
.
setOrderBy
(
"a.uploadTime desc, a.
id desc"
);
}
startPage
(
pageParam
);
List
<
ResourceRelationListVo
>
list
=
mapper
.
queryByTileAndDiyType
(
form
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论