From 1a3f693cd497d04920975af75789cba6b6e866c9 Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Wed, 1 Sep 2021 12:07:54 +0800
Subject: [PATCH] =?UTF-8?q?MQ=E8=BF=9E=E6=8E=A5=E9=85=8D=E7=BD=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/common/service/impl/ProdReadyTaskServiceImpl.java   | 3 ++-
 .../java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java   | 2 +-
 .../main/java/com/foreverwin/mesnac/common/util/DateUtil.java  | 2 +-
 console/src/main/resources/application-local.yml               | 2 +-
 .../foreverwin/mesnac/equip/consumer/ResourceMQConsume.java    | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
index 3af68b0c..ac7ed5e0 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
@@ -68,7 +68,8 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
     public static final String STATUS_FINISH = "FINISH";
     public static final String STATUS_CANCEL = "CANCEL";
     public static final String MESSAGE_TYPE_WLZB = "WLZB";
-    @Autowired
+
+    @Autowired(required = false)
     @Qualifier("defaultJmsTemplate")
     private JmsMessagingTemplate jmsTemplate;
     @Value("${print.server}")
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java b/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java
index 97478976..6c266f28 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
 public class ActiveMQUtil {
 
 
-    @Autowired
+    @Autowired(required = false)
     @Qualifier("mesJmsTemplate")
     private JmsMessagingTemplate mesJmsTemplate;
 
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/util/DateUtil.java b/common/src/main/java/com/foreverwin/mesnac/common/util/DateUtil.java
index be51b7da..d452f7e3 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/util/DateUtil.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/util/DateUtil.java
@@ -688,6 +688,6 @@ public class DateUtil
 		int second = calendar.get(Calendar.SECOND);
 		int msec = calendar.get(Calendar.MILLISECOND);
 
-		return String.valueOf(year) + String.valueOf(month) + String.valueOf(day) + String.valueOf(hour) + String.valueOf(minute) + String.valueOf(second);
+		return String.valueOf(year) + String.valueOf(month) + String.valueOf(day) + String.valueOf(hour) + String.valueOf(minute) + String.valueOf(second) + String.valueOf(msec);
 	}
 }
\ No newline at end of file
diff --git a/console/src/main/resources/application-local.yml b/console/src/main/resources/application-local.yml
index 4459c48e..baf61e8a 100644
--- a/console/src/main/resources/application-local.yml
+++ b/console/src/main/resources/application-local.yml
@@ -38,7 +38,7 @@ spring:
           merge-sql: true
           slow-sql-millis: 100
   activemq:
-    enabled: true
+    enabled: false
     brokerUrl: tcp://localhost:61616?wireFormat.maxInactivityDuration=0
     password: admin
     user: admin
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java b/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java
index 33444777..03645e0c 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java
+++ b/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java
@@ -29,7 +29,7 @@ public class ResourceMQConsume {
     @Autowired
     private ResourceMQProcess resourceMQProcess;
 
-    @Autowired
+    @Autowired(required = false)
     @Qualifier("defaultJmsTemplate")
     private JmsMessagingTemplate template;