From 64f460bb23481ef14ccea5d55369ae189f61bf97 Mon Sep 17 00:00:00 2001
From: mh <ljf25604@163.com>
Date: Fri, 30 Aug 2024 17:57:07 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E5=86=B7=E9=87=8F?=
 =?UTF-8?q?=E8=AE=A1=E3=80=81=E7=94=B5=E8=A1=A8=E6=97=A5=E5=BF=97=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/utils/AnalysisReceiveOrder485.java   | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 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 81fe843..88cfa01 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
@@ -95,9 +95,9 @@ public class AnalysisReceiveOrder485 {
                         dataResultCh.setProjectId(deviceCodeParam.getProjectId());
                         dataResultCh.setGrade(deviceCodeParam.getGrade());
                         String projectName = projectInfoService.selectName(deviceCodeParam.getProjectId());
-                        log.info("冷量计==>" + cloudId + ",读数==>" + dataResultCh.getCurValue() + ",项目名称==>" + projectName);
+                        log.info("冷量计==>{},寄存器地址==>{},读数==>{},项目名称==>{}", cloudId, registerAddr, dataResultCh.getCurValue(), projectName);
                         dataResultService.saveDataResultCh(dataResultCh);
-                        log.info("冷量计保存数据库成功!项目名称:" + projectName);
+                        log.info("冷量计瞬时冷量/流量保存数据库成功!项目名称:{}", projectName);
                     } else if (registerAddr.equals("31") || registerAddr.equals("34")) {
                         dataResultCl.setDeviceAddr(cloudId);
                         dataResultCl.setDeviceType(deviceCodeParam.getDeviceType());
@@ -109,20 +109,20 @@ public class AnalysisReceiveOrder485 {
                         dataResultCl.setGrade(deviceCodeParam.getGrade());
                         dataResultCl.setProjectId(deviceCodeParam.getProjectId());
                         String projectName = projectInfoService.selectName(deviceCodeParam.getProjectId());
-                        log.info("冷量计==>" + cloudId + ",累计读数==>" + lData + ",项目名称==>" + projectName);
+                        log.info("冷量计==>{},寄存器地址==>{},累计读数==>{},项目名称==>{}", cloudId, registerAddr, lData, projectName);
                         if (lData < 99999999) {
                             if (lData != 2231365) {
                                 dataResultService.saveDataResultCl(dataResultCl);
                             }
                         }
-                        log.info("冷量计保存数据成功!项目名称:" + projectName);
+                        log.info("冷量计累计保存数据成功!项目名称:{}", projectName);
                         dataResultService.saveDataResultCl_bak(dataResultCl);
                     }
                 } catch (Exception e) {
                     log.error("保存冷量计数据失败!", e);
                 }
             } else {
-                log.info("冷量计校验失败===>" + dataStr);
+                log.info("冷量计校验失败===>{}", dataStr);
             }
         });
     }
@@ -222,17 +222,16 @@ public class AnalysisReceiveOrder485 {
      */
     public void analysisMeterOrder485(final String dataStr, final DeviceCodeParamEntity deviceCodeParam) {
         threadPoolService.execute(() -> {
-            //时间，创建SimpleDateFormat对象，指定样式    2019-05-13 22:39:30
-            SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Date date = new Date();
-            String dateStr = sdf1.format(date);
-
             if (dataStr.length() == 36 || dataStr.length() == 40 || dataStr.length() == 44 || dataStr.length() == 50) {
                 //检验报文
                 String checkStr = dataStr.substring(0, dataStr.length() - 4); //减去校验码
                 String checkNum = ExchangeStringUtil.makeChecksum(checkStr);  //生成校验码
                 //返回的校验码与重新生成的校验码进行校验
                 if (checkNum.equalsIgnoreCase(dataStr.substring(dataStr.length() - 4, dataStr.length() - 2))) {
+                    //时间，创建SimpleDateFormat对象，指定样式    2019-05-13 22:39:30
+                    SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    Date date = new Date();
+                    String dateStr = sdf1.format(date);
                     //表号，12位
                     String meterId = checkStr.substring(12, 14) + checkStr.substring(10, 12) + checkStr.substring(8, 10)
                             + checkStr.substring(6, 8) + checkStr.substring(4, 6) + checkStr.substring(2, 4);
@@ -270,15 +269,15 @@ public class AnalysisReceiveOrder485 {
                         dataResultEntity.setCurValue(new BigDecimal(data));     //当前读数
                         dataResultEntity.setCurDate(sdf1.parse(dateStr));   //当前日期
                         dataResultEntity.setGrade(deviceCodeParam.getGrade());
-                        dataResultService.saveDataResult(dataResultEntity);
                         String projectName = projectInfoService.selectName(deviceCodeParam.getProjectId());
-                        log.info("电表==>" + meterId + ",读数==>" + data + ",项目名称==>" + projectName);
-                        log.info("电表保存数据成功!项目名称:" + projectName);
+                        log.info("电表==>{},读数==>{},项目名称==>{}", meterId, data, projectName);
+                        dataResultService.saveDataResult(dataResultEntity);
+                        log.info("电表保存数据成功!项目名称:{}", projectName);
                     } catch (Exception e) {
                         log.error("保存电表数据失败!", e);
                     }
                 } else {
-                    log.info("电表校验失败===>" + dataStr);
+                    log.info("电表校验失败===>{}", dataStr);
                 }
             }
         });