diff --git a/business/src/main/java/com/fizz/business/comm/OPC/MessageTestSchedule.java b/business/src/main/java/com/fizz/business/comm/OPC/MessageTestSchedule.java index 867ca88..d9319c8 100644 --- a/business/src/main/java/com/fizz/business/comm/OPC/MessageTestSchedule.java +++ b/business/src/main/java/com/fizz/business/comm/OPC/MessageTestSchedule.java @@ -61,12 +61,12 @@ public class MessageTestSchedule extends BaseSchedule { entryMsg.setTensionBr1Br2(BigDecimal.valueOf(rand.nextDouble()*100)); entryMsg.setTensionBr2Br3(BigDecimal.valueOf(rand.nextDouble()*100)); entryMsg.setStripSpeed(BigDecimal.valueOf(rand.nextDouble()*300)); - entryMsg.setTensionCel(BigDecimal.valueOf(rand.nextDouble()*100)); +// entryMsg.setTensionCel(BigDecimal.valueOf(rand.nextDouble()*100)); entryMsg.setCelLength(celLength); entryMsg.setCelCapacity(celLength.divide(maxCelLength)); AppMeasureFurnaceMessage furMsg = new AppMeasureFurnaceMessage(); - furMsg.setStripLocation(welderLength2); +// furMsg.setStripLocation(welderLength2); // furMsg.setStripSpeed(BigDecimal.valueOf(rand.nextDouble()*100)); AppMeasureCoatMessage coatMsg = new AppMeasureCoatMessage(); diff --git a/business/src/main/java/com/fizz/business/constants/enums/DeviceEnum.java b/business/src/main/java/com/fizz/business/constants/enums/DeviceEnum.java index fc952c4..1e564df 100644 --- a/business/src/main/java/com/fizz/business/constants/enums/DeviceEnum.java +++ b/business/src/main/java/com/fizz/business/constants/enums/DeviceEnum.java @@ -17,9 +17,9 @@ public enum DeviceEnum { POR1(0, "1#开卷机", 0.0, SectionType.ENTRY, SourceType.ENTRY, Arrays.asList("tensionPorBr1", "stripSpeed")), POR2(1, "2#开卷机", 0.0, SectionType.ENTRY, SourceType.ENTRY, Arrays.asList("tensionPorBr2", "stripSpeed")), WELDER(2, "焊机", 4.98, SectionType.ENTRY, SourceType.ENTRY, Arrays.asList("weldStatus")), - ENL1(3, "入口活套1", 19.04, SectionType.PROCESS, SourceType.ENTRY, Arrays.asList("celLength", "celCapacity", "tensionCel", "celLengthMax","celLengthMin", "bR4or5toBR6Tension")), - ENL2(4, "入口活套2", 167.09, SectionType.PROCESS, SourceType.ENTRY, Arrays.asList("celLength", "celCapacity", "tensionCel","celLengthMax","celLengthMin", "bR4or5toBR6Tension")), - ENL3(5, "入口活套3", 198.19, SectionType.PROCESS, SourceType.ENTRY, Arrays.asList("celLength", "celCapacity", "tensionCel","celLengthMax","celLengthMin", "bR4or5toBR6Tension")), + ENL1(3, "入口活套1", 19.04, SectionType.PROCESS, SourceType.ENTRY, Arrays.asList("celLength", "celCapacity", "tensionCel")), + ENL2(4, "入口活套2", 167.09, SectionType.PROCESS, SourceType.ENTRY, Arrays.asList("celLength", "celCapacity", "tensionCel")), + ENL3(5, "入口活套3", 198.19, SectionType.PROCESS, SourceType.ENTRY, Arrays.asList("celLength", "celCapacity", "tensionCel")), // === 工艺段 === CLEAN(6, "清洗段", 264.803, SectionType.PROCESS, SourceType.FURNACE, Arrays.asList("cleaningVoltage", "cleaningCurrent", "alkaliConcentration", "alkaliTemperature")), diff --git a/business/src/main/java/com/fizz/business/domain/msg/AppMeasureCoatMessage.java b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureCoatMessage.java index 452af2b..99f6d22 100644 --- a/business/src/main/java/com/fizz/business/domain/msg/AppMeasureCoatMessage.java +++ b/business/src/main/java/com/fizz/business/domain/msg/AppMeasureCoatMessage.java @@ -1,9 +1,9 @@ package com.fizz.business.domain.msg; +import com.fizz.business.domain.msg.OpcMessage; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; - import java.math.BigDecimal; @Data @@ -56,14 +56,14 @@ public class AppMeasureCoatMessage extends OpcMessage { @Schema(description = "TM出口钢带速度 (m/min)") private BigDecimal stripSpeedTmExit; - @Schema(description = "钢带张力 BR5 – TM (daN)") - private BigDecimal tensionBr5Tm; + @Schema(description = "钢带张力 BR8 – TM (daN)") + private BigDecimal tensionBr8Tm; - @Schema(description = "钢带张力 TM – BR6 (daN)") - private BigDecimal tensionTmBr6; + @Schema(description = "钢带张力 TM – BR9 (daN)") + private BigDecimal tensionTmBr9; - @Schema(description = "钢带张力 BR5 – BR6 (daN)") - private BigDecimal tensionBr5Br6; + @Schema(description = "钢带张力 BR8 – BR9 (daN)") + private BigDecimal tensionBr8Br9; @Schema(description = "TM mask (0x0001 tempering, 0x0002 type, 0x0004 pure water, 0x0008 water+detergent, 0x0010 control mode)") private Integer tmMask; @@ -98,11 +98,11 @@ public class AppMeasureCoatMessage extends OpcMessage { @Schema(description = "备用字段 3") private BigDecimal spare3; - @Schema(description = "钢带张力 TL – BR7 (calc., daN)") - private BigDecimal tensionTlBr7; + @Schema(description = "钢带张力 TL – BR10/BR11 (calc., daN)") + private BigDecimal tensionTlBr10Br11; - @Schema(description = "钢带张力 BR6 – BR7 (calc., daN)") - private BigDecimal tensionBr6Br7; + @Schema(description = "钢带张力 BR9 – BR10/BR11 (calc., daN)") + private BigDecimal tensionBr9toBr10Br11; @Schema(description = "拉矫机投用") private Integer tlFlag; @@ -119,8 +119,8 @@ public class AppMeasureCoatMessage extends OpcMessage { @Schema(description = "Anti Cross Bow Unit - 网距 (mm)") private BigDecimal antiCrossBowUnitMesh; - @Schema(description = "AFP段钢带张力 BR7 – BR8 (N/mm²)") - private BigDecimal tensionBr7Br8; + @Schema(description = "钢带张力 BR10/BR11 – BR12 (N/mm²)") + private BigDecimal tensionBr10Br11Br12; @Schema(description = "AFP段钢带速度 (m/min)") private BigDecimal stripSpeedAfp; @@ -131,8 +131,8 @@ public class AppMeasureCoatMessage extends OpcMessage { @Schema(description = "AFP段钢带温度 (℃)") private Integer stripTempAfp; - @Schema(description = "BR4BR5张力") - private BigDecimal tensionBr4Br5; + @Schema(description = "钢带张力 BR6 – BR7/BR8 (daN)") + private BigDecimal tensionBr6toBr7Br8; @Schema(description = "锌锅温度") private BigDecimal potTemperature; @@ -142,4 +142,4 @@ public class AppMeasureCoatMessage extends OpcMessage { @Schema(description = "锌锅功率") private BigDecimal potPower; -} +} \ No newline at end of file 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 1f5b8c3..c1606ab 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 @@ -1,6 +1,5 @@ package com.fizz.business.domain.msg; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -39,12 +38,15 @@ public class AppMeasureEntryMessage extends OpcMessage { @Schema(description = "入口活套位置(m)") private BigDecimal celLength; + @Schema(description = "入口活套最大长度(m)") + private BigDecimal celLengthMax; + + @Schema(description = "入口活套最小长度(m)") + private BigDecimal celLengthMin; + @Schema(description = "入口活套百分比(m)") private BigDecimal celCapacity; - @Schema(description = "入口活套张力(m)") - private BigDecimal tensionCel ; - @Schema(description = "清洗电压 (V)") private BigDecimal cleaningVoltage; @@ -71,4 +73,7 @@ public class AppMeasureEntryMessage extends OpcMessage { @Schema(description = "热风压力 (Pa)") private BigDecimal hotAirPressure; -} + + @Schema(description = "钢带张力 BR4/5 – BR6 (daN)") + private BigDecimal bR4or5toBR6Tension; +} \ No newline at end of file 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 202d9de..96becbf 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 @@ -1,6 +1,5 @@ package com.fizz.business.domain.msg; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -24,6 +23,12 @@ public class AppMeasureExitMessage extends OpcMessage { @Schema(description = "出口活套位置(m)") private BigDecimal cxlLength; + @Schema(description = "出口活套最大长度(m)") + private BigDecimal cxlLengthMax; + + @Schema(description = "出口活套最小长度(m)") + private BigDecimal cxlLengthMin; + @Schema(description = "出口活套百分比(m)") private BigDecimal cxlCapacity; @@ -47,5 +52,4 @@ public class AppMeasureExitMessage extends OpcMessage { @Schema(description = "钢卷长度 (m)") private BigDecimal coilLength; -} - +} \ No newline at end of file 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 c0630c3..2e807c1 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 @@ -1,6 +1,5 @@ package com.fizz.business.domain.msg; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,19 +14,19 @@ public class AppMeasureFurnaceMessage extends OpcMessage { @Schema(description = "系统计数器 (ms)") private BigDecimal systemCounter; - @Schema(description = "Entry coil identification") - private String entryCoilId; + @Schema(description = "入口钢卷标识") + private String EntryCoilIdentification; - @Schema(description = "Strip location (0 for strip head at reference point (weld detector 1))") - private BigDecimal stripLocation; + @Schema(description = "钢带位置 (0 表示钢带头部在参考点 (weld detector 1))") + private BigDecimal Striplocation; - @Schema(description = "PH炉温实际值") + @Schema(description = "PH炉温实际值 (℃)") private BigDecimal phFurnaceTemperatureActual; - @Schema(description = "NOF1炉温实际值") + @Schema(description = "NOF1炉温实际值 (℃)") private BigDecimal nof1FurnaceTemperatureActual; - @Schema(description = "NOF1炉温设定值") + @Schema(description = "NOF1炉温设定值 (℃)") private BigDecimal nof1FurnaceTemperatureSet; @Schema(description = "NOF1炉温控制输出值") @@ -52,15 +51,15 @@ public class AppMeasureFurnaceMessage extends OpcMessage { private BigDecimal nof1AirFlowControlOutput; @Schema(description = "NOF1空燃比实际值") - private BigDecimal nof1AirFuelRatioActual; + private BigDecimal nof1UtheisaKongCombustionRatioActualValue; @Schema(description = "NOF1空燃比设定值") - private BigDecimal nof1AirFuelRatioSet; + private BigDecimal nof1UtheisaKongCombustionRatioSettingValue; - @Schema(description = "NOF2炉温实际值") + @Schema(description = "NOF2炉温实际值 (℃)") private BigDecimal nof2FurnaceTemperatureActual; - @Schema(description = "NOF2炉温设定值") + @Schema(description = "NOF2炉温设定值 (℃)") private BigDecimal nof2FurnaceTemperatureSet; @Schema(description = "NOF2炉温控制输出值") @@ -85,15 +84,15 @@ public class AppMeasureFurnaceMessage extends OpcMessage { private BigDecimal nof2AirFlowControlOutput; @Schema(description = "NOF2空燃比实际值") - private BigDecimal nof2AirFuelRatioActual; + private BigDecimal nof2UtheisaKongCombustionRatioActualValue; @Schema(description = "NOF2空燃比设定值") - private BigDecimal nof2AirFuelRatioSet; + private BigDecimal nof2UtheisaKongCombustionRatioSettingValue; - @Schema(description = "NOF3炉温实际值") + @Schema(description = "NOF3炉温实际值 (℃)") private BigDecimal nof3FurnaceTemperatureActual; - @Schema(description = "NOF3炉温设定值") + @Schema(description = "NOF3炉温设定值 (℃)") private BigDecimal nof3FurnaceTemperatureSet; @Schema(description = "NOF3炉温控制输出值") @@ -118,15 +117,15 @@ public class AppMeasureFurnaceMessage extends OpcMessage { private BigDecimal nof3AirFlowControlOutput; @Schema(description = "NOF3空燃比实际值") - private BigDecimal nof3AirFuelRatioActual; + private BigDecimal nof3UtheisaKongCombustionRatioActualValue; @Schema(description = "NOF3空燃比设定值") - private BigDecimal nof3AirFuelRatioSet; + private BigDecimal nof3UtheisaKongCombustionRatioSettingValue; - @Schema(description = "NOF4炉温实际值") + @Schema(description = "NOF4炉温实际值 (℃)") private BigDecimal nof4FurnaceTemperatureActual; - @Schema(description = "NOF4炉温设定值") + @Schema(description = "NOF4炉温设定值 (℃)") private BigDecimal nof4FurnaceTemperatureSet; @Schema(description = "NOF4炉温控制输出值") @@ -151,48 +150,15 @@ public class AppMeasureFurnaceMessage extends OpcMessage { private BigDecimal nof4AirFlowControlOutput; @Schema(description = "NOF4空燃比实际值") - private BigDecimal nof4AirFuelRatioActual; + private BigDecimal nof4UtheisaKongCombustionRatioActualValue; @Schema(description = "NOF4空燃比设定值") - private BigDecimal nof4AirFuelRatioSet; + private BigDecimal nof4UtheisaKongCombustionRatioSettingValue; - @Schema(description = "NOF5炉温实际值") - private BigDecimal nof5FurnaceTemperatureActual; - - @Schema(description = "NOF5炉温设定值") - private BigDecimal nof5FurnaceTemperatureSet; - - @Schema(description = "NOF5炉温控制输出值") - private BigDecimal nof5FurnaceTemperatureControlOutput; - - @Schema(description = "NOF5燃气流量实际值") - private BigDecimal nof5GasFlowActual; - - @Schema(description = "NOF5燃气流量设定值") - private BigDecimal nof5GasFlowSet; - - @Schema(description = "NOF5燃气流量控制输出值") - private BigDecimal nof5GasFlowControlOutput; - - @Schema(description = "NOF5空气流量实际值") - private BigDecimal nof5AirFlowActual; - - @Schema(description = "NOF5空气流量设定值") - private BigDecimal nof5AirFlowSet; - - @Schema(description = "NOF5空气流量控制输出值") - private BigDecimal nof5AirFlowControlOutput; - - @Schema(description = "NOF5空燃比实际值") - private BigDecimal nof5AirFuelRatioActual; - - @Schema(description = "NOF5空燃比设定值") - private BigDecimal nof5AirFuelRatioSet; - - @Schema(description = "RTF1炉温实际值") + @Schema(description = "RTF1炉温实际值 (℃)") private BigDecimal rtf1FurnaceTemperatureActual; - @Schema(description = "RTF1炉温设定值") + @Schema(description = "RTF1炉温设定值 (℃)") private BigDecimal rtf1FurnaceTemperatureSet; @Schema(description = "RTF1炉温控制输出值") @@ -217,15 +183,15 @@ public class AppMeasureFurnaceMessage extends OpcMessage { private BigDecimal rtf1AirFlowControlOutput; @Schema(description = "RTF1空燃比实际值") - private BigDecimal rtf1AirFuelRatioActual; + private BigDecimal rtf1UtheisaKongCombustionRatioActualValue; @Schema(description = "RTF1空燃比设定值") - private BigDecimal rtf1AirFuelRatioSet; + private BigDecimal rtf1UtheisaKongCombustionRatioSettingValue; - @Schema(description = "RTF2炉温实际值") + @Schema(description = "RTF2炉温实际值 (℃)") private BigDecimal rtf2FurnaceTemperatureActual; - @Schema(description = "RTF2炉温设定值") + @Schema(description = "RTF2炉温设定值 (℃)") private BigDecimal rtf2FurnaceTemperatureSet; @Schema(description = "RTF2炉温控制输出值") @@ -250,15 +216,15 @@ public class AppMeasureFurnaceMessage extends OpcMessage { private BigDecimal rtf2AirFlowControlOutput; @Schema(description = "RTF2空燃比实际值") - private BigDecimal rtf2AirFuelRatioActual; + private BigDecimal rtf2UtheisaKongCombustionRatioActualValue; @Schema(description = "RTF2空燃比设定值") - private BigDecimal rtf2AirFuelRatioSet; + private BigDecimal rtf2UtheisaKongCombustionRatioSettingValue; - @Schema(description = "SF炉温实际值") + @Schema(description = "SF炉温实际值 (℃)") private BigDecimal sfFurnaceTemperatureActual; - @Schema(description = "SF炉温设定值") + @Schema(description = "SF炉温设定值 (℃)") private BigDecimal sfFurnaceTemperatureSet; @Schema(description = "SF炉温控制输出值") @@ -283,31 +249,31 @@ public class AppMeasureFurnaceMessage extends OpcMessage { private BigDecimal sfAirFlowControlOutput; @Schema(description = "SF空燃比实际值") - private BigDecimal sfAirFuelRatioActual; + private BigDecimal sfUtheisaKongCombustionRatioActualValue; @Schema(description = "SF空燃比设定值") - private BigDecimal sfAirFuelRatioSet; + private BigDecimal sfUtheisaKongCombustionRatioSettingValue; - @Schema(description = "NOF板温实际值") + @Schema(description = "NOF板材温度实际值 (℃)") private BigDecimal nofPlateTemperatureActual; - @Schema(description = "RTF板温实际值") + @Schema(description = "RTF板材温度实际值 (℃)") private BigDecimal rtfPlateTemperatureActual; - @Schema(description = "SF板温实际值") + @Schema(description = "SF板材温度实际值 (℃)") private BigDecimal sfPlateTemperatureActual; - @Schema(description = "TDS板温实际值") + @Schema(description = "TDS板材温度实际值 (℃)") private BigDecimal tdsPlateTemperatureActual; @Schema(description = "PH炉压实际值") - private BigDecimal phFurnacePressureActual; + private BigDecimal PHFurnacePressureActualValue; @Schema(description = "PH炉压设定值") - private BigDecimal phFurnacePressureSet; + private BigDecimal PHFurnacePressureSettingValue; @Schema(description = "PH炉压控制输出值") - private BigDecimal phFurnacePressureControlOutput; + private BigDecimal PHFurnacePressureControlOutputValue; @Schema(description = "NOF炉压实际值") private BigDecimal nofFurnacePressureActual; @@ -318,220 +284,202 @@ public class AppMeasureFurnaceMessage extends OpcMessage { @Schema(description = "TDS炉压实际值") private BigDecimal tdsFurnacePressureActual; - @Schema(description = "JCF1炉温实际值") + @Schema(description = "JCF1炉温实际值 (℃)") private BigDecimal jcf1FurnaceTemperatureActual; - @Schema(description = "JCF1炉温设定值") + @Schema(description = "JCF1炉温设定值 (℃)") private BigDecimal jcf1FurnaceTemperatureSet; @Schema(description = "JCF1炉温控制输出值") private BigDecimal jcf1FurnaceTemperatureControlOutput; - @Schema(description = "JCF1 A相电流") + @Schema(description = "JCF1 A相电流 (A)") private BigDecimal jcf1PhaseACurrent; - @Schema(description = "JCF1 B相电流") + @Schema(description = "JCF1 B相电流 (A)") private BigDecimal jcf1PhaseBCurrent; - @Schema(description = "JCF1 C相电流") + @Schema(description = "JCF1 C相电流 (A)") private BigDecimal jcf1PhaseCCurrent; - @Schema(description = "JCF2炉温实际值") - private BigDecimal jcf2FurnaceTemperatureActual; - - @Schema(description = "JCF2炉温设定值") - private BigDecimal jcf2FurnaceTemperatureSet; - - @Schema(description = "JCF2炉温控制输出值") - private BigDecimal jcf2FurnaceTemperatureControlOutput; - - @Schema(description = "JCF2 A相电流") - private BigDecimal jcf2PhaseACurrent; - - @Schema(description = "JCF2 B相电流") - private BigDecimal jcf2PhaseBCurrent; - - @Schema(description = "JCF2 C相电流") - private BigDecimal jcf2PhaseCCurrent; - - @Schema(description = "LTH炉温实际值") + @Schema(description = "LTH1炉温实际值 (℃)") private BigDecimal lthFurnaceTemperatureActual; - @Schema(description = "LTH炉温设定值") + @Schema(description = "LTH1炉温设定值 (℃)") private BigDecimal lthFurnaceTemperatureSet; - @Schema(description = "LTH炉温控制输出值") + @Schema(description = "LTH1炉温控制输出值") private BigDecimal lthFurnaceTemperatureControlOutput; - @Schema(description = "LTH A相电流") + @Schema(description = "LTH1 A相电流 (A)") private BigDecimal lthPhaseACurrent; - @Schema(description = "LTH B相电流") + @Schema(description = "LTH1 B相电流 (A)") private BigDecimal lthPhaseBCurrent; - @Schema(description = "LTH C相电流") + @Schema(description = "LTH1 C相电流 (A)") private BigDecimal lthPhaseCCurrent; - @Schema(description = "TDS炉温实际值") + @Schema(description = "LTH2炉温实际值 (℃)") + private BigDecimal LTH2FurnaceTemperatureActualValue; + + @Schema(description = "LTH2炉温设定值 (℃)") + private BigDecimal LTH2FurnaceTemperatureSettingValue; + + @Schema(description = "LTH2炉温控制输出值") + private BigDecimal LTH2FurnaceTemperatureControlOutputValue; + + @Schema(description = "LTH2 A相电流 (A)") + private BigDecimal lth2PhaseACurrent; + + @Schema(description = "LTH2 B相电流 (A)") + private BigDecimal lth2PhaseBCurrent; + + @Schema(description = "LTH2 C相电流 (A)") + private BigDecimal lth2PhaseCCurrent; + + @Schema(description = "TDS炉温实际值 (℃)") private BigDecimal tdsFurnaceTemperatureActual; - @Schema(description = "TDS炉温设定值") + @Schema(description = "TDS炉温设定值 (℃)") private BigDecimal tdsFurnaceTemperatureSet; @Schema(description = "TDS炉温控制输出值") private BigDecimal tdsFurnaceTemperatureControlOutput; - @Schema(description = "TDS A相电流") + @Schema(description = "TDS A相电流 (A)") private BigDecimal tdsPhaseACurrent; - @Schema(description = "TDS B相电流") + @Schema(description = "TDS B相电流 (A)") private BigDecimal tdsPhaseBCurrent; - @Schema(description = "TDS C相电流") + @Schema(description = "TDS C相电流 (A)") private BigDecimal tdsPhaseCCurrent; - @Schema(description = "LBZ炉温实际值") + @Schema(description = "LBZ炉温实际值 (℃)") private BigDecimal lbzFurnaceTemperatureActual; - @Schema(description = "LBZ炉温设定值") + @Schema(description = "LBZ炉温设定值 (℃)") private BigDecimal lbzFurnaceTemperatureSet; @Schema(description = "LBZ炉温控制输出值") private BigDecimal lbzFurnaceTemperatureControlOutput; - @Schema(description = "LBZ A相电流") + @Schema(description = "LBZ A相电流 (A)") private BigDecimal lbzPhaseACurrent; - @Schema(description = "LBZ B相电流") + @Schema(description = "LBZ B相电流 (A)") private BigDecimal lbzPhaseBCurrent; - @Schema(description = "LBZ C相电流") + @Schema(description = "LBZ C相电流 (A)") private BigDecimal lbzPhaseCCurrent; - @Schema(description = "JCF风机1实际速度") + @Schema(description = "JCF风机1实际速度 (rpm)") private BigDecimal jcfFan1ActualSpeed; - @Schema(description = "JCF风机1设定速度") + @Schema(description = "JCF风机1设定速度 (rpm)") private BigDecimal jcfFan1SetSpeed; - @Schema(description = "JCF风机2实际速度") + @Schema(description = "JCF风机2实际速度 (rpm)") private BigDecimal jcfFan2ActualSpeed; - @Schema(description = "JCF风机2设定速度") + @Schema(description = "JCF风机2设定速度 (rpm)") private BigDecimal jcfFan2SetSpeed; - @Schema(description = "JCF风机3实际速度") + @Schema(description = "JCF风机3实际速度 (rpm)") private BigDecimal jcfFan3ActualSpeed; - @Schema(description = "JCF风机3设定速度") + @Schema(description = "JCF风机3设定速度 (rpm)") private BigDecimal jcfFan3SetSpeed; - @Schema(description = "JCF风机4实际速度") + @Schema(description = "JCF风机4实际速度 (rpm)") private BigDecimal jcfFan4ActualSpeed; - @Schema(description = "JCF风机4设定速度") + @Schema(description = "JCF风机4设定速度 (rpm)") private BigDecimal jcfFan4SetSpeed; - @Schema(description = "JCF风机5实际速度") - private BigDecimal jcfFan5ActualSpeed; + @Schema(description = "NOF空预热器烟气换热前温度 (℃)") + private BigDecimal NOFUtetheisaKongFlueGasTemperatureBeforeHeatExchange; - @Schema(description = "JCF风机5设定速度") - private BigDecimal jcfFan5SetSpeed; + @Schema(description = "NOF空预热器烟气换热后温度 (℃)") + private BigDecimal NOFUtetheisaKongFlueGasTemperatureAfterHeatExchange; - @Schema(description = "JCF风机6实际速度") - private BigDecimal jcfFan6ActualSpeed; + @Schema(description = "NOF水预热器烟气换热前温度 (℃)") + private BigDecimal NOFWaterFlueGasTemperatureBeforeHeatExchange; - @Schema(description = "JCF风机6设定速度") - private BigDecimal jcfFan6SetSpeed; + @Schema(description = "NOF水预热器烟气换热后温度 (℃)") + private BigDecimal NOFWaterFlueGasTemperatureAfterHeatExchange; - @Schema(description = "JCF风机7实际速度") - private BigDecimal jcfFan7ActualSpeed; + @Schema(description = "NOF助燃空气温度 (℃)") + private BigDecimal NOFCombustionSupportingAirTemperature; - @Schema(description = "JCF风机7设定速度") - private BigDecimal jcfFan7SetSpeed; + @Schema(description = "RTF热风烟气换热前温度 (℃)") + private BigDecimal RTFHotWindGasTemperatureBeforeHeatExchange; - @Schema(description = "NOF空气换热前烟气温度") - private BigDecimal nofAirPreheatFlueGasTemperature; + @Schema(description = "RTF排烟风机入口烟气温度 (℃)") + private BigDecimal RTFSmokeExhaustFanInletGasTemperature; - @Schema(description = "NOF空气换热后烟气温度") - private BigDecimal nofAirPostheatFlueGasTemperature; - - @Schema(description = "NOF水换热后烟气温度") - private BigDecimal nofWaterPostheatFlueGasTemperature; - - @Schema(description = "NOF排烟风机前烟气温度") - private BigDecimal nofExhaustFanInletFlueGasTemperature; - - @Schema(description = "NOF助燃空气温度") - private BigDecimal nofCombustionAirTemperature; - - @Schema(description = "RTF热风换热前烟气温度") - private BigDecimal rtfAirPreheatFlueGasTemperature; - - @Schema(description = "RTF排烟风机前烟气温度") - private BigDecimal rtfExhaustFanInletFlueGasTemperature; - - @Schema(description = "NOF燃气压力") + @Schema(description = "NOF燃气压力 (Pa)") private BigDecimal nofGasPressure; - @Schema(description = "点火燃气压力") + @Schema(description = "点火燃气压力 (Pa)") private BigDecimal ignitionGasPressure; - @Schema(description = "点火空气压力") - private BigDecimal ignitionAirPressure; + @Schema(description = "NOF空气压力 (Pa)") + private BigDecimal nofAirPressure; - @Schema(description = "RTF燃气压力") + @Schema(description = "RTF燃气压力 (Pa)") private BigDecimal rtfGasPressure; - @Schema(description = "NOF空气压力实际值") + @Schema(description = "NOF空气压力实际值 (Pa)") private BigDecimal nofAirPressureActual; - @Schema(description = "NOF空气压力设定值") + @Schema(description = "NOF空气压力设定值 (Pa)") private BigDecimal nofAirPressureSet; @Schema(description = "NOF空气压力控制输出值") private BigDecimal nofAirPressureControlOutput; - @Schema(description = "NOF烟气压力实际值") - private BigDecimal nofFlueGasPressureActual; + @Schema(description = "NOF烟气压力实际值 (Pa)") + private BigDecimal nofGasPressureActual; - @Schema(description = "NOF烟气压力设定值") - private BigDecimal nofFlueGasPressureSet; + @Schema(description = "NOF烟气压力设定值 (Pa)") + private BigDecimal nofGasPressureSet; @Schema(description = "NOF烟气压力控制输出值") - private BigDecimal nofFlueGasPressureControlOutput; + private BigDecimal nofGasPressureControlOutput; - @Schema(description = "RTF空气压力实际值") + + @Schema(description = "RTF空气压力实际值 (Pa)") private BigDecimal rtfAirPressureActual; - @Schema(description = "RTF空气压力设定值") + @Schema(description = "RTF空气压力设定值 (Pa)") private BigDecimal rtfAirPressureSet; @Schema(description = "RTF空气压力控制输出值") private BigDecimal rtfAirPressureControlOutput; - @Schema(description = "RTF烟气压力实际值") - private BigDecimal rtfFlueGasPressureActual; + @Schema(description = "RTF烟气压力实际值 (Pa)") + private BigDecimal rtfGasPressureActual; - @Schema(description = "RTF烟气压力设定值") - private BigDecimal rtfFlueGasPressureSet; + @Schema(description = "RTF烟气压力设定值 (Pa)") + private BigDecimal rtfGasPressureSet; @Schema(description = "RTF烟气压力控制输出值") - private BigDecimal rtfFlueGasPressureControlOutput; + private BigDecimal rtfGasPressureControlOutput; - @Schema(description = "炉气氛微氧含量") + @Schema(description = "炉气氛微氧含量 (%)") private BigDecimal furnaceAtmosphereOxygenContent; - @Schema(description = "炉气氛氢含量") + @Schema(description = "炉气氛氢含量 (%)") private BigDecimal furnaceAtmosphereHydrogenContent; - @Schema(description = "炉气氛露点温度") + @Schema(description = "炉气氛露点温度 (℃)") private BigDecimal furnaceAtmosphereDewPoint; @Schema(description = "燃气瞬时流量") - private BigDecimal gasInstantaneousFlow; + private BigDecimal InstantaneousGasFlowRate; @Schema(description = "燃气瞬时耗量") - private BigDecimal gasInstantaneousConsumption; - + private BigDecimal InstantaneousGasConsumption; } \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/domain/msg/L2HeartMessage.java b/business/src/main/java/com/fizz/business/domain/msg/L2HeartMessage.java new file mode 100644 index 0000000..73ebe29 --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/msg/L2HeartMessage.java @@ -0,0 +1,13 @@ +package com.fizz.business.domain.msg; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@Data +@EqualsAndHashCode(callSuper = true) +@Schema(description = "出口移动电文") +public class L2HeartMessage extends OpcMessage{ + @Schema(description = "计数器") + private Integer counter; +} diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 121cbbc..5588678 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口,默认为8080 - port: 8081 + port: 8080 forward-headers-strategy: framework servlet: # 应用的访问路径