周伟鹏 / cnlive_shenhe · Commits

Commit 7a91bcd9e4bb5dcd4dfe1f6b2cc1295e67096cc5

Authored by 郑超
1 parent c025c575

update

Inline Side-by-side
Showing 1 changed file with 21 additions and 28 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @7a91bcd
... ... @@ -124,7 +124,8 @@ public class VideosController extends BaseController {
124 124 * @return
125 125 */
126 126 @GetMapping("/page")
127   - 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) {
  127 + 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,
  128 + String shen_auditor_id, Integer contentId, String video_id, HttpSession session) {
128 129 if (!StringUtils.isEmpty(shen_auditor_id)) {
129 130 if ((!"自动审核".equals(shen_auditor_id)) && (!"白名单".equals(shen_auditor_id))) {
130 131 shen_auditor_id = usersService.findspidByName(shen_auditor_id);
... ... @@ -192,22 +193,19 @@ public class VideosController extends BaseController {
192 193 if (CommonUtils.isNotNull(shySites)) {
193 194 if (CommonUtils.isNotEmpty(videos.getCategory()) && videos.getCategory().equals(CommonConst.CATEGORY_WITNESS)) {
194 195 //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 .....
  196 + videos.setSpid_desc(shySites.getName() + "(目击者)");
195 197 String source1 = videos.getSource();
196   - if (CommonUtils.isNotEmpty(source1)) {
197   - for (ShyActivity activity : activityList) {
198   - if (activity.getId().equals(Integer.valueOf(source1))) {
199   - videos.setSpid_desc(activity.getActivity());
200   - break;
201   - }
  198 + for (ShyActivity activity : activityList) {
  199 + if (activity.getId().equals(Integer.valueOf(source1))) {
  200 + videos.setSpid_desc(activity.getActivity());
  201 + break;
202 202 }
203 203 }
  204 + } else if (CommonUtils.isNotEmpty(videos.getCategory()) && videos.getCategory().equals(CommonConst.CATEGORY_MOMENT)) {
  205 + videos.setSpid_desc(shySites.getName() + "(朋友圈)");
204 206 } else {
205   - videos.setSpid_desc(shySites.getName() + "(目击者)");
  207 + videos.setSpid_desc(shySites.getName());
206 208 }
207   - } else if (CommonUtils.isNotEmpty(videos.getCategory()) && videos.getCategory().equals(CommonConst.CATEGORY_MOMENT)) {
208   - videos.setSpid_desc(shySites.getName() + "(朋友圈)");
209   - } else {
210   - videos.setSpid_desc(shySites.getName());
211 209 }
212 210 }
213 211 }
... ... @@ -249,30 +247,24 @@ public class VideosController extends BaseController {
249 247 }
250 248 detailsContent.setAttr_tags(CommonUtils.isEmpty(detailsContent.getAttr_tags()) ? "" : detailsContent.getAttr_tags());
251 249 List<ShyActivity> activityList = shyActivityImpl.selectAll();
252   - //model.addAttribute("activityList", activityList);
253 250 ShySites shySites = sitesService.findspidDescByspid(detailsContent.getSpid());
254 251 if (CommonUtils.isNotNull(shySites)) {
255 252 if (CommonUtils.isNotEmpty(detailsContent.getCategory()) && detailsContent.getCategory().equals(CommonConst.CATEGORY_WITNESS)) {
256 253 //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 4-美食中国 5-老年大学 6-旅游摄影大赛 7-老年大学公开课 8-甲申同文 9-万人同唱一首歌 10-上太空 11-芳华归来个人 12-芳华归来团体 13-小小表演家 100-追问发布会 33-万人同唱献给党-独唱 34-万人同唱献给党-合唱
257 254 String source1 = detailsContent.getSource();
258   -
  255 + detailsContent.setSpid_desc(shySites.getName() + "(目击者)");
259 256 //如果source1不等于null；直接查询
260   - if (CommonUtils.isNotEmpty(source1)) {
261   - for (ShyActivity activity : activityList) {
262   - if (activity.getId().equals(Integer.valueOf(source1))) {
263   - detailsContent.setSpid_desc(activity.getActivity());
264   - break;
265   - }
  257 + for (ShyActivity activity : activityList) {
  258 + if (activity.getId().equals(Integer.valueOf(source1))) {
  259 + detailsContent.setSpid_desc(activity.getActivity());
  260 + break;
266 261 }
267 262 }
268   -
  263 + } else if (CommonUtils.isNotEmpty(detailsContent.getCategory()) && detailsContent.getCategory().equals(CommonConst.CATEGORY_MOMENT)) {
  264 + detailsContent.setSpid_desc(shySites.getName() + "(朋友圈)");
269 265 } else {
270   - detailsContent.setSpid_desc(shySites.getName() + "(目击者)");
  266 + detailsContent.setSpid_desc(shySites.getName());
271 267 }
272   - } else if (CommonUtils.isNotEmpty(detailsContent.getCategory()) && detailsContent.getCategory().equals(CommonConst.CATEGORY_MOMENT)) {
273   - detailsContent.setSpid_desc(shySites.getName() + "(朋友圈)");
274   - } else {
275   - detailsContent.setSpid_desc(shySites.getName());
276 268 }
277 269 model.addAttribute("images", images);
278 270 model.addAttribute("avsampleImgs", avsampleImgs);
... ... @@ -306,7 +298,6 @@ public class VideosController extends BaseController {
306 298 }
307 299 } else {
308 300 return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "您领取的内容不存在，请检查并重试");
309   -
310 301 }
311 302 }
312 303 }
... ... @@ -352,7 +343,9 @@ public class VideosController extends BaseController {
352 343 * @param response
353 344 */
354 345 @GetMapping("excel")
355   - public void getExcel(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, Integer source, String video_user_id, String orderByClause, Integer sp_Id, String sp_desc, HttpSession session, HttpServletResponse response) {
  346 + public void getExcel(String video_title, String start_date, String end_date, Integer state, Integer
  347 + receive, String video_priority, Integer source, String video_user_id, String orderByClause, Integer
  348 + sp_Id, String sp_desc, HttpSession session, HttpServletResponse response) {
356 349 if (CommonUtils.isNotEmpty(sp_desc)) {
357 350 ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
358 351 if (CommonUtils.isNotNull(shySite)) {
... ...