From 90b03048e227c5827b7e420cc8490ac9450ae33b Mon Sep 17 00:00:00 2001
From: xufangming <fanming.xu@rootcloud.com>
Date: Fri, 18 Apr 2025 17:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=BA=BF=E7=A8=8B=E6=B1=A0=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 .idea/.gitignore                              |  1 +
 .idea/jarRepositories.xml                     | 20 +++++++++----------
 .idea/modules.xml                             |  8 --------
 .../sp/impl/ServicePlanServiceImpl.java       |  2 +-
 .../com/rootcloud/timer/ServicePlanTimer.java |  4 ++--
 .../main/resources/config/application-k8s.yml |  6 +++++-
 .../src/main/resources/config/application.yml |  2 +-
 8 files changed, 21 insertions(+), 23 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 .idea/modules.xml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..85e7c1d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.idea/
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 13566b8..5dfcf86 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -6,3 +6,4 @@
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
+/.idea/*
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index e8c2e7e..8a6f28d 100644
--- a/.idea/jarRepositories.xml
+++ b/.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" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index b63bac3..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/ServicePlanServiceImpl.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/ServicePlanServiceImpl.java
index a86a0ea..4e3c0ec 100644
--- a/nxgx-ifsm-base/src/main/java/com/rootcloud/domain/service/sp/impl/ServicePlanServiceImpl.java
+++ b/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 {
diff --git a/nxgx-ifsm-base/src/main/java/com/rootcloud/timer/ServicePlanTimer.java b/nxgx-ifsm-base/src/main/java/com/rootcloud/timer/ServicePlanTimer.java
index 2830654..bfb7d19 100644
--- a/nxgx-ifsm-base/src/main/java/com/rootcloud/timer/ServicePlanTimer.java
+++ b/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();
diff --git a/nxgx-ifsm-base/src/main/resources/config/application-k8s.yml b/nxgx-ifsm-base/src/main/resources/config/application-k8s.yml
index 9227c5e..1835777 100644
--- a/nxgx-ifsm-base/src/main/resources/config/application-k8s.yml
+++ b/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
diff --git a/nxgx-ifsm-base/src/main/resources/config/application.yml b/nxgx-ifsm-base/src/main/resources/config/application.yml
index b19646e..ede8f6b 100644
--- a/nxgx-ifsm-base/src/main/resources/config/application.yml
+++ b/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