From ddf0a0009020a742e9a88ef6f8f84ab840f14a4b Mon Sep 17 00:00:00 2001
From: mh <ljf25604@163.com>
Date: Fri, 30 Aug 2024 09:56:27 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E5=86=B7=E9=87=8F?=
 =?UTF-8?q?=E8=AE=A1=E8=AE=A1=E7=AE=97=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mh/user/utils/AnalysisReceiveOrder485.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/user-service/src/main/java/com/mh/user/utils/AnalysisReceiveOrder485.java b/user-service/src/main/java/com/mh/user/utils/AnalysisReceiveOrder485.java
index 32be208..42f75df 100644
--- a/user-service/src/main/java/com/mh/user/utils/AnalysisReceiveOrder485.java
+++ b/user-service/src/main/java/com/mh/user/utils/AnalysisReceiveOrder485.java
@@ -46,7 +46,7 @@ public class AnalysisReceiveOrder485 {
 
     //解析冷量表
     public void analysisCloudOrder485(final String dataStr1, final DeviceCodeParamEntity deviceCodeParam) {
-        threadPoolService.execute(() -> {
+//        threadPoolService.execute(() -> {
             // 去掉空格
             String dataStr = dataStr1.replace(" ", "").toUpperCase();
             // 检验报文
@@ -59,7 +59,7 @@ public class AnalysisReceiveOrder485 {
             if (checkWord.equalsIgnoreCase(dataStr.substring(dataStr.length() - 4))) {
                 //创建SimpleDateFormat对象，指定样式    2019-05-13 22:39:30
                 Date date = new Date();
-                String dateStr = "";
+                String dateStr = sdf1.format(date);;
                 //保留两位小数处理
                 DecimalFormat decimalFormat = new DecimalFormat("0.00");
                 // 表号
@@ -75,12 +75,10 @@ public class AnalysisReceiveOrder485 {
                 DataResultClEntity dataResultCl = new DataResultClEntity();
                 String registerAddr = deviceCodeParam.getRegisterAddr();
                 if (ExchangeStringUtil.isInDate(date, "00:00:00", "00:00:30")) {
-                    dateStr = sdf1.format(date);
                     dateStr = dateStr.substring(0, 17) + "00";
 
                     System.out.println("插入时间00" + dateStr);
                 } else if (ExchangeStringUtil.isInDate(date, "00:00:30", "00:00:59")) {
-                    dateStr = sdf1.format(date);
                     dateStr = dateStr.substring(0, 17) + "30";
 
                     System.out.println("插入时间30" + dateStr);
@@ -128,7 +126,7 @@ public class AnalysisReceiveOrder485 {
             } else {
                 log.info("冷量计校验失败===>" + dataStr);
             }
-        });
+//        });
     }
 
     public String analysisCloudQueue(QueueParam queueParam) {