From 66fa9b123c4d2bccac1f0819ff08319353b9b1d8 Mon Sep 17 00:00:00 2001 From: wxc <191104855@qq.com> Date: Wed, 15 Oct 2025 16:19:33 +0800 Subject: [PATCH] 251015 --- ...connector-java-8.3.81.53-build52.8-bin.jar | Bin libs/gbase/installMavenJar.bat | 1 + .../service/impl/ModelClueServiceImpl.java | 7 +++++-- .../supervisiondata/task/TaskService.java | 18 ++---------------- src/main/resources/application.yml | 1 - 5 files changed, 8 insertions(+), 19 deletions(-) rename {src/main/resources/lib => libs/gbase}/gbase-connector-java-8.3.81.53-build52.8-bin.jar (100%) create mode 100644 libs/gbase/installMavenJar.bat diff --git a/src/main/resources/lib/gbase-connector-java-8.3.81.53-build52.8-bin.jar b/libs/gbase/gbase-connector-java-8.3.81.53-build52.8-bin.jar similarity index 100% rename from src/main/resources/lib/gbase-connector-java-8.3.81.53-build52.8-bin.jar rename to libs/gbase/gbase-connector-java-8.3.81.53-build52.8-bin.jar diff --git a/libs/gbase/installMavenJar.bat b/libs/gbase/installMavenJar.bat new file mode 100644 index 0000000..edbaff3 --- /dev/null +++ b/libs/gbase/installMavenJar.bat @@ -0,0 +1 @@ +mvn install:install-file -DgroupId=com.gbase -DartifactId=gbase-jdbc -Dversion=8.3.81.53-build55.2.1-bin -Dfile="gbase-connector-java-8.3.81.53-build52.8-bin.jar" -Dpackaging=jar \ No newline at end of file diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java index 523f823..dcda181 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/ModelClueServiceImpl.java @@ -87,8 +87,11 @@ public class ModelClueServiceImpl implements ModelClueService { } else { modelClueRecordRepository.getBaseMapper().insert(new ModelClueRecord().setModelId(modelId).setSize(0).setCreateTime(LocalDateTime.now()).setState("fail").setErrMsg("数据为空")); } - model.setLatestRunTime(LocalDateTime.now()); - modelRepository.getBaseMapper().updateById(model); + if (Objects.nonNull(model)) { + model.setLatestRunTime(LocalDateTime.now()); + modelRepository.updateById(model); + } + } public void generateCustomModels() { diff --git a/src/main/java/com/biutag/supervisiondata/task/TaskService.java b/src/main/java/com/biutag/supervisiondata/task/TaskService.java index 7f17fad..15dadf2 100644 --- a/src/main/java/com/biutag/supervisiondata/task/TaskService.java +++ b/src/main/java/com/biutag/supervisiondata/task/TaskService.java @@ -247,21 +247,7 @@ public class TaskService { */ @Scheduled(cron = "0 0 4 * * ?") public void runCustomModels() { - log.info("开始执行自建模型"); - List customModels = modelRepository.getBaseMapper().selectList(Wrappers.lambdaQuery().eq(Model::getModelType, "2")); - if (customModels.isEmpty()) { - return; - } - for (Model model : customModels) { - if (model.getClueCycleDayOfWeek() != null - && model.getClueCycleDayOfWeek().equals("week") - && model.getLatestRunTime() != null - && !model.getLatestRunTime().isBefore(LocalDateTime.now().minusDays(6).with(LocalTime.MIN))) { - log.info("模型{}距上次执行时间未满7天，跳过执行", model.getId()); - continue; - } - modelClueService.generate(model.getId()); - log.info("自建模型{}执行完毕", model.getId()); - } + log.info("runCustomModels-------------------"); + modelClueService.generateCustomModels(); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 98d9721..e21ef0f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -112,7 +112,6 @@ logging: supervisiondata: service: debug - management: endpoint: web: