From 32c13616300f182704a4844fddb8ff7901d51678 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期五, 15 一月 2021 12:09:03 +0800
Subject: [PATCH] 定时任务修改

---
 springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/PartyBuildingJobHandler.java |   62 +++++++++++++++++--------------
 1 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/PartyBuildingJobHandler.java b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/PartyBuildingJobHandler.java
index f681e26..6265902 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/PartyBuildingJobHandler.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/PartyBuildingJobHandler.java
@@ -41,7 +41,8 @@
     public ReturnT<String> timedtaskpartybuildingstatusJobHandler(String param) throws Exception {
         log.info("定时任务刷新党建动态发布状态");
         R r=partyBuildingService.timedTaskPartyBuildingStatus();
-        return new ReturnT(r.getData().toString());
+        log.info("执行结果【{}】",r.toString());
+        return ReturnT.SUCCESS;
     }
 
     /**
@@ -55,33 +56,37 @@
         R r=partyBuildingService.timedTaskPartyBuildingActivity();
         if (R.isOk(r)) {
             Object data = r.getData();
-            List<PartyBuildingActivityVO> partyBuildingActivityVOS= JSONArray.parseArray(JSONArray.toJSONString(data),PartyBuildingActivityVO.class);
-            if (!ObjectUtils.isEmpty(partyBuildingActivityVOS)) {
-                partyBuildingActivityVOS.forEach(partyBuildingActivityVO -> {
-                    List<Long> userIds = partyBuildingActivityVO.getUserIds();
-                    if (!ObjectUtils.isEmpty(userIds)) {
-                        userIds.forEach(aLong -> {
-                            SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
-                            sysUserNoticeVO.setUserId(aLong);
-                            sysUserNoticeVO.setType(1);
-                            sysUserNoticeVO.setBusinessType(2);
-                            sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());
-                            sysUserNoticeVO.setBusinessTime(new Date());
-                            sysUserNoticeVO.setBusinessId(partyBuildingActivityVO.getId());
-                            sysUserNoticeVO.setStatus(0);
-                            sysUserNoticeVO.setTitle("活动因故取消");
-                            sysUserNoticeVO.setBusinessContent("报名人数不足活动自动取消");
-                            sysUserNoticeVO.setBusinessStatus(1);
-                            R r2 = userService.addNotice(sysUserNoticeVO);
-                            if (R.isOk(r2)) {
-                                log.info("新增党建活动取消通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
-                            }
-                        });
-                    }
-                });
+            if (!ObjectUtils.isEmpty(data)) {
+                List<PartyBuildingActivityVO> partyBuildingActivityVOS= JSONArray.parseArray(JSONArray.toJSONString(data),PartyBuildingActivityVO.class);
+                if (!ObjectUtils.isEmpty(partyBuildingActivityVOS)) {
+                    partyBuildingActivityVOS.forEach(partyBuildingActivityVO -> {
+                        List<Long> userIds = partyBuildingActivityVO.getUserIds();
+                        if (!ObjectUtils.isEmpty(userIds)) {
+                            userIds.forEach(aLong -> {
+                                SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
+                                sysUserNoticeVO.setUserId(aLong);
+                                sysUserNoticeVO.setType(1);
+                                sysUserNoticeVO.setBusinessType(2);
+                                sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());
+                                sysUserNoticeVO.setBusinessTime(new Date());
+                                sysUserNoticeVO.setBusinessId(partyBuildingActivityVO.getId());
+                                sysUserNoticeVO.setStatus(0);
+                                sysUserNoticeVO.setTitle("活动因故取消");
+                                sysUserNoticeVO.setBusinessContent("报名人数不足活动自动取消");
+                                sysUserNoticeVO.setBusinessStatus(1);
+                                R r2 = userService.addNotice(sysUserNoticeVO);
+                                if (R.isOk(r2)) {
+                                    log.info("新增党建活动取消通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+                                }
+                            });
+                        }
+                    });
+                }
             }
-        }
-        return new ReturnT(r.getData().toString());
+            }
+
+        log.info("执行结果【{}】",r.toString());
+        return ReturnT.SUCCESS;
     }
 
     /**
@@ -93,6 +98,7 @@
     public ReturnT<String> timedTaskPartyBuildingActivityAllJobHandler(String param) throws Exception {
         log.info("定时任务刷新党建活动的各个状态 除取消外");
         R r=partyBuildingService.timedTaskPartyBuildingActivityAll();
-        return new ReturnT(r.getData().toString());
+        log.info("执行结果【{}】",r.toString());
+        return ReturnT.SUCCESS;
     }
 }

--
Gitblit v1.7.1