Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
zcq
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
zcq
Commits
6f4937d2
提交
6f4937d2
authored
3月 15, 2019
作者:
lizhuo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
d8b37521
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
33 行增加
和
65 行删除
+33
-65
FgMemberCollectionController.java
...ercollection/controller/FgMemberCollectionController.java
+6
-3
FgMemberCollectionService.java
...g/membercollection/service/FgMemberCollectionService.java
+4
-2
FgMemberCollectionServiceImpl.java
...mbercollection/service/FgMemberCollectionServiceImpl.java
+23
-60
没有找到文件。
com.zrqx.member/src/main/java/com/zrqx/member/fg/membercollection/controller/FgMemberCollectionController.java
浏览文件 @
6f4937d2
package
com
.
zrqx
.
member
.
fg
.
membercollection
.
controller
;
package
com
.
zrqx
.
member
.
fg
.
membercollection
.
controller
;
import
java.util.List
;
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
;
...
@@ -10,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -10,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
import
com.zrqx.core.constant.resource.ResourceRequestPath
;
import
com.zrqx.core.constant.resource.ResourceRequestPath
;
import
com.zrqx.core.form.GoodsForm
;
import
com.zrqx.core.form.GoodsForm
;
import
com.zrqx.core.form.resource.fg.membercollection.MemberCollectionForm
;
import
com.zrqx.core.form.resource.fg.membercollection.MemberCollectionForm
;
import
com.zrqx.core.model.member.MemberCollection
;
import
com.zrqx.core.model.resource.authorLibrary.AuthorLibrary
;
import
com.zrqx.core.model.resource.authorLibrary.AuthorLibrary
;
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
;
...
@@ -31,14 +34,14 @@ public class FgMemberCollectionController {
...
@@ -31,14 +34,14 @@ public class FgMemberCollectionController {
@ApiOperation
(
value
=
"批量添加收藏"
,
notes
=
"返回成功条数"
)
@ApiOperation
(
value
=
"批量添加收藏"
,
notes
=
"返回成功条数"
)
@PostMapping
(
value
=
ResourceRequestPath
.
BATCH_SAVE
)
@PostMapping
(
value
=
ResourceRequestPath
.
BATCH_SAVE
)
public
CallBack
<
Integer
>
batchAddMemberCollection
(
@RequestBody
MemberCollectionForm
form
)
{
public
CallBack
<
Integer
>
batchAddMemberCollection
(
@RequestBody
List
<
MemberCollection
>
form
)
{
return
CallBack
.
success
(
service
.
saveMemberCollection
(
form
));
return
CallBack
.
success
(
service
.
saveMemberCollection
(
form
));
}
}
@ApiOperation
(
value
=
"批量取消收藏"
,
notes
=
"返回成功条数"
)
@ApiOperation
(
value
=
"批量取消收藏"
,
notes
=
"返回成功条数"
)
@PostMapping
(
value
=
ResourceRequestPath
.
BATCH_DELETE
)
@PostMapping
(
value
=
ResourceRequestPath
.
BATCH_DELETE
)
public
CallBack
<
Integer
>
batchDeleteMemberCollection
(
@RequestBody
MemberCollectionForm
form
)
{
public
CallBack
<
Integer
>
batchDeleteMemberCollection
(
@RequestBody
List
<
String
>
ids
)
{
return
CallBack
.
success
(
service
.
deleteMemberCollection
(
form
));
return
CallBack
.
success
(
service
.
deleteMemberCollection
(
ids
));
}
}
@ApiOperation
(
value
=
"是否收藏"
,
notes
=
"1有收藏0没有收藏"
)
@ApiOperation
(
value
=
"是否收藏"
,
notes
=
"1有收藏0没有收藏"
)
...
...
com.zrqx.member/src/main/java/com/zrqx/member/fg/membercollection/service/FgMemberCollectionService.java
浏览文件 @
6f4937d2
package
com
.
zrqx
.
member
.
fg
.
membercollection
.
service
;
package
com
.
zrqx
.
member
.
fg
.
membercollection
.
service
;
import
java.util.List
;
import
com.zrqx.core.form.GoodsForm
;
import
com.zrqx.core.form.GoodsForm
;
import
com.zrqx.core.form.resource.fg.membercollection.MemberCollectionForm
;
import
com.zrqx.core.form.resource.fg.membercollection.MemberCollectionForm
;
import
com.zrqx.core.model.member.MemberCollection
;
import
com.zrqx.core.model.member.MemberCollection
;
...
@@ -17,14 +19,14 @@ public interface FgMemberCollectionService extends BaseService<MemberCollection,
...
@@ -17,14 +19,14 @@ public interface FgMemberCollectionService extends BaseService<MemberCollection,
* @param form
* @param form
* @return 成功条数
* @return 成功条数
*/
*/
Integer
saveMemberCollection
(
MemberCollectionForm
form
);
Integer
saveMemberCollection
(
List
<
MemberCollection
>
form
);
/**
/**
* 批量取消收藏
* 批量取消收藏
* @param form
* @param form
* @return 成功条数
* @return 成功条数
*/
*/
Integer
deleteMemberCollection
(
MemberCollectionForm
form
);
Integer
deleteMemberCollection
(
List
<
String
>
ids
);
/**
/**
* 获取是否收藏
* 获取是否收藏
...
...
com.zrqx.member/src/main/java/com/zrqx/member/fg/membercollection/service/FgMemberCollectionServiceImpl.java
浏览文件 @
6f4937d2
package
com
.
zrqx
.
member
.
fg
.
membercollection
.
service
;
package
com
.
zrqx
.
member
.
fg
.
membercollection
.
service
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
com.zrqx.core.enums.
Goods
TypeEnum
;
import
com.zrqx.core.enums.
Resource
TypeEnum
;
import
com.zrqx.core.form.GoodsForm
;
import
com.zrqx.core.form.GoodsForm
;
import
com.zrqx.core.form.member.fg.permissions.LoginMemberInfo
;
import
com.zrqx.core.form.member.fg.permissions.LoginMemberInfo
;
import
com.zrqx.core.form.resource.fg.membercollection.MemberCollectionForm
;
import
com.zrqx.core.form.resource.fg.membercollection.MemberCollectionForm
;
...
@@ -25,7 +22,8 @@ import com.zrqx.member.fg.membercollection.manage.FgMemberConllectionManage;
...
@@ -25,7 +22,8 @@ import com.zrqx.member.fg.membercollection.manage.FgMemberConllectionManage;
import
com.zrqx.member.fg.membercollection.mapper.FgMemberCollectionMapper
;
import
com.zrqx.member.fg.membercollection.mapper.FgMemberCollectionMapper
;
@Service
@Service
public
class
FgMemberCollectionServiceImpl
extends
BaseServiceImpl
<
MemberCollection
,
Integer
>
implements
FgMemberCollectionService
{
public
class
FgMemberCollectionServiceImpl
extends
BaseServiceImpl
<
MemberCollection
,
Integer
>
implements
FgMemberCollectionService
{
@Autowired
@Autowired
private
FgMemberCollectionMapper
mapper
;
private
FgMemberCollectionMapper
mapper
;
...
@@ -34,74 +32,41 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
...
@@ -34,74 +32,41 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
private
Redis
fgRedisManage
;
private
Redis
fgRedisManage
;
@Autowired
@Autowired
private
FgMemberConllectionManage
fgMemberConllectionManage
;
private
FgMemberConllectionManage
fgMemberConllectionManage
;
@Override
@Override
public
BaseMapper
<
MemberCollection
>
getMapper
()
{
public
BaseMapper
<
MemberCollection
>
getMapper
()
{
return
mapper
;
return
mapper
;
}
}
@Override
@Override
public
Integer
saveMemberCollection
(
MemberCollectionForm
form
)
{
public
Integer
saveMemberCollection
(
List
<
MemberCollection
>
form
)
{
MemberCollection
mc
=
null
;
List
<
GoodsForm
>
list
=
form
.
getGoodsList
();
List
<
MemberCollection
>
insertList
=
new
ArrayList
<
MemberCollection
>();
List
<
MemberCollection
>
insertList
=
new
ArrayList
<
MemberCollection
>();
for
(
MemberCollection
mc
:
form
)
{
LoginMemberInfo
member
=
fgRedisManage
.
getMember
();
MemberCollection
hasM
=
mapper
.
selectOne
(
mc
);
String
memberId
=
member
.
getId
().
toString
();
if
(
hasM
==
null
)
{
//用于去掉重复数据
Map
<
String
,
String
>
map
=
new
HashMap
<
String
,
String
>();
for
(
GoodsForm
gf
:
list
)
{
if
(
map
.
get
(
gf
.
getId
())!=
null
){
if
(
gf
.
getType
().
equals
(
map
.
get
(
gf
.
getId
()))){
continue
;
}
}
MemberCollection
record
=
new
MemberCollection
();
record
.
setMemberId
(
memberId
);
record
.
setObjectId
(
String
.
valueOf
(
gf
.
getId
()));
record
.
setObjectType
(
gf
.
getType
());
record
.
setMemberType
(
form
.
getMemberType
());
mc
=
selectOne
(
record
);
if
(
mc
==
null
){
mc
=
new
MemberCollection
();
mc
.
setMemberId
(
memberId
);
mc
.
setObjectId
(
String
.
valueOf
(
gf
.
getId
()));
mc
.
setObjectType
(
gf
.
getType
());
mc
.
setCreateTime
(
new
Date
());
mc
.
setMemberType
(
form
.
getMemberType
());
insertList
.
add
(
mc
);
insertList
.
add
(
mc
);
map
.
put
(
String
.
valueOf
(
gf
.
getId
()),
gf
.
getType
());
}
}
}
}
int
result
=
0
;
int
result
=
0
;
if
(
insertList
.
size
()>
0
)
{
if
(
insertList
.
size
()
>
0
)
{
result
=
mapper
.
insertList
(
insertList
);
result
=
mapper
.
insertList
(
insertList
);
}
}
return
result
;
return
result
;
}
}
@Override
@Override
public
Integer
deleteMemberCollection
(
MemberCollectionForm
form
)
{
public
Integer
deleteMemberCollection
(
List
<
String
>
ids
)
{
int
result
=
0
;
int
result
=
0
;
LoginMemberInfo
member
=
fgRedisManage
.
getMember
();
LoginMemberInfo
member
=
fgRedisManage
.
getMember
();
String
memberId
=
member
.
getId
().
toString
();
String
memberId
=
member
.
getId
().
toString
();
MemberCollection
mc
=
null
;
MemberCollection
mc
=
null
;
List
<
GoodsForm
>
list
=
form
.
getGoodsList
();
for
(
String
id
:
ids
)
{
for
(
GoodsForm
gf
:
list
)
{
mc
=
new
MemberCollection
();
mc
=
new
MemberCollection
();
mc
.
setMemberId
(
memberId
);
mc
.
setMemberId
(
memberId
);
mc
.
setObjectId
(
String
.
valueOf
(
gf
.
getId
()));
mc
.
setObjectId
(
String
.
valueOf
(
id
));
mc
.
setObjectType
(
gf
.
getType
());
mc
.
setMemberType
(
form
.
getMemberType
());
if
(
delete
(
mc
))
{
if
(
delete
(
mc
))
{
result
++;
result
++;
}
}
...
@@ -112,12 +77,12 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
...
@@ -112,12 +77,12 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
@Override
@Override
public
Integer
checkIsCollect
(
GoodsForm
form
)
{
public
Integer
checkIsCollect
(
GoodsForm
form
)
{
return
fgMemberConllectionManage
.
checkIsCollect
(
form
);
return
fgMemberConllectionManage
.
checkIsCollect
(
form
);
}
}
@Override
@Override
public
Integer
queryAuthorCollectNum
(
String
oid
){
public
Integer
queryAuthorCollectNum
(
String
oid
)
{
return
fgMemberConllectionManage
.
queryAuthorCollectNum
(
oid
);
return
fgMemberConllectionManage
.
queryAuthorCollectNum
(
oid
);
}
}
...
@@ -127,16 +92,15 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
...
@@ -127,16 +92,15 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
String
memberId
=
member
.
getId
().
toString
();
String
memberId
=
member
.
getId
().
toString
();
form
.
setMemberId
(
memberId
);
form
.
setMemberId
(
memberId
);
List
<
FgMemberCollectionVo
>
list
=
null
;
List
<
FgMemberCollectionVo
>
list
=
null
;
String
type
=
form
.
get
Goods
Type
();
String
type
=
form
.
get
Object
Type
();
if
(
GoodsTypeEnum
.
EBOOK
.
getCode
().
equals
(
type
))
{
if
(
ResourceTypeEnum
.
BOOK
.
getCode
().
equals
(
type
))
{
startPage
(
pageParam
);
startPage
(
pageParam
);
list
=
mapper
.
queryBookPage
(
form
);
list
=
mapper
.
queryBookPage
(
form
);
//}else if(GoodsTypeEnum.ARTICLE.getCode().equals(type)){
}
else
if
(
ResourceTypeEnum
.
ARTICLE
.
getCode
().
equals
(
type
))
{
}
else
if
(
"2-2"
.
equals
(
type
)){
startPage
(
pageParam
);
startPage
(
pageParam
);
list
=
mapper
.
queryArticlePage
(
form
);
list
=
mapper
.
queryArticlePage
(
form
);
}
}
return
new
PageInfo
<
FgMemberCollectionVo
>(
list
);
return
new
PageInfo
<
FgMemberCollectionVo
>(
list
);
}
}
...
@@ -144,10 +108,9 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
...
@@ -144,10 +108,9 @@ public class FgMemberCollectionServiceImpl extends BaseServiceImpl<MemberCollect
public
PageInfo
<
AuthorLibrary
>
queryPageMyCollect
(
PageParam
pageParam
,
Integer
type
)
{
public
PageInfo
<
AuthorLibrary
>
queryPageMyCollect
(
PageParam
pageParam
,
Integer
type
)
{
String
memberId
=
String
.
valueOf
(
fgRedisManage
.
getMember
().
getId
());
String
memberId
=
String
.
valueOf
(
fgRedisManage
.
getMember
().
getId
());
startPage
(
pageParam
);
startPage
(
pageParam
);
List
<
AuthorLibrary
>
list
=
mapper
.
queryPageMyCollect
(
memberId
,
type
);
List
<
AuthorLibrary
>
list
=
mapper
.
queryPageMyCollect
(
memberId
,
type
);
return
new
PageInfo
<
AuthorLibrary
>(
list
);
return
new
PageInfo
<
AuthorLibrary
>(
list
);
}
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论