新增邮箱通知状态修改定时任务

王言钊
1 parent 92da8342
Showing 2 changed files with 32 additions and 33 deletions
src/main/java/com/cnlive/shenhe/job/LiveApplyJob.java
src/main/java/com/cnlive/shenhe/job/VideosJob.java
@@ -81,15 +81,17 @@ public class LiveApplyJob {
     }
     /**
-     * 直播申请邮件通知
+     * 直播申请邮件通知 五分钟一次
+     * 检测未通知的邮箱进行通知
      */
     @Scheduled(fixedRate = 5 * 60 * 1000)
-    public void liveApplyNotice() {
+    public void autoLiveApplyEmailNotice() {
         Example example = new Example(ShyLiveapply.class);
         Criteria criteria = example.createCriteria();
+        //审核通过的
         criteria.andEqualTo("shenhe_state", CommonConst.AUDIT_SUCCESS);
-        //状态不等于已通知
-        criteria.andNotEqualTo("email_notice_state", CommonConst.NOTICE_SUCCESS);
+        //状态等于未通知
+        criteria.andEqualTo("email_notice_state", CommonConst.NOTICE_INTT);
         List<ShyLiveapply> shyLiveApplyList = shyLiveApplyMapper.selectByExample(example);
         if (shyLiveApplyList.size() > 0) {
             //开发者对应的id，与app_key相对应
@@ -100,13 +102,11 @@ public class LiveApplyJob {
             String url = email_send_URL;
             List<ShyEmail> shyEmailList = emailService.getEmailSendList(CommonConst.EMAIL_LIVEAPPLY);
             logger.info("直播申请邮件通知开始，共" + shyLiveApplyList.size() + "个申请，每个申请通知" + shyEmailList.size() + "个邮箱");
-            int i = 0;
             for (ShyLiveapply liveApply : shyLiveApplyList) {
                 logger.info("当前发送邮件的直播申请id为：" + liveApply.getId());
                 //初始化通知状态
                 Integer noticeState = liveApply.getEmail_notice_state();
                 //初始化通知消息
-                //String noticeMsg = liveApply.getEmail_notice_msg();
                 StringBuilder noticeMsg = new StringBuilder(liveApply.getEmail_notice_msg());
                 //显示spid简称
                 ShySites shySites = sitesService.findspidDescByspid(liveApply.getSp_id());
@@ -124,7 +124,7 @@ public class LiveApplyJob {
                     String emailAddr = shyEmail.getEmail();
                     String title = liveApply.getSpid_desc() + "新直播开播申请";
                     String templateId = "4017";
-                    Map<String, String> emailparams = new HashMap<>();
+                    Map<String, String> emailparams = new HashMap<>(16);
                     emailparams.put("appId", appId);
                     emailparams.put("emailAddr", emailAddr);
                     emailparams.put("title", title);
@@ -140,14 +140,12 @@ public class LiveApplyJob {
                         if (result == null) {
                             noticeState = CommonConst.NOTICE_FAIL;
                             noticeMsg.append("\n").append(dateTime).append(" 邮件服务器调用失败,result为空");
-                            i += 1;
                             break;
                         }
                         Integer code = result.getInteger("errorCode");
                         if (code != 0) {
                             noticeState = CommonConst.NOTICE_FAIL;
                             noticeMsg.append("\n").append(dateTime).append(" 邮件服务器调用失败,result返回消息为：").append(result.getString("errorMessage"));
-                            i += 1;
                             break;
                         } else {
                             noticeState = CommonConst.NOTICE_SUCCESS;
@@ -157,30 +155,8 @@ public class LiveApplyJob {
                         logger.info("异常结果为：{}", e.getMessage());
                         noticeState = CommonConst.NOTICE_FAIL;
                         noticeMsg.append("\n").append(dateTime).append(" 邮件服务器调用失败,服务器报错了");
-                        i += 1;
                         break;
                     }
-                    //String taskId = "003_09";
-                    //String signatureId = "0";
-                    //Map<String, String> mobileparams = new HashMap<>(16);
-                    //mobileparams.put("appId", appId);
-                    //mobileparams.put("mobile", liveApply.getMobile());
-                    //mobileparams.put("content", content.toString());
-                    //mobileparams.put("taskId", taskId);
-                    //mobileparams.put("signatureId", signatureId);
-                    //httpUtil.setParamMap(mobileparams);
-                    //if (i > shyEmailList.size() * 2) {
-                    //    Map<String, String> post = httpUtil.post(mobile_send_URL);
-                    //    logger.info("当前发送短信用户为：" + liveApply.getMobile() + ",发送短信的直播申请审核云id为：" + liveApply.getId() + "结果为：" + post.get("result"));
-                    //    JSONObject result = JSONObject.parseObject(post.get("result"));
-                    //    Integer code = result.getInteger("errorCode");
-                    //    if (code == 0) {
-                    //        noticeState = CommonConst.NOTICE_SUCCESS;
-                    //        noticeMsg.append(noticeMsg).append("\n").append(dateTime).append("短信手机号").append(liveApply.getMobile()).append("(").append(liveApply.getSender()).append(")发送成功").toString();
-                    //        i = 0;
-                    //    }
-                    //    break;
-                    //}
                 }
                 liveApply.setEmail_notice_state(noticeState);
                 liveApply.setEmail_notice_msg(noticeMsg.toString());
@@ -190,6 +166,29 @@ public class LiveApplyJob {
     }
     /**
+     * 每个小时执行一次，定时修改直播申请库中的邮箱通知状态
+     * 检测邮箱通知失败状态的邮箱状态改为未通知状态
+     */
+    @Scheduled(fixedRate = 60 * 60 * 1000)
+    public void autoLiveApplyEmailNoticeStateModify() {
+        Example example = new Example(ShyLiveapply.class);
+        Criteria criteria = example.createCriteria();
+        //审核通过的
+        criteria.andEqualTo("shenhe_state", CommonConst.AUDIT_SUCCESS);
+        //状态等于通知失败的
+        criteria.andEqualTo("email_notice_state", CommonConst.NOTICE_FAIL);
+        List<ShyLiveapply> shyLiveApplyList = shyLiveApplyMapper.selectByExample(example);
+        logger.info("邮箱通知失败的修改数量：{}", shyLiveApplyList.size());
+        for (ShyLiveapply shyLiveapply : shyLiveApplyList) {
+            if (CommonUtils.isNotNull(shyLiveapply)) {
+                //修改为未通知 继续发送
+                shyLiveapply.setEmail_notice_state(CommonConst.NOTICE_INTT);
+                liveApplyService.updateShyLiveApply(shyLiveapply);
+            }
+        }
+    }
+
+    /**
      * 自动退领
      * 每天0点执行
      */
@@ -49,10 +49,10 @@ public class VideosJob {
     /**
      * 定时向易盾发送视频抽帧图片进行检测
      * 机审 、未审核 、抽帧完成 进行送审
-     * 每天8点到23点执行，每分钟一次
+     * 每天8点到23点执行，每三分钟一次
      */
     @Scheduled(cron = "0 0/3 8-23 * * ? ")
-    public void videoFilter(){
+    public void videoFilter() {
         ShyVideos shyVideos = new ShyVideos();
         //审核类型为机审
         shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE);