增加定时任务线程池，增加定时任务执行时间节点

.gitignore

@@ -0,0 +1 @@
+/.idea/

.idea/.gitignore

@@ -6,3 +6,4 @@
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
+/.idea/*

.idea/jarRepositories.xml

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="nexus-rootcloud" />
       <option name="name" value="nexus-rootcloud" />
@@ -16,6 +11,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="jitpack.io" />
       <option name="name" value="jitpack.io" />
@@ -26,16 +26,16 @@
       <option name="name" value="jitpack.io" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="nexus-aliyun" />
       <option name="name" value="nexus-aliyun" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="jboss.community" />
       <option name="name" value="JBoss Community repository" />

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/ifsm-base.iml" filepath="$PROJECT_DIR$/.idea/ifsm-base.iml" />
-    </modules>
-  </component>
-</project>

nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/ServicePlanServiceImpl.java

@@ -494,8 +494,8 @@ public class ServicePlanServiceImpl extends ServiceImpl<ServicePlanDao, ServiceP
     public void scheduledProcessing() {
         //获取当天日期
         String thatDay = DateUtil.format(new Date(), DateUtil.PATTERN_CLASSICAL_SIMPLE);
-        log.info("服务计划执行日期：{}" , thatDay);
         List<ServicePlanVo> servicePlanVos = servicePlanMapper.selectExecutedServicePlan(thatDay);
+        log.info("服务计划执行日期：{},总执行条数：{}" , thatDay,servicePlanVos.size());
         if (servicePlanVos.size() > 0) {
             for (ServicePlanVo item : servicePlanVos) {
                 try {

nxgx-ifsm-base/src/main/java/com/rootcloud/timer/ServicePlanTimer.java

@@ -16,7 +16,7 @@ import javax.annotation.Resource;
  */
 @Component
 @Slf4j
-@EnableScheduling
+//@EnableScheduling
 public class ServicePlanTimer {
 
     @Resource(name = "servicePlanServiceImpl")
@@ -26,7 +26,7 @@ public class ServicePlanTimer {
     /**
      * 定时处理设置了触发条件为系统时间的
      */
-    @Scheduled(cron = "0 0 5,6,7,8,14 * * ?")
+    @Scheduled(cron = "0 * 5,6,7,8,9,10,11,12,14 * * ?")
     public void scheduledProcessing(){
         log.info("服务计划自动触发定时任务开始....");
         planService.scheduledProcessing();

nxgx-ifsm-base/src/main/resources/config/application-k8s.yml

@@ -28,7 +28,7 @@ spring:
     configuration:
       #设置当查询结果值为null时，同样映射该查询字段给map。
       call-setters-on-nulls: true
-      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapper-locations: classpath:/mapper/*.xml
   redis:
     host: ${REDISHOST}
@@ -57,6 +57,10 @@ spring:
     enabled: false
   messages:
     basename: i18n/messages/messages
+  task:
+    scheduling:
+      pool:
+        size: 5
 
 pagehelper:
   helper-dialect: mysql

nxgx-ifsm-base/src/main/resources/config/application.yml

@@ -40,7 +40,7 @@ spring:
     configuration:
       #设置当查询结果值为null时，同样映射该查询字段给map。
       call-setters-on-nulls: true
-      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapper-locations: classpath:/mapper/*.xml
   redis:
 #    host: 10.70.25.113