修改定时任务日志

alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java

@@ -3,7 +3,6 @@ package com.yingji.quartz;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONUtil;
@@ -22,7 +21,11 @@ import org.springframework.scheduling.annotation.Scheduled;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
 
 /**
  * 110数据保存定时任务
@@ -50,26 +53,30 @@ public class AlarmQuartz {
     @Async
     @Scheduled(cron = "0 */1 * * * ? ")
     public void savaData() {
-        // 获取token
-        String token = alarmService.getToken();
         QuartzLog quartzLog = new QuartzLog();
         quartzLog.setInterfaceName(1);
         quartzLog.setCreateTime(LocalDateTime.now());
-        if (StrUtil.isNotEmpty(token)) {
-            // 查询所有id
-            List<String> idList = findId(token);
-            // 根据id查询数据保存
-            addList(idList, token);
-            // 110算法接口
-            if (CollectionUtil.isNotEmpty(idList)) {
-                emergencyAlgorithm();
+        try {
+            // 获取token
+            String token = alarmService.getToken();
+            if (StrUtil.isNotEmpty(token)) {
+                // 查询所有id
+                List<String> idList = findId(token);
+                // 根据id查询数据保存
+                addList(idList, token);
+                // 110算法接口
+                if (CollectionUtil.isNotEmpty(idList)) {
+                    emergencyAlgorithm();
+                }
+                quartzLog.setStatus(1);
+            } else {
+                quartzLog.setStatus(2);
+                log.error("============110算法接口获取token失败=============");
             }
-            quartzLog.setStatus(1);
-            quartzLogService.save(quartzLog);
-        } else {
+        } catch (Exception e) {
             quartzLog.setStatus(2);
+        } finally {
             quartzLogService.save(quartzLog);
-            log.error("============110算法接口获取token失败=============");
         }
     }
 

fire/src/main/java/com/yingji/quartz/FireQuartz.java

@@ -33,6 +33,7 @@ public class FireQuartz {
 
     @Resource
     private QuartzLogService quartzLogService;
+
     /**
      * 保存所有数据
      */
@@ -40,25 +41,29 @@ public class FireQuartz {
     @Scheduled(cron = "0 */5 * * * ? ")
     public void savaData() {
         log.info("119接口开始" + LocalDateTime.now());
-        // 获取token
-        String token = fireService.getToken();
         QuartzLog quartzLog = new QuartzLog();
         quartzLog.setInterfaceName(2);
         quartzLog.setCreateTime(LocalDateTime.now());
-        if (StrUtil.isNotEmpty(token)) {
-            // 根据id查询数据保存
-            List<Fire> list = fireService.findDataList(token);
-            // 110算法接口
-            if (CollectionUtil.isNotEmpty(list)) {
-                fireService.saveAll(list);
+        try {
+            // 获取token
+            String token = fireService.getToken();
+            if (StrUtil.isNotEmpty(token)) {
+                // 根据id查询数据保存
+                List<Fire> list = fireService.findDataList(token);
+                // 110算法接口
+                if (CollectionUtil.isNotEmpty(list)) {
+                    fireService.saveAll(list);
+                }
+                quartzLog.setStatus(1);
+                log.info("119接口结束" + LocalDateTime.now());
+            } else {
+                quartzLog.setStatus(2);
+                log.error("============119算法接口获取token失败119接口结束=============");
             }
-            quartzLog.setStatus(1);
-            quartzLogService.save(quartzLog);
-            log.info("119接口结束" + LocalDateTime.now());
-        } else {
+        } catch (Exception e) {
             quartzLog.setStatus(2);
+        } finally {
             quartzLogService.save(quartzLog);
-            log.error("============119算法接口获取token失败119接口结束=============");
         }
     }
 

rescue/src/main/java/com/yingji/quartz/AccidentQuartz.java

@@ -31,22 +31,27 @@ public class AccidentQuartz {
 
     @Resource
     private QuartzLogService quartzLogService;
+
     @Async
     @Scheduled(cron = "*/10 * * * * ? ")
     public void savaData() {
-        String accessToken = accidentService.getAuthorizeToken();
         QuartzLog quartzLog = new QuartzLog();
         quartzLog.setInterfaceName(3);
         quartzLog.setCreateTime(LocalDateTime.now());
-        if (StrUtil.isNotEmpty(accessToken)) {
-            accidentService.getAccidentUrl(accessToken);
-            quartzLog.setStatus(1);
-            quartzLogService.save(quartzLog);
-            log.info("=================120定时任务结束===============");
-        } else {
+        try {
+            String accessToken = accidentService.getAuthorizeToken();
+            if (StrUtil.isNotEmpty(accessToken)) {
+                accidentService.getAccidentUrl(accessToken);
+                quartzLog.setStatus(1);
+                log.info("=================120定时任务结束===============");
+            } else {
+                quartzLog.setStatus(2);
+                log.info("=================120定时任务获取token失败===============");
+            }
+        } catch (Exception e) {
             quartzLog.setStatus(2);
+        } finally {
             quartzLogService.save(quartzLog);
-            log.info("=================120定时任务获取token失败===============");
         }
     }
 }

rescue/src/main/java/com/yingji/service/impl/AccidentServiceImpl.java

@@ -156,6 +156,7 @@ public class AccidentServiceImpl implements AccidentService {
         String body = HttpRequest.post(getAccidentUrl)
                 .header("Authorization", "Bearer " + accessToken)
                 .body(parse).execute().body();
+        log.error("120接收到的数据为=======================" + body);
         JSONObject json = JSONObject.parse(body);
         Object data = json.get("data");
         if (BeanUtil.isNotEmpty(data)) {
@@ -174,7 +175,6 @@ public class AccidentServiceImpl implements AccidentService {
     private void saveResponseData(Object data) {
         List<EventsResponse> list;
         String recordsStr = JSONUtil.toJsonStr(data);
-        log.error("120接收到的数据为=======================" + recordsStr);
         if (StrUtil.isNotEmpty(recordsStr)) {
             // json数据转换成实体类
             list = JSONUtil.toList(recordsStr, EventsResponse.class);