Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
N
nrgl
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
nrgl
Commits
aa4e97fd
提交
aa4e97fd
authored
5月 05, 2019
作者:
renjiancai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
545213d8
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
25 行增加
和
25 行删除
+25
-25
BookLibraryLabel.java
.../com/zrqx/core/model/resource/ebook/BookLibraryLabel.java
+3
-3
AuthorLibraryController.java
.../bg/controller/authorLibrary/AuthorLibraryController.java
+1
-1
EbookLibraryController.java
...ce/bg/controller/ebooklibrary/EbookLibraryController.java
+5
-5
PdfLibraryController.java
...source/bg/controller/pdflibrary/PdfLibraryController.java
+1
-1
RecycleBinController.java
...source/bg/controller/recycleBin/RecycleBinController.java
+1
-1
BookLabelMapper.java
...va/com/zrqx/resource/bg/mapper/ebook/BookLabelMapper.java
+2
-2
LabelContentDiyTypeMapper.java
...x/resource/bg/mapper/label/LabelContentDiyTypeMapper.java
+1
-1
BookLabelContentDiyTypeSerivceImpl.java
.../bg/service/ebook/BookLabelContentDiyTypeSerivceImpl.java
+3
-3
BookLabelContentDiyTypeService.java
...urce/bg/service/ebook/BookLabelContentDiyTypeService.java
+2
-2
EbookServiceImpl.java
.../com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java
+4
-4
RecycleBinSerivceImpl.java
...resource/bg/service/recycleBin/RecycleBinSerivceImpl.java
+2
-2
没有找到文件。
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ebook/BookLabel.java
→
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ebook/BookL
ibraryL
abel.java
浏览文件 @
aa4e97fd
...
...
@@ -11,9 +11,9 @@ import javax.persistence.Table;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"BookL
abelDiyType
"
,
description
=
"图书与标签关系表"
)
@Table
(
name
=
"res_book_label"
)
public
class
BookLabel
{
@ApiModel
(
value
=
"BookL
ibraryLabel
"
,
description
=
"图书与标签关系表"
)
@Table
(
name
=
"res_book_l
ibrary_l
abel"
)
public
class
BookL
ibraryL
abel
{
@Id
@GeneratedValue
(
strategy
=
GenerationType
.
IDENTITY
,
generator
=
"SELECT REPLACE (UUID(), '-', '')"
)
@ApiModelProperty
(
"图书与标签内容关系表id"
)
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/authorLibrary/AuthorLibraryController.java
浏览文件 @
aa4e97fd
...
...
@@ -35,7 +35,7 @@ import com.zrqx.core.model.resource.audiolibrary.AudioLibraryLabel;
import
com.zrqx.core.model.resource.authorLibrary.AuthorLibrary
;
import
com.zrqx.core.model.resource.authorLibrary.AuthorLibraryDiyType
;
import
com.zrqx.core.model.resource.authorLibrary.AuthorLibraryLabel
;
import
com.zrqx.core.model.resource.ebook.BookLabel
;
import
com.zrqx.core.model.resource.ebook.BookL
ibraryL
abel
;
import
com.zrqx.core.util.CallBack
;
import
com.zrqx.core.util.PageInfo
;
import
com.zrqx.core.util.PageParam
;
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebooklibrary/EbookLibraryController.java
浏览文件 @
aa4e97fd
...
...
@@ -50,7 +50,7 @@ import com.zrqx.core.model.resource.ebook.BookDiyType;
import
com.zrqx.core.model.resource.ebook.BookGoods
;
import
com.zrqx.core.model.resource.ebook.BookGoodsAlbum
;
import
com.zrqx.core.model.resource.ebook.BookIssued
;
import
com.zrqx.core.model.resource.ebook.BookLabel
;
import
com.zrqx.core.model.resource.ebook.BookL
ibraryL
abel
;
import
com.zrqx.core.model.resource.ebook.BookResource
;
import
com.zrqx.core.model.resource.ebook.Ebook
;
import
com.zrqx.core.model.resource.imagelibrary.ImageLibrary
;
...
...
@@ -187,7 +187,7 @@ public class EbookLibraryController {
List
<
BookDiyType
>
dtList
=
bookTypeService
.
selectByCriteria
();
// 自定义标签
bookLableService
.
createCriteria
().
andEqualTo
(
"objectId"
,
oid
);
List
<
BookLabel
>
listLabel
=
bookLableService
.
selectByCriteria
();
List
<
BookL
ibraryL
abel
>
listLabel
=
bookLableService
.
selectByCriteria
();
// 商品相册
bookAlbumService
.
createCriteria
().
andEqualTo
(
"bookId"
,
oid
);
List
<
BookGoodsAlbum
>
album
=
bookAlbumService
.
selectByCriteria
();
...
...
@@ -228,16 +228,16 @@ public class EbookLibraryController {
vo
.
setLabelList
(
new
ArrayList
<
LabelAndContentByDataTypeVO
>());
vo
.
setLabelId
(
new
ArrayList
<
String
>());
vo
.
setLabelContentId
(
new
ArrayList
<
String
>());
List
<
BookL
abel
>
listTemp
=
new
ArrayList
<
Book
Label
>();
List
<
BookL
ibraryLabel
>
listTemp
=
new
ArrayList
<
BookLibrary
Label
>();
if
(
listLabel
!=
null
&&
listLabel
.
size
()
>
0
)
{
for
(
BookLabel
label
:
listLabel
)
{
for
(
BookL
ibraryL
abel
label
:
listLabel
)
{
vo
.
getLabelContentId
().
add
(
label
.
getLabelContentId
());
if
(!
vo
.
getLabelId
().
contains
(
label
.
getLabelId
()))
{
vo
.
getLabelId
().
add
(
label
.
getLabelId
());
listTemp
.
add
(
label
);
}
}
for
(
BookLabel
booklable
:
listTemp
)
{
for
(
BookL
ibraryL
abel
booklable
:
listTemp
)
{
List
<
LabelAndContentByDataTypeVO
>
voList
=
labelContentDiyTypeService
.
listContent
(
ResourceTypeEnum
.
BOOK
.
getCode
(),
booklable
.
getLabelId
(),
vo
.
getLabelContentId
());
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/pdflibrary/PdfLibraryController.java
浏览文件 @
aa4e97fd
...
...
@@ -31,7 +31,7 @@ import com.zrqx.core.form.resource.bg.pdflibrary.BatchUpdatePdfLibraryForm;
import
com.zrqx.core.form.resource.bg.pdflibrary.QueryPdfLibraryForm
;
import
com.zrqx.core.form.resource.bg.pdflibrary.SavePdfLibraryForm
;
import
com.zrqx.core.form.resource.bg.pdflibrary.SaveUpdatePdfLibraryForm
;
import
com.zrqx.core.model.resource.ebook.BookLabel
;
import
com.zrqx.core.model.resource.ebook.BookL
ibraryL
abel
;
import
com.zrqx.core.model.resource.pdflibrary.PdfGoods
;
import
com.zrqx.core.model.resource.pdflibrary.PdfLibrary
;
import
com.zrqx.core.model.resource.pdflibrary.PdfLibraryDiyType
;
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/recycleBin/RecycleBinController.java
浏览文件 @
aa4e97fd
...
...
@@ -60,7 +60,7 @@ import com.zrqx.core.model.resource.ebook.BookDiyType;
import
com.zrqx.core.model.resource.ebook.BookGoods
;
import
com.zrqx.core.model.resource.ebook.BookGoodsAlbum
;
import
com.zrqx.core.model.resource.ebook.BookIssued
;
import
com.zrqx.core.model.resource.ebook.BookLabel
;
import
com.zrqx.core.model.resource.ebook.BookL
ibraryL
abel
;
import
com.zrqx.core.model.resource.ebook.Ebook
;
import
com.zrqx.core.model.resource.imagelibrary.ImageGoods
;
import
com.zrqx.core.model.resource.imagelibrary.ImageLibrary
;
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/ebook/BookLabelMapper.java
浏览文件 @
aa4e97fd
package
com
.
zrqx
.
resource
.
bg
.
mapper
.
ebook
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.resource.ebook.BookLabel
;
import
com.zrqx.core.model.resource.ebook.BookL
ibraryL
abel
;
/**
* 作者和标签关系
*/
public
interface
BookLabelMapper
extends
BaseMapper
<
BookLabel
>
{
public
interface
BookLabelMapper
extends
BaseMapper
<
BookL
ibraryL
abel
>
{
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/label/LabelContentDiyTypeMapper.java
浏览文件 @
aa4e97fd
...
...
@@ -49,7 +49,7 @@ public interface LabelContentDiyTypeMapper extends BaseMapper<LabelContentDiyTy
*/
@Select
(
"<script>"
+
"select distinct a.id, a.labelId, a.labelContent, a.parentId, a.englishName, a.sort, a.code, a.createTime, a.oldCode "
+
"from res_label_content_diy_type a LEFT JOIN res_${name}_label ia on a.labelId=ia.labelId "
+
"from res_label_content_diy_type a LEFT JOIN res_${name}_l
ibrary_l
abel ia on a.labelId=ia.labelId "
+
"where a.id in "
+
" <foreach collection=\"ids\" index=\"index\" item=\"id\" open=\"(\" separator=\",\" close=\")\">"
+
"#{id}"
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/BookLabelContentDiyTypeSerivceImpl.java
浏览文件 @
aa4e97fd
...
...
@@ -4,19 +4,19 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.resource.ebook.BookLabel
;
import
com.zrqx.core.model.resource.ebook.BookL
ibraryL
abel
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.resource.bg.mapper.ebook.BookLabelMapper
;
/**
* 文章库和自定义分类
*/
@Service
public
class
BookLabelContentDiyTypeSerivceImpl
extends
BaseServiceImpl
<
BookLabel
,
Integer
>
implements
BookLabelContentDiyTypeService
{
public
class
BookLabelContentDiyTypeSerivceImpl
extends
BaseServiceImpl
<
BookL
ibraryL
abel
,
Integer
>
implements
BookLabelContentDiyTypeService
{
@Autowired
private
BookLabelMapper
mapper
;
@Override
public
BaseMapper
<
BookLabel
>
getMapper
()
{
public
BaseMapper
<
BookL
ibraryL
abel
>
getMapper
()
{
return
mapper
;
}
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/BookLabelContentDiyTypeService.java
浏览文件 @
aa4e97fd
package
com
.
zrqx
.
resource
.
bg
.
service
.
ebook
;
import
com.zrqx.core.model.resource.ebook.BookLabel
;
import
com.zrqx.core.model.resource.ebook.BookL
ibraryL
abel
;
import
com.zrqx.core.service.BaseService
;
/**
* 文章库和标签
*/
public
interface
BookLabelContentDiyTypeService
extends
BaseService
<
BookLabel
,
Integer
>{
public
interface
BookLabelContentDiyTypeService
extends
BaseService
<
BookL
ibraryL
abel
,
Integer
>{
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java
浏览文件 @
aa4e97fd
...
...
@@ -31,7 +31,7 @@ import com.zrqx.core.model.resource.ebook.BookDiyType;
import
com.zrqx.core.model.resource.ebook.BookGoods
;
import
com.zrqx.core.model.resource.ebook.BookGoodsAlbum
;
import
com.zrqx.core.model.resource.ebook.BookIssued
;
import
com.zrqx.core.model.resource.ebook.BookLabel
;
import
com.zrqx.core.model.resource.ebook.BookL
ibraryL
abel
;
import
com.zrqx.core.model.resource.ebook.Ebook
;
import
com.zrqx.core.model.resource.pdflibrary.PdfLibrary
;
import
com.zrqx.core.model.resource.videolibrary.VideoLibrary
;
...
...
@@ -379,14 +379,14 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
}
ebookDiyTypeMapper
.
insertUuidList
(
dtList
);
// 删除原有标签关系表中的关系
BookL
abel
ebldt
=
new
Book
Label
();
BookL
ibraryLabel
ebldt
=
new
BookLibrary
Label
();
ebldt
.
setObjectId
(
book
.
getId
());
ebookLabelDiyTypeMapper
.
delete
(
ebldt
);
// 添加与标签的关系
List
<
BookL
abel
>
ldtList
=
new
ArrayList
<
Book
Label
>();
List
<
BookL
ibraryLabel
>
ldtList
=
new
ArrayList
<
BookLibrary
Label
>();
if
(
form
.
getLabelId
()!=
null
&&
form
.
getLabelId
().
size
()
>
0
)
{
for
(
int
i
=
0
;
i
<
form
.
getLabelId
().
size
();
i
++)
{
BookL
abel
ldt
=
new
Book
Label
();
BookL
ibraryLabel
ldt
=
new
BookLibrary
Label
();
ldt
.
setId
(
UUIDUtil
.
getUUID
());
ldt
.
setObjectId
(
book
.
getId
());
ldt
.
setLabelContentId
(
form
.
getLabelContentId
().
get
(
i
));
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/recycleBin/RecycleBinSerivceImpl.java
浏览文件 @
aa4e97fd
...
...
@@ -53,7 +53,7 @@ import com.zrqx.core.model.resource.ebook.Book;
import
com.zrqx.core.model.resource.ebook.BookDiyType
;
import
com.zrqx.core.model.resource.ebook.BookGoods
;
import
com.zrqx.core.model.resource.ebook.BookGoodsAlbum
;
import
com.zrqx.core.model.resource.ebook.BookLabel
;
import
com.zrqx.core.model.resource.ebook.BookL
ibraryL
abel
;
import
com.zrqx.core.model.resource.ebook.BookResource
;
import
com.zrqx.core.model.resource.ebook.Ebook
;
import
com.zrqx.core.model.resource.imagelibrary.ImageGoods
;
...
...
@@ -1106,7 +1106,7 @@ public class RecycleBinSerivceImpl extends BaseServiceImpl<RecycleBin,Integer> i
goods
.
setObjectId
(
bin
.
getObjectId
());
bookGoodsMapper
.
delete
(
goods
);
//标签
BookL
abel
lable
=
new
Book
Label
();
BookL
ibraryLabel
lable
=
new
BookLibrary
Label
();
lable
.
setObjectId
(
bin
.
getObjectId
());
bookLabelContentDiyTypeMapper
.
delete
(
lable
);
//分类
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论