Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
石磊
/
cihai
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit f3b6a58e
authored
Jan 31, 2018
by
石头
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
整合词条页面
1 parent
5e468d16
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
1 deletions
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/relate.jsp
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/statement_baike.jsp
serverside/cihai-app/src/main/webapp/static/temp/word/国歌.jpg
serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/dto/WordDTO.java
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/relate.jsp
View file @
f3b6a58
...
@@ -68,6 +68,21 @@
...
@@ -68,6 +68,21 @@
<a
class=
"list-group-item"
>
万象森罗
</a>
<a
class=
"list-group-item"
>
万象森罗
</a>
</div>
</div>
</c:when>
</c:when>
<c:when
test=
"${vo.word eq '象鼻山'}"
>
<div
class=
"list-group"
>
<span
class=
"list-group-item list-group-item-header"
>
${vo.word}
</span>
<a
class=
"list-group-item"
href=
"/word/info/1"
>
象
</a>
<a
class=
"list-group-item"
>
象鼻虫
</a>
<a
class=
"list-group-item"
>
象草
</a>
<a
class=
"list-group-item"
>
象龟
</a>
<a
class=
"list-group-item"
>
象山
</a>
<a
class=
"list-group-item"
>
象山港
</a>
<a
class=
"list-group-item"
>
象山先生集
</a>
<a
class=
"list-group-item"
>
象山学派
</a>
<a
class=
"list-group-item"
>
象舞
</a>
<a
class=
"list-group-item"
>
象戏
</a>
</div>
</c:when>
<c:when
test=
"${vo.word eq '中国'}"
>
<c:when
test=
"${vo.word eq '中国'}"
>
<div
class=
"list-group"
>
<div
class=
"list-group"
>
<span
class=
"list-group-item list-group-item-header"
>
${vo.word}
</span>
<span
class=
"list-group-item list-group-item-header"
>
${vo.word}
</span>
...
...
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/statement_baike.jsp
View file @
f3b6a58
...
@@ -663,6 +663,7 @@
...
@@ -663,6 +663,7 @@
<c:if test="${vo.word eq '心脏'}">
<c:if test="${vo.word eq '心脏'}">
<script>
<script>
$(function() {
$(function() {
// 图谱
// 图谱
var nodeDatas = [{
var nodeDatas = [{
atlasNodes: [{
atlasNodes: [{
...
...
serverside/cihai-app/src/main/webapp/static/temp/word/国歌.jpg
0 → 100644
View file @
f3b6a58
3.19 KB
serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/dto/WordDTO.java
View file @
f3b6a58
...
@@ -79,7 +79,7 @@ public class WordDTO {
...
@@ -79,7 +79,7 @@ public class WordDTO {
relationOneWayQuery
.
setWordId
(
word
.
getId
());
relationOneWayQuery
.
setWordId
(
word
.
getId
());
List
<
RelationOneWayDomain
>
relateList
=
relationOneWayService
.
getList
(
relationOneWayQuery
);
List
<
RelationOneWayDomain
>
relateList
=
relationOneWayService
.
getList
(
relationOneWayQuery
);
wordDTO
.
setHasRelated
(
CollectionUtils
.
isNotEmpty
(
relateList
));
wordDTO
.
setHasRelated
(
CollectionUtils
.
isNotEmpty
(
relateList
));
if
(
ArrayUtils
.
contains
(
new
String
[]{
"象"
,
"中国"
,
"中华人民共和国"
,
"太阳系"
},
word
.
getWord
()))
{
if
(
ArrayUtils
.
contains
(
new
String
[]{
"象"
,
"象鼻山"
,
"中国"
,
"中华人民共和国"
,
"太阳系"
},
word
.
getWord
()))
{
wordDTO
.
setHasRelated
(
true
);
wordDTO
.
setHasRelated
(
true
);
}
}
return
wordDTO
;
return
wordDTO
;
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment