diff --git a/ruoyi-ui/src/views/business/tools/apitools/index.vue b/ruoyi-ui/src/views/business/tools/apitools/index.vue index a4ac5ae4..f944d21e 100644 --- a/ruoyi-ui/src/views/business/tools/apitools/index.vue +++ b/ruoyi-ui/src/views/business/tools/apitools/index.vue @@ -15,6 +15,7 @@ @@ -39,6 +40,7 @@ @@ -61,10 +63,22 @@ +
+ + {{ data.date }} + +
+ + {{ data.title }} + + +
+ 搜索 @@ -199,6 +213,7 @@ export default { //遮罩层 loading1: false, loading2: false, + loading3: false, } @@ -211,8 +226,12 @@ export default { methods: { //获取历史今天数据信息 getHistoryToday() { + this.loading3 = true getHistoryToday().then(res => { + this.loading3 = false this.historyTodayData = res.data + }).catch(err =>{ + this.loading3 = false }) }, @@ -222,7 +241,9 @@ export default { getHoliday().then(res => { this.loading1 = false this.holidayData = res.data - }); + }).catch(err =>{ + this.loading3 = false + }) }, //获取mm图片信息 @@ -236,6 +257,8 @@ export default { res.data.forEach(data => { this.pictureList.push(data.imageUrl) }) + }).catch(err =>{ + this.loading3 = false }) }, diff --git a/xjs-business/xjs-business-common/src/main/java/com/xjs/run/ApplicationRunnerImpl.java b/xjs-business/xjs-business-common/src/main/java/com/xjs/run/ApplicationRunnerImpl.java deleted file mode 100644 index 871940dd..00000000 --- a/xjs-business/xjs-business-common/src/main/java/com/xjs/run/ApplicationRunnerImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.xjs.run; - -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.stereotype.Component; - -/** - * springboot启动成功后执行 - * @author xiejs - * @since 2022-01-19 - */ -@Component -public class ApplicationRunnerImpl implements ApplicationRunner { - - @Override - public void run(ApplicationArguments args) throws Exception { - System.out.println("-----------------启动成功！！！---------------------"); - } -} diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/service/impl/ApiToolsServiceImpl.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/service/impl/ApiToolsServiceImpl.java index 540cb019..2e9cd60c 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/service/impl/ApiToolsServiceImpl.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/apitools/service/impl/ApiToolsServiceImpl.java @@ -165,7 +165,7 @@ public class ApiToolsServiceImpl implements ApiToolsService { public List getHistoryTodayList() { List historyTodayList = historyTodayFactory.apiDataList(); if (CollUtil.isNotEmpty(historyTodayList)) { - return historyTodayList.stream().limit(5).collect(Collectors.toList()); + return historyTodayList.stream().limit(7).collect(Collectors.toList()); }else { throw new ApiException("获取历史上的今天api调用异常！！！"); } diff --git a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/task/DeleteRepeatTask.java b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/task/DeleteRepeatTask.java index 8b0195f6..856f8f5f 100644 --- a/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/task/DeleteRepeatTask.java +++ b/xjs-business/xjs-business-openapi/src/main/java/com/xjs/common/task/DeleteRepeatTask.java @@ -30,10 +30,10 @@ public class DeleteRepeatTask { /** - * 2022-01-07 07:00:00 - * 2022-01-07 08:00:00 - * 2022-01-07 09:00:00 - * 2022-01-07 10:00:00 + * 2022-01-07 07:00:00
+ * 2022-01-07 08:00:00
+ * 2022-01-07 09:00:00
+ * 2022-01-07 10:00:00
*/ @Scheduled(cron = "0 0 10,14,20 * * ? ") public void execute() { diff --git a/xjs-business/xjs-business-warning/src/main/java/com/xjs/XjsWarningApp.java b/xjs-business/xjs-business-warning/src/main/java/com/xjs/XjsWarningApp.java index 6ad4076b..5ea9e72f 100644 --- a/xjs-business/xjs-business-warning/src/main/java/com/xjs/XjsWarningApp.java +++ b/xjs-business/xjs-business-warning/src/main/java/com/xjs/XjsWarningApp.java @@ -5,6 +5,7 @@ import com.ruoyi.common.security.annotation.EnableRyFeignClients; import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableScheduling; /** * @author xiejs @@ -15,6 +16,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableCustomConfig @EnableCustomSwagger2 @EnableRyFeignClients +@EnableScheduling public class XjsWarningApp { public static void main(String[] args) { SpringApplication.run(XjsWarningApp.class, args); diff --git a/xjs-business/xjs-business-warning/src/main/java/com/xjs/handler/RecordDateHandler.java b/xjs-business/xjs-business-warning/src/main/java/com/xjs/handler/RecordDateHandler.java new file mode 100644 index 00000000..7f388540 --- /dev/null +++ b/xjs-business/xjs-business-warning/src/main/java/com/xjs/handler/RecordDateHandler.java @@ -0,0 +1,33 @@ +package com.xjs.handler; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import com.xjs.domain.ApiRecord; + +import java.util.Date; +import java.util.List; + +/** + * 日期的处理 + * @author xiejs + * @since 2022-01-21 + */ +public class RecordDateHandler { + + protected List handleDate(List apiRecordList) { + if (CollUtil.isNotEmpty(apiRecordList)) { + apiRecordList.forEach(apiRecord -> { + String dateTime = DateUtil.formatDateTime(apiRecord.getUpdateTime()); + Date date = DateUtil.parseDate(dateTime).toJdkDate(); + //当前时间和最后一次修改时间间隔天数（超过1 就清零） + long compareTime = DateUtil.between(date, new Date(), DateUnit.DAY); + if (compareTime > 0) { + apiRecord.setDayCount(0L); + } + }); + } + return apiRecordList; + } + +} diff --git a/xjs-business/xjs-business-warning/src/main/java/com/xjs/run/ApplicationRunnerImpl.java b/xjs-business/xjs-business-warning/src/main/java/com/xjs/run/ApplicationRunnerImpl.java new file mode 100644 index 00000000..ca0a99ce --- /dev/null +++ b/xjs-business/xjs-business-warning/src/main/java/com/xjs/run/ApplicationRunnerImpl.java @@ -0,0 +1,35 @@ +package com.xjs.run; + +import com.xjs.domain.ApiRecord; +import com.xjs.handler.RecordDateHandler; +import com.xjs.service.ApiWarningService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * springboot启动成功后执行 + * @author xiejs + * @since 2022-01-19 + */ +@Component +public class ApplicationRunnerImpl extends RecordDateHandler implements ApplicationRunner { + + @Autowired + private ApiWarningService apiWarningService; + + @Override + public void run(ApplicationArguments args) throws Exception { + System.out.println("-----------------启动成功！！！---------------------"); + + //启动后处理每日预警数量 + List apiRecordList = apiWarningService.selectApiRecordList(new ApiRecord()); + List handleDate = super.handleDate(apiRecordList); + handleDate.forEach(data ->{ + apiWarningService.updateApiRecordByUrl(data); + }); + } +} diff --git a/xjs-business/xjs-business-warning/src/main/java/com/xjs/task/WarningTask.java b/xjs-business/xjs-business-warning/src/main/java/com/xjs/task/WarningTask.java new file mode 100644 index 00000000..7e12d53c --- /dev/null +++ b/xjs-business/xjs-business-warning/src/main/java/com/xjs/task/WarningTask.java @@ -0,0 +1,50 @@ +package com.xjs.task; + +import com.xjs.domain.ApiRecord; +import com.xjs.handler.RecordDateHandler; +import com.xjs.service.ApiWarningService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 预警相关定时任务 + * @author xiejs + * @since 2022-01-21 + */ +@Component +@Log4j2 +public class WarningTask extends RecordDateHandler { + + @Autowired + private ApiWarningService apiWarningService; + + /** + * 处理预警api信息的每天调用次数
+ * 最近10次运行:
+ * 2022-01-22 00:00:10
+ * 2022-01-23 00:00:10
+ * 2022-01-24 00:00:10
+ * 2022-01-25 00:00:10
+ * 2022-01-26 00:00:10
+ * 2022-01-27 00:00:10
+ * 2022-01-28 00:00:10
+ * 2022-01-29 00:00:10
+ * 2022-01-30 00:00:10
+ * 2022-01-31 00:00:10
+ */ + @Scheduled(cron = "10 0 0 * * ? ") + public void handleRecordDate() { + List apiRecordList = apiWarningService.selectApiRecordList(new ApiRecord()); + List handleDate = super.handleDate(apiRecordList); + handleDate.forEach(data ->{ + apiWarningService.updateApiRecordByUrl(data); + }); + log.info("定时任务处理预警api信息的每天调用次数完毕"); + } + + +}