周伟鹏 / cnlive_shenhe · Commits

Commit 68f8ec39fa76220f5bdb921103b65d00e87fc563

Authored by liwei2917
1 parent 2a9a54f3

生活圈内容图片视频地址

Inline Side-by-side
Showing 3 changed files with 31 additions and 4 deletions
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
  View file @68f8ec3
1 1 package com.cnlive.shenhe.api;
2 2  
  3 +import com.alibaba.fastjson.JSONArray;
3 4 import com.alibaba.fastjson.JSONObject;
4 5 import com.cnlive.shenhe.bean.ErrorEnum;
5 6 import com.cnlive.shenhe.bean.ResponseBean;
... ... @@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
24 25  
25 26 import java.util.Date;
26 27 import java.util.List;
  28 +import java.util.Map;
27 29  
28 30 import javax.servlet.http.HttpSession;
29 31  
... ... @@ -137,6 +139,21 @@ public class ContentControllerApi {
137 139 List<ShyContent> contentList = contentService.findshyContent(shyContent);
138 140 //获取审核类型
139 141 Integer shenheType = contentService.getShenheType(json.getInteger("spId"),"moment");
  142 +
  143 + //获取生活圈内容的类型 1：图片 2：视频 3：分享
  144 + Integer contentType = json.getInteger("contentType");
  145 + String contentImageUrl="";//内容图片地址
  146 + if(contentType!=null&&contentType==1){
  147 + JSONArray contentImageUrlList = JSONObject.parseArray(json.getString("contentImageUrl"));//朋友圈分享的内容的url
  148 + for(int i=0;i<contentImageUrlList.size();i++){
  149 + JSONObject contentImageUrlMap = contentImageUrlList.getJSONObject(i);
  150 + contentImageUrl+=contentImageUrlMap.getString("imageUrl")+",";
  151 + }
  152 + contentImageUrl=contentImageUrl.substring(0, contentImageUrl.length()-1);//去掉最后一个逗号
  153 + }else{
  154 + contentImageUrl=json.getString("contentImageUrl");
  155 + }
  156 +
140 157 //存在则更新
141 158 if (contentList.size() > 0) {
142 159 ShyContent shyContent1 = contentList.get(0);
... ... @@ -152,7 +169,7 @@ public class ContentControllerApi {
152 169 shyContent1.setCreate_date(CommonUtils.getCurrentTime());
153 170 shyContent1.setCallback(json.getString("callbackUrl"));//回调地址
154 171 shyContent1.setContent_url(json.getString("pageUrl"));//朋友圈分享的url
155   - shyContent1.setContent_pc_url(json.getString("contentImageUrl"));//朋友圈分享的内容的url，以逗号分隔
  172 + shyContent1.setContent_pc_url(contentImageUrl);//朋友圈分享的内容的url，以逗号分隔
156 173 shyContent1.setSp_id(json.getInteger("spId"));//spid
157 174 shyContent1.setAuthor(json.getString("userId"));//用户id
158 175 shyContent1.setSource(json.getString("nickName"));//用户昵称
... ... @@ -184,7 +201,7 @@ public class ContentControllerApi {
184 201 shyContent.setCreate_date(CommonUtils.getCurrentTime());
185 202 shyContent.setCallback(json.getString("callbackUrl"));//回调地址
186 203 shyContent.setContent_url(json.getString("pageUrl"));//朋友圈分享的url
187   - shyContent.setContent_pc_url(json.getString("contentImageUrl"));//朋友圈分享的内容的url，以逗号分隔
  204 + shyContent.setContent_pc_url(contentImageUrl);//朋友圈分享的内容的url，以逗号分隔
188 205 shyContent.setSp_id(json.getInteger("spId"));//spid
189 206 shyContent.setAuthor(json.getString("userId"));//用户id
190 207 shyContent.setSource(json.getString("nickName"));//用户昵称
... ...
src/main/java/com/cnlive/shenhe/controller/ContentController.java
  View file @68f8ec3
... ... @@ -148,6 +148,11 @@ public class ContentController {
148 148 updater =sitesService.getUpdater(updater,auditor_id);
149 149 content.setUpdater(updater);
150 150 }
  151 + //朋友圈内容切割内容图片或者视频地址
  152 + if(content.getContent_tag().equals("moment")){
  153 + String [] contentImageUrlList=content.getContent_pc_url().split(",");
  154 + model.addAttribute("contentImageUrlList", contentImageUrlList);
  155 + }
151 156 model.addAttribute("content", content);
152 157 return "page/contentDetail.html";
153 158 }
... ...
src/main/resources/templates/page/contentDetail.html
  View file @68f8ec3
... ... @@ -85,13 +85,18 @@
85 85 <h5 th:text="${content.sp_id}+'('+${content.sp_desc}+')'">821403</h5>
86 86 </div>
87 87 </div>
88   - <div class="form-group">
  88 + <div class="form-group" th:if="${content.content_tag==content}">
89 89 <label for="program_id" class="control-label col-sm-2">pc地址:</label>
90   -<!-- <button type="button" class="btn btn-primary pull-right" onclick="content(1);"></button> -->
91 90 <div class="col-sm-10">
92 91 <a th:href="@{${content.content_pc_url}}" th:text="${content.content_pc_url}" target="blank"></a>
93 92 </div>
94 93 </div>
  94 + <div class="form-group" th:if="${content.content_tag==moment}">
  95 + <label for="program_id" class="control-label col-sm-2">图片/视频地址:</label>
  96 + <div class="col-sm-10" th:each="contentImageUrlList${contentImageUrlList}">
  97 + <a th:href="@{${contentImageUrl}}" th:text="${contentImageUrl}+'\n'" target="blank"></a>
  98 + </div>
  99 + </div>
95 100 <div class="form-group">
96 101 <label for="activity_id" class="control-label col-sm-2">图文标题:</label>
97 102 <div class="col-sm-10">
... ...