day_22

src/main/java/com/scbfkj/uni/system/ScheduleUtil.java

@@ -2,6 +2,7 @@ package com.scbfkj.uni.system;
 
 import com.scbfkj.uni.library.UniReturnUtil;
 import com.scbfkj.uni.process.DataBase;
+import org.springframework.scheduling.Trigger;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.scheduling.support.CronTrigger;
 import org.springframework.scheduling.support.PeriodicTrigger;
@@ -39,23 +40,32 @@ public class ScheduleUtil {
             throw new RuntimeException("采集服务不存在");
         }
         Map<String, Object> serviceInfo = serviceInfos.get(0);
-        Integer loopCount = Objects.isNull(serviceInfo.get("loopcount")) ? null : Integer.parseInt(serviceInfo.get("loopcount").toString());
+        Object loopcount = serviceInfo.get("loopcount");
+        Integer loopCount = Objects.isNull(loopcount) ? null : Integer.parseInt(loopcount.toString());
         Object cronExpress = serviceInfo.get("cronexpress");
-        if (Objects.isNull(cronExpress)) {
-            throw new RuntimeException("服务:%s，不是定时任务");
-        }
-        if (!scheduleTaskMaps.containsKey(serviceId)) {
-            ScheduleTask scheduleTask = new ScheduleTask(serviceId, loopCount);
-            scheduleTaskMaps.put(serviceId, scheduleTask);
+
+        if (scheduleTaskMaps.containsKey(serviceId)) {
+            return true;
         }
-        ScheduleTask scheduleTask = scheduleTaskMaps.get(serviceId);
+
+
+        ScheduleTask scheduleTask = new ScheduleTask(serviceId, loopCount);
+        scheduleTaskMaps.put(serviceId, scheduleTask);
         //创建定时任务：
         System.out.println("启动定时任务线程 taskId " + scheduleTask.getId());// 设置时间比当前时间晚了
-        if (Objects.isNull(cronExpress)) {
-//                todo 记录日志
-            throw new RuntimeException("定时表达式并没有设置");
+        Object taskType = serviceInfo.get("tasktype");
+        Trigger trigger;
+//        定时
+        if (Objects.equals(taskType.toString(), "1")) {
+            trigger = new CronTrigger(cronExpress.toString());
+//            轮询
+        } else if (Objects.equals(taskType.toString(), "2")) {
+            Object frequency = serviceInfo.getOrDefault("frequency", "0");
+            trigger = new PeriodicTrigger(Duration.ofMillis(Long.parseLong(frequency.toString())));
+        } else {
+            throw new RuntimeException("任务类型不支持  定时任务支持：1：定时任务，2：轮询任务");
         }
-        ScheduledFuture<?> scheduledFuture = threadPoolTaskScheduler.schedule(scheduleTask, new CronTrigger(cronExpress.toString()));
+        ScheduledFuture<?> scheduledFuture = threadPoolTaskScheduler.schedule(scheduleTask, trigger);
         scheduledFutureMap.put(serviceId, scheduledFuture);
         DataBase.update(Config.getCenterConnectionStr(), "update serviceinfo set runState = 1 where  serviceid =?", serviceId);
         return true;
@@ -96,7 +106,7 @@ public class ScheduleUtil {
         if (scheduledFuture != null && !scheduledFuture.isCancelled()) {
             scheduledFuture.cancel(false);
             try {
-                DataBase.update(Config.getCenterConnectionStr(), "update serviceinfo set runState = 0 where  serviceID =?", serviceId);
+                DataBase.update(Config.getCenterConnectionStr(), "update serviceinfo set runState = 0 where  serviceid =?", serviceId);
             } catch (Exception e) {
                 return UniReturnUtil.fail(e);
             }

src/main/java/com/scbfkj/uni/system/SystemInit.java

@@ -40,6 +40,11 @@ public class SystemInit {
     @Value("${app.debug:false}")
     private boolean debug = true;
 
+    @Value("${app.enable-flyway:false}")
+    private boolean enableFlyway = false;
+    @Value("${app.enable-reset-config:false}")
+    private boolean enableResetConfig = false;
+
     public SystemInit(ResourcePatternResolver resourcePatternResolver) {
         this.resourcePatternResolver = resourcePatternResolver;
     }
@@ -52,7 +57,14 @@ public class SystemInit {
         Config.setCenterConnectionStr(DataEncryptionUtil.decryptRSAByPrivateKey(centerConfig));
         Config.setSecurityConnectionStr(DataEncryptionUtil.decryptRSAByPrivateKey(securityConfig));
 //        初始化数据结构
-//        migrateDB();
+        if (enableFlyway) {
+            migrateDB();
+        }
+        if (enableResetConfig) {
+            cleanRemoteConfig(Config.getCenterConnectionStr(), "classpath:sql/systemset/*");
+            cleanRemoteConfig(Config.getSecurityConnectionStr(), "classpath:sql/uniauth/*");
+
+        }
 
 //        日志配置初始化
         Config.targets.addAll(DataBase.query(Config.getCenterConnectionStr(), "select * from systeminfo"));
@@ -61,10 +73,9 @@ public class SystemInit {
         ControlService.startServiceByContainerCode();
 //        日志任务
         ScheduleUtil.startService(LoggerService::sendMessage, 100);
-//        LoggerService.logSystemError(LocalDateTime.now(), "", "");
-        LoggerService.log(LoggerService.LogType.SYSTEM, new HashMap<>() {{
-            put("occurrencetime", LocalDateTime.now());
-        }});
+        HashMap<String, Object> occurrencetime = new HashMap<>();
+        occurrencetime.put("occurrencetime", LocalDateTime.now());
+        LoggerService.log(LoggerService.LogType.SYSTEM, occurrencetime);
     }
 
     private void initializeSystemEnvironment() throws Exception {
@@ -89,8 +100,6 @@ public class SystemInit {
             }
         }
         readConfigFile();
-//        cleanRemoteConfig(Config.getCenterConnectionStr(),"classpath:sql/systemset/*");
-//        cleanRemoteConfig(Config.getSecurityConnectionStr(),"classpath:sql/uniauth/*");
         ControlService.startServiceByContainerCode();
     }
 
@@ -115,7 +124,7 @@ public class SystemInit {
     /**
      * 清理远程数据配置
      */
-    private void cleanRemoteConfig(String connection,String path) throws Exception {
+    private void cleanRemoteConfig(String connection, String path) throws Exception {
 
 
         Resource[] resources = resourcePatternResolver.getResources(path);
@@ -132,7 +141,7 @@ public class SystemInit {
             }
             for (String sql : stringBuilder.toString().split(";")) {
                 if (!sql.trim().isEmpty()) {
-                    if(Config.isDebug()) {
+                    if (Config.isDebug()) {
                         System.out.printf("执行语句：%s%n", sql);
                     }
                     DataBase.update(connection, sql);

src/main/resources/application.properties

@@ -3,4 +3,6 @@ db.security.config=Jnj84d14EmSgKEXyAbSH+bratWGkpV89/VA5Er4yQOt7qlnKtGYJzBVJNNYMB
 #log.target=B7xSbq4imA5zapX8kEO42mU/5sA2TyF/Ba2Y/++F3z9Np7iT4ywDUkbRC4w/Xrxv1kMSR8PQMJ4dfYwc3mYj0SJJivN5A5/6hI+ZSQBabfZZrYwaIIRdM1XIk4wo1SIrSCXKzef8X6YUH70R2tnh+Uq6KNNp08KaZ2ZXM8vX5Ss=
 server.port=9500
 app.container.code=dev
-spring.profiles.default=${ACTIVE:default}
+spring.profiles.default=${ACTIVE:default}
+app.enable-flyway=false
+app.enable-reset-config=false