From bcea5255e647b6de99b6edb6f06b3d7036a2723d Mon Sep 17 00:00:00 2001 From: wangyu <823267011@qq.com> Date: Fri, 6 Feb 2026 23:58:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=B8=E6=95=B0=E5=AF=B9?= =?UTF-8?q?=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fizz/business/domain/s7/DB35501Data.java | 14 ++++++------ .../fizz/business/domain/s7/DB35502Data.java | 22 +++++++++---------- .../service/strip/SegmentTrackerService.java | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/business/src/main/java/com/fizz/business/domain/s7/DB35501Data.java b/business/src/main/java/com/fizz/business/domain/s7/DB35501Data.java index e221651..4f3a6c9 100644 --- a/business/src/main/java/com/fizz/business/domain/s7/DB35501Data.java +++ b/business/src/main/java/com/fizz/business/domain/s7/DB35501Data.java @@ -1,6 +1,6 @@ package com.fizz.business.domain.s7; -import com.github.xingshuangs.iot.protocol.s7.enums.EDataType; +import com.github.xingshuangs.iot.common.enums.EDataType; import com.github.xingshuangs.iot.protocol.s7.serializer.S7Variable; import lombok.Data; @@ -9,22 +9,22 @@ public class DB35501Data { @S7Variable(address = "DB35501.0", type = EDataType.STRING, count = 20) private String coilId; - @S7Variable(address = "DB35501.30", type = EDataType.REAL) + @S7Variable(address = "DB35501.30", type = EDataType.FLOAT32) private float entryCoilWeight; - @S7Variable(address = "DB35501.34", type = EDataType.REAL) + @S7Variable(address = "DB35501.34", type = EDataType.FLOAT32) private float entryCoilLength; - @S7Variable(address = "DB35501.38", type = EDataType.REAL) + @S7Variable(address = "DB35501.38", type = EDataType.FLOAT32) private float entryCoilWidth; - @S7Variable(address = "DB35501.42", type = EDataType.REAL) + @S7Variable(address = "DB35501.42", type = EDataType.FLOAT32) private float entryCoilThick; - @S7Variable(address = "DB35501.46", type = EDataType.REAL) + @S7Variable(address = "DB35501.46", type = EDataType.FLOAT32) private float entryCoilInnerDia; - @S7Variable(address = "DB35501.50", type = EDataType.REAL) + @S7Variable(address = "DB35501.50", type = EDataType.FLOAT32) private float entryCoilOuterDia; @S7Variable(address = "DB35501.54", type = EDataType.BYTE) diff --git a/business/src/main/java/com/fizz/business/domain/s7/DB35502Data.java b/business/src/main/java/com/fizz/business/domain/s7/DB35502Data.java index f34cd53..b008e5e 100644 --- a/business/src/main/java/com/fizz/business/domain/s7/DB35502Data.java +++ b/business/src/main/java/com/fizz/business/domain/s7/DB35502Data.java @@ -1,39 +1,39 @@ package com.fizz.business.domain.s7; -import com.github.xingshuangs.iot.protocol.s7.enums.EDataType; +import com.github.xingshuangs.iot.common.enums.EDataType; import com.github.xingshuangs.iot.protocol.s7.serializer.S7Variable; import lombok.Data; @Data public class DB35502Data { - @S7Variable(address = "DB35502.114", type = EDataType.REAL) + @S7Variable(address = "DB35502.114", type = EDataType.FLOAT32) private float tensionPor1Next; - @S7Variable(address = "DB35502.122", type = EDataType.REAL) + @S7Variable(address = "DB35502.122", type = EDataType.FLOAT32) private float tensionPor2Next; - @S7Variable(address = "DB35502.130", type = EDataType.REAL) + @S7Variable(address = "DB35502.130", type = EDataType.FLOAT32) private float tensionEnLpNext; - @S7Variable(address = "DB35502.138", type = EDataType.REAL) + @S7Variable(address = "DB35502.138", type = EDataType.FLOAT32) private float tensionCleaningNext; - @S7Variable(address = "DB35502.162", type = EDataType.REAL) + @S7Variable(address = "DB35502.162", type = EDataType.FLOAT32) private float tensionGalvanizingCoolNext; - @S7Variable(address = "DB35502.266", type = EDataType.REAL) + @S7Variable(address = "DB35502.266", type = EDataType.FLOAT32) private float tensionExLpNext; - @S7Variable(address = "DB35502.232", type = EDataType.REAL) + @S7Variable(address = "DB35502.232", type = EDataType.FLOAT32) private float tensionTlNext; - @S7Variable(address = "DB35502.198", type = EDataType.REAL) + @S7Variable(address = "DB35502.198", type = EDataType.FLOAT32) private float tensionTmExitNext; - @S7Variable(address = "DB35502.146", type = EDataType.REAL) + @S7Variable(address = "DB35502.146", type = EDataType.FLOAT32) private float tensionFuranceNext; - @S7Variable(address = "DB35502.274", type = EDataType.REAL) + @S7Variable(address = "DB35502.274", type = EDataType.FLOAT32) private float tensionTrNext; } diff --git a/business/src/main/java/com/fizz/business/service/strip/SegmentTrackerService.java b/business/src/main/java/com/fizz/business/service/strip/SegmentTrackerService.java index 7f96812..a36b354 100644 --- a/business/src/main/java/com/fizz/business/service/strip/SegmentTrackerService.java +++ b/business/src/main/java/com/fizz/business/service/strip/SegmentTrackerService.java @@ -545,7 +545,7 @@ public class SegmentTrackerService { } catch (Exception e) { log.error("S7下发异常: {}", e.getMessage(), e); - logDataService.logError("MATMAP-TRACK", "ONLINE S7下发失败, coilId=" + coilId + ", err=" + e.getMessage()); + logDataService.logInfo("MATMAP-TRACK", "ONLINE S7下发失败, coilId=" + coilId + ", err=" + e.getMessage()); } }