Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
J
jfjxhly
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
jfjxhly
Commits
bad68973
提交
bad68973
authored
4月 06, 2021
作者:
renjianyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
5d667dd8
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
68 行增加
和
8 行删除
+68
-8
FgArticlLibraryVo.java
...ource/commons/vo/fg/articlelibrary/FgArticlLibraryVo.java
+26
-0
FgArticleLibraryController.java
...controller/articlelibrary/FgArticleLibraryController.java
+4
-7
FgResourceLibraryController.java
...ntroller/resourcelibrary/FgResourceLibraryController.java
+4
-1
FgArticleLibraryMapper.java
...urce/fg/mapper/articlelibrary/FgArticleLibraryMapper.java
+14
-0
FgArticleLibrarySerivceImpl.java
...g/service/articlelibrary/FgArticleLibrarySerivceImpl.java
+14
-0
FgArticleLibraryService.java
...ce/fg/service/articlelibrary/FgArticleLibraryService.java
+6
-0
没有找到文件。
app/resource/src/main/java/com/zrqx/resource/commons/vo/fg/articlelibrary/FgArticlLibraryVo.java
0 → 100644
浏览文件 @
bad68973
package
com
.
zrqx
.
resource
.
commons
.
vo
.
fg
.
articlelibrary
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
com.zrqx.resource.commons.model.articlelibrary.ArticleToAudio
;
import
com.zrqx.resource.commons.model.resourcerelation.ResourceRelation
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"FgArticleLibraryOneVO"
,
description
=
"前台-单个查询文章返回的实体"
)
public
class
FgArticlLibraryVo
{
@ApiModelProperty
(
value
=
"文章标题"
)
private
String
name
;
@ApiModelProperty
(
"作者"
)
private
String
bookId
;
@ApiModelProperty
(
value
=
"章节标识号(bookid+txt编号)"
)
private
String
markid
;
}
app/resource/src/main/java/com/zrqx/resource/fg/controller/articlelibrary/FgArticleLibraryController.java
浏览文件 @
bad68973
...
...
@@ -39,6 +39,7 @@ import com.zrqx.resource.commons.model.articlelibrary.ArticleLibrary;
import
com.zrqx.resource.commons.model.articlelibrary.ChapterLibrary
;
import
com.zrqx.resource.commons.model.ebook.Ebook
;
import
com.zrqx.resource.commons.model.record.ReadingRecord
;
import
com.zrqx.resource.commons.vo.fg.articlelibrary.FgArticlLibraryVo
;
import
com.zrqx.resource.commons.vo.fg.articlelibrary.FgArticleLibraryListVO
;
import
com.zrqx.resource.commons.vo.fg.articlelibrary.FgArticleLibraryOneVO
;
import
com.zrqx.resource.commons.vo.fg.diytype.FgDiyTypeVo
;
...
...
@@ -120,14 +121,10 @@ public class FgArticleLibraryController {
return
CallBack
.
success
(
new
PageInfo
<
FgArticleLibraryListVO
>(
list
));
}
@ApiOperation
(
value
=
"查询"
,
notes
=
"根据
ID查询
"
)
@ApiOperation
(
value
=
"查询"
,
notes
=
"根据
名称查询补全加高亮
"
)
@GetMapping
(
value
=
"/get/all/name"
)
public
CallBack
<
List
<
String
>>
getAllName
(
FgQueryArticleLibraryForm
from
)
{
Example
example
=
service
.
createExample
();
example
.
createCriteria
().
andLike
(
"name"
,
"%"
+
from
.
getName
()+
"%"
);
List
<
ArticleLibrary
>
list
=
service
.
selectByExample
(
example
);
List
<
String
>
aa
=
list
.
stream
().
map
(
ArticleLibrary:
:
getName
).
collect
(
Collectors
.
toList
());
return
CallBack
.
success
(
aa
);
public
CallBack
<
List
<
FgArticlLibraryVo
>>
getAllName
(
FgQueryArticleLibraryForm
form
)
{
return
CallBack
.
success
(
service
.
getAllName
(
form
));
}
...
...
app/resource/src/main/java/com/zrqx/resource/fg/controller/resourcelibrary/FgResourceLibraryController.java
浏览文件 @
bad68973
...
...
@@ -1501,11 +1501,14 @@ public class FgResourceLibraryController {
resultMap
.
put
(
"ebookOrderNum"
,
solrDocument
.
get
(
"ebookOrderNum"
));
resultMap
.
put
(
"resourceType"
,
solrDocument
.
get
(
"resourceType"
));
resultMap
.
put
(
"cover"
,
solrDocument
.
get
(
"cover"
));
resultMap
.
put
(
"keywords"
,
solrDocument
.
get
(
"keywords"
));
resultMap
.
put
(
"bookId"
,
solrDocument
.
get
(
"bookId"
));
resultMap
.
put
(
"markId"
,
solrDocument
.
get
(
"markId"
));
//resultMap.put("browseNum",solrDocument.get("browseNum"));
//resultMap.put("resourceType",solrDocument.get("resourceType"));
//resultMap.put("name",solrDocument.get("name"));
//
resultMap.put("author", solrDocument.get("author"));
resultMap
.
put
(
"author"
,
solrDocument
.
get
(
"author"
));
//resultMap.put("authorId", solrDocument.get("authorId"));
//将高亮处理的结果存人resultMap
if
(
highlightMap
!=
null
){
...
...
app/resource/src/main/java/com/zrqx/resource/fg/mapper/articlelibrary/FgArticleLibraryMapper.java
浏览文件 @
bad68973
...
...
@@ -9,6 +9,7 @@ import com.zrqx.core.mapper.BaseMapper;
import
com.zrqx.resource.commons.form.fg.articlelibrary.FgQueryArticleLibraryForm
;
import
com.zrqx.resource.commons.form.fg.articlelibrary.FgQueryRecommedArticleForm
;
import
com.zrqx.resource.commons.model.articlelibrary.ArticleLibrary
;
import
com.zrqx.resource.commons.vo.fg.articlelibrary.FgArticlLibraryVo
;
import
com.zrqx.resource.commons.vo.fg.articlelibrary.FgArticleLibraryListVO
;
/**
* 文章库
...
...
@@ -126,4 +127,17 @@ public interface FgArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
+
"</script>"
)
List
<
FgArticleLibraryListVO
>
query
(
@Param
(
"form"
)
FgQueryArticleLibraryForm
form
);
/**
* @param
* @return
*/
@Select
(
"<script>"
+
"select c.markid,c.bookid,b.name from res_ebook a INNER JOIN res_article_library b on a.id = b.bookid INNER JOIN res_chapter_library c on c.markid = b.markid where c.level =1 and b.`status` ='1' "
+
" like(b.name,form.name) "
+
"</script>"
)
List
<
FgArticlLibraryVo
>
getAllName
(
@Param
(
"form"
)
FgQueryArticleLibraryForm
form
);
}
app/resource/src/main/java/com/zrqx/resource/fg/service/articlelibrary/FgArticleLibrarySerivceImpl.java
浏览文件 @
bad68973
...
...
@@ -41,6 +41,7 @@ import com.zrqx.resource.commons.model.articlelibrary.ArticleLibrary;
import
com.zrqx.resource.commons.model.articlelibrary.ArticleLibraryDiyType
;
import
com.zrqx.resource.commons.model.ebook.Book
;
import
com.zrqx.resource.commons.model.ebook.EbookDiyType
;
import
com.zrqx.resource.commons.vo.fg.articlelibrary.FgArticlLibraryVo
;
import
com.zrqx.resource.commons.vo.fg.articlelibrary.FgArticleLibraryListVO
;
import
com.zrqx.resource.commons.vo.fg.articlelibrary.FgArticleLibraryOneVO
;
import
com.zrqx.resource.fg.manage.memberconllection.FgMemberConllectionManage
;
...
...
@@ -749,4 +750,17 @@ public class FgArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,
vo
.
setVideo
(
"无权限"
);
}
}
@Override
public
List
<
FgArticlLibraryVo
>
getAllName
(
FgQueryArticleLibraryForm
form
)
{
List
<
FgArticlLibraryVo
>
list
=
mapper
.
getAllName
(
form
);
for
(
FgArticlLibraryVo
fgArticlLibraryVo
:
list
)
{
String
name
=
fgArticlLibraryVo
.
getName
();
System
.
out
.
println
(
" <span style='color:red;'>"
+
form
.
getName
()
+
"</span>"
);
String
newName
=
name
.
replace
(
form
.
getName
(),
" <span style='color:red;'>"
+
form
.
getName
()
+
"</span>"
);
fgArticlLibraryVo
.
setName
(
newName
);
}
return
list
;
}
}
app/resource/src/main/java/com/zrqx/resource/fg/service/articlelibrary/FgArticleLibraryService.java
浏览文件 @
bad68973
...
...
@@ -12,6 +12,7 @@ import com.zrqx.resource.commons.form.fg.articlelibrary.FgQueryArticleLibraryFor
import
com.zrqx.resource.commons.form.fg.articlelibrary.FgQueryRecommedArticleForm
;
import
com.zrqx.resource.commons.form.fg.articlelibrary.FgQueryRelatedArticleForm
;
import
com.zrqx.resource.commons.model.articlelibrary.ArticleLibrary
;
import
com.zrqx.resource.commons.vo.fg.articlelibrary.FgArticlLibraryVo
;
import
com.zrqx.resource.commons.vo.fg.articlelibrary.FgArticleLibraryListVO
;
import
com.zrqx.resource.commons.vo.fg.articlelibrary.FgArticleLibraryOneVO
;
/**
...
...
@@ -114,4 +115,9 @@ public interface FgArticleLibraryService extends BaseService<ArticleLibrary,Stri
* @date: 2019年1月18日 下午1:50:44
*/
List
<
FgArticleLibraryListVO
>
queryRecommendArticle
(
FgQueryRecommedArticleForm
form
);
List
<
FgArticlLibraryVo
>
getAllName
(
FgQueryArticleLibraryForm
form
);
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论