周伟鹏 / cnlive_shenhe · Commits

Commit 6bcb0695ab2326755dc6aa19bfa4c4aa2aa744af

Authored by 徐近程
1 parent 2966ae9a

update

Inline Side-by-side
Showing 3 changed files with 28 additions and 4 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @6bcb069
... ... @@ -126,7 +126,7 @@ public class VideosController extends BaseController {
126 126 * @return
127 127 */
128 128 @GetMapping("/page")
129   - public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id, Integer source, String video_user_id, String shen_auditor_id, Integer contentId, String video_id, HttpSession session) {
  129 + public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id, String source, String video_user_id, String shen_auditor_id, Integer contentId, String video_id, HttpSession session) {
130 130 if (!StringUtils.isEmpty(shen_auditor_id)) {
131 131 if ((!"自动审核".equals(shen_auditor_id)) && (!"白名单".equals(shen_auditor_id))) {
132 132 shen_auditor_id = usersService.findspidByName(shen_auditor_id);
... ... @@ -191,16 +191,36 @@ public class VideosController extends BaseController {
191 191 ShySites shySites = sitesService.findspidDescByspid(videos.getSpid());
192 192 if (CommonUtils.isNotNull(shySites)) {
193 193 if (CommonUtils.isNotEmpty(videos.getCategory()) && videos.getCategory().equals(CommonConst.CATEGORY_WITNESS)) {
194   - //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 4-美食中国 5-老年大学
  194 + //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 4-美食中国 5-老年大学 6-旅游摄影大赛 7-老年大学公开课 8-甲申同文 9-万人同唱一首歌 10-上太空 11-芳华归来个人 12-芳华归来团体 13-小小表演家 100-追问发布会
195 195 String source1 = videos.getSource();
196 196 if ("1".equals(source1)) {
197 197 videos.setSpid_desc("童声共济" + "(目击者)");
198 198 } else if ("2".equals(source1)) {
199 199 videos.setSpid_desc("全民健身" + "(目击者)");
  200 + } else if ("3".equals(source1)) {
  201 + videos.setSpid_desc("政府监督" + "(目击者)");
200 202 } else if ("4".equals(source1)) {
201 203 videos.setSpid_desc("美食中国" + "(目击者)");
202 204 } else if ("5".equals(source1)) {
203 205 videos.setSpid_desc("老年大学" + "(目击者)");
  206 + } else if ("6".equals(source1)) {
  207 + videos.setSpid_desc("旅游摄影大赛" + "(目击者)");
  208 + } else if ("7".equals(source1)) {
  209 + videos.setSpid_desc("老年大学公开课" + "(目击者)");
  210 + } else if ("8".equals(source1)) {
  211 + videos.setSpid_desc("甲申同文" + "(目击者)");
  212 + } else if ("9".equals(source1)) {
  213 + videos.setSpid_desc("万人同唱一首歌" + "(目击者)");
  214 + } else if ("10".equals(source1)) {
  215 + videos.setSpid_desc("上太空" + "(目击者)");
  216 + } else if ("11".equals(source1)) {
  217 + videos.setSpid_desc("芳华归来个人" + "(目击者)");
  218 + } else if ("12".equals(source1)) {
  219 + videos.setSpid_desc("芳华归来团体" + "(目击者)");
  220 + } else if ("13".equals(source1)) {
  221 + videos.setSpid_desc("小小表演家" + "(目击者)");
  222 + } else if ("100".equals(source1)) {
  223 + videos.setSpid_desc("追问发布会" + "(目击者)");
204 224 } else {
205 225 videos.setSpid_desc(shySites.getName() + "(目击者)");
206 226 }
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @6bcb069
... ... @@ -109,7 +109,7 @@ public class VideosServiceImpl {
109 109 return shyVideosMapper.updateByPrimaryKey(shyVideos);
110 110 }
111 111  
112   - public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id,Integer source,String video_user_id,String shen_auditor_id,String video_id) {
  112 + public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id,String source,String video_user_id,String shen_auditor_id,String video_id) {
113 113 Example example = new Example(ShyVideos.class);
114 114 Example.Criteria criteria = example.createCriteria();
115 115 Example.Criteria criteria2 = example.createCriteria();
... ... @@ -157,9 +157,12 @@ public class VideosServiceImpl {
157 157 }
158 158 }
159 159  
160   - if (source!=null) {
  160 + if (CommonUtils.isNotEmpty(source) && !"moment".equals(source)) {
161 161 criteria.andEqualTo("source", source);
162 162 criteria2.andEqualTo("source", source);
  163 + } else if (CommonUtils.isNotEmpty(source) && "moment".equals(source)) {
  164 + criteria.andEqualTo("category", source);
  165 + criteria2.andEqualTo("category", source);
163 166 }
164 167  
165 168 if (CommonUtils.isNotEmpty(video_user_id)) {
... ...
src/main/resources/templates/page/video.html
  View file @6bcb069
... ... @@ -137,6 +137,7 @@
137 137 <div class="col-sm-10" style="padding: 0;">
138 138 <select class="form-control" id="source" name="source">
139 139 <option value="">全部</option>
  140 + <option value="moment">朋友圈</option>
140 141 <option value="0">上传目击者视频</option>
141 142 <option value="1">童声共济视频</option>
142 143 <option value="2">全民健身视频</option>
... ...