wangxiaofei vor 3 Wochen
Ursprung
Commit
a6a3c72833

+ 7 - 5
taphole-iron/src/main/java/com/sckj/iron/constant/ExceptionTypeEnum.java

@@ -3,23 +3,25 @@ package com.sckj.iron.constant;
 public enum ExceptionTypeEnum {
     // 枚举项:数据名称("数据值")
     KAI_KOU_CHAO_SHI("开口超时", "001001"),
+    KAI_KOU_HAO_SHI_GUO_DUAN("开口耗时过短", "001002"),
     TIE_SHUI_WEN_DU_GUO_DI("铁水温度过低", "005002"),
     TIE_SHUI_WEN_DU_GUO_GAO("铁水温度过高", "005001"),
-    JI_XU_KAI_KOU("急需开口", "006"),
-    JI_XU_DU_KOU("急需堵口", "007"),
-    JI_XU_CHU_TIE("急需出铁", "008"),
+
     TIE_SHUI_LIU_SU_GUO_MAN("铁水流速过慢", "004002"),
     TIE_SHUI_LIU_SU_GUO_KUAI("铁水流速过快", "004001"),
     CHU_TIE_LIANG_TAI_SHAO("出铁量过少", "003002"),
     CHU_TIE_LIANG_TAI_DUO("出铁量过多", "003001"),
     CHU_TIE_SHI_JIAN_TAI_DUAN("出铁时间过短", "002002"),
     CHU_TIE_SHI_JIAN_TAI_CHANG("出铁时间过长", "002001"),
-    KAI_KOU_HAO_SHI_GUO_DUAN("开口耗时过短", "001002"),
+
+    JI_XU_KAI_KOU("急需开口", "006"),
+    JI_XU_DU_KOU("急需堵口", "007"),
+    JI_XU_CHU_TIE("急需出铁", "008"),
     TIE_SHUI_WEN_DU("铁水温度", "005"),
     TIE_SHUI_LIU_SU("铁水流速", "004"),
     CHU_TIE_LIANG("出铁量", "003"),
     CHU_TIE_SHI_JIAN("出铁时间", "002"),
-    KAI_KOU_FAN_YING("开口反应", "001");
+    KAI_KOU_FAN_YING("开口时间", "001");
 
     private final String name;
     private final String code;

+ 0 - 9
taphole-iron/src/main/java/com/sckj/iron/constant/ExpressionConstants.java

@@ -38,15 +38,6 @@ public class ExpressionConstants {
 
 
     //实时数据
-
-    //4号铁口状态
-    public static final String rtIronState1 = "rtIronState1";
-    //4号铁口状态
-    public static final String rtIronState2 = "rtIronState2";
-    //4号铁口状态
-    public static final String rtIronState3 = "rtIronState3";
-    //4号铁口状态
-    public static final String rtIronState4 = "rtIronState4";
     //出铁速度
     public static final String rtIronSpeed = "rtIronSpeed";
     //出铁重量

+ 2 - 2
taphole-iron/src/main/java/com/sckj/iron/service/impl/TIronVisualScreenServiceImpl.java

@@ -531,8 +531,8 @@ public class TIronVisualScreenServiceImpl {
     private java.util.List<java.util.List<Object>> buildL2MinuteArray(java.util.List<IronTrendL2DTO> list, java.util.List<String> xAxis, Map<String, Integer> tappingMap, String field, Object preValue) {
         java.util.Map<String, Object> timeValueMap = new java.util.LinkedHashMap<>();
         for (IronTrendL2DTO e : list) {
-            String startMin = TimeUtils.formatPartialDateStringMin(e.getIronStarttime());
-            String endMin = TimeUtils.formatPartialDateStringMin(e.getIronEndtime());
+            String startMin = e.getIronStarttime();
+            String endMin = e.getIronEndtime();
             if (startMin != null && endMin != null) {
                 Object v = null;
                 switch (field) {

Datei-Diff unterdrückt, da er zu groß ist
+ 458 - 278
taphole-iron/src/main/java/com/sckj/iron/socketio/DeviceEventListener.java


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.