Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
S
skz
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
skz
Commits
b14ed11a
提交
b14ed11a
authored
7月 08, 2020
作者:
yucaiwei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
b794456f
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
67 行增加
和
26 行删除
+67
-26
FileInfoClient.java
...java/com/zrqx/resource/fg/client/file/FileInfoClient.java
+11
-0
FileInfoClientHystric.java
...m/zrqx/resource/fg/client/file/FileInfoClientHystric.java
+7
-0
FgArticleLibrarySerivceImpl.java
...g/service/articlelibrary/FgArticleLibrarySerivceImpl.java
+45
-25
FgResourceLibraryServiceImpl.java
...rce/fg/service/resource/FgResourceLibraryServiceImpl.java
+4
-1
没有找到文件。
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/client/file/FileInfoClient.java
浏览文件 @
b14ed11a
...
...
@@ -5,6 +5,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
com.zrqx.core.model.file.FileInfo
;
import
com.zrqx.core.util.response.CallBack
;
/**
...
...
@@ -34,4 +35,14 @@ public interface FileInfoClient {
*/
@RequestMapping
(
value
=
"/getFilePath"
,
method
=
RequestMethod
.
GET
)
CallBack
<
String
>
downLoad
(
@RequestParam
(
value
=
"fileName"
)
String
fileName
)
;
/**
* 查询文件详细信息
* @param fileName
* @return
* @author ycw
* @date: 2020年7月8日 上午9:26:50
*/
@RequestMapping
(
value
=
"/getInfo"
,
method
=
RequestMethod
.
GET
)
CallBack
<
FileInfo
>
getInfo
(
@RequestParam
(
value
=
"fileName"
)
String
fileName
);
}
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/client/file/FileInfoClientHystric.java
浏览文件 @
b14ed11a
...
...
@@ -4,6 +4,7 @@ import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
import
org.springframework.stereotype.Component
;
import
com.zrqx.core.model.file.FileInfo
;
import
com.zrqx.core.util.response.CallBack
;
@Component
...
...
@@ -21,4 +22,10 @@ public class FileInfoClientHystric implements FileInfoClient {
logger
.
info
(
"通过fileName:"
+
fileName
+
"调用文件服务获取文件地址失败"
);
return
CallBack
.
fail
();
}
@Override
public
CallBack
<
FileInfo
>
getInfo
(
String
fileName
){
logger
.
info
(
"通过fileName:"
+
fileName
+
"调用文件服务获取文件信息失败"
);
return
CallBack
.
fail
();
}
}
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/articlelibrary/FgArticleLibrarySerivceImpl.java
浏览文件 @
b14ed11a
...
...
@@ -33,6 +33,7 @@ import com.zrqx.core.form.resource.fg.articlelibrary.FgQueryArticleLibraryForm;
import
com.zrqx.core.form.resource.fg.articlelibrary.FgQueryRecommedArticleForm
;
import
com.zrqx.core.form.resource.fg.articlelibrary.FgQueryRelatedArticleForm
;
import
com.zrqx.core.mapper.BaseMapper
;
import
com.zrqx.core.model.file.FileInfo
;
import
com.zrqx.core.model.order.OrderInfo
;
import
com.zrqx.core.model.resource.articlelibrary.ArticleLibrary
;
import
com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType
;
...
...
@@ -163,34 +164,47 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
boolean
isComplete
=
false
;
// 是否补全
List
<
FgArticleLibraryListVO
>
lis
=
new
ArrayList
<
FgArticleLibraryListVO
>();
// 补充数据
List
<
FgArticleLibraryListVO
>
list
=
new
ArrayList
<
FgArticleLibraryListVO
>();
PageInfo
<
FgArticleLibraryListVO
>
page
=
new
PageInfo
<
FgArticleLibraryListVO
>(
list
);
if
(
ArrayUtils
.
isNotEmpty
(
ids
)){
startPage
(
pageParam
);
list
=
mapper
.
queryRecommendArticleByIds
(
ids
);
}
// 判断数量是否满足,不满足,需要补全
if
(
list
.
size
()
<
pageParam
.
getPageSize
()){
int
num
=
pageParam
.
getPageSize
()
-
list
.
size
(
);
PageHelper
.
startPage
(
1
,
num
,
"uploadTime desc ,a.id desc"
);
FgQueryRecommedArticleForm
form
=
new
FgQueryRecommedArticleForm
(
);
form
.
setIds
(
ids
);
form
.
setResourceType
(
ArticleTypeEnum
.
ANLI
.
getCode
()
);
lis
=
mapper
.
queryOtherRecommendArticle
(
form
);
if
(
list
.
size
()
==
0
){
list
=
lis
;
}
else
{
list
.
addAll
(
lis
)
;
isComplete
=
true
;
// 判断数量是否满足,不满足,需要补全
if
(
list
.
size
()
<
pageParam
.
getPageSize
()){
int
num
=
pageParam
.
getPageSize
()
-
list
.
size
();
PageHelper
.
startPage
(
1
,
num
,
"uploadTime desc ,a.id desc"
);
FgQueryRecommedArticleForm
form
=
new
FgQueryRecommedArticleForm
(
);
form
.
setIds
(
ids
);
form
.
setResourceType
(
ArticleTypeEnum
.
ANLI
.
getCode
()
);
lis
=
mapper
.
queryOtherRecommendArticle
(
form
);
if
(
list
.
size
()
==
0
){
list
=
lis
;
}
else
{
list
.
addAll
(
lis
);
isComplete
=
true
;
}
}
}
/*if(list.size() == 0){
page
=
new
PageInfo
<
FgArticleLibraryListVO
>(
list
);
if
(
isComplete
){
page
.
setSize
(
list
.
size
());
page
.
setTotal
(
page
.
getTotal
()
+
lis
.
size
());
}
}
else
{
int
num
=
6
;
PageHelper
.
startPage
(
1
,
num
,
"uploadTime desc ,a.id desc"
);
FgQueryRecommedArticleForm
form
=
new
FgQueryRecommedArticleForm
();
form
.
setIds
(
ids
);
form
.
setResourceType
(
ArticleTypeEnum
.
ANLI
.
getCode
());
list
=
mapper
.
queryOtherRecommendArticle
(
form
);
list = BeanUtils.copyList(list, FgArticleLibraryListVO.class);
}*/
page
=
new
PageInfo
<
FgArticleLibraryListVO
>(
list
);
page
.
setSize
(
list
.
size
());
page
.
setTotal
(
list
.
size
());
page
.
setHasNextPage
(
false
);
page
.
setIsLastPage
(
true
);
page
.
setNavigateLastPage
(
1
);
page
.
setLastPage
(
1
);
page
.
setNextPage
(
0
);
page
.
setPages
(
1
);
}
this
.
isPdf
(
list
);
this
.
regEx
(
list
);
// 获取权限判断
...
...
@@ -201,11 +215,6 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
li
.
setMessageCode
(
one
.
getMessageCode
());
}
});
PageInfo
<
FgArticleLibraryListVO
>
page
=
new
PageInfo
<
FgArticleLibraryListVO
>(
list
);
if
(
isComplete
){
page
.
setSize
(
list
.
size
());
page
.
setTotal
(
page
.
getTotal
()
+
lis
.
size
());
}
return
page
;
}
...
...
@@ -289,7 +298,18 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
if
(
result
.
hasEntity
()){
vo
.
setPdfPath
(
"/sc/"
+
result
.
getData
());
}
else
{
logger
.
info
(
"查询pdf地址失败"
);
logger
.
error
(
"查询pdf地址失败"
);
}
}
else
{
vo
.
setIsPdf
(
Integer
.
parseInt
(
BooleanStatusEnum
.
NO
.
getCode
()));
}
if
(
StringUtils
.
isNotBlank
(
vo
.
getAudio
())){
// 查询pdf地址
CallBack
<
FileInfo
>
result
=
fileInfoClient
.
getInfo
(
vo
.
getAudio
());
if
(
result
.
hasEntity
()){
vo
.
setTimeLength
(
result
.
getData
().
getTime
()
+
""
);
}
else
{
logger
.
error
(
"查询音频信息失败"
);
}
}
else
{
vo
.
setIsPdf
(
Integer
.
parseInt
(
BooleanStatusEnum
.
NO
.
getCode
()));
...
...
@@ -315,7 +335,7 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
if
(
result
.
hasEntity
()){
vo
.
setIsCollection
(
result
.
getData
());
}
else
{
logger
.
info
(
"跨服务查询收藏失败"
);
logger
.
error
(
"跨服务查询收藏失败"
);
vo
.
setIsCollection
(
0
);
}
}
...
...
com.zrqx.resource/src/main/java/com/zrqx/resource/fg/service/resource/FgResourceLibraryServiceImpl.java
浏览文件 @
b14ed11a
...
...
@@ -617,7 +617,10 @@ public class FgResourceLibraryServiceImpl implements FgResourceLibraryService {
String
text
=
this
.
regEx1
(
solrDocument
.
get
(
"text"
).
toString
(),
solrDocument
.
get
(
"name"
).
toString
());
Integer
totalCount
=
text
.
length
();
Integer
count
=
totalCount
/
2
;
text
=
HtmlUtil
.
subStringHTML
(
text
,
count
)
+
"..."
;
text
=
HtmlUtil
.
subStringHTML
(
text
,
count
);
if
(
StringUtils
.
isNotBlank
(
text
)){
text
=
text
+
"..."
;
}
resultMap
.
put
(
"text"
,
text
);
}
else
{
resultMap
.
put
(
"text"
,
null
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论