Merge remote-tracking branch 'origin/dev' into dev

王言钊
2 parents 589c11ab 307923e1
Showing 2 changed files with 27 additions and 49 deletions
src/main/java/com/cnlive/shenhe/controller/BaseController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
@@ -48,18 +48,6 @@ public class BaseController {
     }
  
     /**
-     * 获取session中的用户id
-     *
-     * @return
-     */
-    public String getSessionUserId() {
-        SessionUser sessionUser = getSessionUser();
-        if (sessionUser != null) return sessionUser.getUserId();
-        return null;
-    }
-
-
-    /**
      * 设置用户session
      */
     public void setSessionUser(SessionUser sessionUser) {
@@ -97,13 +85,5 @@ public class BaseController {
         model.addAttribute("remindMessage", "提示：如连续两次以上入库失败，请联系开发人员");
     }
  
-    /**
-     * 设置报错页面显示信息——权限不足
-     *
-     * @param model
-     */
-    public void setmodelLimit(Model model) {
-        model.addAttribute("errorMessage", "您没有此操作的权限，请重试或者联系管理员开通！");
-    }
  
 }
@@ -13,7 +13,10 @@ import com.cnlive.shenhe.serviceImpl.ShyActivityImpl;
 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
 import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
-import com.cnlive.shenhe.utils.*;
+import com.cnlive.shenhe.utils.AuditPass;
+import com.cnlive.shenhe.utils.CommonConst;
+import com.cnlive.shenhe.utils.CommonUtils;
+import com.cnlive.shenhe.utils.HttpClientUtils;
 import com.github.pagehelper.PageInfo;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -46,8 +49,6 @@ public class VideosController extends BaseController {
     @Autowired
     AuditPass Pass;
     @Autowired
-    InfoUtil infoUtil;
-    @Autowired
     VideosServiceImpl videosService;
     @Autowired
     UsersServiceImpl usersService;
@@ -80,28 +81,26 @@ public class VideosController extends BaseController {
         logger.info("id:{},activity_id:{},state:{},attr_tags:{},msg:{},callback:{}", id, activity_id, state, attr_tags, msg, callback);
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-//        ShyVideos shyVideos = videosService.selectByPrimaryKey(id);
-//        if (shyVideos.getReceive() && CommonUtils.isNotEmpty(shyVideos.getReceive_user_id()) && userId.equals(shyVideos.getReceive_user_id())) {
-        JSONObject result = null;
+        JSONObject result;
         try {
             result = Pass.auditPass(activity_id, state, attr_tags, msg, callback);
         } catch (Exception e) {
             e.printStackTrace();
-            System.out.println("视频审核失败");
+            logger.error("视频审核失败", e);
             return new ResponseBean(ErrorEnum.ERROR);
         }
         if (result == null) {
-            System.out.println("视频审核失败且接口错误没有返回信息");
+            logger.error("视频审核失败且接口错误没有返回信息");
             return new ResponseBean(ErrorEnum.ERROR);
         }
         Integer code = result.getInteger("code");
         String errorCode = result.getString("errorCode");
         if (code != null && code != 0) {
-            System.out.println("审核失败，code==" + code);
+            logger.error("审核失败，code==" + code);
             return new ResponseBean(code, result.getString("msg"));
         }
         if (errorCode != null && !"0".equals(errorCode)) {
-            System.out.println("审核失败，code==" + code);
+            logger.error("审核失败，code==" + code);
             return new ResponseBean(Integer.valueOf(errorCode), "服务器异常");
         }
         state = state == 4 ? 2 : 1;
@@ -110,7 +109,6 @@ public class VideosController extends BaseController {
             return new ResponseBean(ErrorEnum.ERROR);
         }
         return new ResponseBean(ErrorEnum.SUCCESS);
-//        }
     }
  
     /**
@@ -137,21 +135,22 @@ public class VideosController extends BaseController {
         if (CommonUtils.isNull(sessionUser)) {
             return "redirect:/users/login";
         }
-        Integer spid = sessionUser.getSpid();
-        logger.info("sp_Id:{},spid:{}", sp_Id, spid);
+
+        Integer sessionUserSpid = sessionUser.getSpid();
+        logger.info("sp_Id:{},sessionUserSpid:{}", sp_Id, sessionUserSpid);
         String userId = sessionUser.getUserId();
         if (CommonUtils.isNull(page)) page = 1;
         if (CommonUtils.isNull(pageSize)) pageSize = 10;
-        if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
+        if (CommonUtils.isNotEmpty(sp_desc) && sessionUserSpid == 0) {
             ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
             if (CommonUtils.isNotNull(shySite)) {
-                spid = shySite.getSpid();
+                sessionUserSpid = shySite.getSpid();
             } else {
                 setmodelSite(model);
                 return "error.html";
             }
-        } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
-            spid = null;
+        } else if (CommonUtils.isEmpty(sp_desc) && sessionUserSpid == 0) {
+            sessionUserSpid = null;
         }
  
         if (CommonUtils.isNotNull(contentId)) {
@@ -168,23 +167,22 @@ public class VideosController extends BaseController {
             }
         }
  
-        PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, spid, userId, sp_Id, source, video_user_id, shen_auditor_id, video_id);
+        PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, sessionUserSpid, userId, sp_Id, source, video_user_id, shen_auditor_id, video_id);
         //查询查询条件
         List<ShyActivity> activityList = shyActivityImpl.selectAll();
         List<ShyVideos> list = videoPage.getList();
         if (!list.isEmpty()) {
             for (ShyVideos videos : list) {
-                if (videos.getState() != CommonConst.AUDIT_INTT) {
+                if (!videos.getState().equals(CommonConst.AUDIT_INTT)) {
                     String updater = CommonUtils.isEmpty(videos.getUpdater()) || "null".equals(videos.getUpdater()) ? "白名单" : videos.getUpdater();
-                    String auditor_id = videos.getAuditor_id();
-                    if (CommonUtils.isNotEmpty(auditor_id)) {
+                    String auditorId = videos.getAuditor_id();
+                    if (CommonUtils.isNotEmpty(auditorId)) {
                         ShyUsers user = new ShyUsers();
-                        user.setUser_id(auditor_id);
+                        user.setUser_id(auditorId);
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
                             String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                            String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                            updater = userName;
+                            updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
                         }
                     }
                     videos.setUpdater(updater);
@@ -193,7 +191,7 @@ public class VideosController extends BaseController {
                 ShySites shySites = sitesService.findspidDescByspid(videos.getSpid());
                 if (CommonUtils.isNotNull(shySites)) {
                     if (CommonUtils.isNotEmpty(videos.getCategory()) && videos.getCategory().equals(CommonConst.CATEGORY_WITNESS)) {
-                        //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 4-美食中国 5-老年大学 6-旅游摄影大赛 7-老年大学公开课 8-甲申同文 9-万人同唱一首歌 10-上太空 11-芳华归来个人 12-芳华归来团体 13-小小表演家 100-追问发布会  33-万人同唱献给党-独唱 34-万人同唱献给党-合唱
+                        //0-目击者 1-童声共济 2-全民健身 3-目击者政府监督 .....
                         String source1 = videos.getSource();
                         if (CommonUtils.isNotEmpty(source1)) {
                             for (ShyActivity activity : activityList) {
@@ -215,9 +213,9 @@ public class VideosController extends BaseController {
         }
         /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/
         String state1 = state == null ? "" : state.toString();
-        String receive1 = "";
+        String receive1;
         if (CommonUtils.isNotNull(receive)) {
-            receive1 = receive == CommonConst.RECEIVE_AFTER ? "true" : "false";
+            receive1 = receive.equals(CommonConst.RECEIVE_AFTER) ? "true" : "false";
         } else {
             receive1 = "";
         }
@@ -244,9 +242,9 @@ public class VideosController extends BaseController {
         Object avsampleImgs = JSON.parse(detailsContent.getAvsample_imgs());
         String yuming = "";
         Integer plat = detailsContent.getPlat();
-        if (plat == CommonConst.QINIU_PLAT) {
+        if (CommonConst.QINIU_PLAT.equals(plat)) {
             yuming = qn_domain + "/";
-        } else if (plat == CommonConst.KS_PLAT) {
+        } else if (CommonConst.KS_PLAT.equals(plat)) {
             yuming = ks_domain + "/";
         }
         detailsContent.setAttr_tags(CommonUtils.isEmpty(detailsContent.getAttr_tags()) ? "" : detailsContent.getAttr_tags());