整理代码格式

陈浩
1 parent d48a002e
Showing 9 changed files with 31 additions and 27 deletions
src/main/java/com/cnlive/shenhe/api/CommentsControllerApi.java
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/SitesServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/UsersServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+
 import java.util.Date;
 import java.util.List;
@@ -36,7 +36,7 @@ public class VideosControllerApi {
     VideosServiceImpl videosService;
     @Autowired
     UsersServiceImpl usersService;
-    //先统一入库，入库时查询是否已有，有，更新 无，插入  白名单单独定时任务
+
     @PostMapping("/import")
     @ResponseBody
     public ResponseBean impotVideo(String param) {
@@ -48,7 +48,7 @@ public class VideosControllerApi {
         shyVideos1.setVideo_id(videoId);
         //查询一下 存在，更新 没有，插入
         List<ShyVideos> listshyVideos = videosService.findshyVideo(shyVideos1);
-        if(listshyVideos.size()>0){
+        if (listshyVideos.size() > 0) {
             ShyVideos shyVideos = listshyVideos.get(0);
             //封装数据入库
             shyVideos.setVideo_id(videoId);
@@ -69,9 +69,9 @@ public class VideosControllerApi {
             shyVideos.setSpid(Integer.parseInt(json.getString("spId")));
             shyVideos.setState(CommonConst.AUDIT_INTT);
             boolean YorN = videosService.updateshyVideos(shyVideos);
-            if(YorN == true){
+            if (YorN == true) {
                 return new ResponseBean(ErrorEnum.SUCCESS);
-            }else {
+            } else {
                 return new ResponseBean(ErrorEnum.ERROR);
             }
         }
@@ -74,7 +74,7 @@ public class CommentsController {
         List<ShyComments> list = commentPage.getList();
         if (!list.isEmpty()) {
             for (ShyComments comment : list) {
-                if(comment.getState()!=CommonConst.AUDIT_INTT){
+                if (comment.getState() != CommonConst.AUDIT_INTT) {
                     String auditor = "白名单";
                     String auditor_id = comment.getAuditor_id();
                     if (CommonUtils.isNotEmpty(auditor_id)) {
@@ -29,21 +29,21 @@ public class UsersController {
     @GetMapping(value = "/{id}")
     @ResponseBody
-    public Object getTest(@PathVariable Integer id){
-        return  usersService.get(id);
+    public Object getTest(@PathVariable Integer id) {
+        return usersService.get(id);
     }
     @RequestMapping("/login")
     public String index(HttpServletRequest request) {
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
-        if(CommonUtils.isNull(principal)){
+        if (CommonUtils.isNull(principal)) {
             return "redirect:https://user.cnlive.com/OpenSSO2/login?service=http://shenhe.cnlive.com/users/login";
         }
         //用户ID
         String id = principal.getName();
-        if(CommonUtils.isNotEmpty(id)){
+        if (CommonUtils.isNotEmpty(id)) {
             ShyUsers user = usersService.get(Integer.parseInt(id));
-            if(CommonUtils.isNotNull(user)&&user.getState()){
+            if (CommonUtils.isNotNull(user) && user.getState()) {
                 SessionUser sessionUser = new SessionUser();
                 sessionUser.setUserId(user.getUser_id());
                 sessionUser.setSpid(Integer.parseInt(principal.getAttributes().get("new_sp_id").toString()));
@@ -52,7 +52,7 @@ public class UsersController {
                 sessionUser.setEmail(user.getEmail());
                 sessionUser.setLogo(user.getUser_logo());
                 sessionUser.setMaster(user.getMaster());
-                request.getSession().setAttribute(SessionUser.SESSION_KEY,sessionUser);
+                request.getSession().setAttribute(SessionUser.SESSION_KEY, sessionUser);
                 return "redirect:/videos/page";
             }
         }
@@ -77,7 +77,7 @@ public class VideosController {
         }
         Integer code = result.getInteger("code");
         if (code != 0) {
-            System.out.println("审核失败，");
+            System.out.println("审核失败，code==" + code);
             return new ResponseBean(code, result.getString("msg"));
         }
         state = state == 4 ? 2 : 1;
@@ -49,9 +49,10 @@ public class CommentsServiceImpl {
         List<ShyComments> commentsList = shyCommentsMapper.select(shyComments);
         return commentsList;
     }
+
     public boolean updateshyComments1(ShyComments shyComments) {
         int result = shyCommentsMapper.updateByPrimaryKeySelective(shyComments);
-        if(result==0){
+        if (result == 0) {
             return false;
         }
         return true;
@@ -59,7 +60,7 @@ public class CommentsServiceImpl {
     public boolean impotComments(ShyComments shyComments) {
         int result = shyCommentsMapper.insert(shyComments);
-        if(result==0){
+        if (result == 0) {
             return false;
         }
         return true;
@@ -21,13 +21,13 @@ public class SitesServiceImpl {
     @Autowired
     ShySitesMapper shySitesMapper;
-    public PageInfo<ShySites> getPage(Integer page, Integer pageSize, String orderByClause,String key, Integer spId){
+    public PageInfo<ShySites> getPage(Integer page, Integer pageSize, String orderByClause, String key, Integer spId) {
         Example example = new Example(ShySites.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(orderByClause)) {
             example.setOrderByClause(orderByClause);
         }
-        if (CommonUtils.isNotEmpty(key)){
+        if (CommonUtils.isNotEmpty(key)) {
             criteria.andLike("name", "%" + key + "%");
             criteria.andLike("company", "%" + key + "%");
         }
@@ -45,8 +45,9 @@ public class SitesServiceImpl {
     }
     public boolean update(ShySites site) {
-        return shySitesMapper.updateByPrimaryKeySelective(site)==1;
+        return shySitesMapper.updateByPrimaryKeySelective(site) == 1;
     }
+
     public List<ShySites> findAll() {
         List<ShySites> shySites = shySitesMapper.selectAll();
         return shySites;
@@ -16,7 +16,7 @@ public class UsersServiceImpl {
     @Autowired
     ShyUsersMapper shyUsersMapper;
-    public ShyUsers get(Integer id){
+    public ShyUsers get(Integer id) {
         return shyUsersMapper.selectByPrimaryKey(id);
     }
@@ -33,7 +33,7 @@ public class VideosServiceImpl {
     public boolean impotVideo(ShyVideos shyVideos) {
         int result = shyVideosMapper.insert(shyVideos);
-        if(result==0){
+        if (result == 0) {
             return false;
         }
         return true;
@@ -43,7 +43,7 @@ public class VideosServiceImpl {
         List<ShySites> sitesList = shySitesMapper.select(shySites);
         return sitesList;
     }
-//    重改逻辑后新加的方法============================
+
     public List<ShyVideos> findshyVideo(ShyVideos shyVideos) {
         List<ShyVideos> shyVideoslist = shyVideosMapper.select(shyVideos);
         return shyVideoslist;
@@ -51,12 +51,13 @@ public class VideosServiceImpl {
     public boolean updateshyVideos(ShyVideos shyVideos) {
         int i = shyVideosMapper.updateByPrimaryKeySelective(shyVideos);
-        if(i==0){
+        if (i == 0) {
             return false;
         }
         return true;
     }
-    public int updateVideo(Integer id, String auditor_id, Integer state,  String msg) {
+
+    public int updateVideo(Integer id, String auditor_id, Integer state, String msg) {
         ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id);
         shyVideos.setAuditor_id(auditor_id);
         shyVideos.setState(state);
@@ -75,7 +76,7 @@ public class VideosServiceImpl {
             Timestamp startdate = null;
             Timestamp enddate = null;
             try {
-                startdate = CommonUtils.parseDate(start_date,"yyyy-MM-dd HH:mm:ss");
+                startdate = CommonUtils.parseDate(start_date, "yyyy-MM-dd HH:mm:ss");
                 enddate = CommonUtils.parseDate(end_date, "yyyy-MM-dd HH:mm:ss");
             } catch (ParseException e) {
                 e.printStackTrace();
@@ -86,14 +87,14 @@ public class VideosServiceImpl {
         if (CommonUtils.isNotEmpty(video_title)) {
             criteria.andLike("video_title", "%" + video_title + "%");
         }
-        if (CommonUtils.isNotNull(state) &&  state == 0) {
+        if (CommonUtils.isNotNull(state) && state == 0) {
             criteria.andEqualTo("state", state);
-        }else if (CommonUtils.isNotNull(state) && state == 1){
+        } else if (CommonUtils.isNotNull(state) && state == 1) {
             criteria.andEqualTo("state", state);
-            criteria2.andEqualTo("state",2);
+            criteria2.andEqualTo("state", 2);
             example.or(criteria2);
         }
-        if (CommonUtils.isNotNull(video_priority)) {
+        if (CommonUtils.isNotEmpty(video_priority)) {
             criteria.andEqualTo("video_priority", video_priority);
         }
         if (CommonUtils.isNotNull(spid)) {