Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Z
zcq
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
zcq
Commits
06e41cb5
提交
06e41cb5
authored
7月 31, 2019
作者:
renjiancai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
38381754
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
6 行增加
和
93 行删除
+6
-93
RecommendController.java
...resource/bg/controller/recommend/RecommendController.java
+6
-38
ResourceLibraryController.java
...controller/resourcelibrary/ResourceLibraryController.java
+0
-55
没有找到文件。
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/recommend/RecommendController.java
浏览文件 @
06e41cb5
...
...
@@ -66,22 +66,11 @@ public class RecommendController {
@ApiOperation
(
value
=
"更新"
,
notes
=
"根据ID更新,空值默认不更新"
)
@PostMapping
(
value
=
ResourceRequestPath
.
UPDATE
)
public
CallBack
<
Boolean
>
update
(
@RequestBody
UpdateRecommendForm
form
){
if
(
form
.
getId
()
==
null
&&
form
.
getNationsType
()
==
null
){
throw
new
ParameterValidateException
(
1
,
"推进位id
和民族id不能同时
为空"
);
if
(
form
.
getId
()
==
null
){
throw
new
ParameterValidateException
(
1
,
"推进位id
不能
为空"
);
}
Recommend
recommend
=
new
Recommend
();
BeanUtils
.
copyProperties
(
form
,
recommend
);
//民族主页推荐位需要另外判断
if
(
form
.
getId
()
==
null
&&
form
.
getNationsType
()
!=
null
){
Integer
recomId
=
service
.
queryRecommendIdByNationAndRecommendType
(
form
.
getNationsType
());
if
(
recomId
==
null
){
throw
new
BusinessValidateException
(
"操作失败"
);
}
else
{
recommend
.
setId
(
recomId
);
}
}
else
{
recommend
.
setId
(
form
.
getId
());
}
if
(!
service
.
updateByPrimaryKeySelective
(
recommend
)){
throw
new
BusinessValidateException
(
"操作失败"
);
}
...
...
@@ -91,23 +80,12 @@ public class RecommendController {
@ApiOperation
(
value
=
"删除"
,
notes
=
"删除"
)
@PostMapping
(
value
=
ResourceRequestPath
.
DELETE
)
public
CallBack
<
Boolean
>
delete
(
@RequestBody
DeleteRecommendForm
form
){
if
(
form
.
getId
()
==
null
&&
form
.
getNationsType
()
==
null
){
throw
new
ParameterValidateException
(
1
,
"推进位id
和民族id不能同时
为空"
);
if
(
form
.
getId
()
==
null
){
throw
new
ParameterValidateException
(
1
,
"推进位id
不能
为空"
);
}
service
.
deleteByPrimaryKey
(
form
.
getId
());
RecommendResource
record
=
new
RecommendResource
();
//民族主页推荐位需要另外判断
if
(
form
.
getId
()
==
null
&&
form
.
getNationsType
()
!=
null
){
Integer
recomId
=
service
.
queryRecommendIdByNationAndRecommendType
(
form
.
getNationsType
());
if
(
recomId
==
null
){
throw
new
BusinessValidateException
(
"操作失败"
);
}
else
{
record
.
setRecomId
(
recomId
);
service
.
deleteByPrimaryKey
(
recomId
);
}
}
else
{
record
.
setRecomId
(
form
.
getId
());
service
.
deleteByPrimaryKey
(
form
.
getId
());
}
record
.
setRecomId
(
form
.
getId
());
recommendResourceService
.
delete
(
record
);
return
CallBack
.
success
();
}
...
...
@@ -194,15 +172,5 @@ public class RecommendController {
return
recommendResourceService
.
updateResourceContent
(
form
)
?
CallBack
.
success
()
:
CallBack
.
fail
();
}
/*@ApiOperation(value = "获取推荐组下推荐资源的所有类别")
@GetMapping(value = SysUserRequestPath.GET_TYPE)
public CallBack<Map<String,String>> getAllType() {
return CallBack.success(RecommendResourceTypeEnum.getAllEnumMap());
}*/
/* public Integer queryRecommendIdByNationAndRecommendType(Integer nationsType){
Integer recomId = service.queryRecommendIdByNationAndRecommendType(nationsType);
return recomId;
}*/
}
com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/resourcelibrary/ResourceLibraryController.java
浏览文件 @
06e41cb5
...
...
@@ -42,7 +42,6 @@ import com.zrqx.core.model.resource.authorLibrary.AuthorLibrary;
import
com.zrqx.core.model.resource.ebook.Book
;
import
com.zrqx.core.model.resource.ebook.Ebook
;
import
com.zrqx.core.model.resource.marketing.PromotionContent
;
import
com.zrqx.core.model.resource.recommend.RecommendResource
;
import
com.zrqx.core.util.datatype.ArrayUtils
;
import
com.zrqx.core.util.page.PageInfo
;
import
com.zrqx.core.util.page.PageParam
;
...
...
@@ -162,60 +161,6 @@ public class ResourceLibraryController {
}
return
CallBack
.
success
();
}
@ApiOperation
(
value
=
"推荐位弹框查询资源"
,
notes
=
"资源类型 0全部 理论 药物 方剂 临床 医案 文化 机构 医论 其他 医著 医家"
)
@GetMapping
(
value
=
ResourceRequestPath
.
RECOMMEND
+
ResourceRequestPath
.
PAGE
)
public
CallBack
<
PageInfo
<?>>
queryRecommend
(
QueryLibraryForm
form
,
PageParam
pageParam
){
//先查询出推荐位列表中已存在的资源
List
<
RecommendResource
>
list
=
new
ArrayList
<
RecommendResource
>();
if
(
form
.
getRecomId
()
!=
null
){
//公共推进位和民族推荐位
RecommendResource
recommendResource
=
new
RecommendResource
();
recommendResource
.
setRecomId
(
form
.
getRecomId
());
list
=
recommendResourceService
.
select
(
recommendResource
);
}
else
{
//民族主页推荐位
Integer
recomId
=
recommendService
.
queryRecommendIdByNationAndRecommendType
(
form
.
getNationsType
());
if
(
recomId
==
null
){
throw
new
BusinessValidateException
(
1
,
"无该民族主页"
);
}
else
{
RecommendResource
recommendResource
=
new
RecommendResource
();
recommendResource
.
setRecomId
(
recomId
);
list
=
recommendResourceService
.
select
(
recommendResource
);
}
}
List
<
String
>
authorIdList
=
null
;
List
<
String
>
ebookIdList
=
null
;
List
<
String
>
articleIdList
=
null
;
if
(
ArrayUtils
.
isNotEmpty
(
list
)){
Map
<
Integer
,
List
<
String
>>
resultMap
=
list
.
stream
().
collect
(
Collectors
.
groupingBy
(
RecommendResource
::
getResType
,
Collectors
.
mapping
(
RecommendResource
::
getResId
,
Collectors
.
toList
())));
authorIdList
=
resultMap
.
get
(
AllResourceTypeEnum
.
ZHUANJIA
.
getCode
());
ebookIdList
=
resultMap
.
get
(
AllResourceTypeEnum
.
TUSHU
.
getCode
());
Stream
<
ArticleTypeEnum
>
streamType
=
Stream
.
of
(
ArticleTypeEnum
.
values
());
articleIdList
=
streamType
.
map
(
ArticleTypeEnum
::
getCode
)
.
map
(
resultMap
::
get
).
flatMap
(
List
::
stream
).
collect
(
Collectors
.
toList
());
}
QueryResourceForPoPForm
f
=
new
QueryResourceForPoPForm
();
BeanUtils
.
copyProperties
(
form
,
f
);
//医家库列表查询
if
(
form
.
getResourceType
()
==
AllResourceTypeEnum
.
ZHUANJIA
.
getCode
()){
f
.
setIds
(
authorIdList
);
return
CallBack
.
success
(
authorLibraryService
.
pageByTitleAndDiyType
(
f
,
pageParam
));
}
//医著库列表查询
if
(
form
.
getResourceType
()
==
AllResourceTypeEnum
.
TUSHU
.
getCode
()){
f
.
setIds
(
ebookIdList
);
return
CallBack
.
success
(
ebookservice
.
pageByTitleAndDiyType
(
f
,
pageParam
));
}
//文章库列表查询
if
(
ArticleTypeEnum
.
getName
(
form
.
getResourceType
().
toString
())
!=
null
){
f
.
setIds
(
articleIdList
);
return
CallBack
.
success
(
articleLibraryService
.
pageByTitleAndDiyType
(
f
,
pageParam
));
}
return
CallBack
.
success
();
}
@ApiOperation
(
value
=
"选择弹窗中的列表"
,
notes
=
"查询选择弹窗中的列表"
)
@GetMapping
(
value
=
ResourceRequestPath
.
RELATION_RESOURCE
+
ResourceRequestPath
.
POPPAGE
)
public
CallBack
<
PageInfo
<
ResourceRelationListVo
>>
page
(
QueryResourceForPoPForm
form
,
PageParam
pageParam
)
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论