From caf2599a9869244ded811018811c37a2aabac3fc Mon Sep 17 00:00:00 2001 From: vince <757871790@qq.com> Date: 星期三, 08 一月 2025 11:29:05 +0800 Subject: [PATCH] 优化测温协议 --- src/main/java/com/fzzy/gateway/GatewayUtils.java | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/fzzy/gateway/GatewayUtils.java b/src/main/java/com/fzzy/gateway/GatewayUtils.java index 7e4df85..c0e9aee 100644 --- a/src/main/java/com/fzzy/gateway/GatewayUtils.java +++ b/src/main/java/com/fzzy/gateway/GatewayUtils.java @@ -2,8 +2,11 @@ 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; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import java.util.*; @@ -138,4 +141,41 @@ } return null; } + + + public static GrainCableData getCableData(GatewayDevice gatewayDevice) { + String cableRule = gatewayDevice.getCableRule(); + 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]); + } else { + String[] attCir = cableCir.split("-"); + cableZ = Integer.valueOf(attCir[0]); + cableY = 1; + cableX = 0; + //閽堝澶氬湀璁$畻鎬昏繃澶氬皯鏍圭數缂� + for (int i = 0; i < attCir.length; i++) { + cableX += Integer.valueOf(attCable[i]); + } + } + + result.setCableY(cableY); + result.setCableZ(cableZ); + result.setCableX(cableX); + result.setSumNum(cableZ * cableY * cableX); + + result.setTotalCircle(attCable.length); + + return result; + } } -- Gitblit v1.9.3