From 5dd24f9b8880457785a13f142edc73eab947a47b Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 30 Dec 2025 13:44:50 +0800 Subject: [PATCH] =?UTF-8?q?refactor(message):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 AppMeasureEntryMessage 中的 payOffReelNumber 重命名为 PORFlag - 将 AppMeasureEntryMessage 中的 tensionPorBr1 重命名为 PORTension - 将 AppMeasureEntryMessage 中的 tensionBr1Br2 重命名为 BR1Tension - 将 AppMeasureEntryMessage 中的 tensionBr2Br3 重命名为 BR2Tension - 将 AppMeasureEntryMessage 中的 celCapacity 重命名为 celPercent - 将 AppMeasureExitMessage 中的 cxlCapacity 重命名为 cxlPercent - 将 AppMeasureFurnaceMessage 中的 plate temperature 字段重命名为 board temperature - 更新 OpcMessageIdsManager 中对应的字段映射关系 --- .../domain/msg/AppMeasureEntryMessage.java | 10 +++++----- .../domain/msg/AppMeasureExitMessage.java | 2 +- .../domain/msg/AppMeasureFurnaceMessage.java | 8 ++++---- .../service/manager/OpcMessageIdsManager.java | 20 +++++++++---------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/business/src/main/java/com/fizz/business/domain/msg/AppMeasureEntryMessage.java b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureEntryMessage.java index c1606ab..d822bf8 100644 --- a/business/src/main/java/com/fizz/business/domain/msg/AppMeasureEntryMessage.java +++ b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureEntryMessage.java @@ -21,16 +21,16 @@ public class AppMeasureEntryMessage extends OpcMessage { private BigDecimal stripLocation; @Schema(description = "开卷机号，1 或 2") - private Integer payOffReelNumber; + private Integer PORFlag; @Schema(description = "钢带张力 POR – BR1 (daN)") - private BigDecimal tensionPorBr1; + private BigDecimal PORTension; @Schema(description = "钢带张力 BR1 – BR2 (daN)") - private BigDecimal tensionBr1Br2; + private BigDecimal BR1Tension; @Schema(description = "钢带张力 BR2 – BR3 (daN)") - private BigDecimal tensionBr2Br3; + private BigDecimal BR2Tension; @Schema(description = "钢带速度 (m/min)") private BigDecimal stripSpeed; @@ -45,7 +45,7 @@ public class AppMeasureEntryMessage extends OpcMessage { private BigDecimal celLengthMin; @Schema(description = "入口活套百分比(m)") - private BigDecimal celCapacity; + private BigDecimal celPercent; @Schema(description = "清洗电压 (V)") private BigDecimal cleaningVoltage; diff --git a/business/src/main/java/com/fizz/business/domain/msg/AppMeasureExitMessage.java b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureExitMessage.java index 96becbf..8059b48 100644 --- a/business/src/main/java/com/fizz/business/domain/msg/AppMeasureExitMessage.java +++ b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureExitMessage.java @@ -30,7 +30,7 @@ public class AppMeasureExitMessage extends OpcMessage { private BigDecimal cxlLengthMin; @Schema(description = "出口活套百分比(m)") - private BigDecimal cxlCapacity; + private BigDecimal cxlPercent; @Schema(description = "出口活套张力(m)") private BigDecimal tensionCxl ; diff --git a/business/src/main/java/com/fizz/business/domain/msg/AppMeasureFurnaceMessage.java b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureFurnaceMessage.java index 2e807c1..d2668dc 100644 --- a/business/src/main/java/com/fizz/business/domain/msg/AppMeasureFurnaceMessage.java +++ b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureFurnaceMessage.java @@ -255,16 +255,16 @@ public class AppMeasureFurnaceMessage extends OpcMessage { private BigDecimal sfUtheisaKongCombustionRatioSettingValue; @Schema(description = "NOF板材温度实际值 (℃)") - private BigDecimal nofPlateTemperatureActual; + private BigDecimal nofBoardTemperatureActual; @Schema(description = "RTF板材温度实际值 (℃)") - private BigDecimal rtfPlateTemperatureActual; + private BigDecimal rtfBoardTemperatureActual; @Schema(description = "SF板材温度实际值 (℃)") - private BigDecimal sfPlateTemperatureActual; + private BigDecimal sfBoardTemperatureActual; @Schema(description = "TDS板材温度实际值 (℃)") - private BigDecimal tdsPlateTemperatureActual; + private BigDecimal tdsBoardTemperatureActual; @Schema(description = "PH炉压实际值") private BigDecimal PHFurnacePressureActualValue; diff --git a/business/src/main/java/com/fizz/business/service/manager/OpcMessageIdsManager.java b/business/src/main/java/com/fizz/business/service/manager/OpcMessageIdsManager.java index 029a9b2..7b4113a 100644 --- a/business/src/main/java/com/fizz/business/service/manager/OpcMessageIdsManager.java +++ b/business/src/main/java/com/fizz/business/service/manager/OpcMessageIdsManager.java @@ -86,15 +86,15 @@ public class OpcMessageIdsManager { entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.coilID","entryCoilId"); entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.stripLocation","stripLocation"); - entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.PORFlag","payOffReelNumber"); - entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.PORTension","tensionPorBr1"); - entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.BR1Tension","tensionBr1Br2"); - entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.BR2Tension","tensionBr2Br3"); + entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.PORFlag","PORFlag"); + entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.PORTension","PORTension"); + entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.BR1Tension","BR1Tension"); + entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.BR2Tension","BR2Tension"); entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.StripSpeed","stripSpeed"); entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.celLength","celLength"); entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.celLengthMax","celLengthMax"); entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.celLengthMin","celLengthMin"); - entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.celPercent","celCapacity"); + entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.celPercent","celPercent"); // entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.weight","tensionCel"); entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.cleaningVoltage","cleaningVoltage"); entryLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.EntryLineMeasure.cleaningCurrent","cleaningCurrent"); @@ -254,10 +254,10 @@ public class OpcMessageIdsManager { furLineMeasureIds.put("ns=2;s=ProcessCGL.PLCFur.FurLineMeasure.SFUtheisaKongCombustionRatioSettingValue", "sfUtheisaKongCombustionRatioSettingValue"); // ===================== 板材温度相关 ===================== - furLineMeasureIds.put("ns=2;s=ProcessCGL.PLCFur.FurLineMeasure.NOFBoardTemperatureActualValue", "nofPlateTemperatureActual"); - furLineMeasureIds.put("ns=2;s=ProcessCGL.PLCFur.FurLineMeasure.RTFBoardTemperatureActualValue", "rtfPlateTemperatureActual"); - furLineMeasureIds.put("ns=2;s=ProcessCGL.PLCFur.FurLineMeasure.SFBoardTemperatureActualValue", "sfPlateTemperatureActual"); - furLineMeasureIds.put("ns=2;s=ProcessCGL.PLCFur.FurLineMeasure.TDSBoardTemperatureActualValue", "tdsPlateTemperatureActual"); + furLineMeasureIds.put("ns=2;s=ProcessCGL.PLCFur.FurLineMeasure.NOFBoardTemperatureActualValue", "nofBoardTemperatureActual"); + furLineMeasureIds.put("ns=2;s=ProcessCGL.PLCFur.FurLineMeasure.RTFBoardTemperatureActualValue", "rtfBoardTemperatureActual"); + furLineMeasureIds.put("ns=2;s=ProcessCGL.PLCFur.FurLineMeasure.SFBoardTemperatureActualValue", "sfBoardTemperatureActual"); + furLineMeasureIds.put("ns=2;s=ProcessCGL.PLCFur.FurLineMeasure.TDSBoardTemperatureActualValue", "tdsBoardTemperatureActual"); furLineMeasureIds.put("ns=2;s=ProcessCGL.PLCFur.FurLineMeasure.PHFurnacePressureActualValue", "PHFurnacePressureActualValue"); furLineMeasureIds.put("ns=2;s=ProcessCGL.PLCFur.FurLineMeasure.PHFurnacePressureSettingValue", "PHFurnacePressureSettingValue"); furLineMeasureIds.put("ns=2;s=ProcessCGL.PLCFur.FurLineMeasure.PHFurnacePressureControlOutputValue", "PHFurnacePressureControlOutputValue"); @@ -366,7 +366,7 @@ public class OpcMessageIdsManager { exitLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.ExitLineMeasure.cxlLength", "cxlLength"); exitLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.ExitLineMeasure.cxlLengthMax", "cxlLengthMax"); exitLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.ExitLineMeasure.cxlLengthMin", "cxlLengthMin"); - exitLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.ExitLineMeasure.cxlPercent", "cxlCapacity"); + exitLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.ExitLineMeasure.cxlPercent", "cxlPercent"); // exitLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.ExitLineMeasure.tensionCxl", "tensionCxl"); exitLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.ExitLineMeasure.oilingFlag", "oilingFlag"); exitLineMeasureIds.put("ns=2;s=ProcessCGL.PLCLine.ExitLineMeasure.oilingAmountTop", "oilingAmountTop");