Skip to content

石磊 / cihai

Go to a project
Commit bcfb968d by 侯昆
Options

去掉纪念页面

1 parent 57d9ef8d
Inline Side-by-side
Showing 8 changed files with 14 additions and 10 deletions
serverside/cihai-app/src/main/java/com/dookay/cihai/app/controller/HistoryHtmlController.java
...@@ -72,9 +72,9 @@ public class HistoryHtmlController extends BaseController { ...@@ -72,9 +72,9 @@ public class HistoryHtmlController extends BaseController {
* @author houkun * @author houkun
* @date 2018/1/24 * @date 2018/1/24
*/ */
@RequestMapping(value = "/memory", method = RequestMethod.GET) // @RequestMapping(value = "/memory", method = RequestMethod.GET)
public ModelAndView memory() { // public ModelAndView memory() {
ModelAndView mv = new ModelAndView("/history/memory"); // ModelAndView mv = new ModelAndView("/history/memory");
return mv; // return mv;
} // }
} }
serverside/cihai-app/src/main/java/com/dookay/cihai/app/controller/vo/CharacterBaikeVO.java
...@@ -38,6 +38,7 @@ public class CharacterBaikeVO { ...@@ -38,6 +38,7 @@ public class CharacterBaikeVO {
private Long wordId; private Long wordId;
@ApiModelProperty("字") @ApiModelProperty("字")
private String word; private String word;
private String description;
@ApiModelProperty("上面的简介") @ApiModelProperty("上面的简介")
private List<String> brief; private List<String> brief;
@ApiModelProperty("下面的释义主体") @ApiModelProperty("下面的释义主体")
...@@ -53,6 +54,7 @@ public class CharacterBaikeVO { ...@@ -53,6 +54,7 @@ public class CharacterBaikeVO {
CharacterBaikeVO dto = new CharacterBaikeVO(); CharacterBaikeVO dto = new CharacterBaikeVO();
dto.setWordId(word.getId()); dto.setWordId(word.getId());
dto.setWord(word.getWord()); dto.setWord(word.getWord());
dto.setDescription(word.getBaikeDescription());
List<String> brief = Arrays.stream(StringUtils.split(word.getBaikeBrief(), '`')) List<String> brief = Arrays.stream(StringUtils.split(word.getBaikeBrief(), '`'))
.filter(StringUtils::isNoneBlank) .filter(StringUtils::isNoneBlank)
.map(StringUtils::trim) .map(StringUtils::trim)
......
serverside/cihai-app/src/main/java/com/dookay/cihai/app/controller/vo/StatementBaikeVO.java
...@@ -37,6 +37,7 @@ public class StatementBaikeVO { ...@@ -37,6 +37,7 @@ public class StatementBaikeVO {
private Long wordId; private Long wordId;
@ApiModelProperty("词") @ApiModelProperty("词")
private String word; private String word;
private String description;
@ApiModelProperty("上面的简介") @ApiModelProperty("上面的简介")
private List<String> brief; private List<String> brief;
@ApiModelProperty("下面的释义主体") @ApiModelProperty("下面的释义主体")
...@@ -52,6 +53,7 @@ public class StatementBaikeVO { ...@@ -52,6 +53,7 @@ public class StatementBaikeVO {
StatementBaikeVO dto = new StatementBaikeVO(); StatementBaikeVO dto = new StatementBaikeVO();
dto.setWordId(word.getId()); dto.setWordId(word.getId());
dto.setWord(word.getWord()); dto.setWord(word.getWord());
dto.setDescription(word.getBaikeDescription());
List<String> brief = Arrays.stream(StringUtils.split(word.getBaikeBrief(), '`')) List<String> brief = Arrays.stream(StringUtils.split(word.getBaikeBrief(), '`'))
.filter(StringUtils::isNoneBlank) .filter(StringUtils::isNoneBlank)
.map(StringUtils::trim) .map(StringUtils::trim)
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/all.jsp
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<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>
<a class="nav-link" href="/history/people">人物</a> <a class="nav-link" href="/history/people">人物</a>
<a class="nav-link" href="/history/memory">纪念</a> <%--<a class="nav-link" href="/history/memory">纪念</a>--%>
</nav> </nav>
<ul class="list-unstyled list-history"> <ul class="list-unstyled list-history">
<li> <li>
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/event.jsp
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<a class="nav-link" href="/history/all">全部</a> <a class="nav-link" href="/history/all">全部</a>
<a class="nav-link active" href="/history/event">事件</a> <a class="nav-link active" href="/history/event">事件</a>
<a class="nav-link" href="/history/people">人物</a> <a class="nav-link" href="/history/people">人物</a>
<a class="nav-link" href="/history/memory">纪念</a> <%--<a class="nav-link" href="/history/memory">纪念</a>--%>
</nav> </nav>
<ul class="list-unstyled list-history"> <ul class="list-unstyled list-history">
<li> <li>
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/people.jsp
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<a class="nav-link" href="/history/all">全部</a> <a class="nav-link" href="/history/all">全部</a>
<a class="nav-link" href="/history/event">事件</a> <a class="nav-link" href="/history/event">事件</a>
<a class="nav-link active" href="/history/people">人物</a> <a class="nav-link active" href="/history/people">人物</a>
<a class="nav-link" href="/history/memory">纪念</a> <%--<a class="nav-link" href="/history/memory">纪念</a>--%>
</nav> </nav>
<ul class="list-unstyled list-history"> <ul class="list-unstyled list-history">
<li> <li>
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/character_baike.jsp
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<i class="icon icon-shengyin"></i> <i class="icon icon-shengyin"></i>
</a> </a>
</div> </div>
<%--<h4>长鼻目象科哺乳动物</h4>--%> <h4>${vo.description}</h4>
</div> </div>
</div> </div>
<c:if test="${vo.images.size() > 0}"> <c:if test="${vo.images.size() > 0}">
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/statement_baike.jsp
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<i class="icon icon-shengyin"></i> <i class="icon icon-shengyin"></i>
</a> </a>
</div> </div>
<%--<h4>长鼻目象科哺乳动物</h4>--%> <h4>${vo.description}</h4>
</div> </div>
</div> </div>
<c:if test="${vo.images.size() > 0}"> <c:if test="${vo.images.size() > 0}">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!