251015

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

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() {

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<Model> customModels = modelRepository.getBaseMapper().selectList(Wrappers.<Model>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();
     }
 }

src/main/resources/application.yml

@@ -112,7 +112,6 @@ logging:
         supervisiondata:
           service: debug
 
-
 management:
   endpoint:
     web: