From a376b30e63684f1a0f5b7f45322801be9145c09f Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 07 十月 2023 10:43:19 +0800
Subject: [PATCH] 贝博粮情解析4

---
 igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java |   43 ++++++++++++++++++++++++-------------------
 1 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
index 176e119..f93e77b 100644
--- a/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
+++ b/igds-protocol-beibo/src/main/java/com/ld/igds/protocol/beibo/grainv1/analysis/AnalysisService.java
@@ -20,6 +20,7 @@
 import com.ld.igds.protocol.beibo.grainv1.util.BeiboGrainServerUtils;
 import com.ld.igds.util.BytesUtil;
 import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.NumberUtil;
 import com.ld.igds.warn.WarnUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -170,23 +171,6 @@
         }
 
         // 涓�鍒嗗嚑澶氫粨鎯呭喌锛岃�冭檻鍗曚粨閲囬泦鍜屽浠撻噰闆�
-        // 鍗曚粨閲囬泦鏃跺�欐暟鎹粠0杩斿洖
-        if (StringUtils.isEmpty(exeRequest.getDepotIds())) {
-
-            depotConf.setCableEnd(depotConf.getCableEnd() - depotConf.getCableStart() + 1);
-            depotConf.setCableStart(ser.getCableStart());
-
-            if (DepotType.TYPE_02.getCode().equals(depotConf.getDepotType())) {
-                analysisStep2(depotConf, ser, exeRequest, reMessage, sysConf);
-            } else if (DepotType.TYPE_04.getCode().equals(depotConf.getDepotType())) {
-                analysisStep2(depotConf, ser, exeRequest, reMessage, sysConf);
-            } else {
-                analysisStep1(depotConf, ser, exeRequest, reMessage, sysConf);
-            }
-
-            return;
-
-        }
 
         // 鎵归噺閲囬泦鎵�鏈夊叧鑱斾竴璧烽噰闆嗭紝閬嶅巻鎵ц
         for (DepotConf depotConfTemp : depotConfs) {
@@ -264,12 +248,22 @@
         int curRoot = 1;//鎵�鍦ㄦ牴
         int curCir = 1;//鎵�鍦ㄥ湀
         int cirLay = 1;//褰撳墠鍦堢殑灞�
+        int symbol = 0; //绗﹀彿浣�
         for (int i = 0; i < strPoints.length() / 4; i++) {
             temp = strPoints.substring(i * 4, i * 4 + 4);
             if (temp == null) {
                 temp = "0000";
             }
-            tempValue = BytesUtil.hexToInt(BytesUtil.tran_LH(temp)) / 10.0;
+            //楂樹綆浣嶈浆鎹㈠悗杞负16浣嶄簩杩涘埗瀛楃涓�
+            temp = BytesUtil.toBinary8StringSame(BytesUtil.hexToInt(BytesUtil.tran_LH(temp)), 16);
+            //绗﹀彿浣�
+            symbol = Integer.valueOf(temp.substring(0, 1));
+            //鑾峰彇娓╁害鍊�
+            tempValue = BytesUtil.hexToInt(BytesUtil.binToHex(temp.substring(6))) * 0.0625;
+            if(symbol == 1){
+                tempValue = (1- BytesUtil.hexToInt(BytesUtil.binToHex(temp.substring(6))))*0.0625;
+            }
+            tempValue = NumberUtil.keepPrecision(tempValue, 1);
 
             //闈炴甯稿��
             if (tempValue > ERROR_CHECK_TAG2) {
@@ -369,12 +363,23 @@
         List<Double> temps = new ArrayList<>();
         double tempValue;
         String temp;
+        int symbol = 0;
         for (int i = 0; i < strPoints.length() / 4; i++) {
             temp = strPoints.substring(i * 4, i * 4 + 4);
             if (temp == null) {
                 temp = "0000";
             }
-            tempValue = BytesUtil.hexToInt(BytesUtil.tran_LH(temp)) / 10.0;
+
+            //楂樹綆浣嶈浆鎹㈠悗杞负16浣嶄簩杩涘埗瀛楃涓�
+            temp = BytesUtil.toBinary8StringSame(BytesUtil.hexToInt(BytesUtil.tran_LH(temp)), 16);
+            //绗﹀彿浣�
+            symbol = Integer.valueOf(temp.substring(0, 1));
+            //鑾峰彇娓╁害鍊�
+            tempValue = BytesUtil.hexToInt(BytesUtil.binToHex(temp.substring(6))) * 0.0625;
+            if(symbol == 1){
+                tempValue = (1- BytesUtil.hexToInt(BytesUtil.binToHex(temp.substring(6))))*0.0625;
+            }
+            tempValue = NumberUtil.keepPrecision(tempValue, 1);
             // 璇存槑瑙f瀽鐨勬暟鎹湁闂
             if (tempValue == ERROR_CHECK_TAG || tempValue == ERROR_CHECK_TAG2) {
                 tempValue = Constant.ERROR_TEMP;

--
Gitblit v1.9.3