From 21a7b0c7e23a767821a0fb90136e24d063ec9bff Mon Sep 17 00:00:00 2001 From: wu Date: Thu, 13 Jun 2024 15:22:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yingji/quartz/AlarmQuartz.java | 39 +++++++++++-------- .../java/com/yingji/quartz/FireQuartz.java | 31 ++++++++------- .../com/yingji/quartz/AccidentQuartz.java | 21 ++++++---- .../service/impl/AccidentServiceImpl.java | 2 +- 4 files changed, 55 insertions(+), 38 deletions(-) diff --git a/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java b/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java index f2027e2..fcc5163 100644 --- a/alarm/src/main/java/com/yingji/quartz/AlarmQuartz.java +++ b/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 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 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失败============="); } } diff --git a/fire/src/main/java/com/yingji/quartz/FireQuartz.java b/fire/src/main/java/com/yingji/quartz/FireQuartz.java index 49b6bd9..b51618b 100644 --- a/fire/src/main/java/com/yingji/quartz/FireQuartz.java +++ b/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 list = fireService.findDataList(token); - // 110算法接口 - if (CollectionUtil.isNotEmpty(list)) { - fireService.saveAll(list); + try { + // 获取token + String token = fireService.getToken(); + if (StrUtil.isNotEmpty(token)) { + // 根据id查询数据保存 + List 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接口结束============="); } } diff --git a/rescue/src/main/java/com/yingji/quartz/AccidentQuartz.java b/rescue/src/main/java/com/yingji/quartz/AccidentQuartz.java index 5a26ada..46045d0 100644 --- a/rescue/src/main/java/com/yingji/quartz/AccidentQuartz.java +++ b/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失败==============="); } } } diff --git a/rescue/src/main/java/com/yingji/service/impl/AccidentServiceImpl.java b/rescue/src/main/java/com/yingji/service/impl/AccidentServiceImpl.java index e4f20d5..1e89fee 100644 --- a/rescue/src/main/java/com/yingji/service/impl/AccidentServiceImpl.java +++ b/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 list; String recordsStr = JSONUtil.toJsonStr(data); - log.error("120接收到的数据为=======================" + recordsStr); if (StrUtil.isNotEmpty(recordsStr)) { // json数据转换成实体类 list = JSONUtil.toList(recordsStr, EventsResponse.class);