Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
zgzx
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
zgzx
Commits
67c8a6fc
提交
67c8a6fc
authored
9月 12, 2019
作者:
renjiancai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
d0faf480
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
82 行增加
和
41 行删除
+82
-41
EbookController.java
...om/zrqx/resource/bg/controller/ebook/EbookController.java
+0
-1
EbookMainBodyController.java
...resource/bg/controller/ebook/EbookMainBodyController.java
+3
-2
ResourceLibraryController.java
...controller/resourcelibrary/ResourceLibraryController.java
+0
-2
EbookMainBodyService.java
.../zrqx/resource/bg/service/ebook/EbookMainBodyService.java
+3
-1
EbookMainBodyServiceImpl.java
...x/resource/bg/service/ebook/EbookMainBodyServiceImpl.java
+10
-2
FgArticleLibraryController.java
...controller/articlelibrary/FgArticleLibraryController.java
+0
-2
FgEbookMainBodyController.java
...source/fg/controller/ebook/FgEbookMainBodyController.java
+52
-0
FgEbookMapper.java
...java/com/zrqx/resource/fg/mapper/ebook/FgEbookMapper.java
+9
-22
FgEbookServiceImpl.java
...om/zrqx/resource/fg/service/ebook/FgEbookServiceImpl.java
+5
-9
没有找到文件。
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebook/EbookController.java
浏览文件 @
67c8a6fc
...
@@ -299,7 +299,6 @@ public class EbookController {
...
@@ -299,7 +299,6 @@ public class EbookController {
clservice
.
insertList
(
new
ArrayList
(
ev
.
getChapterSet
()));
clservice
.
insertList
(
new
ArrayList
(
ev
.
getChapterSet
()));
return
CallBack
.
success
();
return
CallBack
.
success
();
}
}
}
}
// 资源类型
// 资源类型
ev
.
getBook
().
setStatus
(
BookSaleStatusEnum
.
STATUS_1
.
getCode
());
ev
.
getBook
().
setStatus
(
BookSaleStatusEnum
.
STATUS_1
.
getCode
());
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/ebook/EbookMainBodyController.java
浏览文件 @
67c8a6fc
package
com
.
zrqx
.
resource
.
bg
.
controller
.
ebook
;
package
com
.
zrqx
.
resource
.
bg
.
controller
.
ebook
;
import
java.text.ParseException
;
import
java.util.List
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -36,7 +37,7 @@ public class EbookMainBodyController {
...
@@ -36,7 +37,7 @@ public class EbookMainBodyController {
@ApiOperation
(
"保存杂志主体"
)
@ApiOperation
(
"保存杂志主体"
)
@PostMapping
(
ResourceRequestPath
.
SAVE
)
@PostMapping
(
ResourceRequestPath
.
SAVE
)
public
CallBack
<?>
saveBook
(
@RequestBody
SaveUpdateEbookMainBodyForm
form
)
{
public
CallBack
<?>
saveBook
(
@RequestBody
SaveUpdateEbookMainBodyForm
form
)
throws
ParseException
{
if
(!
ebookMainBodyService
.
saveOrUpdate
(
form
))
{
if
(!
ebookMainBodyService
.
saveOrUpdate
(
form
))
{
throw
new
BusinessValidateException
(
"操作失败"
);
throw
new
BusinessValidateException
(
"操作失败"
);
}
}
...
@@ -44,7 +45,7 @@ public class EbookMainBodyController {
...
@@ -44,7 +45,7 @@ public class EbookMainBodyController {
}
}
@ApiOperation
(
"修改杂志主体"
)
@ApiOperation
(
"修改杂志主体"
)
@PostMapping
(
ResourceRequestPath
.
UPDATE
)
@PostMapping
(
ResourceRequestPath
.
UPDATE
)
public
CallBack
<?>
updateBook
(
@RequestBody
SaveUpdateEbookMainBodyForm
form
)
{
public
CallBack
<?>
updateBook
(
@RequestBody
SaveUpdateEbookMainBodyForm
form
)
throws
ParseException
{
if
(!
ebookMainBodyService
.
saveOrUpdate
(
form
))
{
if
(!
ebookMainBodyService
.
saveOrUpdate
(
form
))
{
throw
new
BusinessValidateException
(
"操作失败"
);
throw
new
BusinessValidateException
(
"操作失败"
);
}
}
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/resourcelibrary/ResourceLibraryController.java
浏览文件 @
67c8a6fc
...
@@ -8,7 +8,6 @@ import java.util.List;
...
@@ -8,7 +8,6 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
org.jboss.logging.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
...
@@ -50,7 +49,6 @@ import tk.mybatis.mapper.entity.Example;
...
@@ -50,7 +49,6 @@ import tk.mybatis.mapper.entity.Example;
@RequestMapping
(
ResourceRequestPath
.
BG
+
ResourceRequestPath
.
RESOURCE
)
@RequestMapping
(
ResourceRequestPath
.
BG
+
ResourceRequestPath
.
RESOURCE
)
@Api
(
description
=
"资源的公共接口"
)
@Api
(
description
=
"资源的公共接口"
)
public
class
ResourceLibraryController
{
public
class
ResourceLibraryController
{
private
static
final
Logger
log
=
Logger
.
getLogger
(
ResourceLibraryController
.
class
);
@Autowired
@Autowired
private
ArticleLibraryService
articleLibraryService
;
private
ArticleLibraryService
articleLibraryService
;
@Autowired
@Autowired
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookMainBodyService.java
浏览文件 @
67c8a6fc
package
com
.
zrqx
.
resource
.
bg
.
service
.
ebook
;
package
com
.
zrqx
.
resource
.
bg
.
service
.
ebook
;
import
java.text.ParseException
;
import
com.zrqx.core.form.resource.bg.ebook.QueryEbookMainBodyForm
;
import
com.zrqx.core.form.resource.bg.ebook.QueryEbookMainBodyForm
;
import
com.zrqx.core.form.resource.bg.ebook.SaveUpdateEbookMainBodyForm
;
import
com.zrqx.core.form.resource.bg.ebook.SaveUpdateEbookMainBodyForm
;
import
com.zrqx.core.model.resource.ebook.EbookMainBody
;
import
com.zrqx.core.model.resource.ebook.EbookMainBody
;
...
@@ -22,7 +24,7 @@ public interface EbookMainBodyService extends BaseService<EbookMainBody, String>
...
@@ -22,7 +24,7 @@ public interface EbookMainBodyService extends BaseService<EbookMainBody, String>
* @author rjc
* @author rjc
* @date: 2019年9月10日 上午9:25:20
* @date: 2019年9月10日 上午9:25:20
*/
*/
boolean
saveOrUpdate
(
SaveUpdateEbookMainBodyForm
form
);
boolean
saveOrUpdate
(
SaveUpdateEbookMainBodyForm
form
)
throws
ParseException
;
/**
/**
* 分页查询
* 分页查询
* @param form
* @param form
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookMainBodyServiceImpl.java
浏览文件 @
67c8a6fc
package
com
.
zrqx
.
resource
.
bg
.
service
.
ebook
;
package
com
.
zrqx
.
resource
.
bg
.
service
.
ebook
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -14,7 +16,6 @@ import com.zrqx.core.model.resource.ebook.EbookMainBody;
...
@@ -14,7 +16,6 @@ import com.zrqx.core.model.resource.ebook.EbookMainBody;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.vo.resource.ebook.EbookListVO
;
import
com.zrqx.core.vo.resource.ebook.EbookMainBodyListVO
;
import
com.zrqx.core.vo.resource.ebook.EbookMainBodyListVO
;
import
com.zrqx.resource.bg.mapper.ebook.EbookMainBodyMapper
;
import
com.zrqx.resource.bg.mapper.ebook.EbookMainBodyMapper
;
...
@@ -35,15 +36,22 @@ public class EbookMainBodyServiceImpl extends BaseServiceImpl<EbookMainBody, Str
...
@@ -35,15 +36,22 @@ public class EbookMainBodyServiceImpl extends BaseServiceImpl<EbookMainBody, Str
}
}
@Override
@Override
public
boolean
saveOrUpdate
(
SaveUpdateEbookMainBodyForm
form
)
{
public
boolean
saveOrUpdate
(
SaveUpdateEbookMainBodyForm
form
)
throws
ParseException
{
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm"
);
EbookMainBody
body
=
new
EbookMainBody
();
EbookMainBody
body
=
new
EbookMainBody
();
BeanUtils
.
copyProperties
(
form
,
body
);
BeanUtils
.
copyProperties
(
form
,
body
);
if
(
body
.
getId
()
==
null
)
{
if
(
body
.
getId
()
==
null
)
{
if
(
form
.
getPublishTime
()!=
null
&&
!
form
.
getPublishTime
().
equals
(
""
))
{
body
.
setPublishTime
(
sdf
.
parse
(
form
.
getPublishTime
()));
}
body
.
setStatus
(
1
);
body
.
setStatus
(
1
);
body
.
setUploadTime
(
new
Date
());
body
.
setUploadTime
(
new
Date
());
ebookMainBodyMapper
.
insertSelective
(
body
);
ebookMainBodyMapper
.
insertSelective
(
body
);
}
else
{
}
else
{
body
.
setUpdateTime
(
new
Date
());
body
.
setUpdateTime
(
new
Date
());
if
(
form
.
getPublishTime
()!=
null
&&
!
form
.
getPublishTime
().
equals
(
""
))
{
body
.
setPublishTime
(
sdf
.
parse
(
form
.
getPublishTime
()));
}
ebookMainBodyMapper
.
updateByPrimaryKeySelective
(
body
);
ebookMainBodyMapper
.
updateByPrimaryKeySelective
(
body
);
}
}
return
true
;
return
true
;
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/articlelibrary/FgArticleLibraryController.java
浏览文件 @
67c8a6fc
...
@@ -37,11 +37,9 @@ import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryListVO;
...
@@ -37,11 +37,9 @@ import com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryListVO;
import
com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryOneVO
;
import
com.zrqx.core.vo.resource.fg.articlelibrary.FgArticleLibraryOneVO
;
import
com.zrqx.core.vo.resource.fg.diytype.FgDiyTypeVo
;
import
com.zrqx.core.vo.resource.fg.diytype.FgDiyTypeVo
;
import
com.zrqx.core.vo.resource.fg.resource.FgAboutListVo
;
import
com.zrqx.core.vo.resource.fg.resource.FgAboutListVo
;
import
com.zrqx.resource.fg.client.sysuser.FgSysuserClient
;
import
com.zrqx.resource.fg.service.articlelibrary.FgArticleLibraryDiyTypeService
;
import
com.zrqx.resource.fg.service.articlelibrary.FgArticleLibraryDiyTypeService
;
import
com.zrqx.resource.fg.service.articlelibrary.FgArticleLibraryService
;
import
com.zrqx.resource.fg.service.articlelibrary.FgArticleLibraryService
;
import
com.zrqx.resource.fg.service.articlelibrary.FgChapterLibraryService
;
import
com.zrqx.resource.fg.service.articlelibrary.FgChapterLibraryService
;
import
com.zrqx.resource.fg.service.ebook.FgEbookService
;
import
com.zrqx.resource.fg.service.record.FgRecordService
;
import
com.zrqx.resource.fg.service.record.FgRecordService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/ebook/FgEbookMainBodyController.java
0 → 100644
浏览文件 @
67c8a6fc
package
com
.
zrqx
.
resource
.
fg
.
controller
.
ebook
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.zrqx.core.constant.resource.ResourceRequestPath
;
import
com.zrqx.core.form.resource.fg.ebook.FgQueryEbookInfoForm
;
import
com.zrqx.core.model.resource.ebook.EbookMainBody
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.core.vo.resource.fg.ebook.FgEbookListVO
;
import
com.zrqx.resource.bg.service.ebook.EbookMainBodyService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
/**
* 电子书管理-controller
* @author Conan
* @date 2018年7月13日上午10:02:31
*/
@RestController
@RequestMapping
(
ResourceRequestPath
.
FG
+
ResourceRequestPath
.
EBOOKMAIABODY
)
@Api
(
description
=
"前台-杂志主体"
)
public
class
FgEbookMainBodyController
{
@Autowired
private
EbookMainBodyService
ebookMainBodyService
;
@ApiOperation
(
"查询电子书列表"
)
@GetMapping
(
ResourceRequestPath
.
PAGE
)
public
CallBack
<
List
<
EbookMainBody
>>
getBookMainBodyList
()
{
List
<
EbookMainBody
>
list
=
ebookMainBodyService
.
selectAll
();
for
(
EbookMainBody
body
:
list
)
{
String
[]
str
=
body
.
getPeriodsNumber
().
split
(
","
);
for
(
EbookMainBody
ebookMainBody
:
list
)
{
}
//body.setPeriodsNumber(periodsNumber);
}
return
CallBack
.
success
();
}
}
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/ebook/FgEbookMapper.java
浏览文件 @
67c8a6fc
...
@@ -124,31 +124,18 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
...
@@ -124,31 +124,18 @@ public interface FgEbookMapper extends BaseMapper<Ebook>{
* @date: 2019年1月11日 下午3:50:49
* @date: 2019年1月11日 下午3:50:49
*/
*/
@Select
(
"<script>"
@Select
(
"<script>"
+
"select DISTINCT bb.id, bb.name, bb.authorId, bb.author, bb.translatorId, bb.translator, "
+
"select bb.id, bb.year, bb.periods, bb.bookCover,bb.status,bb.mainBody,bb.year "
+
"bb.publishTime, bb.status, bb.nationsType, be.realPrice, be.priceOption, be.price, be.bookCover, be.summary, be.bookStatus, be.browseNum, be.goodsType "
+
"FROM res_book bb WHERE bb.status = 1 "
+
"FROM res_book bb "
+
"LEFT JOIN res_ebook be ON bb.id = be.id "
+
"<if test='year != null and year.size > 0'>"
+
"LEFT JOIN res_ebook_diy_type bdt ON be.id = bdt.ebookId "
+
"and bb.year in "
+
"LEFT JOIN res_ebook_label_content_diy_type blcdt on be.id = blcdt.ebookId "
+
" <foreach collection=\"year\" index=\"index\" item=\"year\" open=\"(\" separator=\",\" close=\")\">"
+
"WHERE be.bookStatus = 4 "
+
" concat(#{year},'%') "
+
"<if test='diyTypeCode != null and diyTypeCode.size > 0'>"
+
"and bdt.diytypeCode in "
+
" <foreach collection=\"diyTypeCode\" index=\"index\" item=\"code\" open=\"(\" separator=\",\" close=\")\">"
+
" concat(#{code},'%') "
+
"</foreach>"
+
"</foreach>"
+
"</if>"
+
"</if>"
+
"<if test='labelContentDiyTypeCode != null and labelContentDiyTypeCode.size > 0'>"
+
"<if test = 'mainBody != null' >"
+
"and blcdt.labelContentDiyTypeCode in "
+
"and bb.mainBody = #{mainBody} "
+
" <foreach collection=\"labelContentDiyTypeCode\" index=\"index\" item=\"code\" open=\"(\" separator=\",\" close=\")\">"
+
" concat(#{code},'%') "
+
"</foreach>"
+
"</if>"
+
"<if test = 'nationsType != null' >"
+
"and bb.nationsType = #{nationsType} "
+
"</if>"
+
"</if>"
+
"<if test = 'authorId != null' >"
+
"and bb.authorId = #{authorId} "
+
"</if>"
+
"</script>"
)
+
"</script>"
)
List
<
FgEbookListVO
>
page
(
FgQueryEbookInfoForm
form
);
List
<
FgEbookListVO
>
page
(
FgQueryEbookInfoForm
form
);
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/ebook/FgEbookServiceImpl.java
浏览文件 @
67c8a6fc
...
@@ -148,13 +148,9 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
...
@@ -148,13 +148,9 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
public
List
<
FgEbookListVO
>
page
(
FgQueryEbookInfoForm
form
,
PageParam
pageParam
){
public
List
<
FgEbookListVO
>
page
(
FgQueryEbookInfoForm
form
,
PageParam
pageParam
){
startPage
(
pageParam
);
startPage
(
pageParam
);
List
<
FgEbookListVO
>
list
=
ebookMapper
.
page
(
form
);
List
<
FgEbookListVO
>
list
=
ebookMapper
.
page
(
form
);
// 调用
for
(
FgEbookListVO
vo
:
list
)
{
list
.
forEach
(
li
->{
vo
.
setName
(
vo
.
getYear
()+
"年第"
+
vo
.
getPeriods
()+
"期"
);
FgEbookVO
one
=
ebookOneInfoById
(
li
.
getId
());
}
BeanUtils
.
copyProperties
(
one
,
li
);
});
//去标签
regEx
(
list
);
return
list
;
return
list
;
}
}
...
@@ -387,9 +383,9 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
...
@@ -387,9 +383,9 @@ public class FgEbookServiceImpl extends BaseServiceImpl<Ebook, String> implement
private
void
regEx
(
List
<
FgEbookListVO
>
list
){
private
void
regEx
(
List
<
FgEbookListVO
>
list
){
if
(
ArrayUtils
.
isNotEmpty
(
list
)){
if
(
ArrayUtils
.
isNotEmpty
(
list
)){
list
.
forEach
(
li
->
{
list
.
forEach
(
li
->
{
if
(
StringUtils
.
isNotBlank
(
li
.
getSummary
())){
/*
if(StringUtils.isNotBlank(li.getSummary())){
li.setSummary(removeLabel(li.getSummary()));
li.setSummary(removeLabel(li.getSummary()));
}
}
*/
});
});
}
}
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论