Skip to content

石磊 / cihai

Go to a project
Commit aeb21d9d by 侯昆
Options

静态修改

1 parent 810cac7f
Expand all
Inline Side-by-side
Showing 15 changed files with 146 additions and 53 deletions
serverside/cihai-app/src/main/java/com/dookay/cihai/app/controller/WordHtmlController.java
......@@ -23,11 +23,14 @@ import com.dookay.cihai.core.word.service.IRelationOneWayService;
import com.dookay.cihai.core.word.service.IWordRelationService;
import com.dookay.cihai.core.word.service.IWordService;
import com.dookay.coral.common.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.ModelAndView;
import java.util.List;
......@@ -112,7 +115,8 @@ public class WordHtmlController extends BaseController {
* @return
*/
@RequestMapping(value = "/relate/{id}", method = RequestMethod.GET)
public ModelAndView relate(@PathVariable("id") Long id) {
public ModelAndView relate(@PathVariable("id") @ApiParam(value = "词的id",required = true) Long id,
@RequestParam(required = false ) @ApiParam("相关类型， 0 百科 1语词") Integer type) {
WordDomain wordDomain = wordService.get(id);
RelationOneWayQuery q = new RelationOneWayQuery();
q.setWordId(id);
......@@ -124,6 +128,7 @@ public class WordHtmlController extends BaseController {
OneWayRelateVO vo = OneWayRelateVO.fromDomain(wordDomain, relateList, relatedWords);
ModelAndView mv = new ModelAndView("/word/relate");
mv.addObject("vo", vo);
mv.addObject("type", type == null ? 0 : type);
return mv;
// WordDomain wordDomain = wordService.get(id);
// List<WordDomain> relateWords = wordRelationService.getRelateWords(id);
......
serverside/cihai-app/src/main/java/com/dookay/cihai/app/controller/vo/OneWayRelateVO.java
......@@ -16,6 +16,7 @@ package com.dookay.cihai.app.controller.vo;
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 java.util.HashMap;
......@@ -38,14 +39,17 @@ public class OneWayRelateVO {
public static OneWayRelateVO fromDomain(WordDomain word, List<RelationOneWayDomain> relations, List<WordDomain> relatedWords) {
OneWayRelateVO vo = new OneWayRelateVO();
vo.setWord(word.getWord());
Map<String, List<RelationOneWayDomain>> map = relations.stream().collect(Collectors.groupingBy(RelationOneWayDomain::getGroupName));
HashMap<String, List<WordDomain>> relationByGroup = new HashMap<>(map.size());
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());
relationByGroup.put(entry.getKey(), words);
if (CollectionUtils.isNotEmpty(relatedWords) &&
CollectionUtils.isNotEmpty(relations)) {
Map<String, List<RelationOneWayDomain>> map = relations.stream().collect(Collectors.groupingBy(RelationOneWayDomain::getGroupName));
HashMap<String, List<WordDomain>> relationByGroup = new HashMap<>(map.size());
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());
relationByGroup.put(entry.getKey(), words);
}
vo.setRelationByGroup(relationByGroup);
}
vo.setRelationByGroup(relationByGroup);
return vo;
}
}
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/all.jsp
......@@ -28,7 +28,7 @@
</li>
<li>
<div class="time">1222</div>
<p>大<a href="/home/search?keyword=日莲">日莲</a>，日本佛教日莲宗创始人出生。</p>
<p>大<a href=javascript:;>日莲</a>，日本佛教日莲宗创始人出生。</p>
</li>
<li>
<div class="time">1304</div>
......@@ -36,19 +36,19 @@
</li>
<li>
<div class="time">1352</div>
<p><a href="/home/search?keyword=郭子兴">郭子兴</a>起义军攻克濠州。</p>
<p><a href=javascript:;>郭子兴</a>起义军攻克濠州。</p>
</li>
<li>
<div class="time">1870</div>
<p><a href="/home/search?keyword=普法战争">普法战争</a>，法国失败。</p>
<p><a href=javascript:;>普法战争</a>，法国失败。</p>
</li>
<li>
<div class="time">1910</div>
<p><a href="/home/search?keyword=孙中山">孙中山</a><a href="/home/search?keyword=章太炎">章太炎</a>分道扬镳同盟会分裂。</p>
<p><a href=javascript:;>孙中山</a><a href=javascript:;>章太炎</a>分道扬镳同盟会分裂。</p>
</li>
<li>
<div class="time">1921</div>
<p><a href="/home/search?keyword=华国锋">华国锋</a>同志诞辰。</p>
<p><a href=/home/search?keyword=华国锋>华国锋</a>同志诞辰。</p>
</li>
<li>
<div class="time">1930</div>
......@@ -56,11 +56,11 @@
</li>
<li>
<div class="time">1935</div>
<p>红军取得<a href="/home/search?keyword=长征">长征</a>以来第一次重大胜利。</p>
<p>红军取得<a href=javascript:;>长征</a>以来第一次重大胜利。</p>
</li>
<li>
<div class="time">1938</div>
<p>京剧名家<a href="/home/search?keyword=杨小楼">杨小楼</a>病逝。</p>
<p>京剧名家<a href=javascript:;>杨小楼</a>病逝。</p>
</li>
<li>
<div class="time">1959</div>
......@@ -68,7 +68,7 @@
</li>
<li>
<div class="time">1976</div>
<p>英国<a href="/home/search?keyword=北海油田">北海油田</a>的奥克钻油区正式运作。</p>
<p>英国<a href=javascript:;>北海油田</a>的奥克钻油区正式运作。</p>
</li>
<li class="more">
<a href="/history/event">更多</a>
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/event.jsp
......@@ -24,15 +24,16 @@
<ul class="list-unstyled list-history">
<li>
<div class="time">1352</div>
<p><a href="/home/search?keyword=郭子兴">郭子兴</a>起义军攻克濠州。</p>
<p><a href=javascript:;>郭子兴</a>起义军攻克濠州。</p>
</li>
<li>
<div class="time">1870</div>
<p><a href="/home/search?keyword=普法战争">普法战争</a>，法国失败。</p>
<p><a href=javascript:;>普法战争</a>，法国失败。</p>
</li>
<li>
<div class="time">1910</div>
<p><a href="/home/search?keyword=孙中山">孙中山</a><a href="/home/search?keyword=章太炎">章太炎</a>分道扬镳同盟会分裂。</p>
<p><a href=javascript:;>孙中山</a>
<a href=javascript:;>章太炎</a>分道扬镳同盟会分裂。</p>
</li>
<li>
<div class="time">1930</div>
......@@ -40,7 +41,7 @@
</li>
<li>
<div class="time">1935</div>
<p>红军取得<a href="/home/search?keyword=长征">长征</a>以来第一次重大胜利。</p>
<p>红军取得<a href=javascript:;>长征</a>以来第一次重大胜利。</p>
</li>
<li>
<div class="time">1959</div>
......@@ -48,15 +49,15 @@
</li>
<li>
<div class="time">1976</div>
<p>英国<a href="/home/search?keyword=北海油田">北海油田</a>的奥克钻油区正式运作。</p>
<p>英国<a href=javascript:;>北海油田</a>的奥克钻油区正式运作。</p>
</li>
<li>
<div class="time">1985</div>
<p><a href="/home/search?keyword=以色列">以色列</a>军队开始从<a href="/home/search?keyword=黎巴嫩">黎巴嫩</a>撤退。</p>
<p><a href=javascript:;>以色列</a>军队开始从<a href=javascript:;>黎巴嫩</a>撤退。</p>
</li>
<li>
<div class="time">2005</div>
<p>限制全球温室气体排放量的“<a href="/home/search?keyword=京都议定书">京都议定书</a>” 获得120多个国家确认正式生效。</p>
<p>限制全球温室气体排放量的“<a href=javascript:;>京都议定书</a>” 获得120多个国家确认正式生效。</p>
</li>
<li></li>
<li class="end">
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/people.jsp
......@@ -28,7 +28,7 @@
</li>
<li>
<div class="time">1222</div>
<p>大<a href="/home/search?keyword=日莲">日莲</a>，日本佛教日莲宗创始人出生。</p>
<p>大<a href=javascript:;>日莲</a>，日本佛教日莲宗创始人出生。</p>
</li>
<li>
<div class="time">1304</div>
......@@ -40,15 +40,15 @@
</li>
<li>
<div class="time">1938</div>
<p>京剧名家<a href="/home/search?keyword=杨小楼">杨小楼</a>病逝。</p>
<p>京剧名家<a href=javascript:;>杨小楼</a>病逝。</p>
</li>
<li>
<div class="time">1988</div>
<p>教育家、作家<a href="/home/search?keyword=叶圣陶">叶圣陶</a>逝世。</p>
<p>教育家、作家<a href=javascript:;>叶圣陶</a>逝世。</p>
</li>
<li>
<div class="time">1997</div>
<p>著名实验物理学家<a href="/home/search?keyword=吴健雄">吴健雄</a>女士去世 。</p>
<p>著名实验物理学家<a href=javascript:;>吴健雄</a>女士去世 。</p>
</li>
<li></li>
<li class="end">
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/character_baike.jsp
......@@ -18,10 +18,10 @@
<div class="word-read pt-0">
<c:forEach var="item" items="${vo.spell}">
<span>【${item}】</span>
<a class="link js-play-voice" href="javascript:;">
<i class="icon icon-shengyin"></i>
</a>
</c:forEach>
<a class="link js-play-voice" href="javascript:;">
<i class="icon icon-shengyin"></i>
</a>
</div>
<h4>${vo.description}</h4>
</div>
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/character_paraph.jsp
......@@ -15,19 +15,21 @@
<div class="header-main-1 clearfix">
<div class="header-main-left">
<h1>${vo.word}</h1>
<div class="header-main-word-dropdown clearfix">
<a class="btn btn-sm btn-link dropdown-toggle collapsed js-collapse" href="#header-main-collapse-1" data-toggle="collapse">字源</a>
<a class="btn btn-sm btn-link dropdown-toggle collapsed js-collapse" href="#header-main-collapse-2" data-toggle="collapse">书法</a>
</div>
<c:if test="${vo.word eq '象'}">
<div class="header-main-word-dropdown clearfix">
<a class="btn btn-sm btn-link dropdown-toggle collapsed js-collapse" href="#header-main-collapse-1" data-toggle="collapse">字源</a>
<a class="btn btn-sm btn-link dropdown-toggle collapsed js-collapse" href="#header-main-collapse-2" data-toggle="collapse">书法</a>
</div>
</c:if>
</div>
<div class="header-main-right">
<div class="word-read">
<c:forEach var="item" items="${vo.spell}">
<span>【${item}】</span>
<a class="link js-play-voice" href="javascript:;">
<i class="icon icon-shengyin"></i>
</a>
</c:forEach>
<a class="link js-play-voice" href="javascript:;">
<i class="icon icon-shengyin"></i>
</a>
</div>
<c:if test="${vo.brief.size()>0}">
<table>
......@@ -45,10 +47,11 @@
</div>
<div class="clear collapse-wrapper">
<div class="collapse" id="header-main-collapse-1">
<img class="img-fluid" src="${ctx}/static/temp/ziyuan.jpg" width="225">
<img class="img-fluid" src="/static/images/xiang-ziyuan-1.png">
<img class="img-fluid" src="images/xiang-ziyuan-2.png">
</div>
<div class="collapse" id="header-main-collapse-2">
<img class="img-fluid" src="${ctx}/static/temp/ziyuan.jpg" width="225">
<img class="img-fluid" src="/staticimages/xiang-shufa-1.png">
</div>
</div>
</div>
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/relate.jsp
......@@ -13,18 +13,97 @@
</head>
<body class="relation-word-body">
<%--<div class="container-fluid">--%>
<%--<div class="relation-word">--%>
<%--<h4>相关词</h4>--%>
<%--<div class="list-group">--%>
<%--<span class="list-group-item list-group-item-header">${word.word}</span>--%>
<%--<c:forEach items="${vos}" var="item">--%>
<%--<a class="list-group-item" href="/word/info/${item.wordId}">${item.word}</a>--%>
<%--</c:forEach>--%>
<%--</div>--%>
<%--</div>--%>
<%--<div class="relation-word">--%>
<%--<h4>相关词</h4>--%>
<%--<div class="list-group">--%>
<%--<span class="list-group-item list-group-item-header">${word.word}</span>--%>
<%--<c:forEach items="${vos}" var="item">--%>
<%--<a class="list-group-item" href="/word/info/${item.wordId}">${item.word}</a>--%>
<%--</c:forEach>--%>
<%--</div>--%>
<%--</div>--%>
<%--</div>--%>
<div class="relation-word">
<h4>相关词</h4>
<c:choose>
<c:when test="${vo.word eq '象' and type eq 0}">
<div class="list-group">
<span class="list-group-item list-group-item-header">${vo.word}</span>
<a class="list-group-item" >象鼻虫</a>
<a class="list-group-item" href="/word/info/522">象鼻山</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 '象' and type eq 1}">
<div class="list-group">
<span class="list-group-item list-group-item-header">开头</span>
<a class="list-group-item" >象车</a>
<a class="list-group-item" >象服</a>
<a class="list-group-item" >象罔</a>
</div>
<div class="list-group">
<span class="list-group-item list-group-item-header">中间</span>
<a class="list-group-item" >形象工程</a>
<a class="list-group-item" >形象代言人</a>
<a class="list-group-item" >形象大使</a>
</div>
<div class="list-group">
<span class="list-group-item list-group-item-header">结尾</span>
<a class="list-group-item" >历象</a>
<a class="list-group-item" >蛇吞象</a>
<a class="list-group-item" >罔象</a>
</div>
<div class="list-group">
<span class="list-group-item list-group-item-header">相关成语</span>
<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 '中国'}">
<div class="list-group">
<span class="list-group-item list-group-item-header">${vo.word}</span>
<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 '中华人民共和国'}">
<div class="list-group">
<span class="list-group-item list-group-item-header">${vo.word}</span>
<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>
<a class="list-group-item" >中华人民共和国可再生能源法</a>
</div>
</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" >太阳系运动</a>
<a class="list-group-item" >太阳系起源</a>
<a class="list-group-item" >太阳系物理学</a>
</div>
</c:when>
</c:choose>
<c:forEach items="${vo.relationByGroup}" var="item">
<div class="list-group">
<span class="list-group-item list-group-item-header">${item.key}</span>
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/statement_paraph.jsp
......@@ -19,10 +19,10 @@
<div class="word-read">
<c:if test="${vo.spell.length() > 0}">
<span>【 <c:forEach var="item" items="${vo.spell}"> ${item} </c:forEach> 】</span>
<a class="link js-play-voice" href="javascript:;">
<i class="icon icon-shengyin"></i>
</a>
</c:if>
<a class="link js-play-voice" href="javascript:;">
<i class="icon icon-shengyin"></i>
</a>
</div>
<%--<h4>长鼻目象科哺乳动物</h4>--%>
</div>
......
serverside/cihai-app/src/main/webapp/static/css/vendor.css
This diff could not be displayed because it is too large.
serverside/cihai-app/src/main/webapp/static/index.html
......@@ -44,10 +44,11 @@
</div>
<div class="clear collapse-wrapper">
<div class="collapse" id="header-main-collapse-1">
<img class="img-fluid" src="temp/ziyuan.jpg" width="225">
<img class="img-fluid" src="images/xiang-ziyuan-1.png">
<img class="img-fluid" src="images/xiang-ziyuan-2.png">
</div>
<div class="collapse" id="header-main-collapse-2">
<img class="img-fluid" src="temp/ziyuan.jpg" width="225">
<img class="img-fluid" src="images/xiang-shufa-1.png">
</div>
</div>
</div>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!