Skip to content

石磊 / cihai

Go to a project
Commit 5c46a7a5 by 侯昆
Options

相关词修改

1 parent 2cf1278f
Inline Side-by-side
Showing 11 changed files with 407 additions and 125 deletions
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/all.jsp
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<body class="history"> <body class="history">
<div class="container-fluid"> <div class="container-fluid">
<div class="wrapper-ipad-app-h5"> <div class="wrapper-ipad-app-h5">
<h1 class="text-center">一起进入历史上的2月16日</h1> <h1 class="text-center">一起进入历史上的2月14日</h1>
<nav class="nav justify-content-center"> <nav class="nav justify-content-center">
<a class="nav-link active" href="/history/all">全部</a> <a class="nav-link active" href="/history/all">全部</a>
<a class="nav-link" href="/history/event">事件</a> <a class="nav-link" href="/history/event">事件</a>
...@@ -23,52 +23,60 @@ ...@@ -23,52 +23,60 @@
</nav> </nav>
<ul class="list-unstyled list-history"> <ul class="list-unstyled list-history">
<li> <li>
<div class="time">1032</div> <div class="time">1869</div>
<p>宋英宗赵曙出生。</p> <p>英国物理学家查尔斯·威尔逊出生。</p>
</li> </li>
<li> <li>
<div class="time">1222</div> <div class="time">1876</div>
<p>大日莲，日本佛教日莲宗创始人出生。</p> <p>亚历山大·贝尔获得电话的专利。</p>
</li> </li>
<li> <li>
<div class="time">1304</div> <div class="time">1879</div>
<p>元朝第八位皇帝元文宗图帖睦尔出生。</p> <p>大智利同玻利维亚、秘鲁两国爆发太平洋战争。</p>
</li> </li>
<li> <li>
<div class="time">1352</div> <div class="time">1898</div>
<p>郭子兴起义军攻克濠州。</p> <p>瑞士天文学家弗里兹·扎维奇出生。</p>
</li> </li>
<li> <li>
<div class="time">1870</div> <div class="time">1912</div>
<p>普法战争，法国失败。</p> <p>孙中山辞去临时大总统一职。</p>
</li> </li>
<li> <li>
<div class="time">1910</div> <div class="time">1912</div>
<p>孙中山、章太炎分道扬镳同盟会分裂。</p> <p>中国著名音乐家<a href=/home/search?keyword=聂耳>聂耳</a>出生。</p>
</li> </li>
<li> <li>
<div class="time">1921</div> <div class="time">1924</div>
<p><a href=/home/search?keyword=华国锋>华国锋</a>同志诞辰。</p> <p>国际商业机器有限公司（即IBM）成立。</p>
</li> </li>
<li> <li>
<div class="time">1930</div> <div class="time">1927</div>
<p>红军有了第一架飞机——“列宁”号。</p> <p>中国作家木心出生。</p>
</li> </li>
<li> <li>
<div class="time">1935</div> <div class="time">1943</div>
<p>红军取得长征以来第一次重大胜利。</p> <p>德国数学家希尔伯特逝世。</p>
</li> </li>
<li> <li>
<div class="time">1938</div> <div class="time">1946</div>
<p>京剧名家杨小楼病逝。</p> <p>世界上第一台电子计算机(ENIAC)在美国宾夕法尼亚大学诞生。</p>
</li> </li>
<li> <li>
<div class="time">1959</div> <div class="time">1950</div>
<p>菲德尔·卡斯特罗就任古巴总理。</p> <p>《中苏友好同盟互助条约》在莫斯科签订。</p>
</li> </li>
<li> <li>
<div class="time">1976</div> <div class="time">1952</div>
<p>英国北海油田的奥克钻油区正式运作。</p> <p>第六届冬季奥运会在挪威奥斯陆开幕。</p>
</li>
<li>
<div class="time">1961</div>
<p>发现第一个合成制造的化学元素：铹。</p>
</li>
<li>
<div class="time">1972</div>
<p>中国与墨西哥建交。</p>
</li> </li>
<li class="more"> <li class="more">
<a href="/history/event">更多</a> <a href="/history/event">更多</a>
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/event.jsp
...@@ -23,41 +23,40 @@ ...@@ -23,41 +23,40 @@
</nav> </nav>
<ul class="list-unstyled list-history"> <ul class="list-unstyled list-history">
<li> <li>
<div class="time">1352</div> <div class="time">1876</div>
<p>郭子兴起义军攻克濠州。</p> <p>亚历山大·贝尔获得电话的专利。</p>
</li> </li>
<li> <li>
<div class="time">1870</div> <div class="time">1879</div>
<p>普法战争，法国失败。</p> <p>大智利同玻利维亚、秘鲁两国爆发太平洋战争。</p>
</li> </li>
<li> <li>
<div class="time">1910</div> <div class="time">1912</div>
<p>孙中山 <p>孙中山辞去临时大总统一职。</p>
章太炎分道扬镳同盟会分裂。</p>
</li> </li>
<li> <li>
<div class="time">1930</div> <div class="time">1924</div>
<p>红军有了第一架飞机——“列宁”号。</p> <p>国际商业机器有限公司（即IBM）成立。</p>
</li> </li>
<li> <li>
<div class="time">1935</div> <div class="time">1946</div>
<p>红军取得长征以来第一次重大胜利。</p> <p>世界上第一台电子计算机(ENIAC)在美国宾夕法尼亚大学诞生。</p>
</li> </li>
<li> <li>
<div class="time">1959</div> <div class="time">1950</div>
<p>菲德尔·卡斯特罗就任古巴总理。</p> <p>《中苏友好同盟互助条约》在莫斯科签订。</p>
</li> </li>
<li> <li>
<div class="time">1976</div> <div class="time">1952</div>
<p>英国北海油田的奥克钻油区正式运作。</p> <p>第六届冬季奥运会在挪威奥斯陆开幕。</p>
</li> </li>
<li> <li>
<div class="time">1985</div> <div class="time">1961</div>
<p>以色列军队开始从黎巴嫩撤退。</p> <p>发现第一个合成制造的化学元素：铹。</p>
</li> </li>
<li> <li>
<div class="time">2005</div> <div class="time">1972</div>
<p>限制全球温室气体排放量的“京都议定书” 获得120多个国家确认正式生效。</p> <p>中国与墨西哥建交。</p>
</li> </li>
<li></li> <li></li>
<li class="end"> <li class="end">
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/people.jsp
...@@ -23,34 +23,25 @@ ...@@ -23,34 +23,25 @@
</nav> </nav>
<ul class="list-unstyled list-history"> <ul class="list-unstyled list-history">
<li> <li>
<div class="time">1032</div> <div class="time">1869</div>
<p>宋英宗赵曙出生。</p> <p>英国物理学家查尔斯·威尔逊出生。</p>
</li> </li>
<li> <li>
<div class="time">1222</div> <div class="time">1898</div>
<p>大日莲，日本佛教日莲宗创始人出生。</p> <p>瑞士天文学家弗里兹·扎维奇出生。</p>
</li> </li>
<li> <li>
<div class="time">1304</div> <div class="time">1912</div>
<p>元朝第八位皇帝元文宗图帖睦尔出生。</p> <p>中国著名音乐家<a href=/home/search?keyword=聂耳>聂耳</a>出生。</p>
</li> </li>
<li> <li>
<div class="time">1921</div> <div class="time">1927</div>
<p><a href="/home/search?keyword=华国锋">华国锋</a>同志诞辰。</p> <p>中国作家木心出生。</p>
</li> </li>
<li> <li>
<div class="time">1938</div> <div class="time">1943</div>
<p>京剧名家杨小楼病逝。</p> <p>德国数学家希尔伯特逝世。</p>
</li> </li>
<li>
<div class="time">1988</div>
<p>教育家、作家叶圣陶逝世。</p>
</li>
<li>
<div class="time">1997</div>
<p>著名实验物理学家吴健雄女士去世 。</p>
</li>
<li></li>
<li class="end"> <li class="end">
<p>留存当下，回忆过去。</p> <p>留存当下，回忆过去。</p>
</li> </li>
......
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/controller/WordController.java
...@@ -14,14 +14,18 @@ package com.dookay.cihai.pc.controller; ...@@ -14,14 +14,18 @@ package com.dookay.cihai.pc.controller;
* * * *
****************************************/ ****************************************/
import com.dookay.cihai.core.word.domain.RelationOneWayDomain;
import com.dookay.cihai.core.word.domain.WordDomain; import com.dookay.cihai.core.word.domain.WordDomain;
import com.dookay.cihai.core.word.dto.WordDTO; import com.dookay.cihai.core.word.dto.WordDTO;
import com.dookay.cihai.core.word.enums.WordType; import com.dookay.cihai.core.word.enums.WordType;
import com.dookay.cihai.core.word.query.RelationOneWayQuery;
import com.dookay.cihai.core.word.query.WordQuery;
import com.dookay.cihai.core.word.service.IRelationOneWayService; import com.dookay.cihai.core.word.service.IRelationOneWayService;
import com.dookay.cihai.core.word.service.IWordRelationService; import com.dookay.cihai.core.word.service.IWordRelationService;
import com.dookay.cihai.core.word.service.IWordService; import com.dookay.cihai.core.word.service.IWordService;
import com.dookay.cihai.pc.controller.vo.*; import com.dookay.cihai.pc.controller.vo.*;
import com.dookay.coral.common.core.exception.ServiceException; import com.dookay.coral.common.core.exception.ServiceException;
import com.dookay.coral.common.core.utils.lang.CollectionUtils;
import com.dookay.coral.common.core.utils.lang.StringUtils; import com.dookay.coral.common.core.utils.lang.StringUtils;
import com.dookay.coral.common.web.controller.BaseController; import com.dookay.coral.common.web.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -32,6 +36,7 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -32,6 +36,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* 词控制器 * 词控制器
...@@ -99,8 +104,18 @@ public class WordController extends BaseController { ...@@ -99,8 +104,18 @@ public class WordController extends BaseController {
mv.addObject("hasBaike", hasBaike); mv.addObject("hasBaike", hasBaike);
mv.addObject("vo", CharacterParaphVO.fromDomain(character)); mv.addObject("vo", CharacterParaphVO.fromDomain(character));
mv.addObject("edition", EditionVO.fromDomain(character)); mv.addObject("edition", EditionVO.fromDomain(character));
List<WordDomain> relateWords = wordRelationService.getRelateWords(character.getId()); // 相关词
mv.addObject("relateWords", relateWords); RelationOneWayQuery q = new RelationOneWayQuery();
q.setWordId(id);
List<RelationOneWayDomain> relateList = relationOneWayService.getList(q);
if (CollectionUtils.isNotEmpty(relateList)) {
List<Long> relateIds = relateList.stream().map(RelationOneWayDomain::getRelateWordId).collect(Collectors.toList());
WordQuery wq = new WordQuery();
wq.setIds(relateIds);
List<WordDomain> relatedWords = wordService.getList(wq);
OneWayRelateVO oneway = OneWayRelateVO.fromDomain(character, relateList, relatedWords);
mv.addObject("oneway", oneway);
}
return mv; return mv;
} }
...@@ -119,8 +134,18 @@ public class WordController extends BaseController { ...@@ -119,8 +134,18 @@ public class WordController extends BaseController {
mv.addObject("vo", CharacterBaikeVO.fromDomain(character)); mv.addObject("vo", CharacterBaikeVO.fromDomain(character));
mv.addObject("hasParaph", hasParaph); mv.addObject("hasParaph", hasParaph);
mv.addObject("edition", EditionVO.fromDomain(character)); mv.addObject("edition", EditionVO.fromDomain(character));
List<WordDomain> relateWords = wordRelationService.getRelateWords(character.getId()); // 相关词
mv.addObject("relateWords", relateWords); RelationOneWayQuery q = new RelationOneWayQuery();
q.setWordId(id);
List<RelationOneWayDomain> relateList = relationOneWayService.getList(q);
if (CollectionUtils.isNotEmpty(relateList)) {
List<Long> relateIds = relateList.stream().map(RelationOneWayDomain::getRelateWordId).collect(Collectors.toList());
WordQuery wq = new WordQuery();
wq.setIds(relateIds);
List<WordDomain> relatedWords = wordService.getList(wq);
OneWayRelateVO oneway = OneWayRelateVO.fromDomain(character, relateList, relatedWords);
mv.addObject("oneway", oneway);
}
return mv; return mv;
} }
...@@ -139,8 +164,18 @@ public class WordController extends BaseController { ...@@ -139,8 +164,18 @@ public class WordController extends BaseController {
mv.addObject("hasBaike", hasBaike); mv.addObject("hasBaike", hasBaike);
mv.addObject("vo", StatementParaphVO.fromDomain(statement)); mv.addObject("vo", StatementParaphVO.fromDomain(statement));
mv.addObject("edition", EditionVO.fromDomain(statement)); mv.addObject("edition", EditionVO.fromDomain(statement));
List<WordDomain> relateWords = wordRelationService.getRelateWords(statement.getId()); // 相关词
mv.addObject("relateWords", relateWords); RelationOneWayQuery q = new RelationOneWayQuery();
q.setWordId(id);
List<RelationOneWayDomain> relateList = relationOneWayService.getList(q);
if (CollectionUtils.isNotEmpty(relateList)) {
List<Long> relateIds = relateList.stream().map(RelationOneWayDomain::getRelateWordId).collect(Collectors.toList());
WordQuery wq = new WordQuery();
wq.setIds(relateIds);
List<WordDomain> relatedWords = wordService.getList(wq);
OneWayRelateVO oneway = OneWayRelateVO.fromDomain(statement, relateList, relatedWords);
mv.addObject("oneway", oneway);
}
return mv; return mv;
} }
...@@ -159,8 +194,18 @@ public class WordController extends BaseController { ...@@ -159,8 +194,18 @@ public class WordController extends BaseController {
mv.addObject("vo", StatementBaikeVO.fromDomain(statement)); mv.addObject("vo", StatementBaikeVO.fromDomain(statement));
mv.addObject("hasParaph", hasParaph); mv.addObject("hasParaph", hasParaph);
mv.addObject("edition", EditionVO.fromDomain(statement)); mv.addObject("edition", EditionVO.fromDomain(statement));
List<WordDomain> relateWords = wordRelationService.getRelateWords(statement.getId()); // 相关词
mv.addObject("relateWords", relateWords); RelationOneWayQuery q = new RelationOneWayQuery();
q.setWordId(id);
List<RelationOneWayDomain> relateList = relationOneWayService.getList(q);
if (CollectionUtils.isNotEmpty(relateList)) {
List<Long> relateIds = relateList.stream().map(RelationOneWayDomain::getRelateWordId).collect(Collectors.toList());
WordQuery wq = new WordQuery();
wq.setIds(relateIds);
List<WordDomain> relatedWords = wordService.getList(wq);
OneWayRelateVO oneway = OneWayRelateVO.fromDomain(statement, relateList, relatedWords);
mv.addObject("oneway", oneway);
}
return mv; return mv;
} }
......
serverside/cihai-pc/src/main/java/com/dookay/cihai/pc/controller/vo/OneWayRelateVO.java 0 → 100644
package com.dookay.cihai.pc.controller.vo;
/*****************************************
* *
* @dookay.com Internet make it happen *
* ----------- ----------------------- *
* dddd ddddd Internet make it happen *
* o o o Internet make it happen *
* k k k Internet make it happen *
* a a a Internet make it happen *
* yyyy yyyyy Internet make it happen *
* ----------- ----------------------- *
* @dookay.com Internet make it happen *
* *
****************************************/
import com.dookay.cihai.core.word.domain.RelationOneWayDomain;
import com.dookay.cihai.core.word.domain.WordDomain;
import com.dookay.coral.common.core.utils.lang.CollectionUtils;
import lombok.Data;
import org.apache.commons.lang3.tuple.MutableTriple;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 单向相关视图模型
*
* @author houkun
* @date 2018/1/24
*/
@Data
public class OneWayRelateVO {
private String word;
private List<MutableTriple<Integer, String, List<WordDomain>>> relationByGroup;
public static OneWayRelateVO fromDomain(WordDomain word, List<RelationOneWayDomain> relations, List<WordDomain> relatedWords) {
OneWayRelateVO vo = new OneWayRelateVO();
vo.setWord(word.getWord());
if (CollectionUtils.isNotEmpty(relatedWords) &&
CollectionUtils.isNotEmpty(relations)) {
Map<String, List<RelationOneWayDomain>> map = relations.stream().collect(Collectors.groupingBy(RelationOneWayDomain::getGroupName));
List<MutableTriple<Integer, String, List<WordDomain>>> relationByGroup = new ArrayList<>();
for (Map.Entry<String, List<RelationOneWayDomain>> entry : map.entrySet()) {
List<Long> relatedIds = entry.getValue().stream().map(RelationOneWayDomain::getRelateWordId).collect(Collectors.toList());
List<WordDomain> words = relatedWords.stream().filter(w -> relatedIds.contains(w.getId())).collect(Collectors.toList());
words.sort(Comparator.comparing(n->n.getCreateTime()));
MutableTriple<Integer, String, List<WordDomain>> triple = new MutableTriple<>();
triple.setLeft(entry.getValue().get(0).getGroupRank());
triple.setMiddle(entry.getKey());
triple.setRight(words);
relationByGroup.add(triple);
}
List<MutableTriple<Integer, String, List<WordDomain>>> sorted = relationByGroup.stream().sorted(Comparator.comparing(MutableTriple::getLeft)).collect(Collectors.toList());
vo.setRelationByGroup(sorted);
}
return vo;
}
}
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/home/index.jsp
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<div class="container-fluid search-main"> <div class="container-fluid search-main">
<form class="navbar-form clearfix j_search_form" action="/home/search" method="GET"> <form class="navbar-form clearfix j_search_form" action="/home/search" method="GET">
<div class="logo-search"> <div class="logo-search">
<img class="img-responsive" src="/static/images/logo-search.png"> <img class="img-responsive" src="/static/images/logo-search2.png">
</div> </div>
<div class="search-main-input-wrapper"> <div class="search-main-input-wrapper">
<img class="search-main-input-img" src="/static/images/bg-dog.png" alt=""> <img class="search-main-input-img" src="/static/images/bg-dog.png" alt="">
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/character_baike.jsp
<%@ page import="com.alibaba.fastjson.JSON" %>
<%@ page import="com.dookay.cihai.pc.helper.HtmlHelper" %> <%@ page import="com.dookay.cihai.pc.helper.HtmlHelper" %>
<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %> <%@ include file="/WEB-INF/jsp/include/taglib.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:useBean id="relateWords" scope="request" type="java.util.List<com.dookay.cihai.core.word.domain.WordDomain>"/>
<jsp:useBean id="edition" scope="request" type="com.dookay.cihai.pc.controller.vo.EditionVO"/> <jsp:useBean id="edition" scope="request" type="com.dookay.cihai.pc.controller.vo.EditionVO"/>
<jsp:useBean id="vo" scope="request" type="com.dookay.cihai.pc.controller.vo.CharacterBaikeVO"/> <jsp:useBean id="vo" scope="request" type="com.dookay.cihai.pc.controller.vo.CharacterBaikeVO"/>
...@@ -12,17 +10,18 @@ ...@@ -12,17 +10,18 @@
</jsp:include> </jsp:include>
<div class="encyclopedia" <div class="container">
<div class="encyclopedia"
<c:choose> <c:choose>
<c:when test="${vo.images.size() > 0}"> <c:when test="${vo.images.size() > 0}">
style="background-image:url(${vo.images.get(0).file})" style=" background-image:url(${vo.images.get(0).file})"
</c:when> </c:when>
<c:otherwise> <c:otherwise>
style="background-image:url(/static/images/word-bg-01.jpg)" style="background-image:url(/static/images/word-bg-01.jpg)"
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
> >
<div class="container"> <div class="encyclopedia-mask"></div>
<div class="content"> <div class="content">
<div class="row"> <div class="row">
<div class="col-xs-17"> <div class="col-xs-17">
...@@ -142,20 +141,47 @@ ...@@ -142,20 +141,47 @@
</div> </div>
</div> </div>
</div> </div>
<c:if test="${relateWords.size()>0}"> <%--@elvariable id="oneway" type="com.dookay.cihai.pc.controller.vo.OneWayRelateVO"--%>
<c:choose>
<c:when test="${vo.word eq '象'}">
<div class="recommend">
<div class="recommend-title title-base">推荐词</div>
<div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">象</div>
<div class="recommend-cells">
<span class="recommend-cell">象鼻虫</span>
<span class="recommend-cell">象鼻山</span>
<span class="recommend-cell">象草</span>
<span class="recommend-cell">象龟</span>
<span class="recommend-cell">象山</span>
<span class="recommend-cell">象山港</span>
<span class="recommend-cell">象山先生集</span>
<span class="recommend-cell">象山学派</span>
<span class="recommend-cell">象舞</span>
<span class="recommend-cell">象戏</span>
</div>
</div>
</div>
</c:when>
<c:when test="${oneway != null}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">推荐词</div> <div class="recommend-title title-base">推荐词</div>
<c:forEach items="${oneway.relationByGroup}" var="group">
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">${vo.word}</div> <div class="recommend-section-title title-sm title-primary">${group.middle}</div>
<div class="recommend-cells"> <div class="recommend-cells">
<c:forEach items="${relateWords}" var="item"> <c:forEach items="${group.right}" var="item">
<span class="recommend-cell">${item.word}</span> <a href="/word/${item.id}" style="color: #000;">
<span class="recommend-cell">${item.word}</span></a>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
</c:forEach>
</div> </div>
</c:if> </c:when>
<div class="aside-tag text-primary">标签：语词</div>
</c:choose>
<div class="aside-tag text-primary">标签：百科</div>
</aside> </aside>
</div> </div>
</div> </div>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/character_paraph.jsp
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %> <%@ include file="/WEB-INF/jsp/include/taglib.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:useBean id="relateWords" scope="request" type="java.util.List<com.dookay.cihai.core.word.domain.WordDomain>"/>
<jsp:useBean id="edition" scope="request" type="com.dookay.cihai.pc.controller.vo.EditionVO"/> <jsp:useBean id="edition" scope="request" type="com.dookay.cihai.pc.controller.vo.EditionVO"/>
<jsp:useBean id="vo" scope="request" type="com.dookay.cihai.pc.controller.vo.CharacterParaphVO"/> <jsp:useBean id="vo" scope="request" type="com.dookay.cihai.pc.controller.vo.CharacterParaphVO"/>
<jsp:include page="/WEB-INF/jsp/include/header_search.jsp"> <jsp:include page="/WEB-INF/jsp/include/header_search.jsp">
...@@ -215,19 +214,54 @@ ...@@ -215,19 +214,54 @@
</div> </div>
</div> </div>
</div> </div>
<c:if test="${relateWords.size()>0}"> <%--@elvariable id="oneway" type="com.dookay.cihai.pc.controller.vo.OneWayRelateVO"--%>
<c:choose>
<c:when test="${vo.word eq '象'}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">推荐词</div> <div class="recommend-title title-base">推荐词</div>
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">${vo.word}</div> <div class="recommend-section-title title-sm title-primary">开头</div>
<div class="recommend-cells"> <div class="recommend-cells">
<c:forEach items="${relateWords}" var="item"> <span class="recommend-cell">象车</span>
<span class="recommend-cell">${item.word}</span> <span class="recommend-cell">象服</span>
<span class="recommend-cell">象齿焚身</span>
</div>
</div>
<div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">中间</div>
<div class="recommend-cells">
<span class="recommend-cell">形象工程</span>
<span class="recommend-cell">形象代言人</span>
<span class="recommend-cell">形象大使</span>
</div>
</div>
<div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">结尾</div>
<div class="recommend-cells">
<span class="recommend-cell">历象</span>
<span class="recommend-cell">蛇吞象</span>
<span class="recommend-cell">盲人摸象</span>
</div>
</div>
</div>
</c:when>
<c:when test="${oneway != null}">
<div class="recommend">
<div class="recommend-title title-base">推荐词</div>
<c:forEach items="${oneway.relationByGroup}" var="group">
<div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">${group.middle}</div>
<div class="recommend-cells">
<c:forEach items="${group.right}" var="item">
<a href="/word/${item.id}" style="color: #000;">
<span class="recommend-cell">${item.word}</span></a>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
</c:forEach>
</div> </div>
</c:if> </c:when>
</c:choose>
<div class="aside-tag text-primary">标签：语词</div> <div class="aside-tag text-primary">标签：语词</div>
</aside> </aside>
</div> </div>
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/statement_baike.jsp
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %> <%@ include file="/WEB-INF/jsp/include/taglib.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:useBean id="relateWords" scope="request" type="java.util.List<com.dookay.cihai.core.word.domain.WordDomain>"/>
<jsp:useBean id="edition" scope="request" type="com.dookay.cihai.pc.controller.vo.EditionVO"/> <jsp:useBean id="edition" scope="request" type="com.dookay.cihai.pc.controller.vo.EditionVO"/>
<jsp:useBean id="vo" scope="request" type="com.dookay.cihai.pc.controller.vo.StatementBaikeVO"/> <jsp:useBean id="vo" scope="request" type="com.dookay.cihai.pc.controller.vo.StatementBaikeVO"/>
<%--<%=JSON.toJSONString(vo)%>--%> <%--<%=JSON.toJSONString(vo)%>--%>
...@@ -10,15 +9,12 @@ ...@@ -10,15 +9,12 @@
<jsp:param name="pageTitle" value="百科"/> <jsp:param name="pageTitle" value="百科"/>
</jsp:include> </jsp:include>
<c:choose> <div class="container">
<c:when test="${vo.word eq '太阳系'}">
<div class="container">
<div class="encyclopedia" style="background-image:url(/static/images/world.topo.bathy.200401.jpg)">
<div class="encyclopedia-mask"></div>
</c:when>
<c:otherwise>
<div class="encyclopedia" <div class="encyclopedia"
<c:choose> <c:choose>
<c:when test="${vo.word eq '太阳系'}">
style="background-image:url(/static/images/world.topo.bathy.200401.jpg)"
</c:when>
<c:when test="${vo.images.size() > 0}"> <c:when test="${vo.images.size() > 0}">
style="background-image:url(${vo.images.get(0).file})" style="background-image:url(${vo.images.get(0).file})"
</c:when> </c:when>
...@@ -27,10 +23,8 @@ ...@@ -27,10 +23,8 @@
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
> >
<div class="container"> <div class="encyclopedia-mask"></div>
</c:otherwise> <div class="content">
</c:choose>
<div class="content">
<div class="row"> <div class="row">
<div class="col-xs-17"> <div class="col-xs-17">
<ul class="tab-nav"> <ul class="tab-nav">
...@@ -386,7 +380,8 @@ ...@@ -386,7 +380,8 @@
<h5 class="media-title">《阿Q正传》</h5> <h5 class="media-title">《阿Q正传》</h5>
<div class="media"> <div class="media">
<div class="media-body"> <div class="media-body">
<p>中篇小说。鲁迅著。1921年12月4日至1922年2月12日，用巴人笔名陆续发表于北京《晨报副刊》。后收入《呐喊》。作品以辛亥革命前后的中国农村为背景，塑造了阿Q这一艺术典型，表达了作者对阿Q“哀其不幸，怒其不争”的态度和力图唤醒农民的觉悟、促使他们起来革命的愿望。小说后半部分写了辛亥革命以后阿Q从不理解革命到向往革命的心理发展，以及被诬为盗贼而遭杀害的悲惨结局，揭示出中国农民阶级中所蕴藏的革命因素和消极因素，总结了辛亥革命不彻底的沉痛教训。</p> <p>
中篇小说。鲁迅著。1921年12月4日至1922年2月12日，用巴人笔名陆续发表于北京《晨报副刊》。后收入《呐喊》。作品以辛亥革命前后的中国农村为背景，塑造了阿Q这一艺术典型，表达了作者对阿Q“哀其不幸，怒其不争”的态度和力图唤醒农民的觉悟、促使他们起来革命的愿望。小说后半部分写了辛亥革命以后阿Q从不理解革命到向往革命的心理发展，以及被诬为盗贼而遭杀害的悲惨结局，揭示出中国农民阶级中所蕴藏的革命因素和消极因素，总结了辛亥革命不彻底的沉痛教训。</p>
</div> </div>
<img class="align-self-start ml-3" src="/static/images/luxun_24.jpg"> <img class="align-self-start ml-3" src="/static/images/luxun_24.jpg">
</div> </div>
...@@ -473,7 +468,8 @@ ...@@ -473,7 +468,8 @@
<h5 class="media-title">《野草》</h5> <h5 class="media-title">《野草》</h5>
<div class="media"> <div class="media">
<div class="media-body"> <div class="media-body">
<p>散文诗集。鲁迅著。1927年北京北新书局初版。收入1924—1926年所作23篇散文诗，书前有题辞一篇。以曲折幽晦的象征表达了20世纪20年代中期作者内心世界的苦闷和对现实社会的抗争。《这样的战士》、《淡淡的血痕中》、《一觉》等篇表达了对现实的失望与愤懑；《影的告别》、《死火》、《墓碣文》等篇描绘了对自我深刻解剖之后的迷茫心境；《希望》、《死后》等篇写出了对未来的疑惧，深刻地表现出作者的人生哲学。语言俏奇瑰丽，意象玄妙奇美。</p> <p>
散文诗集。鲁迅著。1927年北京北新书局初版。收入1924—1926年所作23篇散文诗，书前有题辞一篇。以曲折幽晦的象征表达了20世纪20年代中期作者内心世界的苦闷和对现实社会的抗争。《这样的战士》、《淡淡的血痕中》、《一觉》等篇表达了对现实的失望与愤懑；《影的告别》、《死火》、《墓碣文》等篇描绘了对自我深刻解剖之后的迷茫心境；《希望》、《死后》等篇写出了对未来的疑惧，深刻地表现出作者的人生哲学。语言俏奇瑰丽，意象玄妙奇美。</p>
</div> </div>
<img class="align-self-start ml-3" src="/static/images/luxun_44.jpg"> <img class="align-self-start ml-3" src="/static/images/luxun_44.jpg">
</div> </div>
...@@ -491,7 +487,8 @@ ...@@ -491,7 +487,8 @@
<h5 class="media-title">《彷徨》</h5> <h5 class="media-title">《彷徨》</h5>
<div class="media"> <div class="media">
<div class="media-body"> <div class="media-body">
<p>短篇小说集。鲁迅著。1926年北京北新书局初版，收入1924—1925年间所作的11篇小说。集中所收《祝福》、《在酒楼上》、《孤独者》、《伤逝》、《离婚》、《肥皂》等名作，深刻地描绘出当时知识分子精神上的困境，流露了忧郁、愤懑、迷茫的情绪，展露出作者激愤与痛苦的心灵世界。在自我反思的同时，依旧延续了《呐喊》中反封建的主题，尤其是在《祝福》中揭示了像祥林嫂这样的被凌辱被压迫者的麻木的灵魂。在小说结构、心理描写和语言运用上较以前的作品更为成熟。</p> <p>
短篇小说集。鲁迅著。1926年北京北新书局初版，收入1924—1925年间所作的11篇小说。集中所收《祝福》、《在酒楼上》、《孤独者》、《伤逝》、《离婚》、《肥皂》等名作，深刻地描绘出当时知识分子精神上的困境，流露了忧郁、愤懑、迷茫的情绪，展露出作者激愤与痛苦的心灵世界。在自我反思的同时，依旧延续了《呐喊》中反封建的主题，尤其是在《祝福》中揭示了像祥林嫂这样的被凌辱被压迫者的麻木的灵魂。在小说结构、心理描写和语言运用上较以前的作品更为成熟。</p>
</div> </div>
<img class="align-self-start ml-3" src="/static/images/luxun_49.jpg"> <img class="align-self-start ml-3" src="/static/images/luxun_49.jpg">
</div> </div>
...@@ -598,7 +595,8 @@ ...@@ -598,7 +595,8 @@
<h5 class="media-title">雷恩( Ludwig Renn ) （1889—1979）</h5> <h5 class="media-title">雷恩( Ludwig Renn ) （1889—1979）</h5>
<div class="media"> <div class="media">
<div class="media-body"> <div class="media-body">
<p>德国小说家。出身贵族。参加过第一次世界大战。20年代接受马克思主义。1928年参加德国共产党和红色阵线战士同盟。1928—1932年担任无产阶级革命作家联盟书记，出版《左曲线》等刊物。1933年纳粹执政后两次被捕，获释后流亡国外，参加国际纵队，支援西班牙人民。1939年流亡墨西哥，1947年回国。主要作品有小说《战争》、《战后》、《没落的贵族》，青少年读物《特里尼》、《黑人诺比》等。30年代初期曾致电鲁迅，支持中国左翼作家联盟的正义斗争。</p> <p>
德国小说家。出身贵族。参加过第一次世界大战。20年代接受马克思主义。1928年参加德国共产党和红色阵线战士同盟。1928—1932年担任无产阶级革命作家联盟书记，出版《左曲线》等刊物。1933年纳粹执政后两次被捕，获释后流亡国外，参加国际纵队，支援西班牙人民。1939年流亡墨西哥，1947年回国。主要作品有小说《战争》、《战后》、《没落的贵族》，青少年读物《特里尼》、《黑人诺比》等。30年代初期曾致电鲁迅，支持中国左翼作家联盟的正义斗争。</p>
<p <p
class="mb-0"> class="mb-0">
<br> <br>
...@@ -774,25 +772,84 @@ ...@@ -774,25 +772,84 @@
</div> </div>
</div> </div>
</div> </div>
<c:if test="${relateWords.size()>0}"> <%--@elvariable id="oneway" type="com.dookay.cihai.pc.controller.vo.OneWayRelateVO"--%>
<c:choose>
<c:when test="${vo.word eq '象鼻山'}">
<div class="recommend">
<div class="recommend-title title-base">推荐词</div>
<div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">象鼻山</div>
<div class="recommend-cells">
<span class="recommend-cell">象</span>
<span class="recommend-cell">象鼻虫</span>
<span class="recommend-cell">象草</span>
<span class="recommend-cell">象龟</span>
<span class="recommend-cell">象山</span>
<span class="recommend-cell">象山港</span>
<span class="recommend-cell">象山先生集</span>
<span class="recommend-cell">象山学派</span>
<span class="recommend-cell">象舞</span>
<span class="recommend-cell">象戏</span>
</div>
</div>
</div>
</c:when>
<c:when test="${vo.word eq '中华人民共和国'}">
<div class="recommend">
<div class="recommend-title title-base">推荐词</div>
<div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">中华人民共和国</div>
<div class="recommend-cells">
<span class="recommend-cell">中华人民共和国主席</span>
<span class="recommend-cell">中华人民共和国首都</span>
<span class="recommend-cell">中华人民共和国宪法</span>
<span class="recommend-cell">中华人民共和国国旗</span>
<span class="recommend-cell">中华人民共和国国徽</span>
<span class="recommend-cell">中华人民共和国国务院</span>
<span class="recommend-cell">中华人民共和国合同法</span>
<span class="recommend-cell">中华人民共和国审计法</span>
<span class="recommend-cell">中华人民共和国财政部</span>
<span class="recommend-cell">中华人民共和国可再生能源法</span>
</div>
</div>
</div>
</c:when>
<c:when test="${vo.word eq '太阳系'}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">推荐词</div> <div class="recommend-title title-base">推荐词</div>
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">${vo.word}</div> <div class="recommend-section-title title-sm title-primary">太阳系</div>
<div class="recommend-cells"> <div class="recommend-cells">
<c:forEach items="${relateWords}" var="item"> <span class="recommend-cell">太阳系运动</span>
<span class="recommend-cell">${item.word}</span> <span class="recommend-cell">太阳系起源</span>
<span class="recommend-cell">太阳系物理学</span>
</div>
</div>
</div>
</c:when>
<c:when test="${oneway != null}">
<div class="recommend">
<div class="recommend-title title-base">推荐词</div>
<c:forEach items="${oneway.relationByGroup}" var="group">
<div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">${group.middle}</div>
<div class="recommend-cells">
<c:forEach items="${group.right}" var="item">
<a href="/word/${item.id}" style="color: #000;">
<span class="recommend-cell">${item.word}</span></a>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
</c:forEach>
</div> </div>
</c:if> </c:when>
<div class="aside-tag text-primary">标签：语词</div> </c:choose>
<div class="aside-tag text-primary">标签：百科</div>
</aside> </aside>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="album-alert"> <div class="album-alert">
<div class="album-swiper swiper-container"> <div class="album-swiper swiper-container">
...@@ -901,7 +958,7 @@ ...@@ -901,7 +958,7 @@
} }
} }
}; };
$("#map-tab").one('shown.bs.tab', function(e) { $("#map-tab").one('shown.bs.tab', function (e) {
var chart = $("#chart-earth").get(0) var chart = $("#chart-earth").get(0)
var earth = echarts.init(chart) var earth = echarts.init(chart)
earth.setOption(option) earth.setOption(option)
...@@ -916,7 +973,7 @@ ...@@ -916,7 +973,7 @@
<script src="/static/js/echarts.min.js"></script> <script src="/static/js/echarts.min.js"></script>
<script src="/static/js/echarts-gl.js"></script> <script src="/static/js/echarts-gl.js"></script>
<script> <script>
$(function(){ $(function () {
//- 心脏 //- 心脏
function option(data) { function option(data) {
return { return {
...@@ -942,6 +999,7 @@ ...@@ -942,6 +999,7 @@
}] }]
} }
} }
var obj = [{ var obj = [{
name: '心', name: '心',
children: [{ children: [{
...@@ -1171,19 +1229,19 @@ ...@@ -1171,19 +1229,19 @@
}] }]
}] }]
var arr = [] var arr = []
$("#heart-tab").one('shown.bs.tab', function(e) { $("#heart-tab").one('shown.bs.tab', function (e) {
// 图谱轮播 // 图谱轮播
var swiperTp = new Swiper('.tp-swiper', { var swiperTp = new Swiper('.tp-swiper', {
prevButton: '.swiper-button-prev', prevButton: '.swiper-button-prev',
nextButton: '.swiper-button-next', nextButton: '.swiper-button-next',
onInit: function(swiper) { onInit: function (swiper) {
var index = swiper.activeIndex var index = swiper.activeIndex
arr.push(index) arr.push(index)
var tar = $(".tp-swiper").find(".swiper-slide").eq(index).children().get(0) var tar = $(".tp-swiper").find(".swiper-slide").eq(index).children().get(0)
var chart = echarts.init(tar) var chart = echarts.init(tar)
chart.setOption(option(obj[index])) chart.setOption(option(obj[index]))
}, },
onSlideChangeEnd: function(swiper) { onSlideChangeEnd: function (swiper) {
var index = swiper.activeIndex var index = swiper.activeIndex
var short = [2, 3, 5] var short = [2, 3, 5]
if (arr.indexOf(index) === -1) { if (arr.indexOf(index) === -1) {
......
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/statement_paraph.jsp
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %> <%@ include file="/WEB-INF/jsp/include/taglib.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:useBean id="relateWords" scope="request" type="java.util.List<com.dookay.cihai.core.word.domain.WordDomain>"/>
<jsp:useBean id="edition" scope="request" type="com.dookay.cihai.pc.controller.vo.EditionVO"/> <jsp:useBean id="edition" scope="request" type="com.dookay.cihai.pc.controller.vo.EditionVO"/>
<jsp:useBean id="vo" scope="request" type="com.dookay.cihai.pc.controller.vo.StatementParaphVO"/> <jsp:useBean id="vo" scope="request" type="com.dookay.cihai.pc.controller.vo.StatementParaphVO"/>
<jsp:include page="/WEB-INF/jsp/include/header_search.jsp"> <jsp:include page="/WEB-INF/jsp/include/header_search.jsp">
...@@ -196,19 +195,78 @@ ...@@ -196,19 +195,78 @@
</div> </div>
</div> </div>
</div> </div>
<c:if test="${relateWords.size()>0}"> <%--@elvariable id="oneway" type="com.dookay.cihai.pc.controller.vo.OneWayRelateVO"--%>
<c:choose>
<c:when test="${vo.word eq '象鼻山'}">
<div class="recommend"> <div class="recommend">
<div class="recommend-title title-base">推荐词</div> <div class="recommend-title title-base">推荐词</div>
<div class="recommend-section"> <div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">${vo.word}</div> <div class="recommend-section-title title-sm title-primary">象鼻山</div>
<div class="recommend-cells"> <div class="recommend-cells">
<c:forEach items="${relateWords}" var="item"> <span class="recommend-cell">象</span>
<span class="recommend-cell">${item.word}</span> <span class="recommend-cell">象鼻虫</span>
<span class="recommend-cell">象草</span>
<span class="recommend-cell">象龟</span>
<span class="recommend-cell">象山</span>
<span class="recommend-cell">象山港</span>
<span class="recommend-cell">象山先生集</span>
<span class="recommend-cell">象山学派</span>
<span class="recommend-cell">象舞</span>
<span class="recommend-cell">象戏</span>
</div>
</div>
</div>
</c:when>
<c:when test="${vo.word eq '中华人民共和国'}">
<div class="recommend">
<div class="recommend-title title-base">推荐词</div>
<div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">中华人民共和国</div>
<div class="recommend-cells">
<span class="recommend-cell">中华人民共和国主席</span>
<span class="recommend-cell">中华人民共和国首都</span>
<span class="recommend-cell">中华人民共和国宪法</span>
<span class="recommend-cell">中华人民共和国国旗</span>
<span class="recommend-cell">中华人民共和国国徽</span>
<span class="recommend-cell">中华人民共和国国务院</span>
<span class="recommend-cell">中华人民共和国合同法</span>
<span class="recommend-cell">中华人民共和国审计法</span>
<span class="recommend-cell">中华人民共和国财政部</span>
<span class="recommend-cell">中华人民共和国可再生能源法</span>
</div>
</div>
</div>
</c:when>
<c:when test="${vo.word eq '太阳系'}">
<div class="recommend">
<div class="recommend-title title-base">推荐词</div>
<div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">太阳系</div>
<div class="recommend-cells">
<span class="recommend-cell">太阳系运动</span>
<span class="recommend-cell">太阳系起源</span>
<span class="recommend-cell">太阳系物理学</span>
</div>
</div>
</div>
</c:when>
<c:when test="${oneway != null}">
<div class="recommend">
<div class="recommend-title title-base">推荐词</div>
<c:forEach items="${oneway.relationByGroup}" var="group">
<div class="recommend-section">
<div class="recommend-section-title title-sm title-primary">${group.middle}</div>
<div class="recommend-cells">
<c:forEach items="${group.right}" var="item">
<a href="/word/${item.id}" style="color: #000;">
<span class="recommend-cell">${item.word}</span></a>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
</c:forEach>
</div> </div>
</c:if> </c:when>
</c:choose>
<div class="aside-tag text-primary">标签：语词</div> <div class="aside-tag text-primary">标签：语词</div>
</aside> </aside>
</div> </div>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!