Skip to content

石磊 / cihai

Go to a project
Commit 3bb71d89 by 侯昆
Options

添加音频

1 parent f3b6a58e
Inline Side-by-side
Showing 4 changed files with 55 additions and 0 deletions
serverside/cihai-app/src/main/java/com/dookay/cihai/app/controller/vo/CharacterBaikeVO.java
...@@ -49,6 +49,8 @@ public class CharacterBaikeVO { ...@@ -49,6 +49,8 @@ public class CharacterBaikeVO {
private List<ImageModel> images; private List<ImageModel> images;
@ApiModelProperty("视频列表") @ApiModelProperty("视频列表")
private List<ImageModel> videos; private List<ImageModel> videos;
@ApiModelProperty("音频列表")
private List<ImageModel> audios;
public static CharacterBaikeVO fromDomain(WordDomain word) { public static CharacterBaikeVO fromDomain(WordDomain word) {
CharacterBaikeVO dto = new CharacterBaikeVO(); CharacterBaikeVO dto = new CharacterBaikeVO();
...@@ -81,6 +83,9 @@ public class CharacterBaikeVO { ...@@ -81,6 +83,9 @@ public class CharacterBaikeVO {
if (StringUtils.isNotEmpty(word.getBaikeVideo())) { if (StringUtils.isNotEmpty(word.getBaikeVideo())) {
dto.setVideos(ImageModel.toList(word.getBaikeVideo())); dto.setVideos(ImageModel.toList(word.getBaikeVideo()));
} }
if (StringUtils.isNotEmpty(word.getBaikeVoice())) {
dto.setAudios(ImageModel.toList(word.getBaikeVoice()));
}
return dto; return dto;
} }
} }
serverside/cihai-app/src/main/java/com/dookay/cihai/app/controller/vo/StatementBaikeVO.java
...@@ -48,6 +48,8 @@ public class StatementBaikeVO { ...@@ -48,6 +48,8 @@ public class StatementBaikeVO {
private List<ImageModel> images; private List<ImageModel> images;
@ApiModelProperty("视频列表") @ApiModelProperty("视频列表")
private List<ImageModel> videos; private List<ImageModel> videos;
@ApiModelProperty("音频列表")
private List<ImageModel> audios;
public static StatementBaikeVO fromDomain(WordDomain word) { public static StatementBaikeVO fromDomain(WordDomain word) {
StatementBaikeVO dto = new StatementBaikeVO(); StatementBaikeVO dto = new StatementBaikeVO();
...@@ -76,6 +78,9 @@ public class StatementBaikeVO { ...@@ -76,6 +78,9 @@ public class StatementBaikeVO {
if (StringUtils.isNotEmpty(word.getBaikeVideo())) { if (StringUtils.isNotEmpty(word.getBaikeVideo())) {
dto.setVideos(ImageModel.toList(word.getBaikeVideo())); dto.setVideos(ImageModel.toList(word.getBaikeVideo()));
} }
if (StringUtils.isNotEmpty(word.getBaikeVoice())) {
dto.setAudios(ImageModel.toList(word.getBaikeVoice()));
}
return dto; return dto;
} }
} }
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/character_baike.jsp
...@@ -66,6 +66,13 @@ ...@@ -66,6 +66,13 @@
</a> </a>
</li> </li>
</c:if> </c:if>
<c:if test="${vo.audios.size() > 0}">
<li class="nav-item">
<a class="nav-link" href="#content-detail-tab-2" role="tab" data-toggle="tab">音频
<div class="badge badge-secondary">${vo.audios.size()}</div>
</a>
</li>
</c:if>
</ul> </ul>
<div class="tab-content pt-3"> <div class="tab-content pt-3">
<c:if test="${vo.body.size() > 0}"> <c:if test="${vo.body.size() > 0}">
...@@ -90,6 +97,21 @@ ...@@ -90,6 +97,21 @@
</c:forEach> </c:forEach>
</div> </div>
</c:if> </c:if>
<c:if test="${vo.audios.size() > 0}">
<div class="tab-pane" id="content-detail-tab-2" role="tabpanel">
<c:forEach items="<%=Lists.partition(vo.getAudios(), 4)%>" var="group">
<div class="row list-img">
<c:forEach items="${group}" var="item">
<div class="col-sm-3">
<a href="/audio?file=${item.file}">
<img class="img-fluid" src="/static/temp/word/${item.alt}">
</a>
</div>
</c:forEach>
</div>
</c:forEach>
</div>
</c:if>
</div> </div>
</article> </article>
</div> </div>
......
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/word/statement_baike.jsp
...@@ -74,6 +74,13 @@ ...@@ -74,6 +74,13 @@
</a> </a>
</li> </li>
</c:if> </c:if>
<c:if test="${vo.audios.size() > 0}">
<li class="nav-item">
<a class="nav-link" href="#content-detail-tab-2" role="tab" data-toggle="tab">音频
<div class="badge badge-secondary">${vo.audios.size()}</div>
</a>
</li>
</c:if>
<c:if test="${vo.word eq '心脏'}"> <c:if test="${vo.word eq '心脏'}">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="#content-detail-tab-3" role="tab" data-toggle="tab">图谱</a> <a class="nav-link" href="#content-detail-tab-3" role="tab" data-toggle="tab">图谱</a>
...@@ -633,6 +640,22 @@ ...@@ -633,6 +640,22 @@
</c:forEach> </c:forEach>
</div> </div>
</c:if> </c:if>
<c:if test="${vo.audios.size() > 0}">
<div class="tab-pane" id="content-detail-tab-2" role="tabpanel">
<c:forEach items="<%=Lists.partition(vo.getAudios(), 4)%>" var="group">
<div class="row list-img">
<c:forEach items="${group}" var="item">
<div class="col-sm-3">
<a href="/audio?file=${item.file}">
<img class="img-fluid" src="/static/temp/word/${item.alt}">
</a>
</div>
</c:forEach>
</div>
</c:forEach>
</div>
</c:if>
<c:if test="${vo.word eq '心脏'}"> <c:if test="${vo.word eq '心脏'}">
<div class="tab-pane " id="content-detail-tab-3" role="tabpanel"> <div class="tab-pane " id="content-detail-tab-3" role="tabpanel">
<div class="carousel slide" id="carouselExampleControls" data-ride="carousel" data-interval="false"> <div class="carousel slide" id="carouselExampleControls" data-ride="carousel" data-interval="false">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!