Merge remote-tracking branch 'origin/master'

business/src/main/java/com/fizz/business/constants/enums/DeviceEnum.java

@@ -1,7 +1,5 @@
 package com.fizz.business.constants.enums;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -16,18 +14,20 @@ import java.util.*;
  */
 public enum DeviceEnum {
     POR1(0, "1#开卷机", 0.0, Arrays.asList("tensionPorBr1", "stripSpeed")),
-    POR2(1, "2#开卷机", 1.0, Arrays.asList("tensionPorBr2", "stripSpeed")),
-    WELDER(2, "焊机", 5.0, Arrays.asList("weldStatus")),
-    ENL1(3, "入口活套1", 10.0, Arrays.asList("celLength", "celCapacity", "tensionCel")),
-    ENL2(4, "入口活套2", 12.0, Arrays.asList("celLength", "celCapacity", "tensionCel")),
-    CLEAN(5, "清洗段", 20.0, Arrays.asList("cleaningVoltage", "cleaningCurrent", "alkaliConcentration", "alkaliTemperature")),
-    FUR1(6, "退火炉-预热段", 30.0, Arrays.asList("phfExitStripTemp","potTemperature","gasConsumption")),
-    FUR2(7, "退火炉-加热段", 40.0, Arrays.asList("rtfExitStripTemp","zincPotPower")),
-    FUR3(8, "退火炉-冷却段", 50.0, Arrays.asList("jcsExitStripTemp","coolingTowerStripTemp")),
-    FUR4(9, "退火炉-均衡段", 60.0, Arrays.asList("scsExitStripTemp")),
-    TM(10, "光整机", 70.0, Arrays.asList("tensionBr5Tm", "stripSpeedTmExit")),
-    TL(11, "拉矫机", 80.0, Arrays.asList("tlElongation", "tensionTlBr7")),
-    COAT(12, "后处理段", 90.0, Arrays.asList(
+    POR2(1, "2#开卷机", 0.0, Arrays.asList("tensionPorBr2", "stripSpeed")),
+    WELDER(2, "焊机", 16.433, Arrays.asList("weldStatus")),
+    ENL1(3, "入口活套1", 58.987, Arrays.asList("celLength", "celCapacity", "tensionCel")),
+    ENL2(4, "入口活套2", 118.518, Arrays.asList("celLength", "celCapacity", "tensionCel")),
+    CLEAN(5, "清洗段", 97.607, Arrays.asList("cleaningVoltage", "cleaningCurrent", "alkaliConcentration", "alkaliTemperature")),
+    FUR1(6, "退火炉-预热段", 63.013, Arrays.asList("phfExitStripTemp","potTemperature","gasConsumption")),
+    FUR2(7, "退火炉-加热段", 72.01, Arrays.asList("rtfExitStripTemp","zincPotPower")),
+    FUR3(8, "退火炉-冷却段", 30.71, Arrays.asList("jcsExitStripTemp","coolingTowerStripTemp")),
+    FUR4(9, "退火炉-均衡段", 14.607, Arrays.asList("scsExitStripTemp")),
+    POT(10, "锌锅", 10.373, Arrays.asList("scsExitStripTemp")),
+    TOWER(11, "后处理", 144.412, Arrays.asList("scsExitStripTemp")),
+    TM(11, "光整机", 26.527, Arrays.asList("tensionBr5Tm", "stripSpeedTmExit")),
+    TL(12, "拉矫机", 15.027, Arrays.asList("tlElongation", "tensionTlBr7")),
+    COAT(13, "后处理段", 145.5, Arrays.asList(
             "avrCoatingWeightTop","stdCoatingWeightTop","maxCoatingWeightTop","minCoatingWeightTop",
             "avrCoatingWeightBottom","stdCoatingWeightBottom","maxCoatingWeightBottom","minCoatingWeightBottom",
             "airKnifePressure","airKnifeFlow","airKnifeGap","stripSpeedTmExit","tensionBr5Tm",
@@ -36,12 +36,12 @@ public enum DeviceEnum {
             "tensionTlBr7","tensionBr6Br7","tlFlag","tlElongation","levelingUnit1Mesh","levelingUnit2Mesh",
             "antiCrossBowUnitMesh","tensionBr7Br8","stripSpeedAfp","stripTempAfp"
     )),
-    CXL1(13, "出口活套1", 100.0, Arrays.asList("cxlLength", "cxlCapacity", "tensionCxl")),
-    CXL2(14, "出口活套2", 102.0, Arrays.asList("cxlLength", "cxlCapacity", "tensionCxl")),
-    INS(15, "检查站", 110.0, Arrays.asList("inspectionStatus")),
-    TR(16, "卷取机", 120.0, Arrays.asList("coilLength", "speedExitSection", "tensionBr9Tr")),
-    EXC(17, "卸卷小车", 999999.0, Collections.emptyList()),
-    WEIGHT(18, "称重鞍座", 999999.0, Collections.emptyList());
+    CXL1(14, "出口活套1", 1, Arrays.asList("cxlLength", "cxlCapacity", "tensionCxl")),
+    CXL2(15, "出口活套2", 126.837, Arrays.asList("cxlLength", "cxlCapacity", "tensionCxl")),
+    INS(16, "检查站", 0, Arrays.asList("inspectionStatus")),
+    TR(17, "卷取机", 21.549, Arrays.asList("coilLength", "speedExitSection", "tensionBr9Tr")),
+    EXC(18, "卸卷小车", 999999.0, Collections.emptyList()),
+    WEIGHT(19, "称重鞍座", 999999.0, Collections.emptyList());
 
     private final int idx;
     private final String desc;