Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
H
hxkf
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
hxkf
Commits
ebb74920
提交
ebb74920
authored
4月 20, 2020
作者:
liupengfei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
7bb771a6
显示空白字符变更
内嵌
并排
正在显示
15 个修改的文件
包含
19 行增加
和
756 行删除
+19
-756
ArticleController.java
...zrqx/sysuser/bg/controller/culture/ArticleController.java
+0
-110
SubjectController.java
...zrqx/sysuser/bg/controller/culture/SubjectController.java
+0
-105
ArticleDiyTypeMapper.java
.../zrqx/sysuser/bg/mapper/culture/ArticleDiyTypeMapper.java
+0
-26
ArticleMapper.java
...ava/com/zrqx/sysuser/bg/mapper/culture/ArticleMapper.java
+0
-42
ArticleMemberRealtionMapper.java
...ysuser/bg/mapper/culture/ArticleMemberRealtionMapper.java
+0
-11
SubArtRelationMapper.java
.../zrqx/sysuser/bg/mapper/culture/SubArtRelationMapper.java
+0
-27
SubjectMapper.java
...ava/com/zrqx/sysuser/bg/mapper/culture/SubjectMapper.java
+0
-28
ArticleService.java
...a/com/zrqx/sysuser/bg/service/culture/ArticleService.java
+0
-37
ArticleServiceImpl.java
...m/zrqx/sysuser/bg/service/culture/ArticleServiceImpl.java
+0
-167
SubjectService.java
...a/com/zrqx/sysuser/bg/service/culture/SubjectService.java
+0
-37
SubjectServiceImpl.java
...m/zrqx/sysuser/bg/service/culture/SubjectServiceImpl.java
+0
-146
Comment.java
.../java/com/zrqx/sysuser/commons/model/comment/Comment.java
+4
-4
FgCommentAgreeServiceImpl.java
...sysuser/fg/service/comment/FgCommentAgreeServiceImpl.java
+2
-2
FgCommentServiceImpl.java
...zrqx/sysuser/fg/service/comment/FgCommentServiceImpl.java
+8
-9
FgShippingAddressServiceImpl.java
...service/shippingaddress/FgShippingAddressServiceImpl.java
+5
-5
没有找到文件。
app/sysuser/src/main/java/com/zrqx/sysuser/bg/controller/culture/ArticleController.java
deleted
100644 → 0
浏览文件 @
7bb771a6
package
com
.
zrqx
.
sysuser
.
bg
.
controller
.
culture
;
import
java.util.List
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.zrqx.core.commons.model.sysuser.Article
;
import
com.zrqx.core.enums.ResponseCodeEnum
;
import
com.zrqx.core.enums.sysuser.ad.AdStatusEnum
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.util.datatype.ArrayUtils
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.sysuser.bg.service.culture.ArticleService
;
import
com.zrqx.sysuser.commons.form.bg.culture.BatchUpdateDiyTypeForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.QueryArticleForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.SaveUpdateArticleForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.UpOrDownForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.UpdateSortForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.UpdateStatusForm
;
import
com.zrqx.sysuser.commons.vo.fg.article.ArticleVo
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
@RestController
@RequestMapping
(
"/bg/article"
)
@Api
(
description
=
"文化-文章管理"
)
public
class
ArticleController
{
@Autowired
private
ArticleService
service
;
@ApiOperation
(
value
=
"新增"
,
notes
=
"新增一个"
)
@PostMapping
(
value
=
"/save"
)
public
CallBack
<
Boolean
>
save
(
@RequestBody
SaveUpdateArticleForm
form
)
{
if
(!
service
.
saveOrUpdate
(
form
))
{
throw
new
BaseException
(
"操作失败"
);
}
return
CallBack
.
success
(
true
);
}
@ApiOperation
(
value
=
"批量删除"
,
notes
=
"批量删除"
)
@PostMapping
(
value
=
"/batch/delete"
)
public
CallBack
<
Boolean
>
deleteByIds
(
@RequestBody
List
<
String
>
ids
)
{
if
(
ArrayUtils
.
isNotEmpty
(
ids
)){
for
(
String
id
:
ids
)
{
Article
article
=
service
.
selectByPrimaryKey
(
id
);
if
(
article
!=
null
&&
article
.
getStatus
()
==
0
)
{
service
.
deleteByPrimaryKey
(
id
);
}
else
{
throw
new
BaseException
(
"该条数据是上架状态,请重新选择"
);
}
}
}
return
CallBack
.
success
(
true
);
}
@ApiOperation
(
value
=
"批量上下架"
,
notes
=
"批量上下架"
)
@PostMapping
(
value
=
"/batch/upOrdown"
)
public
CallBack
<
Boolean
>
upOrdownByIds
(
@RequestBody
UpOrDownForm
form
)
{
if
(
form
.
getIds
().
size
()
==
AdStatusEnum
.
STATUS_0
.
getCode
()){
throw
new
BaseException
(
"没有选中任何数据,请重新选择"
);
}
return
CallBack
.
success
(
service
.
updateUpOrDown
(
form
));
}
@ApiOperation
(
value
=
"查询"
,
notes
=
"根据ID查询"
)
@GetMapping
(
value
=
"/{oid}"
)
public
CallBack
<
ArticleVo
>
getById
(
@PathVariable
String
oid
)
{
return
CallBack
.
success
(
service
.
selectById
(
oid
));
}
@ApiOperation
(
value
=
"分页查询"
,
notes
=
"分页查询"
)
@GetMapping
(
value
=
"/page"
)
public
CallBack
<
PageInfo
<
Article
>>
getUserPage
(
QueryArticleForm
article
,
PageParam
pageParam
){
return
CallBack
.
success
(
service
.
page
(
article
,
pageParam
));
}
@ApiOperation
(
value
=
"更改状态"
,
notes
=
"更改状态"
)
@PostMapping
(
value
=
"/batch/updateStatus"
)
public
CallBack
<
Boolean
>
updateStatus
(
@RequestBody
UpdateStatusForm
form
)
{
return
CallBack
.
success
(
service
.
updateForm
(
form
));
}
@ApiOperation
(
value
=
"更改排序号"
,
notes
=
"更改排序号"
)
@PostMapping
(
value
=
"/updateSort"
)
public
CallBack
<
Boolean
>
updateSort
(
@RequestBody
UpdateSortForm
form
)
{
Article
article
=
service
.
selectByPrimaryKey
(
form
.
getId
());
article
.
setSort
(
form
.
getSort
());
return
CallBack
.
success
(
service
.
updateByPrimaryKey
(
article
));
}
@ApiOperation
(
value
=
"批量修改分类"
,
notes
=
"批量修改分类"
)
@PostMapping
(
value
=
"/batch/update/diytype"
)
public
CallBack
<
Boolean
>
batchUpdateDiyType
(
@RequestBody
BatchUpdateDiyTypeForm
form
)
{
if
(
form
.
getIds
().
size
()
==
0
)
{
throw
new
BaseException
(
ResponseCodeEnum
.
MISS_EXCEPTION
.
getCode
(),
"没有选中任何数据,请重新选择"
);
}
return
CallBack
.
success
(
service
.
batchUpdateDiyType
(
form
));
}
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/controller/culture/SubjectController.java
deleted
100644 → 0
浏览文件 @
7bb771a6
package
com
.
zrqx
.
sysuser
.
bg
.
controller
.
culture
;
import
java.util.List
;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.zrqx.core.commons.model.sysuser.Article
;
import
com.zrqx.core.enums.sysuser.ad.AdStatusEnum
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.core.util.response.CallBack
;
import
com.zrqx.sysuser.bg.service.culture.SubjectService
;
import
com.zrqx.sysuser.commons.form.bg.culture.EnableOrDisableForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.QuerySubjecteForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.RelationPageForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.SaveRelationForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.UpdateSubjectStatusForm
;
import
com.zrqx.sysuser.commons.model.culture.Subject
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
tk.mybatis.mapper.entity.Example
;
import
tk.mybatis.mapper.entity.Example.Criteria
;
@RestController
@RequestMapping
(
"/bg/subject"
)
@Api
(
description
=
"文化-专题管理"
)
public
class
SubjectController
{
@Autowired
private
SubjectService
service
;
@ApiOperation
(
value
=
"新增"
,
notes
=
"新增一个"
)
@PostMapping
(
value
=
"/save"
)
public
CallBack
<
Boolean
>
save
(
@RequestBody
Subject
subject
)
{
return
CallBack
.
success
(
service
.
saveOrUpdate
(
subject
));
}
@ApiOperation
(
value
=
"批量启禁用"
,
notes
=
"批量启禁用"
)
@PostMapping
(
value
=
"/batch/enableOrDisable"
)
public
CallBack
<
Boolean
>
upOrdownByIds
(
@RequestBody
EnableOrDisableForm
form
)
{
if
(
form
.
getIds
().
length
==
AdStatusEnum
.
STATUS_0
.
getCode
()){
throw
new
BaseException
(
"没有选中任何数据,请重新选择"
);
}
return
CallBack
.
success
(
service
.
updateEnableOrDisable
(
form
));
}
@ApiOperation
(
value
=
"批量删除"
,
notes
=
"批量删除"
)
@PostMapping
(
value
=
"/batch/delete"
)
public
CallBack
<
Boolean
>
deleteByIds
(
@RequestBody
Integer
[]
ids
)
{
if
(
ids
.
length
==
AdStatusEnum
.
STATUS_0
.
getCode
()){
throw
new
BaseException
(
"没有选中任何数据,请重新选择"
);
}
return
CallBack
.
success
(
service
.
batchDelete
(
ids
));
}
@ApiOperation
(
value
=
"查询"
,
notes
=
"根据ID查询"
)
@GetMapping
(
value
=
"/{oid}"
)
public
CallBack
<
Subject
>
getById
(
@PathVariable
Integer
oid
)
{
return
CallBack
.
success
(
service
.
selectByPrimaryKey
(
oid
));
}
@ApiOperation
(
value
=
"分页查询"
,
notes
=
"分页查询"
)
@GetMapping
(
value
=
"/page"
)
public
CallBack
<
PageInfo
<
Subject
>>
getUserPage
(
QuerySubjecteForm
subject
,
PageParam
pageParam
){
return
CallBack
.
success
(
service
.
page
(
subject
,
pageParam
));
}
@ApiOperation
(
value
=
"更改状态 置顶推荐"
,
notes
=
"更改状态 置顶推荐"
)
@PostMapping
(
value
=
"/batch/updateStatus"
)
public
CallBack
<
Boolean
>
updateStatus
(
@RequestBody
UpdateSubjectStatusForm
form
)
{
return
CallBack
.
success
(
service
.
updateForm
(
form
));
}
@ApiOperation
(
value
=
"保存关联关系"
,
notes
=
"保存关联关系"
)
@PostMapping
(
value
=
"/saveRelation"
)
public
CallBack
<
Boolean
>
saveRelation
(
@RequestBody
SaveRelationForm
form
)
{
return
CallBack
.
success
(
service
.
saveRelation
(
form
));
}
@ApiOperation
(
value
=
"添加关联关系后文章分页列表"
,
notes
=
"添加关联关系后文章分页列表"
)
@GetMapping
(
value
=
"/page/article"
)
public
CallBack
<
PageInfo
<
Article
>>
getRelationPage
(
RelationPageForm
form
,
PageParam
pageParam
){
return
CallBack
.
success
(
service
.
getRelationPage
(
pageParam
,
form
));
}
@ApiOperation
(
value
=
"批量删除关联关系"
,
notes
=
"批量删除关联关系"
)
@PostMapping
(
value
=
"/batch/delete/relation"
)
public
CallBack
<
Boolean
>
deleteRelationByIds
(
@RequestBody
List
<
String
>
ids
)
{
if
(
ids
.
size
()
==
0
)
{
throw
new
BaseException
(
"没有选中任何数据,请重新选择"
);
}
return
CallBack
.
success
(
service
.
deleteById
(
ids
));
}
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/culture/ArticleDiyTypeMapper.java
deleted
100644 → 0
浏览文件 @
7bb771a6
package
com
.
zrqx
.
sysuser
.
bg
.
mapper
.
culture
;
import
java.util.List
;
import
org.apache.ibatis.annotations.Delete
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.sysuser.commons.model.culture.ArticleDiyType
;
@Mapper
public
interface
ArticleDiyTypeMapper
extends
BaseMapper
<
ArticleDiyType
>
{
@Select
(
"<script>"
+
" select * from sys_article_diy_type where ArticleId = #{id} "
+
"</script>"
)
List
<
ArticleDiyType
>
selectByArticleId
(
@Param
(
"id"
)
String
id
);
@Delete
(
"<script>"
+
" delete from sys_article_diy_type where articleId =#{id} "
+
"</script>"
)
int
deleteByArticle
(
@Param
(
"id"
)
String
id
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/culture/ArticleMapper.java
deleted
100644 → 0
浏览文件 @
7bb771a6
package
com
.
zrqx
.
sysuser
.
bg
.
mapper
.
culture
;
import
java.util.List
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
com.zrqx.core.commons.model.sysuser.Article
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.sysuser.commons.form.bg.culture.QueryArticleForm
;
@Mapper
public
interface
ArticleMapper
extends
BaseMapper
<
Article
>{
@Select
(
"<script>"
+
" select a.id,a.title,a.source,a.author,a.keywords,a.img,a.synopsis, "
+
" a.text,a.video,a.articleType,a.status,a.topStatus,a.recommendStatus, "
+
" a.hotStatus,a.sort,a.createTime from sys_article a LEFT JOIN sys_article_diy_type b "
+
" on a.id = b.articleId where 1=1 "
+
"<if test='"
+
NOTBLANK
+
"(form.title)' >"
+
" and a.title like concat('%',#{form.title},'%') "
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.articleType)' >"
+
" and a.articleType = #{form.articleType} "
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.status)' >"
+
" and a.status = #{form.status} "
+
"</if>"
// + "<if test='" + NOTBLANK + "(form.diytype)' >"
// + " and b.diyTypeId = #{form.diytype} "
// + "</if>"
+
" <if test = '"
+
NOTBLANK
+
"(form.diyTypeCode)'> "
+
" AND b.code like concat(#{form.diyTypeCode},'%') "
+
" </if> "
+
" GROUP BY a.id"
+
"</script>"
)
List
<
Article
>
page
(
@Param
(
"form"
)
QueryArticleForm
article
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/culture/ArticleMemberRealtionMapper.java
deleted
100644 → 0
浏览文件 @
7bb771a6
package
com
.
zrqx
.
sysuser
.
bg
.
mapper
.
culture
;
import
org.apache.ibatis.annotations.Mapper
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.sysuser.commons.model.culture.ArticleMemberRealtion
;
@Mapper
public
interface
ArticleMemberRealtionMapper
extends
BaseMapper
<
ArticleMemberRealtion
>
{
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/culture/SubArtRelationMapper.java
deleted
100644 → 0
浏览文件 @
7bb771a6
package
com
.
zrqx
.
sysuser
.
bg
.
mapper
.
culture
;
import
java.util.List
;
import
org.apache.ibatis.annotations.Delete
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Select
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.sysuser.commons.model.culture.SubArtRelation
;
import
feign.Param
;
@Mapper
public
interface
SubArtRelationMapper
extends
BaseMapper
<
SubArtRelation
>
{
@Delete
(
"<script>"
+
" DELETE FROM sys_subartrelation WHERE subjectId = #{id} "
+
"</script>"
)
int
deleteRelation
(
@Param
(
"id"
)
Integer
id
);
@Select
(
"<script>"
+
" select articleId from sys_subartrelation where subjectId = #{id} "
+
"</script>"
)
List
<
String
>
selectBySubId
(
@Param
(
"id"
)
Integer
subjectId
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/culture/SubjectMapper.java
deleted
100644 → 0
浏览文件 @
7bb771a6
package
com
.
zrqx
.
sysuser
.
bg
.
mapper
.
culture
;
import
java.util.List
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
org.apache.ibatis.annotations.Select
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.sysuser.commons.form.bg.culture.QuerySubjecteForm
;
import
com.zrqx.sysuser.commons.model.culture.Subject
;
@Mapper
public
interface
SubjectMapper
extends
BaseMapper
<
Subject
>
{
@Select
(
"<script>"
+
" select id,title,img,topImg,topStatus,synopsis,recommendStatus,status,createTime "
+
" from sys_subject where 1=1 "
+
"<if test='"
+
NOTBLANK
+
"(form.title)' >"
+
" and title like concat('%',#{form.title},'%') "
+
"</if>"
+
"<if test='"
+
NOTBLANK
+
"(form.status)' >"
+
" and status = #{form.status} "
+
"</if>"
+
"</script>"
)
List
<
Subject
>
page
(
@Param
(
"form"
)
QuerySubjecteForm
subject
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/culture/ArticleService.java
deleted
100644 → 0
浏览文件 @
7bb771a6
package
com
.
zrqx
.
sysuser
.
bg
.
service
.
culture
;
import
com.zrqx.core.commons.model.sysuser.Article
;
import
com.zrqx.core.service.BaseService
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.sysuser.commons.form.bg.culture.BatchUpdateDiyTypeForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.QueryArticleForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.SaveUpdateArticleForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.UpOrDownForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.UpdateStatusForm
;
import
com.zrqx.sysuser.commons.vo.fg.article.ArticleVo
;
/**
* 文章管理
*/
public
interface
ArticleService
extends
BaseService
<
Article
,
String
>{
boolean
saveOrUpdate
(
SaveUpdateArticleForm
form
);
boolean
updateUpOrDown
(
UpOrDownForm
form
);
boolean
updateForm
(
UpdateStatusForm
form
);
PageInfo
<
Article
>
page
(
QueryArticleForm
article
,
PageParam
pageParam
);
ArticleVo
selectById
(
String
oid
);
/**
* 批量绑定自定义分类
* @param form
* @return
* @auther zzg
* @data 2020年3月31日 下午3:35:27
*/
boolean
batchUpdateDiyType
(
BatchUpdateDiyTypeForm
form
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/culture/ArticleServiceImpl.java
deleted
100644 → 0
浏览文件 @
7bb771a6
package
com
.
zrqx
.
sysuser
.
bg
.
service
.
culture
;
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
;
import
com.zrqx.core.commons.model.sysuser.Article
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.core.util.bean.BeanUtils
;
import
com.zrqx.core.util.datatype.ArrayUtils
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.sysuser.bg.mapper.culture.ArticleDiyTypeMapper
;
import
com.zrqx.sysuser.bg.mapper.culture.ArticleMapper
;
import
com.zrqx.sysuser.bg.mapper.culture.ArticleMemberRealtionMapper
;
import
com.zrqx.sysuser.commons.form.bg.culture.BatchUpdateDiyTypeForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.QueryArticleForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.SaveUpdateArticleForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.UpOrDownForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.UpdateStatusForm
;
import
com.zrqx.sysuser.commons.model.culture.ArticleDiyType
;
import
com.zrqx.sysuser.commons.model.culture.ArticleMemberRealtion
;
import
com.zrqx.sysuser.commons.vo.fg.article.ArticleVo
;
/**
* 文章管理
*/
@Service
public
class
ArticleServiceImpl
extends
BaseServiceImpl
<
Article
,
String
>
implements
ArticleService
{
@Autowired
private
ArticleMapper
mapper
;
@Autowired
private
ArticleDiyTypeMapper
adtMapper
;
@Autowired
private
ArticleMemberRealtionMapper
amrMapper
;
@Override
public
BaseMapper
<
Article
>
getMapper
()
{
return
mapper
;
}
@Override
public
boolean
saveOrUpdate
(
SaveUpdateArticleForm
form
)
{
Article
article
=
new
Article
();
BeanUtils
.
copyProperties
(
form
,
article
);
if
(
article
.
getId
()
==
null
)
{
// 添加
article
.
setStatus
(
0
);
article
.
setTopStatus
(
0
);
article
.
setRecommendStatus
(
0
);
article
.
setHotStatus
(
0
);
article
.
setCreateTime
(
new
Date
());
mapper
.
insert
(
article
);
// 添加文章会员关系
// ArticleMemberRealtion entity = new ArticleMemberRealtion();
if
(
StringUtils
.
isEmpty
(
form
.
getMemberName
()))
{
article
.
setMemberName
(
"admin"
);
}
else
{
article
.
setMemberName
(
form
.
getMemberName
());
}
// entity.setArticleId(article.getId());
// entity.setCreateTime(new Date());
// amrMapper.insert(entity);
if
(
ArrayUtils
.
isNotEmpty
(
form
.
getArticleDiyType
()))
{
form
.
getArticleDiyType
().
forEach
(
v
->{
v
.
setArticleId
(
article
.
getId
());
});
adtMapper
.
insertList
(
form
.
getArticleDiyType
());
}
}
else
{
// 修改
if
(
StringUtils
.
isEmpty
(
form
.
getMemberName
()))
{
article
.
setMemberName
(
"admin"
);
}
else
{
article
.
setMemberName
(
form
.
getMemberName
());
}
article
.
setUpdateTime
(
new
Date
());
boolean
a
=
mapper
.
updateByPrimaryKeySelective
(
article
)
>
0
;
// 删除文章会员关系
// ArticleMemberRealtion entity = new ArticleMemberRealtion();
// entity.setArticleId(form.getId());
// amrMapper.delete(entity);
// 添加文章会员关系
// entity.setMemberId(form.getMemberName());
// entity.setArticleId(article.getId());
// entity.setCreateTime(new Date());
// amrMapper.insert(entity);
//删除分类关系
boolean
b
=
adtMapper
.
deleteByArticle
(
form
.
getId
())
>
0
;
if
(
ArrayUtils
.
isNotEmpty
(
form
.
getArticleDiyType
()))
{
//添加分类关系
for
(
ArticleDiyType
v
:
form
.
getArticleDiyType
()){
v
.
setArticleId
(
form
.
getId
());
adtMapper
.
insert
(
v
);
}
}
}
return
true
;
}
@Override
public
boolean
updateUpOrDown
(
UpOrDownForm
form
)
{
form
.
getIds
().
forEach
(
id
->{
Article
article
=
mapper
.
selectByPrimaryKey
(
id
);
article
.
setStatus
(
form
.
getStatus
());
mapper
.
updateByPrimaryKeySelective
(
article
);
});
return
true
;
}
@Override
public
boolean
updateForm
(
UpdateStatusForm
form
)
{
Article
article
=
mapper
.
selectByPrimaryKey
(
form
.
getId
());
if
(
"1"
.
equals
(
form
.
getScore
()))
{
article
.
setTopStatus
(
form
.
getTopStatus
());
}
else
if
(
"2"
.
equals
(
form
.
getScore
()))
{
article
.
setRecommendStatus
(
form
.
getRecommendStatus
());
}
else
{
article
.
setHotStatus
(
form
.
getHotStatus
());
}
return
mapper
.
updateByPrimaryKeySelective
(
article
)
>
0
;
}
@Override
public
PageInfo
<
Article
>
page
(
QueryArticleForm
article
,
PageParam
pageParam
)
{
pageParam
.
setOrderBy
(
"a.createTime desc"
);
startPage
(
pageParam
);
List
<
Article
>
list
=
mapper
.
page
(
article
);
return
new
PageInfo
<
Article
>(
list
);
}
@Override
public
ArticleVo
selectById
(
String
oid
)
{
ArticleVo
vo
=
new
ArticleVo
();
Article
article
=
mapper
.
selectByPrimaryKey
(
oid
);
BeanUtils
.
copyProperties
(
article
,
vo
);
List
<
ArticleDiyType
>
articleDiyType
=
adtMapper
.
selectByArticleId
(
article
.
getId
());
vo
.
setArticleDiyType
(
articleDiyType
);
// ArticleMemberRealtion entity = new ArticleMemberRealtion();
// entity.setArticleId(oid);
// List<ArticleMemberRealtion> select = amrMapper.select(entity);
return
vo
;
}
@Override
public
boolean
batchUpdateDiyType
(
BatchUpdateDiyTypeForm
form
)
{
//先删除课程和自定义分类的关系
if
(
form
.
getDiyIds
()
!=
null
&&
form
.
getDiyIds
().
size
()
>
0
)
{
//绑定
form
.
getIds
().
forEach
(
val
->{
adtMapper
.
deleteByArticle
(
val
);
form
.
getDiyIds
().
forEach
(
vo
->{
vo
.
setArticleId
(
val
);
vo
.
setDiyTypeId
(
vo
.
getId
());
adtMapper
.
insert
(
vo
);
});
});
}
return
true
;
}
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/culture/SubjectService.java
deleted
100644 → 0
浏览文件 @
7bb771a6
package
com
.
zrqx
.
sysuser
.
bg
.
service
.
culture
;
import
java.util.List
;
import
com.zrqx.core.commons.model.sysuser.Article
;
import
com.zrqx.core.service.BaseService
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.sysuser.commons.form.bg.culture.EnableOrDisableForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.QuerySubjecteForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.RelationPageForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.SaveRelationForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.UpdateSubjectStatusForm
;
import
com.zrqx.sysuser.commons.model.culture.Subject
;
/**
* 专题管理
*/
public
interface
SubjectService
extends
BaseService
<
Subject
,
Integer
>
{
boolean
updateEnableOrDisable
(
EnableOrDisableForm
form
);
boolean
batchDelete
(
Integer
[]
ids
);
boolean
updateForm
(
UpdateSubjectStatusForm
form
);
boolean
saveRelation
(
SaveRelationForm
form
);
PageInfo
<
Article
>
getRelationPage
(
PageParam
pageParam
,
RelationPageForm
form
);
boolean
deleteById
(
List
<
String
>
ids
);
boolean
saveOrUpdate
(
Subject
subject
);
PageInfo
<
Subject
>
page
(
QuerySubjecteForm
subject
,
PageParam
pageParam
);
}
app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/culture/SubjectServiceImpl.java
deleted
100644 → 0
浏览文件 @
7bb771a6
package
com
.
zrqx
.
sysuser
.
bg
.
service
.
culture
;
import
java.util.ArrayList
;
import
java.util.Comparator
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
com.alibaba.druid.util.StringUtils
;
import
com.zrqx.core.commons.model.sysuser.Article
;
import
com.zrqx.core.exception.BaseException
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.service.BaseServiceImpl
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
import
com.zrqx.sysuser.bg.mapper.culture.ArticleMapper
;
import
com.zrqx.sysuser.bg.mapper.culture.SubArtRelationMapper
;
import
com.zrqx.sysuser.bg.mapper.culture.SubjectMapper
;
import
com.zrqx.sysuser.commons.form.bg.culture.EnableOrDisableForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.QuerySubjecteForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.RelationPageForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.SaveRelationForm
;
import
com.zrqx.sysuser.commons.form.bg.culture.UpdateSubjectStatusForm
;
import
com.zrqx.sysuser.commons.model.culture.SubArtRelation
;
import
com.zrqx.sysuser.commons.model.culture.Subject
;
@Service
public
class
SubjectServiceImpl
extends
BaseServiceImpl
<
Subject
,
Integer
>
implements
SubjectService
{
@Autowired
private
SubjectMapper
mapper
;
@Autowired
private
SubArtRelationMapper
saMapper
;
@Autowired
private
ArticleMapper
arMapper
;
@Override
public
BaseMapper
<
Subject
>
getMapper
()
{
return
mapper
;
}
@Override
public
boolean
updateEnableOrDisable
(
EnableOrDisableForm
form
)
{
for
(
Integer
id
:
form
.
getIds
())
{
Subject
subject
=
mapper
.
selectByPrimaryKey
(
id
);
subject
.
setStatus
(
form
.
getStatus
());
mapper
.
updateByPrimaryKeySelective
(
subject
);
}
return
true
;
}
@Override
public
boolean
batchDelete
(
Integer
[]
ids
)
{
for
(
Integer
id
:
ids
)
{
Subject
subject
=
mapper
.
selectByPrimaryKey
(
id
);
if
(
subject
!=
null
&&
subject
.
getStatus
()
==
0
)
{
mapper
.
deleteByPrimaryKey
(
id
);
// 删除关联关系
saMapper
.
deleteRelation
(
id
);
}
else
{
throw
new
BaseException
(
"该条数据是启用状态,请重新选择"
);
}
}
return
true
;
}
@Override
public
boolean
updateForm
(
UpdateSubjectStatusForm
form
)
{
Subject
subject
=
mapper
.
selectByPrimaryKey
(
form
.
getId
());
if
(
"1"
.
equals
(
form
.
getScore
()))
{
subject
.
setTopStatus
(
form
.
getTopStatus
());
}
else
if
(
"2"
.
equals
(
form
.
getScore
()))
{
subject
.
setRecommendStatus
(
form
.
getRecommendStatus
());
}
return
mapper
.
updateByPrimaryKeySelective
(
subject
)
>
0
;
}
/**
* 保存专题/文章关联关系
*/
@Override
public
boolean
saveRelation
(
SaveRelationForm
form
)
{
form
.
getArticleIds
().
forEach
(
v
->{
SubArtRelation
sar
=
new
SubArtRelation
();
sar
.
setArticleId
(
v
);
sar
.
setSubjectId
(
form
.
getSubjectId
());
saMapper
.
insert
(
sar
);
});
return
true
;
}
@Override
public
PageInfo
<
Article
>
getRelationPage
(
PageParam
pageParam
,
RelationPageForm
form
)
{
startPage
(
pageParam
);
List
<
Article
>
list
=
new
ArrayList
<
Article
>();
List
<
String
>
articleIds
=
saMapper
.
selectBySubId
(
form
.
getSubjectId
());
articleIds
.
forEach
(
id
->{
Article
article
=
arMapper
.
selectByPrimaryKey
(
id
);
if
(
StringUtils
.
isEmpty
(
form
.
getTitle
()))
{
list
.
add
(
article
);
}
else
{
//条件筛选
if
(
article
.
getTitle
().
contains
(
form
.
getTitle
()))
{
list
.
add
(
article
);
}
}
});
list
.
stream
().
sorted
(
Comparator
.
comparing
(
Article:
:
getSort
).
reversed
()).
collect
(
Collectors
.
toList
());
return
new
PageInfo
<
Article
>(
list
);
}
@Override
public
boolean
deleteById
(
List
<
String
>
ids
)
{
ids
.
forEach
(
id
->{
SubArtRelation
sar
=
new
SubArtRelation
();
sar
.
setArticleId
(
id
);
saMapper
.
delete
(
sar
);
});
return
true
;
}
@Override
public
boolean
saveOrUpdate
(
Subject
subject
)
{
if
(
subject
.
getId
()
==
null
)
{
subject
.
setCreateTime
(
new
Date
());
subject
.
setTopStatus
(
0
);
subject
.
setStatus
(
0
);
subject
.
setRecommendStatus
(
0
);
mapper
.
insert
(
subject
);
}
else
{
subject
.
setUpdateTime
(
new
Date
());
mapper
.
updateByPrimaryKeySelective
(
subject
);
}
return
true
;
}
@Override
public
PageInfo
<
Subject
>
page
(
QuerySubjecteForm
subject
,
PageParam
pageParam
)
{
pageParam
.
setOrderBy
(
"createTime desc"
);
startPage
(
pageParam
);
List
<
Subject
>
list
=
mapper
.
page
(
subject
);
return
new
PageInfo
<
Subject
>(
list
);
}
}
app/sysuser/src/main/java/com/zrqx/sysuser/commons/model/comment/Comment.java
浏览文件 @
ebb74920
...
...
@@ -6,14 +6,14 @@ package com.zrqx.sysuser.commons.model.comment;
import
java.util.Date
;
import
com.zrqx.core.enums.resource.ResourceTypeEnum
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.Id
;
import
javax.persistence.Table
;
import
com.zrqx.core.enums.resource.ResourceTypeEnum
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/**
...
...
app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/comment/FgCommentAgreeServiceImpl.java
浏览文件 @
ebb74920
...
...
@@ -39,14 +39,14 @@ public class FgCommentAgreeServiceImpl extends BaseServiceImpl<CommentAgree, Int
*/
@Override
public
boolean
agreeComments
(
Integer
commentId
,
Integer
type
)
{
if
(
redisManage
.
getMember
W
()
==
null
)
{
if
(
redisManage
.
getMember
()
==
null
)
{
throw
new
BaseException
(
1
,
"登录过期或未登录"
);
}
if
(
commentId
==
null
)
{
throw
new
BaseException
(
2
,
"评论id不能为空"
);
}
CommentAgree
obj
=
new
CommentAgree
();
obj
.
setUserId
(
redisManage
.
getMember
W
().
getId
().
toString
());
obj
.
setUserId
(
redisManage
.
getMember
().
getId
().
toString
());
obj
.
setCommentId
(
commentId
);
if
(
type
==
1
)
{
if
(
mapper
.
insert
(
obj
)
>
0
)
{
...
...
app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/comment/FgCommentServiceImpl.java
浏览文件 @
ebb74920
...
...
@@ -98,7 +98,7 @@ public class FgCommentServiceImpl extends BaseServiceImpl<Comment, Integer>
BeanUtils
.
copyProperties
(
form
,
comment
);
comment
.
setStatus
(
CommentEnum
.
NOT_REVIEW
.
getCode
());
comment
.
setMainId
(
0
);
comment
.
setUserId
(
redisManage
.
getMember
W
().
getId
().
toString
());
comment
.
setUserId
(
redisManage
.
getMember
().
getId
().
toString
());
int
num
=
mapper
.
selectCount
(
comment
);
vo
.
setCommentNum
(
vo
.
getCommentNum
()
+
num
);
}
...
...
@@ -109,7 +109,7 @@ public class FgCommentServiceImpl extends BaseServiceImpl<Comment, Integer>
@Override
public
PageInfo
<
FgCommentListVo
>
page
(
FgQueryCommentForm
form
,
PageParam
pageParam
){
if
(
redisManage
.
isExistMember
()){
form
.
setUserId
(
redisManage
.
getMember
W
().
getId
().
toString
());
form
.
setUserId
(
redisManage
.
getMember
().
getId
().
toString
());
}
...
...
@@ -121,7 +121,7 @@ public class FgCommentServiceImpl extends BaseServiceImpl<Comment, Integer>
// 设置是否是本人
l
.
setIsOwn
(
Integer
.
parseInt
(
BooleanStatusEnum
.
NO
.
getCode
()));
if
(
redisManage
.
isExistMember
()){
userId
=
redisManage
.
getMember
W
().
getId
().
toString
();
userId
=
redisManage
.
getMember
().
getId
().
toString
();
// 设置是否是本人
if
(
userId
.
equals
(
l
.
getUserId
())){
l
.
setIsOwn
(
Integer
.
parseInt
(
BooleanStatusEnum
.
YES
.
getCode
()));
...
...
@@ -136,7 +136,7 @@ public class FgCommentServiceImpl extends BaseServiceImpl<Comment, Integer>
list
.
forEach
(
l
->
{
CommentAgree
ca
=
new
CommentAgree
();
ca
.
setCommentId
(
l
.
getId
());
ca
.
setUserId
(
redisManage
.
getMember
W
().
getId
().
toString
());
ca
.
setUserId
(
redisManage
.
getMember
().
getId
().
toString
());
if
(!
commentAgreeMapper
.
select
(
ca
).
isEmpty
()){
l
.
setIsAgree
(
Integer
.
parseInt
(
BooleanStatusEnum
.
YES
.
getCode
()));
}
...
...
@@ -178,10 +178,9 @@ public class FgCommentServiceImpl extends BaseServiceImpl<Comment, Integer>
}
Comment
comment
=
new
Comment
();
BeanUtils
.
copyProperties
(
form
,
comment
);
Member
member
=
redisManage
.
getMemberW
();
LoginMemberInfo
member
=
redisManage
.
getMember
();
comment
.
setUserId
(
member
.
getId
().
toString
());
comment
.
setUserName
(
member
.
getAccount
());
comment
.
setUserImg
(
member
.
getImg
());
comment
.
setName
(
member
.
getNickName
());
comment
.
setReleaseTime
(
new
Date
());
comment
.
setStatus
(
CommentEnum
.
NOT_REVIEW
.
getCode
());
...
...
@@ -199,7 +198,7 @@ public class FgCommentServiceImpl extends BaseServiceImpl<Comment, Integer>
// 设置回复数量
String
userId
=
null
;
if
(
redisManage
.
isExistMember
()){
userId
=
redisManage
.
getMember
W
().
getId
().
toString
();
userId
=
redisManage
.
getMember
().
getId
().
toString
();
}
vo
.
setReplyNum
(
mapper
.
selectReplyNum
(
oid
,
userId
));
// 设置是否已点赞
...
...
@@ -210,7 +209,7 @@ public class FgCommentServiceImpl extends BaseServiceImpl<Comment, Integer>
//判断是否已点赞
CommentAgree
ca
=
new
CommentAgree
();
ca
.
setCommentId
(
oid
);
ca
.
setUserId
(
redisManage
.
getMember
W
().
getId
().
toString
());
ca
.
setUserId
(
redisManage
.
getMember
().
getId
().
toString
());
if
(!
commentAgreeMapper
.
select
(
ca
).
isEmpty
()){
vo
.
setIsAgree
(
Integer
.
parseInt
(
BooleanStatusEnum
.
YES
.
getCode
()));
}
...
...
@@ -244,7 +243,7 @@ public class FgCommentServiceImpl extends BaseServiceImpl<Comment, Integer>
}
startPage
(
pageParam
);
String
userId
=
redisManage
.
getMember
W
().
getId
().
toString
();
String
userId
=
redisManage
.
getMember
().
getId
().
toString
();
List
<
FgMyCommentListVo
>
vos
=
mapper
.
getMyCommentList
(
userId
,
resourceType
);
if
(
StringUtils
.
isNotEmpty
(
resourceType
)){
if
(
vos
!=
null
&&
vos
.
size
()
>
0
){
...
...
app/sysuser/src/main/java/com/zrqx/sysuser/fg/service/shippingaddress/FgShippingAddressServiceImpl.java
浏览文件 @
ebb74920
...
...
@@ -72,7 +72,7 @@ public class FgShippingAddressServiceImpl extends BaseServiceImpl<ShippingAddre
*/
private
void
checkAddressNum
()
{
ShippingAddress
shippingAddress
=
new
ShippingAddress
();
shippingAddress
.
setUserId
(
redis
.
getId
()+
""
);
shippingAddress
.
setUserId
(
redis
.
get
Op
Id
()+
""
);
if
(
mapper
.
selectCount
(
shippingAddress
)
>=
10
){
logger
.
info
(
"保存地址超过10个"
);
throw
new
BaseException
(
"保存地址超过10个"
);
...
...
@@ -102,12 +102,12 @@ public class FgShippingAddressServiceImpl extends BaseServiceImpl<ShippingAddre
private
void
perfectTime
(
ShippingAddress
shippingAddress
)
{
if
(
shippingAddress
.
getId
()
==
null
){
shippingAddress
.
setCreateTime
(
new
Date
());
shippingAddress
.
setCreaterName
(
redis
.
get
OpName
());
shippingAddress
.
setCreaterName
(
redis
.
get
Member
().
getAccount
());
shippingAddress
.
setCreater
(
redis
.
getOpId
()+
""
);
}
shippingAddress
.
setUpdateTime
(
new
Date
());
shippingAddress
.
setUpdaterName
(
redis
.
get
OpName
());
shippingAddress
.
setUpdater
(
redis
.
getId
()+
""
);
shippingAddress
.
setUpdaterName
(
redis
.
get
Member
().
getAccount
());
shippingAddress
.
setUpdater
(
redis
.
get
Op
Id
()+
""
);
}
/**
...
...
@@ -118,7 +118,7 @@ public class FgShippingAddressServiceImpl extends BaseServiceImpl<ShippingAddre
// 开启分页
startPage
(
pageParam
);
ShippingAddress
shippingAddress
=
new
ShippingAddress
();
shippingAddress
.
setUserId
(
redis
.
getId
()+
""
);
shippingAddress
.
setUserId
(
redis
.
get
Op
Id
()+
""
);
List
<
ShippingAddress
>
lists
=
mapper
.
select
(
shippingAddress
);
List
<
ShippingAddressVo
>
vos
=
lists
.
stream
().
map
(
list
->
{
ShippingAddressVo
vo
=
new
ShippingAddressVo
();
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论