自动退领

liwei2917
1 parent f89387f4
Showing 3 changed files with 32 additions and 8 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/job/VideosJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -70,7 +70,7 @@ public class VideosController {
         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())) {
+//        if (shyVideos.getReceive() && CommonUtils.isNotEmpty(shyVideos.getReceive_user_id()) && userId.equals(shyVideos.getReceive_user_id())) {
             JSONObject result = null;
             try {
                 result = Pass.auditPass(activity_id, state, attr_tags, msg, callback);
@@ -94,9 +94,9 @@ public class VideosController {
                 return new ResponseBean(ErrorEnum.ERROR);
             }
             return new ResponseBean(ErrorEnum.SUCCESS);
-        }
-        logger.error("领取逻辑不符，不能审核，Video_id:{}", shyVideos.getVideo_id());
-        return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "领取逻辑不符，不能审核");
+//        }
+//        logger.error("领取逻辑不符，不能审核，Video_id:{}", shyVideos.getVideo_id());
+//        return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "领取逻辑不符，不能审核");
     }
     /**
@@ -223,6 +223,12 @@ public class VideosController {
     }
+    /**
+     * 退领
+     * @param ids
+     * @param session
+     * @return
+     */
     @PostMapping("/retReceive")
     @ResponseBody
     public ResponseBean retReceive(String ids, HttpSession session) {
@@ -56,7 +56,7 @@ public class VideosJob {
     /**
      * 定时发送数美检测视频
      */
-    @Scheduled(fixedRate =  60 * 1000)
+    @Scheduled(cron="0 0/1 7-23 * * ? *")//每天7点到23点执行，每分钟一次
     public void videofilter() {
     	 ShyVideos shyVideos = new ShyVideos();
     	 shyVideos.setCategory(CommonConst.CATEGORY_WITNESS);//目击者
@@ -75,4 +75,22 @@ public class VideosJob {
              }
          }
     }
+    
+    
+    /**
+     * 自动退领
+     */
+    @Scheduled(cron="0 0 0 * * ? ")//每天0点执行
+    public void autoRetReceive() {
+    	ShyVideos shyVideos = new ShyVideos();
+    	shyVideos.setState(CommonConst.AUDIT_INTT);//审核状态：未审核
+    	shyVideos.setReceive(CommonConst.RECEIVE_AFTER);//已领取
+    	List<ShyVideos> shyVideosList = videosService.findshyVideo(shyVideos);
+    	for (ShyVideos shyVideos2 : shyVideosList) {
+    		shyVideos2.setReceive(CommonConst.RECEIVE_BEFORE);//未领取
+    		shyVideos2.setReceive_user_id(null);
+    		videosService.updateshyVideos(shyVideos2);
+		}
+    }
+    
 }
@@ -86,7 +86,7 @@ public class VideosServiceImpl {
     }
     public boolean updateshyVideos(ShyVideos shyVideos) {
-        int i = shyVideosMapper.updateByPrimaryKeySelective(shyVideos);
+        int i = shyVideosMapper.updateByPrimaryKey(shyVideos);
         if (i == 0) {
             return false;
         }
@@ -99,7 +99,7 @@ public class VideosServiceImpl {
         shyVideos.setState(state);
         shyVideos.setMsg(msg);
         shyVideos.setUpdater(updater);
-        return shyVideosMapper.updateByPrimaryKeySelective(shyVideos);
+        return shyVideosMapper.updateByPrimaryKey(shyVideos);
     }
     public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Boolean receive, Integer page, Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId) {
@@ -209,7 +209,7 @@ public class VideosServiceImpl {
             if (shyVideos.getState() == CommonConst.AUDIT_INTT && shyVideos.getReceive() && shyVideos.getReceive_user_id().equals(userId)) {
                 shyVideos.setReceive(CommonConst.RECEIVE_BEFORE);
                 shyVideos.setReceive_user_id(null);
-                int i = shyVideosMapper.updateByPrimaryKeySelective(shyVideos);
+                int i = shyVideosMapper.updateByPrimaryKey(shyVideos);
                 if (i != 1) {
                     return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "退领失败，请重试");
                 }