Skip to content

石磊 / cihai

Go to a project
Commit 5e468d16 by 石头
Options

整合词条页面

1 parent cc88ba6e
Expand all
Inline Side-by-side
Showing 18 changed files with 30 additions and 27 deletions
serverside/cihai-admin/src/main/java/com/dookay/cihai/admin/controller/WordRelateController.java
...@@ -43,6 +43,7 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -43,6 +43,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.charset.Charset;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
...@@ -77,11 +78,14 @@ public class WordRelateController extends BaseController { ...@@ -77,11 +78,14 @@ public class WordRelateController extends BaseController {
* @date 2018/1/9 * @date 2018/1/9
*/ */
@RequestMapping(value = "/pic/add", method = RequestMethod.POST) @RequestMapping(value = "/pic/add", method = RequestMethod.POST)
public JsonResult picAdd(@ModelAttribute AddPicForm form) { public JsonResult picAdd(@ModelAttribute AddPicForm form) throws Exception{
WordQuery q = new WordQuery(); WordQuery q = new WordQuery();
System.out.println(form.getWord());
q.setWord(form.getWord()); q.setWord(form.getWord());
WordDomain wordDomain = wordService.getFirst(q); WordDomain wordDomain = wordService.getFirst(q);
if (wordDomain == null) { if (wordDomain == null) {
System.out.println(String.format("%s不存在",form.getWord()));
return errorResult("词条不存在"); return errorResult("词条不存在");
} }
List<ImageModel> modelList = doUpload(form.getWord(), form.getImage()); List<ImageModel> modelList = doUpload(form.getWord(), form.getImage());
......
serverside/cihai-app/src/main/java/com/dookay/cihai/app/controller/WordController.java
...@@ -86,7 +86,6 @@ public class WordController extends BaseController { ...@@ -86,7 +86,6 @@ public class WordController extends BaseController {
List<ImageModel> images = List<ImageModel> images =
ImageModel.toList(wordDomain.getBaikePhotos()) ImageModel.toList(wordDomain.getBaikePhotos())
.stream() .stream()
.sorted(Comparator.comparing(ImageModel::getFile))
.collect(Collectors.toList()); .collect(Collectors.toList());
WordPicsVO vo = new WordPicsVO(); WordPicsVO vo = new WordPicsVO();
vo.setPics(images); vo.setPics(images);
......
serverside/cihai-app/src/main/java/com/dookay/cihai/app/controller/vo/OneWayRelateVO.java
...@@ -49,6 +49,7 @@ public class OneWayRelateVO { ...@@ -49,6 +49,7 @@ public class OneWayRelateVO {
for (Map.Entry<String, List<RelationOneWayDomain>> entry : map.entrySet()) { for (Map.Entry<String, List<RelationOneWayDomain>> entry : map.entrySet()) {
List<Long> relatedIds = entry.getValue().stream().map(RelationOneWayDomain::getRelateWordId).collect(Collectors.toList()); 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()); 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<>(); MutableTriple<Integer, String, List<WordDomain>> triple = new MutableTriple<>();
triple.setLeft(entry.getValue().get(0).getGroupRank()); triple.setLeft(entry.getValue().get(0).getGroupRank());
triple.setMiddle(entry.getKey()); triple.setMiddle(entry.getKey());
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/all.jsp
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</li> </li>
<li> <li>
<div class="time">1222</div> <div class="time">1222</div>
<p>大<a href=javascript:;>日莲</a>，日本佛教日莲宗创始人出生。</p> <p>大日莲，日本佛教日莲宗创始人出生。</p>
</li> </li>
<li> <li>
<div class="time">1304</div> <div class="time">1304</div>
...@@ -36,15 +36,15 @@ ...@@ -36,15 +36,15 @@
</li> </li>
<li> <li>
<div class="time">1352</div> <div class="time">1352</div>
<p><a href=javascript:;>郭子兴</a>起义军攻克濠州。</p> <p>郭子兴起义军攻克濠州。</p>
</li> </li>
<li> <li>
<div class="time">1870</div> <div class="time">1870</div>
<p><a href=javascript:;>普法战争</a>，法国失败。</p> <p>普法战争，法国失败。</p>
</li> </li>
<li> <li>
<div class="time">1910</div> <div class="time">1910</div>
<p><a href=javascript:;>孙中山</a><a href=javascript:;>章太炎</a>分道扬镳同盟会分裂。</p> <p>孙中山、章太炎分道扬镳同盟会分裂。</p>
</li> </li>
<li> <li>
<div class="time">1921</div> <div class="time">1921</div>
...@@ -56,11 +56,11 @@ ...@@ -56,11 +56,11 @@
</li> </li>
<li> <li>
<div class="time">1935</div> <div class="time">1935</div>
<p>红军取得<a href=javascript:;>长征</a>以来第一次重大胜利。</p> <p>红军取得长征以来第一次重大胜利。</p>
</li> </li>
<li> <li>
<div class="time">1938</div> <div class="time">1938</div>
<p>京剧名家<a href=javascript:;>杨小楼</a>病逝。</p> <p>京剧名家杨小楼病逝。</p>
</li> </li>
<li> <li>
<div class="time">1959</div> <div class="time">1959</div>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</li> </li>
<li> <li>
<div class="time">1976</div> <div class="time">1976</div>
<p>英国<a href=javascript:;>北海油田</a>的奥克钻油区正式运作。</p> <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
...@@ -24,16 +24,16 @@ ...@@ -24,16 +24,16 @@
<ul class="list-unstyled list-history"> <ul class="list-unstyled list-history">
<li> <li>
<div class="time">1352</div> <div class="time">1352</div>
<p><a href=javascript:;>郭子兴</a>起义军攻克濠州。</p> <p>郭子兴起义军攻克濠州。</p>
</li> </li>
<li> <li>
<div class="time">1870</div> <div class="time">1870</div>
<p><a href=javascript:;>普法战争</a>，法国失败。</p> <p>普法战争，法国失败。</p>
</li> </li>
<li> <li>
<div class="time">1910</div> <div class="time">1910</div>
<p><a href=javascript:;>孙中山</a> <p>孙中山
<a href=javascript:;>章太炎</a>分道扬镳同盟会分裂。</p> 章太炎分道扬镳同盟会分裂。</p>
</li> </li>
<li> <li>
<div class="time">1930</div> <div class="time">1930</div>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</li> </li>
<li> <li>
<div class="time">1935</div> <div class="time">1935</div>
<p>红军取得<a href=javascript:;>长征</a>以来第一次重大胜利。</p> <p>红军取得长征以来第一次重大胜利。</p>
</li> </li>
<li> <li>
<div class="time">1959</div> <div class="time">1959</div>
...@@ -49,15 +49,15 @@ ...@@ -49,15 +49,15 @@
</li> </li>
<li> <li>
<div class="time">1976</div> <div class="time">1976</div>
<p>英国<a href=javascript:;>北海油田</a>的奥克钻油区正式运作。</p> <p>英国北海油田的奥克钻油区正式运作。</p>
</li> </li>
<li> <li>
<div class="time">1985</div> <div class="time">1985</div>
<p><a href=javascript:;>以色列</a>军队开始从<a href=javascript:;>黎巴嫩</a>撤退。</p> <p>以色列军队开始从黎巴嫩撤退。</p>
</li> </li>
<li> <li>
<div class="time">2005</div> <div class="time">2005</div>
<p>限制全球温室气体排放量的“<a href=javascript:;>京都议定书</a>” 获得120多个国家确认正式生效。</p> <p>限制全球温室气体排放量的“京都议定书” 获得120多个国家确认正式生效。</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
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</li> </li>
<li> <li>
<div class="time">1222</div> <div class="time">1222</div>
<p>大<a href=javascript:;>日莲</a>，日本佛教日莲宗创始人出生。</p> <p>大日莲，日本佛教日莲宗创始人出生。</p>
</li> </li>
<li> <li>
<div class="time">1304</div> <div class="time">1304</div>
...@@ -40,15 +40,15 @@ ...@@ -40,15 +40,15 @@
</li> </li>
<li> <li>
<div class="time">1938</div> <div class="time">1938</div>
<p>京剧名家<a href=javascript:;>杨小楼</a>病逝。</p> <p>京剧名家杨小楼病逝。</p>
</li> </li>
<li> <li>
<div class="time">1988</div> <div class="time">1988</div>
<p>教育家、作家<a href=javascript:;>叶圣陶</a>逝世。</p> <p>教育家、作家叶圣陶逝世。</p>
</li> </li>
<li> <li>
<div class="time">1997</div> <div class="time">1997</div>
<p>著名实验物理学家<a href=javascript:;>吴健雄</a>女士去世 。</p> <p>著名实验物理学家吴健雄女士去世 。</p>
</li> </li>
<li></li> <li></li>
<li class="end"> <li class="end">
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/luxunRelate.jsp
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<div class="card mb-1"> <div class="card mb-1">
<div class="card-header"> <div class="card-header">
<h5 class="mb-0 collapsed" data-toggle="collapse" data-target="#collapse1"> <h5 class="mb-0 collapsed" data-toggle="collapse" data-target="#collapse1">
<button class="btn btn-link">鲁迅夫人</button> <button class="btn btn-link">夫人</button>
</h5> </h5>
</div> </div>
<div class="collapse" id="collapse1" data-parent="#accordion"> <div class="collapse" id="collapse1" data-parent="#accordion">
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<div class="card mb-1"> <div class="card mb-1">
<div class="card-header"> <div class="card-header">
<h5 class="mb-0 collapsed" data-toggle="collapse" data-target="#collapse2"> <h5 class="mb-0 collapsed" data-toggle="collapse" data-target="#collapse2">
<button class="btn btn-link">鲁迅胞弟</button> <button class="btn btn-link">胞弟</button>
</h5> </h5>
</div> </div>
<div class="collapse" id="collapse2" data-parent="#accordion"> <div class="collapse" id="collapse2" data-parent="#accordion">
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<div class="card mb-1"> <div class="card mb-1">
<div class="card-header"> <div class="card-header">
<h5 class="mb-0 collapsed" data-toggle="collapse" data-target="#collapse3"> <h5 class="mb-0 collapsed" data-toggle="collapse" data-target="#collapse3">
<button class="btn btn-link">鲁迅主编刊物</button> <button class="btn btn-link">主编刊物</button>
</h5> </h5>
</div> </div>
<div class="collapse" id="collapse3" data-parent="#accordion"> <div class="collapse" id="collapse3" data-parent="#accordion">
......
serverside/cihai-core/src/main/java/com/dookay/cihai/core/aip/AipDefaultClient.java
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
package com.dookay.cihai.core.aip; package com.dookay.cihai.core.aip;
import com.alibaba.fastjson.JSON;
import com.dookay.cihai.core.aip.enums.ImageInputTypeEnum; import com.dookay.cihai.core.aip.enums.ImageInputTypeEnum;
import com.dookay.cihai.core.aip.enums.ScanResultTypeEnum; import com.dookay.cihai.core.aip.enums.ScanResultTypeEnum;
import com.dookay.cihai.core.aip.model.GeneralRecognitionResult; import com.dookay.cihai.core.aip.model.GeneralRecognitionResult;
......
serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/dto/WordDTO.java
...@@ -69,7 +69,6 @@ public class WordDTO { ...@@ -69,7 +69,6 @@ public class WordDTO {
ImageModel thumb = ImageModel thumb =
ImageModel.toList(word.getBaikePhotos()) ImageModel.toList(word.getBaikePhotos())
.stream() .stream()
.sorted(Comparator.comparing(ImageModel::getFile))
.findFirst() .findFirst()
.orElse(null); .orElse(null);
wordDTO.setThumb(thumb); wordDTO.setThumb(thumb);
......
serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/HomeController.java
...@@ -136,7 +136,6 @@ public class HomeController extends BaseController { ...@@ -136,7 +136,6 @@ 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(image);
try { try {
ScanResult imageResult = aipDefaultClient.scan(image); ScanResult imageResult = aipDefaultClient.scan(image);
System.out.println(imageResult); System.out.println(imageResult);
......
serverside/cihai-wechat/src/main/resources/application-dev.properties
...@@ -15,7 +15,7 @@ spring.redis.password=100001 ...@@ -15,7 +15,7 @@ spring.redis.password=100001
# 文件存储 # 文件存储
coral.web.resource.mapping.uploads-inner=/uploads/* coral.web.resource.mapping.uploads-inner=/uploads/*
coral.web.resource.mapping.uploads-mapping=/data/www/uploads/cihai coral.web.resource.mapping.uploads-mapping=/data/www/uploads/cihai
coral.web.view.form.enable-prevent-duplicate=false
#wechat config #wechat config
#AppID #AppID
coral.wechat.WechatConfig.appId=wx319ed3575ffe9ff8 coral.wechat.WechatConfig.appId=wx319ed3575ffe9ff8
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!