From 077393cd372e33c652a04b6964f9a7a12751de3b Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Mon, 6 Feb 2023 17:04:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=9D=E5=85=BB=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/hd/nladmin-system/pom.xml                             | 5 ++++-
 .../java/org/nl/wms/sb/auToTask/AutoCreateUpkeep.java     | 8 ++++----
 .../src/main/resources/config/application-dev.yml         | 3 +--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mes/hd/nladmin-system/pom.xml b/mes/hd/nladmin-system/pom.xml
index b8769900..4527e5e9 100644
--- a/mes/hd/nladmin-system/pom.xml
+++ b/mes/hd/nladmin-system/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>3.19.1</version>
+            <version>3.16.4</version>
             <exclusions>
                 <exclusion>
                     <artifactId>spring-boot-starter-actuator</artifactId>
@@ -271,6 +271,9 @@
                 <includes>
                     <include>**/*.*</include>
                 </includes>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
             </resource>
             <resource>
                 <directory>${basedir}/src/main/resources</directory>
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/auToTask/AutoCreateUpkeep.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/auToTask/AutoCreateUpkeep.java
index 15a7c47e..6a273a40 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/auToTask/AutoCreateUpkeep.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/auToTask/AutoCreateUpkeep.java
@@ -63,20 +63,20 @@ public class AutoCreateUpkeep {
                         // 计算 维修计划日期 - 当前日期 后的天数
                         Date today2 = DateUtil.parse(today);
                         Date plan_start_date2 = DateUtil.parse(plan_start_date);
-                        long num = (int) DateUtil.between(plan_start_date2,today2, DateUnit.DAY);
+                        long num = (int) DateUtil.between(today2,plan_start_date2, DateUnit.DAY);
                         // 周期为年 ：当前日期-保养计划日期 <= 15 天时，新增保养单
                         if (StrUtil.equals(maintenancecycle,"01")) {
-                            if (num >= 15) {
+                            if (num <= 15) {
                                 this.createMain(param);
                             }
                             // 周期为月 ：当前日期-保养计划日期 <= 7 天时，新增保养单
                         } else if (StrUtil.equals(maintenancecycle,"02")) {
-                            if (num >= 7) {
+                            if (num <= 7) {
                                 this.createMain(param);
                             }
                             // 周期为周 ：当前日期-保养计划日期 <= 3 天时，新增保养单
                         } else if (StrUtil.equals(maintenancecycle,"03")) {
-                            if (num >= 3) {
+                            if (num <= 3) {
                                 this.createMain(param);
                             }
                         }
diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
index 0c9b9209..889ecee7 100644
--- a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
@@ -84,8 +84,7 @@ spring:
         singleServerConfig:
           connectionMinimumIdleSize: 8
           connectionPoolSize: 8
-          address: redis://47.96.133.178:6479
-          password: 942464Yy
+          address: redis://127.0.0.1:6379
           idleConnectionTimeout: 10000
           timeout: 3000
 # 登录相关配置