Skip to content

石磊 / cihai

Go to a project
Commit 71b99fbe by 徐甲彬
Options

Merge remote-tracking branch 'origin/master'

2 parents ca5e1a2b 388d41da
Expand all
Inline Side-by-side
Showing 15 changed files with 65 additions and 59 deletions
serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/domain/WordDomain.java
...@@ -83,6 +83,7 @@ public class WordDomain implements Serializable { ...@@ -83,6 +83,7 @@ public class WordDomain implements Serializable {
private String category; private String category;
private String wordAlias; private String wordAlias;
private Boolean isPolyphone;
} }
serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/HomeController.java
...@@ -14,10 +14,12 @@ ...@@ -14,10 +14,12 @@
package com.dookay.cihai.wechat.controller; package com.dookay.cihai.wechat.controller;
import com.dookay.cihai.core.aip.AipDefaultClient;
import com.dookay.cihai.core.aip.AipImageClassifyClient; import com.dookay.cihai.core.aip.AipImageClassifyClient;
import com.dookay.cihai.core.aip.AipWordUtilBean; import com.dookay.cihai.core.aip.AipWordUtilBean;
import com.dookay.cihai.core.aip.model.ImageResult; import com.dookay.cihai.core.aip.model.ImageResult;
import com.dookay.cihai.core.aip.model.LexerItem; import com.dookay.cihai.core.aip.model.LexerItem;
import com.dookay.cihai.core.aip.model.ScanResult;
import com.dookay.cihai.core.theme.domain.ThemeDomain; 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;
...@@ -63,6 +65,9 @@ public class HomeController extends BaseController { ...@@ -63,6 +65,9 @@ public class HomeController extends BaseController {
@Autowired @Autowired
private AipImageClassifyClient aipImageClassifyClient; private AipImageClassifyClient aipImageClassifyClient;
@Autowired
private AipDefaultClient aipDefaultClient;
/** /**
* @author 石磊 * @author 石磊
* @date 2017/12/6 * @date 2017/12/6
...@@ -130,10 +135,13 @@ public class HomeController extends BaseController { ...@@ -130,10 +135,13 @@ public class HomeController extends BaseController {
@RequestMapping(value = "/image/search", method = RequestMethod.POST, produces = MediaTypes.JSON_UTF_8) @RequestMapping(value = "/image/search", method = RequestMethod.POST, produces = MediaTypes.JSON_UTF_8)
@ResponseBody @ResponseBody
public JsonResult imageSearch(String image) { public JsonResult imageSearch(String image) {
System.out.println("进入图片检索");
try { try {
ImageResult imageResult = aipImageClassifyClient.getImageResult(image); ScanResult imageResult = aipDefaultClient.scan(image);
String name = imageResult.getName(); System.out.println(imageResult);
if (imageResult.getWordsList().size() <= 0) {
return errorResult("暂无检索结果");
}
String name = imageResult.getWordsList().get(0);
System.out.println(name); System.out.println(name);
WordQuery wordQuery = new WordQuery(); WordQuery wordQuery = new WordQuery();
wordQuery.setKeyword(name); wordQuery.setKeyword(name);
...@@ -145,7 +153,7 @@ public class HomeController extends BaseController { ...@@ -145,7 +153,7 @@ public class HomeController extends BaseController {
wordDomain = wordService.getFirst(wordQuery); wordDomain = wordService.getFirst(wordQuery);
if (wordDomain == null) return errorResult("暂无检索结果"); if (wordDomain == null) return errorResult("暂无检索结果");
} }
return successResult("success", "/word/baike/" + wordDomain.getId()); return successResult("success", !wordDomain.getIsPolyphone() ? "/word/baike/" + wordDomain.getId() : "/word/detail/" + wordDomain.getId());
} catch (Exception ex) { } catch (Exception ex) {
return errorResult("暂无检索结果"); return errorResult("暂无检索结果");
} }
......
serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/WordController.java
...@@ -43,7 +43,7 @@ public class WordController extends BaseController { ...@@ -43,7 +43,7 @@ public class WordController 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) {
WordDomain wordDomain = wordService.get(id); WordDomain wordDomain = wordService.get(id);
ModelAndView mv = new ModelAndView("/portal/word/detail"); ModelAndView mv = new ModelAndView(!wordDomain.getIsPolyphone() ? "portal/word/detail" : "portal/word/polyphone");
mv.addObject("word", wordDomain); mv.addObject("word", wordDomain);
return mv; return mv;
} }
...@@ -56,7 +56,7 @@ public class WordController extends BaseController { ...@@ -56,7 +56,7 @@ public class WordController extends BaseController {
@RequestMapping(value = "/baike/{id}", method = RequestMethod.GET) @RequestMapping(value = "/baike/{id}", method = RequestMethod.GET)
public ModelAndView baike(@PathVariable Long id) { public ModelAndView baike(@PathVariable Long id) {
WordDomain wordDomain = wordService.get(id); WordDomain wordDomain = wordService.get(id);
ModelAndView mv = new ModelAndView("/portal/word/baike"); ModelAndView mv = new ModelAndView("portal/word/baike");
mv.addObject("word", wordDomain); mv.addObject("word", wordDomain);
return mv; return mv;
} }
......
serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/include/footer.jsp
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<%--添加此行消除额外空格--%> <%--添加此行消除额外空格--%>
<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script> <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
<script src="${ctx}/static/js/vendor.js"></script> <script src="${ctx}/static/js/vendor.js"></script>
<script src="${ctx}/static/js/plugins/lodash.core.js"></script>
<script src="${ctx}/static/js/backend.js"></script> <script src="${ctx}/static/js/backend.js"></script>
<script src="${ctx}/static/js/layer/layer.js"></script> <script src="${ctx}/static/js/layer/layer.js"></script>
<script src="${ctx}/static/js/main.js"></script> <script src="${ctx}/static/js/main.js"></script>
......
serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/theme/detail.jsp
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
jQuery.get(location.href + "/map", {}, function (data) { jQuery.get(location.href + "/map", {}, function (data) {
if (data.code == "OK") { if (data.code == "OK") {
mapData = data.data; mapData = data.data;
relationPic('relation-pic', mapData); return newNetwork('relation-pic', mapData);
} else { } else {
console.log("请求数据失败"); console.log("请求数据失败");
} }
...@@ -333,8 +333,8 @@ ...@@ -333,8 +333,8 @@
function loadRelated() { function loadRelated() {
jQuery.get(location.href + "/related", {}, function (data) { jQuery.get(location.href + "/related", {}, function (data) {
if (data.code == "OK") { if (data.code == "OK") {
mapData = data.data; relateData = data.data;
relationPic('word-analysis', relateData); return newNetwork('word-analysis', relateData);
} else { } else {
console.log("请求数据失败"); console.log("请求数据失败");
} }
...@@ -342,8 +342,8 @@ ...@@ -342,8 +342,8 @@
} }
function relationPic(id, data) { function newNetwork(id, data) {
return new vis.Network(document.getElementById(id), mapData, { var netWork = new vis.Network(document.getElementById(id), data, {
nodes: { nodes: {
shape: 'dot', shape: 'dot',
borderWidth: 3, borderWidth: 3,
...@@ -357,11 +357,27 @@ ...@@ -357,11 +357,27 @@
}, },
font: { font: {
color: '#333' color: '#333'
},
},
});
netWork.on("doubleClick", function (e) {
console.log(e);
var i = e.nodes[0];
var node = _.filter(data.nodes, function (n) {
return n.id == i;
});
jQuery.get("/home/search", {keyword: node[0].label}, function (data) {
if (data.code == "OK") {
location.href = data.data;
} else {
myApp.dialog.alert(data.message);
} }
} })
}); });
return netWork;
}; };
$('.js-refresh').click(function () { $('.js-refresh').click(function () {
wordAnalysis.destroy(); wordAnalysis.destroy();
loadRelated(); loadRelated();
...@@ -369,8 +385,6 @@ ...@@ -369,8 +385,6 @@
var mapData = {}; var mapData = {};
var relateData = {}; var relateData = {};
relationPic('relation-pic', mapData); var map = loadMap();
var wordAnalysis = relationPic('word-analysis', mapData); var wordAnalysis = loadRelated();
loadMap();
loadRelated();
</script> </script>
serverside/cihai-wechat/src/main/webapp/static/2-1字语词义.html
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="left"> <div class="left">
<a class="link back" href="/"> <a class="link js-jump-page" href="index.html">
<i class="iconfont icon-jiantou"></i> <i class="iconfont icon-jiantou"></i>
<span class="ios-only">返回</span> <span class="ios-only">返回</span>
</a> </a>
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
<span class="icon icon-word-prev"></span> <span class="icon icon-word-prev"></span>
</a> </a>
<h1 class="word-title-inner bg-farmland">象</h1> <h1 class="word-title-inner bg-farmland">象</h1>
<a class="word-title-pager next" href="/word-wiki/">百科 <a class="word-title-pager next js-jump-page" href="2-2字百科义.html">百科
<span class="icon icon-word-next"></span> <span class="icon icon-word-next"></span>
</a> </a>
</div> </div>
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
<li class="accordion-item"> <li class="accordion-item">
<a class="item-link item-content" href="#"> <a class="item-link item-content" href="#">
<div class="item-inner"> <div class="item-inner">
<div class="item-title">书法</div> <div class="item-title">基本释义</div>
</div> </div>
</a> </a>
<div class="accordion-item-content"> <div class="accordion-item-content">
......
serverside/cihai-wechat/src/main/webapp/static/2-2字百科义.html
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
<div class="navbar"> <div class="navbar">
<div class="navbar-inner navbar-word-wiki"> <div class="navbar-inner navbar-word-wiki">
<div class="left"> <div class="left">
<a class="link back" href="/"> <a class="link js-jump-page" href="index.html">
<i class="iconfont icon-jiantou"></i> <i class="iconfont icon-jiantou"></i>
<span class="ios-only">返回</span> <span class="ios-only">返回</span>
</a> </a>
...@@ -360,7 +360,7 @@ ...@@ -360,7 +360,7 @@
<div class="single-word"> <div class="single-word">
<div class="word-body"> <div class="word-body">
<div class="word-title"> <div class="word-title">
<a class="word-title-pager prev active back">语词 <a class="word-title-pager prev active js-jump-page" href="2-1字语词义.html">语词
<span class="icon icon-word-prev"></span> <span class="icon icon-word-prev"></span>
</a> </a>
<h1 class="word-title-inner">象</h1> <h1 class="word-title-inner">象</h1>
...@@ -418,7 +418,7 @@ ...@@ -418,7 +418,7 @@
</li> </li>
<li> <li>
<strong>分布区域：</strong> <strong>分布区域：</strong>
<span>非洲撒哈拉沙漠以南和南亚及东南亚以及中国南部边。非洲撒哈拉沙漠以南和南亚及东南亚以及中国南部边。非洲撒哈拉沙漠以南和南亚及东南亚以及中国南部边。非洲撒哈拉沙漠以南和南亚及东南亚以及中国南部边。非洲撒哈拉沙漠以南和南亚及东南亚以及中国南部边。</span> <span>非洲撒哈拉沙漠以南和南亚及东南亚以及中国南部边。</span>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -427,15 +427,15 @@ ...@@ -427,15 +427,15 @@
<div class="word-tab js-word-tab"> <div class="word-tab js-word-tab">
<ul> <ul>
<li class="active"> <li class="active">
<a href="#">基本释义</a> <a href="#tab01">基本释义</a>
</li> </li>
<li> <li>
<a href="#">图册 <a href="#tab02">图册
<span>(125)</span> <span>(125)</span>
</a> </a>
</li> </li>
<li> <li>
<a href="#">视频 <a href="#tab03">视频
<span>(3)</span> <span>(3)</span>
</a> </a>
</li> </li>
...@@ -443,36 +443,12 @@ ...@@ -443,36 +443,12 @@
</div> </div>
<div class="tab-con js-tab-con"> <div class="tab-con js-tab-con">
<div class="tab-panel active" id="tab01"> <div class="tab-panel active" id="tab01">
<div class="tip-box">
<span> 这段话可设置舒适的文字大小。</span>
<div class="tip-operation">
<a class="large-btn" href="#">大</a>
<a class="normal-btn" href="#">选中</a>
<a class="small-btn" href="#">小</a>
</div>
</div>
<div class="article">哺乳纲，长鼻目，象科。陆上现存最大的哺乳动物。肩高2.5～3.0米。皮厚毛少，肢粗如柱。鼻与上唇愈合成圆筒状长鼻，鼻端有指状突起一或两个。上颌门齿大而长，称“象牙”。有两种：亚洲象（Elephas maximus），体较小，额部下凹，鼻端具一指状凸起，耳小，后足四蹄。仅雄象有象牙，分布于南亚、东南亚等地；亦见于中国云南等地，国家一级保护动物。非洲象（Loxodonta africana），体较大，额部凸出，鼻端有两个指状凸起，耳大披肩，后足三蹄。雌雄均有象牙，不易驯服，分布于非洲。</div> <div class="article">哺乳纲，长鼻目，象科。陆上现存最大的哺乳动物。肩高2.5～3.0米。皮厚毛少，肢粗如柱。鼻与上唇愈合成圆筒状长鼻，鼻端有指状突起一或两个。上颌门齿大而长，称“象牙”。有两种：亚洲象（Elephas maximus），体较小，额部下凹，鼻端具一指状凸起，耳小，后足四蹄。仅雄象有象牙，分布于南亚、东南亚等地；亦见于中国云南等地，国家一级保护动物。非洲象（Loxodonta africana），体较大，额部凸出，鼻端有两个指状凸起，耳大披肩，后足三蹄。雌雄均有象牙，不易驯服，分布于非洲。</div>
</div> </div>
<div class="tab-panel" id="tab02"> <div class="tab-panel" id="tab02">
<div class="tip-box">
<span> 这里的段话，您可以设置舒适的文字大小。</span>
<div class="tip-operation">
<a class="large-btn" href="#">大</a>
<a class="normal-btn" href="#">选中</a>
<a class="small-btn" href="#">小</a>
</div>
</div>
<div class="article">哺乳纲，长鼻目，象科。陆上现存最大的哺乳动物。肩高2.5～3.0米。皮厚毛少，肢粗如柱。鼻与上唇愈合成圆筒状长鼻，鼻端有指状突起一或两个。上颌门齿大而长，称“象牙”。有两种：亚洲象（Elephas maximus），体较小，额部下凹，鼻端具一指状凸起，耳小，后足四蹄。仅雄象有象牙，分布于南亚、东南亚等地；亦见于中国云南等地，国家一级保护动物。非洲象（Loxodonta africana），体较大，额部凸出，鼻端有两个指状凸起，耳大披肩，后足三蹄。雌雄均有象牙，不易驯服，分布于非洲。</div> <div class="article">哺乳纲，长鼻目，象科。陆上现存最大的哺乳动物。肩高2.5～3.0米。皮厚毛少，肢粗如柱。鼻与上唇愈合成圆筒状长鼻，鼻端有指状突起一或两个。上颌门齿大而长，称“象牙”。有两种：亚洲象（Elephas maximus），体较小，额部下凹，鼻端具一指状凸起，耳小，后足四蹄。仅雄象有象牙，分布于南亚、东南亚等地；亦见于中国云南等地，国家一级保护动物。非洲象（Loxodonta africana），体较大，额部凸出，鼻端有两个指状凸起，耳大披肩，后足三蹄。雌雄均有象牙，不易驯服，分布于非洲。</div>
</div> </div>
<div class="tab-panel" id="tab03"> <div class="tab-panel" id="tab03">
<div class="tip-box">
<span> 这里的段话，您可以设置舒适的文字大小。</span>
<div class="tip-operation">
<a class="large-btn" href="#">大</a>
<a class="normal-btn" href="#">选中</a>
<a class="small-btn" href="#">小</a>
</div>
</div>
<div class="article">哺乳纲，长鼻目，象科。陆上现存最大的哺乳动物。肩高2.5～3.0米。皮厚毛少，肢粗如柱。鼻与上唇愈合成圆筒状长鼻，鼻端有指状突起一或两个。上颌门齿大而长，称“象牙”。有两种：亚洲象（Elephas maximus），体较小，额部下凹，鼻端具一指状凸起，耳小，后足四蹄。仅雄象有象牙，分布于南亚、东南亚等地；亦见于中国云南等地，国家一级保护动物。非洲象（Loxodonta africana），体较大，额部凸出，鼻端有两个指状凸起，耳大披肩，后足三蹄。雌雄均有象牙，不易驯服，分布于非洲。</div> <div class="article">哺乳纲，长鼻目，象科。陆上现存最大的哺乳动物。肩高2.5～3.0米。皮厚毛少，肢粗如柱。鼻与上唇愈合成圆筒状长鼻，鼻端有指状突起一或两个。上颌门齿大而长，称“象牙”。有两种：亚洲象（Elephas maximus），体较小，额部下凹，鼻端具一指状凸起，耳小，后足四蹄。仅雄象有象牙，分布于南亚、东南亚等地；亦见于中国云南等地，国家一级保护动物。非洲象（Loxodonta africana），体较大，额部凸出，鼻端有两个指状凸起，耳大披肩，后足三蹄。雌雄均有象牙，不易驯服，分布于非洲。</div>
</div> </div>
</div> </div>
......
serverside/cihai-wechat/src/main/webapp/static/css/vendor.css
This diff could not be displayed because it is too large.
serverside/cihai-wechat/src/main/webapp/static/js/main.js
...@@ -11,18 +11,23 @@ setTimeout(function () { ...@@ -11,18 +11,23 @@ setTimeout(function () {
$loading.hide(); $loading.hide();
},300); },300);
// tab切换
$('.js-word-tab .tab-link').click(function () {
var $this = $(this);
$this.parent().addClass('active').siblings().removeClass('active');
$($this.attr('href')).addClass('active').siblings().removeClass('active');
return false;
});
/** /**
* 页面切换 * 页面切换
* @param url * @param url
*/ */
function jumpPage(url) { function jumpPage(url) {
$loading.show(); $loading.show().removeClass('fade-out');
setTimeout(function () { setTimeout(function () {
$loading.removeClass('fade-in'); window.location.href = url;
setTimeout(function () { },300);
window.location.href = url;
},300);
},10);
} }
$('.js-jump-page').click(function () { $('.js-jump-page').click(function () {
......
serverside/cihai-wechat/src/main/webapp/static/js/plugins/lodash.core.js 0 → 100644
This diff could not be displayed because it is too large.
serverside/cihai-wechat/src/main/webapp/static/专题.html
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
<div class="view view-main view-init ios-edges" data-url="/"> <div class="view view-main view-init ios-edges" data-url="/">
<div class="page"> <div class="page">
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner navbar-word-wiki">
<div class="left"> <div class="left">
<a class="link back" href="/"> <a class="link js-jump-page" href="index.html">
<i class="iconfont icon-jiantou"></i> <i class="iconfont icon-jiantou"></i>
<span class="ios-only">返回</span> <span class="ios-only">返回</span>
</a> </a>
...@@ -364,7 +364,8 @@ ...@@ -364,7 +364,8 @@
font: { font: {
color: '#333' color: '#333'
} }
} },
clickToUse: true
}); });
}; };
var relationPicData = { var relationPicData = {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!