Skip to content

石磊 / cihai

Go to a project
Commit 5cd291e3 by 石头
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/HomeController.java
2 parents 3fbd46dc dec545c2
Inline Side-by-side
Showing 4 changed files with 159 additions and 163 deletions
serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/AipWordUtilBean.java
...@@ -58,7 +58,7 @@ public final class AipWordUtilBean { ...@@ -58,7 +58,7 @@ public final class AipWordUtilBean {
private static final String SCORE_KEY_PREFIX = "WORD_SCORE:"; private static final String SCORE_KEY_PREFIX = "WORD_SCORE:";
private static final double CRITICAL_VALUE = 0.4D; private static final double CRITICAL_VALUE = 0.4D;
private static final double RELATE_CRITICAL_VALUE = 0.6D; private static final double RELATE_CRITICAL_VALUE = 0.65D;
/** /**
* 内部错误 * 内部错误
......
serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/HomeController.java
...@@ -21,6 +21,7 @@ import com.dookay.cihai.core.theme.domain.ThemeDomain; ...@@ -21,6 +21,7 @@ import com.dookay.cihai.core.theme.domain.ThemeDomain;
import com.dookay.cihai.core.theme.query.ThemeQuery; import com.dookay.cihai.core.theme.query.ThemeQuery;
import com.dookay.cihai.core.theme.service.IThemeService; import com.dookay.cihai.core.theme.service.IThemeService;
import com.dookay.cihai.core.word.domain.WordDomain; import com.dookay.cihai.core.word.domain.WordDomain;
import com.dookay.cihai.core.word.domain.CustomDictionaryDomain;
import com.dookay.cihai.core.word.query.CustomDictionaryQuery; import com.dookay.cihai.core.word.query.CustomDictionaryQuery;
import com.dookay.cihai.core.word.query.WordQuery; import com.dookay.cihai.core.word.query.WordQuery;
import com.dookay.cihai.core.word.service.ICustomDictionaryService; import com.dookay.cihai.core.word.service.ICustomDictionaryService;
...@@ -35,6 +36,8 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -35,6 +36,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import java.util.List;
/** /**
* @author 石磊 * @author 石磊
* @date 2017/12/6 * @date 2017/12/6
...@@ -78,13 +81,16 @@ public class HomeController extends BaseController { ...@@ -78,13 +81,16 @@ public class HomeController extends BaseController {
public JsonResult search(String keyword) { public JsonResult search(String keyword) {
System.out.println("进入搜索"); System.out.println("进入搜索");
String result = null; String result = null;
CustomDictionaryQuery query1 = new CustomDictionaryQuery(); boolean inDic = false;
query1.setWord(keyword); List<CustomDictionaryDomain> dictionaryDomainList = customDictionaryService.getList(new CustomDictionaryQuery());
for (CustomDictionaryDomain dic : dictionaryDomainList) {
if (keyword.contains(dic.getWord())) {
result = dic.getWord();
inDic = true;
}
}
try { try {
int count = customDictionaryService.count(query1); if (!inDic) {
if (count > 0) {
result = keyword;
} else {
result = aipWordUtilBean.extractQueryKeyword(keyword); result = aipWordUtilBean.extractQueryKeyword(keyword);
} }
ThemeQuery query = new ThemeQuery(); ThemeQuery query = new ThemeQuery();
......
serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/ThemeController.java
...@@ -23,6 +23,7 @@ import com.dookay.cihai.core.theme.domain.ThemeDomain; ...@@ -23,6 +23,7 @@ import com.dookay.cihai.core.theme.domain.ThemeDomain;
import com.dookay.cihai.core.theme.service.IThemeService; import com.dookay.cihai.core.theme.service.IThemeService;
import com.dookay.coral.common.web.controller.BaseController; import com.dookay.coral.common.web.controller.BaseController;
import com.dookay.coral.common.web.response.JsonResult; import com.dookay.coral.common.web.response.JsonResult;
import com.dookay.coral.common.web.utils.HtmlUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
...@@ -57,8 +58,16 @@ public class ThemeController extends BaseController { ...@@ -57,8 +58,16 @@ public class ThemeController extends BaseController {
@RequestMapping(value = "/detail/{id}", method = RequestMethod.GET) @RequestMapping(value = "/detail/{id}", method = RequestMethod.GET)
public ModelAndView detail(@PathVariable Long id) { public ModelAndView detail(@PathVariable Long id) {
ThemeDomain themeDomain = themeService.get(id); ThemeDomain themeDomain = themeService.get(id);
String document = themeDomain.getIntroduce();
document = HtmlUtils.removeTag(document);
List<WordCount> wordCounts = aipWordUtilBean.extractNounWordsWithCount(document)
.stream().sorted(Comparator.comparing(WordCount::getValue).reversed())
.filter(w -> !w.getLabel().equals(themeDomain.getTitle()))
.limit(10)
.collect(Collectors.toList());
ModelAndView mv = new ModelAndView("portal/theme/detail"); ModelAndView mv = new ModelAndView("portal/theme/detail");
mv.addObject("theme", themeDomain); mv.addObject("theme", themeDomain);
mv.addObject("wordCounts", wordCounts);
return mv; return mv;
} }
...@@ -73,6 +82,7 @@ public class ThemeController extends BaseController { ...@@ -73,6 +82,7 @@ public class ThemeController extends BaseController {
public JsonResult related(@PathVariable Long id) { public JsonResult related(@PathVariable Long id) {
ThemeDomain themeDomain = themeService.get(id); ThemeDomain themeDomain = themeService.get(id);
String document = themeDomain.getIntroduce(); String document = themeDomain.getIntroduce();
document = HtmlUtils.removeTag(document);
List<WordCount> wordCounts = aipWordUtilBean.extractNounWordsWithCount(document); List<WordCount> wordCounts = aipWordUtilBean.extractNounWordsWithCount(document);
List<WordCount> collect = wordCounts.stream().sorted(Comparator.comparingDouble(l -> Math.random())).limit(8).collect(Collectors.toList()); List<WordCount> collect = wordCounts.stream().sorted(Comparator.comparingDouble(l -> Math.random())).limit(8).collect(Collectors.toList());
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
...@@ -92,6 +102,7 @@ public class ThemeController extends BaseController { ...@@ -92,6 +102,7 @@ public class ThemeController extends BaseController {
public JsonResult map(@PathVariable Long id) { public JsonResult map(@PathVariable Long id) {
ThemeDomain themeDomain = themeService.get(id); ThemeDomain themeDomain = themeService.get(id);
String document = themeDomain.getIntroduce(); String document = themeDomain.getIntroduce();
document = HtmlUtils.removeTag(document);
List<String> keywords = aipWordUtilBean.extractKeyWords(themeDomain.getTitle(), document, 15); List<String> keywords = aipWordUtilBean.extractKeyWords(themeDomain.getTitle(), document, 15);
List<WordSequence> wordSequences = keywords.stream().map(l -> new WordSequence(keywords.indexOf(l), l)).collect(Collectors.toList()); List<WordSequence> wordSequences = keywords.stream().map(l -> new WordSequence(keywords.indexOf(l), l)).collect(Collectors.toList());
List<WordRelation> wordRelations = aipWordUtilBean.generateWordsMap(keywords); List<WordRelation> wordRelations = aipWordUtilBean.generateWordsMap(keywords);
......
serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/theme/detail.jsp
<%--@elvariable id="theme" type="com.dookay.cihai.core.theme.domain.ThemeDomain"--%>
<%@ 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" %>
...@@ -27,30 +28,14 @@ ...@@ -27,30 +28,14 @@
<img src="${ctx}/static/images/special-top.png"> <img src="${ctx}/static/images/special-top.png">
</div> </div>
<div class="txt-content"> <div class="txt-content">
<p class="intro-txt">中国共产党第十九次全国代表大会（简称党的十九大）于2017年10月18日至10月24日在北京召开。</p> ${theme.introduce}
<p class="intro-txt">2017年10月18日上午9:00，中国共产党第十九次全国代表大会在人民大会堂开幕。习近平代表第十八届中央委员会向大会作了题为《决胜全面建成小康社会 夺取新时代中国特色社会主义伟大胜利》的报告。</p>
<p class="intro-txt">这次大会的主题是：不忘初心，牢记使命，高举中国特色社会主义伟大旗帜，决胜全面建成小康社会，夺取新时代中国特色社会主义伟大胜利，为实现中华民族伟大复兴的中国梦不懈奋斗。</p>
</div> </div>
<div class="read-more js-read-more"> <div class="read-more js-read-more">
<span class="txt">展开阅读全部</span> <span class="txt">展开阅读全部</span>
<span class="iconfont icon-zhankai"></span> <span class="iconfont icon-zhankai"></span>
</div> </div>
<h5 class="sub-title">基本信息</h5> <h5 class="sub-title">基本信息</h5>
<div class="basic-msg"> ${theme.basicInfo}
<b>中文名称：</b>中国共产党第十九次全国代表大会
</div>
<div class="basic-msg">
<b>会议简称：</b>党的十九大
</div>
<div class="basic-msg">
<b>会议时间：</b>2017年10月18日-24日
</div>
<div class="basic-msg">
<b>会议地点：</b>北京
</div>
<div class="basic-msg">
<b>代表人数：</b>2287（确认2280名代表资格有效）
</div>
</div> </div>
</div> </div>
<!--相关词条--> <!--相关词条-->
...@@ -77,149 +62,143 @@ ...@@ -77,149 +62,143 @@
<div class="extend-word"> <div class="extend-word">
<div class="name">延伸词条</div> <div class="name">延伸词条</div>
<div class="word-list"> <div class="word-list">
<div class="item">新时代</div> <%--@elvariable id="wordCounts" type="java.util.List<com.dookay.cihai.core.aip.model.WordCount>"--%>
<div class="item">主要矛盾</div> <c:forEach items="${wordCounts}" var="item">
<div class="item">四个伟大</div> <div class="item">${item.label}</div>
<div class="item">全面小康</div> </c:forEach>
<div class="item">新征程</div>
<div class="item">新时代</div>
<div class="item">中国特色社会主义思想</div>
<div class="item">土地承包</div>
<div class="item">全面依法治国</div>
<div class="item">青春梦想</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!--"数"说十九大--> <!--"数"说十九大-->
<div class="num-progress"> <%--<div class="num-progress">--%>
<div class="special-title"> <%--<div class="special-title">--%>
<div class="tip"> <%--<div class="tip">--%>
<img src="${ctx}/static/images/special-tip.png"> <%--<img src="${ctx}/static/images/special-tip.png">--%>
</div> <%--</div>--%>
<div class="title">"数"说十九大</div> <%--<div class="title">"数"说十九大</div>--%>
</div> <%--</div>--%>
<div class="block block-strong inset"> <%--<div class="block block-strong inset">--%>
<div class="swiper-button-prev iconfont icon-jiantou"></div> <%--<div class="swiper-button-prev iconfont icon-jiantou"></div>--%>
<div class="swiper-button-next iconfont icon-jiantou"></div> <%--<div class="swiper-button-next iconfont icon-jiantou"></div>--%>
<div class="swiper-container num-swiper"> <%--<div class="swiper-container num-swiper">--%>
<div class="swiper-wrapper"> <%--<div class="swiper-wrapper">--%>
<div class="swiper-slide active">350公里</div> <%--<div class="swiper-slide active">350公里</div>--%>
<div class="swiper-slide">6000多万</div> <%--<div class="swiper-slide">6000多万</div>--%>
<div class="swiper-slide">103个国家</div> <%--<div class="swiper-slide">103个国家</div>--%>
<div class="swiper-slide">1.2亿吨</div> <%--<div class="swiper-slide">1.2亿吨</div>--%>
<div class="swiper-slide active">350公里</div> <%--<div class="swiper-slide active">350公里</div>--%>
<div class="swiper-slide">6000多万</div> <%--<div class="swiper-slide">6000多万</div>--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
<div class="swiper-container num-content-swiper"> <%--<div class="swiper-container num-content-swiper">--%>
<div class="swiper-wrapper"> <%--<div class="swiper-wrapper">--%>
<div class="swiper-slide"> <%--<div class="swiper-slide">--%>
<div class="time">2017年9月21号</div> <%--<div class="time">2017年9月21号</div>--%>
<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p> <%--<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p>--%>
<div class="key-word"> <%--<div class="key-word">--%>
<span class="name">延展关键词：</span> <%--<span class="name">延展关键词：</span>--%>
<span class="item">高铁</span> <%--<span class="item">高铁</span>--%>
<span class="item">速度</span> <%--<span class="item">速度</span>--%>
<span class="item">铁路</span> <%--<span class="item">铁路</span>--%>
<span class="item">复兴号</span> <%--<span class="item">复兴号</span>--%>
</div> <%--</div>--%>
<div class="pic"> <%--<div class="pic">--%>
<img src="${ctx}/static/images/special-pic-02.jpg"> <%--<img src="${ctx}/static/images/special-pic-02.jpg">--%>
</div> <%--</div>--%>
<div class="pic"> <%--<div class="pic">--%>
<img src="${ctx}/static/images/special-pic-08.jpg"> <%--<img src="${ctx}/static/images/special-pic-08.jpg">--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
<div class="swiper-slide"> <%--<div class="swiper-slide">--%>
<div class="time">2017年9月22号</div> <%--<div class="time">2017年9月22号</div>--%>
<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p> <%--<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p>--%>
<div class="key-word"> <%--<div class="key-word">--%>
<span class="name">延展关键词：</span> <%--<span class="name">延展关键词：</span>--%>
<span class="item">高铁</span> <%--<span class="item">高铁</span>--%>
<span class="item">速度</span> <%--<span class="item">速度</span>--%>
<span class="item">铁路</span> <%--<span class="item">铁路</span>--%>
<span class="item">复兴号</span> <%--<span class="item">复兴号</span>--%>
</div> <%--</div>--%>
<div class="pic"> <%--<div class="pic">--%>
<img src="${ctx}/static/images/special-pic-02.jpg"> <%--<img src="${ctx}/static/images/special-pic-02.jpg">--%>
</div> <%--</div>--%>
<div class="pic"> <%--<div class="pic">--%>
<img src="${ctx}/static/images/special-pic-08.jpg"> <%--<img src="${ctx}/static/images/special-pic-08.jpg">--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
<div class="swiper-slide"> <%--<div class="swiper-slide">--%>
<div class="time">2017年9月23号</div> <%--<div class="time">2017年9月23号</div>--%>
<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p> <%--<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p>--%>
<div class="key-word"> <%--<div class="key-word">--%>
<span class="name">延展关键词：</span> <%--<span class="name">延展关键词：</span>--%>
<span class="item">高铁</span> <%--<span class="item">高铁</span>--%>
<span class="item">速度</span> <%--<span class="item">速度</span>--%>
<span class="item">铁路</span> <%--<span class="item">铁路</span>--%>
<span class="item">复兴号</span> <%--<span class="item">复兴号</span>--%>
</div> <%--</div>--%>
<div class="pic"> <%--<div class="pic">--%>
<img src="${ctx}/static/images/special-pic-02.jpg"> <%--<img src="${ctx}/static/images/special-pic-02.jpg">--%>
</div> <%--</div>--%>
<div class="pic"> <%--<div class="pic">--%>
<img src="${ctx}/static/images/special-pic-08.jpg"> <%--<img src="${ctx}/static/images/special-pic-08.jpg">--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
<div class="swiper-slide"> <%--<div class="swiper-slide">--%>
<div class="time">2017年9月24号</div> <%--<div class="time">2017年9月24号</div>--%>
<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p> <%--<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p>--%>
<div class="key-word"> <%--<div class="key-word">--%>
<span class="name">延展关键词：</span> <%--<span class="name">延展关键词：</span>--%>
<span class="item">高铁</span> <%--<span class="item">高铁</span>--%>
<span class="item">速度</span> <%--<span class="item">速度</span>--%>
<span class="item">铁路</span> <%--<span class="item">铁路</span>--%>
<span class="item">复兴号</span> <%--<span class="item">复兴号</span>--%>
</div> <%--</div>--%>
<div class="pic"> <%--<div class="pic">--%>
<img src="${ctx}/static/images/special-pic-02.jpg"> <%--<img src="${ctx}/static/images/special-pic-02.jpg">--%>
</div> <%--</div>--%>
<div class="pic"> <%--<div class="pic">--%>
<img src="${ctx}/static/images/special-pic-08.jpg"> <%--<img src="${ctx}/static/images/special-pic-08.jpg">--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
<div class="swiper-slide"> <%--<div class="swiper-slide">--%>
<div class="time">2017年9月21号</div> <%--<div class="time">2017年9月21号</div>--%>
<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p> <%--<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p>--%>
<div class="key-word"> <%--<div class="key-word">--%>
<span class="name">延展关键词：</span> <%--<span class="name">延展关键词：</span>--%>
<span class="item">高铁</span> <%--<span class="item">高铁</span>--%>
<span class="item">速度</span> <%--<span class="item">速度</span>--%>
<span class="item">铁路</span> <%--<span class="item">铁路</span>--%>
<span class="item">复兴号</span> <%--<span class="item">复兴号</span>--%>
</div> <%--</div>--%>
<div class="pic"> <%--<div class="pic">--%>
<img src="${ctx}/static/images/special-pic-02.jpg"> <%--<img src="${ctx}/static/images/special-pic-02.jpg">--%>
</div> <%--</div>--%>
<div class="pic"> <%--<div class="pic">--%>
<img src="${ctx}/static/images/special-pic-08.jpg"> <%--<img src="${ctx}/static/images/special-pic-08.jpg">--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
<div class="swiper-slide"> <%--<div class="swiper-slide">--%>
<div class="time">2017年9月22号</div> <%--<div class="time">2017年9月22号</div>--%>
<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p> <%--<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p>--%>
<div class="key-word"> <%--<div class="key-word">--%>
<span class="name">延展关键词：</span> <%--<span class="name">延展关键词：</span>--%>
<span class="item">高铁</span> <%--<span class="item">高铁</span>--%>
<span class="item">速度</span> <%--<span class="item">速度</span>--%>
<span class="item">铁路</span> <%--<span class="item">铁路</span>--%>
<span class="item">复兴号</span> <%--<span class="item">复兴号</span>--%>
</div> <%--</div>--%>
<div class="pic"> <%--<div class="pic">--%>
<img src="${ctx}/static/images/special-pic-02.jpg"> <%--<img src="${ctx}/static/images/special-pic-02.jpg">--%>
</div> <%--</div>--%>
<div class="pic"> <%--<div class="pic">--%>
<img src="${ctx}/static/images/special-pic-08.jpg"> <%--<img src="${ctx}/static/images/special-pic-08.jpg">--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
</div> <%--</div>--%>
<!--十九大图谱--> <!--十九大图谱-->
<div class="relation-pic"> <div class="relation-pic">
<div class="special-title"> <div class="special-title">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!