From f7178996ca77a1bccc941c0e7a73b36803e508cb Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期五, 01 三月 2024 16:13:11 +0800
Subject: [PATCH] 优化协议
---
src/main/java/com/fzzy/gateway/GatewayUtils.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/GatewayUtils.java b/src/main/java/com/fzzy/gateway/GatewayUtils.java
index a0aa2d3..00fc7f8 100644
--- a/src/main/java/com/fzzy/gateway/GatewayUtils.java
+++ b/src/main/java/com/fzzy/gateway/GatewayUtils.java
@@ -2,6 +2,7 @@
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiCommonDevice;
+import com.fzzy.api.data.DepotType;
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.gateway.data.GrainCableData;
import com.fzzy.gateway.entity.GatewayDevice;
@@ -147,10 +148,13 @@
String cableCir = gatewayDevice.getCableCir();
GrainCableData result = new GrainCableData();
+ result.setCableRule(cableRule);
+ result.setCableCir(cableCir);
int cableY, cableX;
String[] attCable = cableRule.split("-");
int cableZ = Integer.valueOf(attCable[0]);
+
if (StringUtils.isEmpty(cableCir)) {
cableY = Integer.valueOf(attCable[1]);
cableX = Integer.valueOf(attCable[2]);
@@ -159,12 +163,10 @@
cableZ = Integer.valueOf(attCir[0]);
cableY = 1;
cableX = 0;
- //閽堝澶氬湀璁＄畻
+ //閽堝澶氬湀璁＄畻鎬昏繃澶氬皯鏍圭數缂�
for (int i = 0; i < cableCir.length(); i++) {
- cableX += Integer.valueOf(attCir[i]);
+ cableX += Integer.valueOf(attCable[i]);
}
-
- result.setCir(true);
}
result.setCableY(cableY);
@@ -172,6 +174,8 @@
result.setCableX(cableX);
result.setSumNum(cableZ * cableY * cableX);
+ result.setTotalCircle(attCable.length);
+
return result;
}
}
--
Gitblit v1.9.3