Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
zgzx
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
zgzx
Commits
80248383
提交
80248383
authored
9月 25, 2019
作者:
renjiancai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
e696e0c3
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
27 行增加
和
26 行删除
+27
-26
EbookMainBodyRelation.java
...zrqx/core/model/resource/ebook/EbookMainBodyRelation.java
+2
-0
EbookMainBodyServiceImpl.java
...x/resource/bg/service/ebook/EbookMainBodyServiceImpl.java
+0
-19
EbookServiceImpl.java
.../com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java
+19
-6
FgEbookController.java
.../zrqx/resource/fg/controller/ebook/FgEbookController.java
+1
-0
FgEbookMainBodyController.java
...source/fg/controller/ebook/FgEbookMainBodyController.java
+5
-1
没有找到文件。
com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ebook/EbookMainBodyRelation.java
浏览文件 @
80248383
...
...
@@ -22,6 +22,8 @@ public class EbookMainBodyRelation {
private
String
id
;
@ApiModelProperty
(
"资源id"
)
private
String
objectId
;
@ApiModelProperty
(
"杂志主体id"
)
private
String
mainBodyId
;
@ApiModelProperty
(
"年份id"
)
private
String
yearId
;
@ApiModelProperty
(
"年份"
)
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookMainBodyServiceImpl.java
浏览文件 @
80248383
...
...
@@ -30,9 +30,6 @@ import com.zrqx.resource.bg.mapper.ebook.EbookMainBodyRelationMapper;
public
class
EbookMainBodyServiceImpl
extends
BaseServiceImpl
<
EbookMainBody
,
String
>
implements
EbookMainBodyService
{
@Autowired
private
EbookMainBodyMapper
ebookMainBodyMapper
;
@Autowired
private
EbookMainBodyRelationMapper
ebookMainBodyRelationMapper
;
@Override
public
BaseMapper
<
EbookMainBody
>
getMapper
()
{
// TODO Auto-generated method stub
...
...
@@ -58,22 +55,6 @@ public class EbookMainBodyServiceImpl extends BaseServiceImpl<EbookMainBody, Str
body
.
setPublishTime
(
sdf
.
parse
(
form
.
getPublishTime
()));
}
ebookMainBodyMapper
.
updateByPrimaryKeySelective
(
body
);
//删除当前对象与年份的关系
EbookMainBodyRelation
relation
=
new
EbookMainBodyRelation
();
relation
.
setObjectId
(
form
.
getId
());
ebookMainBodyRelationMapper
.
delete
(
relation
);
}
//添加当前对象与年份的关系
if
(
form
.
getPeriodsNumber
()
!=
null
){
String
[]
split
=
form
.
getPeriodsNumber
().
split
(
","
);
for
(
String
str
:
split
)
{
EbookMainBodyRelation
relation
=
new
EbookMainBodyRelation
();
relation
.
setObjectId
(
body
.
getId
());
relation
.
setYearId
(
str
);
relation
.
setYear
(
form
.
getYear
());
relation
.
setUploadTime
(
new
Date
());
ebookMainBodyRelationMapper
.
insert
(
relation
);
}
}
return
true
;
}
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java
浏览文件 @
80248383
package
com
.
zrqx
.
resource
.
bg
.
service
.
ebook
;
import
java.math.BigDecimal
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
...
...
@@ -13,8 +12,6 @@ import org.springframework.stereotype.Service;
import
org.springframework.web.multipart.MultipartFile
;
import
com.zrqx.core.enums.AllResourceTypeEnum
;
import
com.zrqx.core.enums.resource.EbookStatusEnum
;
import
com.zrqx.core.enums.resource.PriceOptionEnum
;
import
com.zrqx.core.form.resource.bg.QueryResourceForPoPForm
;
import
com.zrqx.core.form.resource.bg.ebook.QueryEbookInfoForm
;
import
com.zrqx.core.form.resource.bg.ebook.SaveEbookForm
;
...
...
@@ -22,8 +19,8 @@ import com.zrqx.core.form.resource.bg.ebook.SaveUpdateEbookForm;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.resource.ebook.Book
;
import
com.zrqx.core.model.resource.ebook.Ebook
;
import
com.zrqx.core.model.resource.ebook.EbookDiyType
;
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.YearLibrary
;
import
com.zrqx.core.service.BaseServiceImpl
;
...
...
@@ -31,11 +28,10 @@ import com.zrqx.core.util.page.PageInfo;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.vo.resource.ebook.EbookListVO
;
import
com.zrqx.resource.bg.mapper.ebook.BookMapper
;
import
com.zrqx.resource.bg.mapper.ebook.EbookDiyTypeMapper
;
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 +53,9 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
private
EbookMainBodyMapper
ebookMainBodyMapper
;
@Autowired
private
YearLibraryMapper
yearLibraryMapper
;
@Autowired
private
EbookMainBodyRelationMapper
ebookMainBodyRelationMapper
;
/*@Autowired
private PeriodsLibraryMapper ebookMainBodyMapper;*/
...
...
@@ -153,6 +152,20 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
}
}
bookMapper
.
updateByPrimaryKey
(
book
);
//删除当前对象与年份的关系
EbookMainBodyRelation
relation
=
new
EbookMainBodyRelation
();
relation
.
setObjectId
(
form
.
getId
());
ebookMainBodyRelationMapper
.
delete
(
relation
);
}
//添加当前对象与年份的关系
if
(
book
.
getYearId
()
!=
null
){
EbookMainBodyRelation
relation
=
new
EbookMainBodyRelation
();
relation
.
setObjectId
(
book
.
getId
());
relation
.
setYearId
(
book
.
getYearId
());
relation
.
setYear
(
book
.
getYear
());
relation
.
setUploadTime
(
new
Date
());
relation
.
setMainBodyId
(
book
.
getMainBodyId
());
ebookMainBodyRelationMapper
.
insert
(
relation
);
}
return
true
;
}
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/ebook/FgEbookController.java
浏览文件 @
80248383
...
...
@@ -65,6 +65,7 @@ public class FgEbookController {
if
(
form
.
getType
().
equals
(
"1"
))
{
//杂志
list
=
bookservice
.
pageBook
(
form
,
pageParam
);
}
else
if
(
form
.
getType
().
equals
(
"2"
))
{
list
=
articleLibraryService
.
page
(
form
,
pageParam
);
}
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/ebook/FgEbookMainBodyController.java
浏览文件 @
80248383
package
com
.
zrqx
.
resource
.
fg
.
controller
.
ebook
;
import
java.util.ArrayList
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Set
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
...
...
@@ -52,12 +54,14 @@ public class FgEbookMainBodyController {
List
<
YearLibrary
>
list
=
new
ArrayList
<
YearLibrary
>();
FgEbookMainBodyVO
vo
=
new
FgEbookMainBodyVO
();
Example
example
=
ebookMainBodyRelationService
.
createExample
();
example
.
and
().
andEqualTo
(
"
object
Id"
,
oid
);
example
.
and
().
andEqualTo
(
"
mainBody
Id"
,
oid
);
List
<
EbookMainBodyRelation
>
ebookList
=
ebookMainBodyRelationService
.
selectByExample
(
example
);
for
(
EbookMainBodyRelation
ebookMainBodyRelation
:
ebookList
)
{
YearLibrary
library
=
yearLibraryService
.
queryByUploadAsc
(
ebookMainBodyRelation
.
getYearId
()).
get
(
0
);
list
.
add
(
library
);
}
Set
set
=
new
HashSet
(
list
);
List
tempList
=
new
ArrayList
(
set
);
vo
.
setYear
(
list
);
return
CallBack
.
success
(
vo
);
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论