L2代码优化

taphole-common/src/main/java/com/sckj/common/validate/commons/LongIdValidate.java

@@ -1,6 +1,6 @@
 package com.sckj.common.validate.commons;
 
-import com.sckj.common.validator.annotation.IDMust;
+import com.sckj.common.validator.annotation.LongIDMust;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,7 +13,7 @@ public class LongIdValidate implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @IDMust(message = "id参数必传且需大于0")
+    @LongIDMust(message = "id参数必传且需大于0")
     @ApiModelProperty(value = "ID", required = true)
     private Long id;
 

taphole-common/src/main/java/com/sckj/common/validator/LongIDMustValidator.java

@@ -0,0 +1,23 @@
+package com.sckj.common.validator;
+
+import com.sckj.common.validator.annotation.LongIDMust;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+/**
+ * 验证主键ID参数
+ */
+public class LongIDMustValidator implements ConstraintValidator<LongIDMust, Long> {
+
+    @Override
+    public void initialize(LongIDMust constraintAnnotation) {
+        ConstraintValidator.super.initialize(constraintAnnotation);
+    }
+
+    @Override
+    public boolean isValid(Long value, ConstraintValidatorContext constraintValidatorContext) {
+        return value != null && value > 0;
+    }
+
+}

taphole-common/src/main/java/com/sckj/common/validator/annotation/LongIDMust.java

@@ -0,0 +1,21 @@
+package com.sckj.common.validator.annotation;
+
+import com.sckj.common.validator.LongIDMustValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.*;
+
+@Documented
+@Constraint(validatedBy = LongIDMustValidator.class)
+@Target({ ElementType.PARAMETER,ElementType.FIELD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LongIDMust {
+
+    String message() default "id参数必须存在且大于0";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default { };
+
+}

taphole-iron/src/main/java/com/sckj/iron/constant/L1TagConstants.java

@@ -1,28 +0,0 @@
-package com.sckj.iron.constant;
-
-/***
- * L2的标签
- */
-public class L1TagConstants {
-    //1号出铁状态标记
-    public static final String TAG_TAPHOLE1_STATUS = "BF4_1_IRONNOTCH_TAPPING";
-    //2号出铁状态标记
-    public static final String TAG_TAPHOLE2_STATUS = "BF4_2_IRONNOTCH_TAPPING";
-    //3号出铁状态标记
-    public static final String TAG_TAPHOLE3_STATUS = "BF4_3_IRONNOTCH_TAPPING";
-    //4号出铁状态标记
-    public static final String TAG_TAPHOLE4_STATUS = "BF4_4_IRONNOTCH_TAPPING";
-    //铁水温度
-    public static final String TAG_IRON_TEMP = "BF4_1_IRONNOTCH_MIR_TEMP";
-    //1TH-1号车受铁速度
-    public static final String TAG_CAR11 = "BF4_1_IRONNOTCH_RAILLINE_ACPIRON_SPEED1";
-    //1TH-2号车受铁速度
-    public static final String TAG_CAR12 = "BF4_1_IRONNOTCH_RAILLINE_ACPIRON_SPEED2";
-    //1TH-1号车总重
-    public static final String TAG_IRON_WEIGHT11 = "BF4_1TH_1_TPC_TWT";
-    //1TH-2号车TPC总重
-    public static final String TAG_IRON_WEIGHT12 = "BF4_1TH_2_TPC_TWT";
-    //冲渣状态
-    public static final String TAG_FLUSH_STATUS = "BF4_1TH_SLAG_TAPPING_SIGNAL";
-
-}

taphole-iron/src/main/java/com/sckj/iron/constant/ScheduledTimeConstants.java

@@ -1,83 +0,0 @@
-//package com.sckj.iron.constant;
-//
-///***
-// * 定时任务延迟和定时常量
-// * 单位：s
-// */
-//public class ScheduledTimeConstants {
-//    //堵口预警
-//    //延迟
-//    public static   long OPEN_WARN_DELAY = 0;
-//    //定时
-//    public static   long OPEN_WARN_PERIOD = 60;
-//    //堵口预警
-//    //延迟
-//    public static   long CLOSURE_WARN_DELAY = 0;
-//    //定时
-//    public static   long CLOSURE_WARN_PERIOD = 60;
-//
-//    //出铁预警
-//    //延时
-//    public static   long TAPPING_WARN_DELAY = 0;
-//    //定时
-//    public static   long TAPPING_WARN_PERIOD = 0;
-//
-//    //出铁超时报警
-//    //延迟
-//    public static   long TAPPING_TIMEOUT_WARN_DELAY = 0;
-//    //定时
-//    public static   long TAPPING_TIMEOUT_WARN_PERIOD = 0;
-//
-//
-//    //打泥量计算
-//    //延迟
-//    public static   long HIT_MUD_DELAY = 0;
-//    //定时
-//    public static   long HIT_MUD_PERIOD = 0;
-//
-//
-//    //出铁计时(这个固定不变,按秒改变)
-//    //延迟
-//    public static   long TAPPING_CONSTTIME_DELAY = 0;
-//    //定时
-//    public static   long TAPPING_CONSTTIME_PERIOD = 1;
-//
-//
-//    //出铁诊断
-//    //延迟
-//    public static   long TAPPING_TEST_DELAY = 0;
-//    //定时
-//    public static   long TAPPING_TEST_PERIOD = 1;
-//
-//    //L1订阅
-//    //延迟
-//    public static   long OPCDASUBSCRIBE_DELAY = 0;
-//    //定时
-//    public static   long OPCDASUBSCRIBE_PERIOD = 15;
-//
-//
-//
-//    public static String getPrintString() {
-//        return "ScheduledTimeConstants{" +
-//                "OPEN_WARN_DELAY=" + OPEN_WARN_DELAY +
-//                ", OPEN_WARN_PERIOD=" + OPEN_WARN_PERIOD +
-//                ", CLOSURE_WARN_DELAY=" + CLOSURE_WARN_DELAY +
-//                ", CLOSURE_WARN_PERIOD=" + CLOSURE_WARN_PERIOD +
-//                ", TAPPING_WARN_DELAY=" + TAPPING_WARN_DELAY +
-//                ", TAPPING_WARN_PERIOD=" + TAPPING_WARN_PERIOD +
-//                ", TAPPING_TIMEOUT_WARN_DELAY=" + TAPPING_TIMEOUT_WARN_DELAY +
-//                ", TAPPING_TIMEOUT_WARN_PERIOD=" + TAPPING_TIMEOUT_WARN_PERIOD +
-//                ", HIT_MUD_DELAY=" + HIT_MUD_DELAY +
-//                ", HIT_MUD_PERIOD=" + HIT_MUD_PERIOD +
-//                ", TAPPING_CONSTTIME_DELAY=" + TAPPING_CONSTTIME_DELAY +
-//                ", TAPPING_CONSTTIME_PERIOD=" + TAPPING_CONSTTIME_PERIOD +
-//                ", TAPPING_TEST_DELAY=" + TAPPING_TEST_DELAY +
-//                ", TAPPING_TEST_PERIOD=" + TAPPING_TEST_PERIOD +
-//                ", OPCDASUBSCRIBE_DELAY=" + OPCDASUBSCRIBE_DELAY +
-//                ", OPCDASUBSCRIBE_PERIOD=" + OPCDASUBSCRIBE_PERIOD +
-//                '}';
-//    }
-//
-//
-//
-//}

taphole-iron/src/main/java/com/sckj/iron/constant/SubscribeTagConstants.java

@@ -0,0 +1,90 @@
+package com.sckj.iron.constant;
+
+import java.util.Objects;
+
+/***
+ * L2的标签
+ */
+public class SubscribeTagConstants {
+    //1号出铁状态标记
+    public static final String TAG_TAPHOLE1_STATUS(String type) {
+        if (Objects.equals(type, "3")) {
+            return "BF4_1_IRONNOTCH_TAPPING";
+        }
+        return "AOD25606.PV";
+    }
+
+    //2号出铁状态标记
+    public static final String TAG_TAPHOLE2_STATUS(String type) {
+        if (Objects.equals(type, "3")) {
+            return "BF4_2_IRONNOTCH_TAPPING";
+        }
+        return "AOD25622.PV";
+    }
+
+    //3号出铁状态标记
+    public static final String TAG_TAPHOLE3_STATUS(String type) {
+        if (Objects.equals(type, "3")) {
+            return "BF4_3_IRONNOTCH_TAPPING";
+        }
+        return "AOD25706.PV";
+    }
+
+    //4号出铁状态标记
+    public static final String TAG_TAPHOLE4_STATUS(String type) {
+        if (Objects.equals(type, "3")) {
+            return "BF4_4_IRONNOTCH_TAPPING";
+        }
+        return "AOD25722.PV";
+    }
+
+    //铁水温度
+    public static final String TAG_IRON_TEMP(String type) {
+        if (Objects.equals(type, "3")) {
+            return "BF4_1_IRONNOTCH_MIR_TEMP";
+        }
+        return "CL510104.CPV";
+    }
+
+    //1TH-1号车受铁速度
+    public static final String TAG_CAR11(String type) {
+        if (Objects.equals(type, "3")) {
+            return "BF4_1_IRONNOTCH_RAILLINE_ACPIRON_SPEED1";
+        }
+        return "WZ540101.PV";
+    }
+
+    //1TH-2号车受铁速度
+    public static final String TAG_CAR12(String type) {
+        if (Objects.equals(type, "3")) {
+            return "BF4_1_IRONNOTCH_RAILLINE_ACPIRON_SPEED2";
+        }
+        return "WZ540201.PV";
+    }
+
+    //1TH-1号车总重
+    public static final String TAG_IRON_WEIGHT11(String type) {
+        if (Objects.equals(type, "3")) {
+            return "BF4_1TH_1_TPC_TWT";
+        }
+        return "WI5401.PV";
+    }
+
+    //1TH-2号车TPC总重
+    public static final String TAG_IRON_WEIGHT12(String type) {
+        if (Objects.equals(type, "3")) {
+            return "BF4_1TH_2_TPC_TWT";
+        }
+        return "WI5402.PV";
+    }
+
+    //冲渣状态
+    public static final String TAG_FLUSH_STATUS(String type) {
+        if (Objects.equals(type, "3")) {
+            return "BF4_1TH_SLAG_TAPPING_SIGNAL";
+        }
+        return "AOD25607.PV";
+    }
+
+
+}

taphole-iron/src/main/java/com/sckj/iron/socketio/DeviceEventListener.java

@@ -10,8 +10,8 @@ import com.sckj.common.eventbus.EventListener;
 import com.sckj.common.manager.ScheduledTaskManager;
 import com.sckj.common.socketio.SocketUtil;
 import com.sckj.common.util.RedisUtils;
-import com.sckj.iron.constant.L1TagConstants;
 import com.sckj.iron.constant.ParamsConstants;
+import com.sckj.iron.constant.SubscribeTagConstants;
 import com.sckj.iron.constant.TaskNameConstants;
 import com.sckj.iron.dto.IronStepDTO;
 import com.sckj.iron.dto.IronTimeNoDTO;
@@ -24,7 +24,6 @@ import com.sckj.iron.entity.TIronStepLog;
 import com.sckj.iron.service.impl.*;
 import com.sckj.iron.util.LocalDateUtils;
 import com.sckj.iron.vo.IronStepVO;
-import com.sckj.l2.dto.L2Data;
 import com.sckj.l2.entity.TL2Data;
 import com.sckj.l2.service.impl.L2DataServiceImpl;
 import com.sckj.l2.service.impl.TL2DataServiceImpl;
@@ -399,9 +398,9 @@ public class DeviceEventListener extends EventListener { //
 
         //实时数据
         taskExecutor.submit(() -> {
-            setRealtimeDataAndStatus(opcData, null);
-        });
 
+        });
+        setRealtimeDataAndStatus(opcData, null);
     }
 
     //出铁次数编号
@@ -729,13 +728,13 @@ public class DeviceEventListener extends EventListener { //
             scheduledTaskManager.addTask(scheduleTappingTest.getName(), scheduleTappingTest.getDelay(), scheduleTappingTest.getPeriod(), TimeUnit.SECONDS, () -> {
                 //堵口预警
                 log.info("出铁结束,定时任务:{},出铁诊断", TaskNameConstants.TASKNAME_TAPPING_TEST);
-                L2Data fixedLatestElement = (L2Data) RedisUtils.getFixedLatestElement(IRON_ELEMENT);
+                TL2Data fixedLatestElement = (TL2Data) RedisUtils.getFixedLatestElement(IRON_ELEMENT);
                 //平均温度
-                String mudWeight = fixedLatestElement.getAvgTemp();
+                Double mudWeight = fixedLatestElement.getAvgTemp();
                 //出铁时间
                 //String ironCosttime = fixedLatestElement.getI
                 //实际出铁量
-                String ironWeight = fixedLatestElement.getIronWeight();
+                Double ironWeight = fixedLatestElement.getIronWeight();
 
 //            TIronData ironData = new TIronData();
 //            BeanUtils.copyProperties(ironData, fixedLatestElement);
@@ -801,7 +800,7 @@ public class DeviceEventListener extends EventListener { //
     /***
      * 设置实时数据值和状态
      */
-    private synchronized void setRealtimeDataAndStatus(OPCData opcData, L2Data l2Data) {
+    private synchronized void setRealtimeDataAndStatus(OPCData opcData, TL2Data l2Data) {
         //铁水温度
         //铁水流速
         //铁水成分
@@ -809,7 +808,7 @@ public class DeviceEventListener extends EventListener { //
         //WI5401.PV  1TH-1号车总重
         //WI5402.PV  1TH-2号车TPC总重
         if (ObjectUtils.isNotEmpty(opcData)) {
-            if (opcData.getPointName().contains(L1TagConstants.TAG_IRON_TEMP)) {
+            if (opcData.getPointName().contains(SubscribeTagConstants.TAG_IRON_TEMP(opcData.getServerType()))) {
                 RealtimeData realtimeData = new RealtimeData();
                 realtimeData.setValue(opcData.getData());
                 realtimeData.setUnit("℃");
@@ -828,7 +827,7 @@ public class DeviceEventListener extends EventListener { //
                 }
 
 
-            } else if (opcData.getPointName().contains(L1TagConstants.TAG_CAR11) || opcData.getPointName().contains(L1TagConstants.TAG_CAR12)) {
+            } else if (opcData.getPointName().contains(SubscribeTagConstants.TAG_CAR11(opcData.getServerType())) || opcData.getPointName().contains(SubscribeTagConstants.TAG_CAR12(opcData.getServerType()))) {
                 //1TH-1号车受铁速度
                 RealtimeData realtimeData = new RealtimeData();
                 realtimeData.setValue(opcData.getData());
@@ -846,7 +845,7 @@ public class DeviceEventListener extends EventListener { //
                     speeds = (RealtimeData[]) ironSpeed.getValue();
                 }
 
-                if (opcData.getPointName().contains(L1TagConstants.TAG_CAR11)) {
+                if (opcData.getPointName().contains(SubscribeTagConstants.TAG_CAR11(opcData.getServerType()))) {
                     realtimeData.setDesc("1号车");
                     speeds[0] = realtimeData;
                     speed1 = new AtomicDouble(Double.parseDouble(opcData.getData().toString()));
@@ -864,7 +863,7 @@ public class DeviceEventListener extends EventListener { //
                     ironSpeed.setTime(LocalDateUtils.formatDate(opcData.getServerTime()));
 
                 }
-            } else if (opcData.getPointName().contains(L1TagConstants.TAG_TAPHOLE1_STATUS)) {
+            } else if (opcData.getPointName().contains(SubscribeTagConstants.TAG_TAPHOLE1_STATUS(opcData.getServerType()))) {
                 RealtimeData realtimeData = new RealtimeData();
                 realtimeData.setValue(opcData.getData());
                 realtimeData.setDesc("出铁状态");
@@ -878,16 +877,16 @@ public class DeviceEventListener extends EventListener { //
                     taphole1End();
                 }
 
-            } else if (opcData.getPointName().contains(L1TagConstants.TAG_TAPHOLE2_STATUS)) {
+            } else if (opcData.getPointName().contains(SubscribeTagConstants.TAG_TAPHOLE2_STATUS(opcData.getServerType()))) {
                 ironLoading2.set(Integer.parseInt(opcData.getData().toString()));
 
-            } else if (opcData.getPointName().contains(L1TagConstants.TAG_TAPHOLE3_STATUS)) {
+            } else if (opcData.getPointName().contains(SubscribeTagConstants.TAG_TAPHOLE3_STATUS(opcData.getServerType()))) {
                 ironLoading3.set(Integer.parseInt(opcData.getData().toString()));
 
-            } else if (opcData.getPointName().contains(L1TagConstants.TAG_TAPHOLE4_STATUS)) {
+            } else if (opcData.getPointName().contains(SubscribeTagConstants.TAG_TAPHOLE4_STATUS(opcData.getServerType()))) {
                 ironLoading4.set(Integer.parseInt(opcData.getData().toString()));
 
-            } else if (opcData.getPointName().contains(L1TagConstants.TAG_IRON_WEIGHT11) || opcData.getPointName().contains(L1TagConstants.TAG_IRON_WEIGHT12)) {
+            } else if (opcData.getPointName().contains(SubscribeTagConstants.TAG_IRON_WEIGHT11(opcData.getServerType())) || opcData.getPointName().contains(SubscribeTagConstants.TAG_IRON_WEIGHT12(opcData.getServerType()))) {
                 //铁水流量
                 RealtimeData ironWeight = new RealtimeData();
                 ironWeight.setDesc("铁水流量");
@@ -897,11 +896,8 @@ public class DeviceEventListener extends EventListener { //
                 ironWeight.setValue(mTotalWeight);
                 mRealtimeData.put(IRON_WEIGHT, ironWeight);
 //                log.info(">>>>>>>>>>>>>{}:{},total:{}", opcData.getPointName(), opcData.getData(), totalWeight.toPlainString());
-
                 ironWeight.setTime(LocalDateUtils.formatDate(opcData.getServerTime()));
-
-
-            } else if (opcData.getPointName().contains(L1TagConstants.TAG_FLUSH_STATUS)) {
+            } else if (opcData.getPointName().contains(SubscribeTagConstants.TAG_FLUSH_STATUS(opcData.getServerType()))) {
                 RealtimeData realtimeData = new RealtimeData();
                 realtimeData.setValue(opcData.getData());
                 realtimeData.setDesc("冲渣状态");
@@ -910,7 +906,7 @@ public class DeviceEventListener extends EventListener { //
 
         }
 
-        L2Data fixedLatestElement = (L2Data) RedisUtils.getFixedLatestElement(IRON_ELEMENT);
+        TL2Data fixedLatestElement = (TL2Data) RedisUtils.getFixedLatestElement(IRON_ELEMENT);
 
         if (ObjectUtils.isNotEmpty(fixedLatestElement)) {
             //铁水成分
@@ -1212,6 +1208,7 @@ public class DeviceEventListener extends EventListener { //
             return;
         }
         if (ObjectUtils.isNotEmpty(message)) {
+            log.info("取消预警:{}", message);
             scheduledTaskManager.cancelTask(message.getType());
         }
     }

taphole-l2-start/src/main/java/com/sckj/l2start/listener/L2EventListener.java

@@ -2,6 +2,7 @@ package com.sckj.l2start.listener;
 
 import com.google.common.eventbus.Subscribe;
 import com.sckj.common.eventbus.EventListener;
+import com.sckj.common.util.RedisUtils;
 import com.sckj.l2.entity.TL2Data;
 import com.sckj.l2.entity.TL2Material;
 import com.sckj.l2.service.impl.TL2DataServiceImpl;
@@ -40,21 +41,19 @@ public class L2EventListener extends EventListener {
         if (ObjectUtils.isEmpty(dataList)) {
             return;
         }
-        log.info("onL2DataMessageEvent");
-        for (String data : dataList) {
-            log.info(data);
-        }
-        log.info("onL2DataMessageEvent");
+//        log.info("onL2DataMessageEvent");
+        log.info("{}",dataList);
+//        log.info("onL2DataMessageEvent");
         if (dataList.size() == 22) {
             TL2Material tl2Material = new TL2Material();
             tl2Material.setChargeNo(dataList.get(0));
             tl2Material.setTheoryWeight(dataList.get(1));
             tl2Material.setLoadMaterialTime(dataList.get(2));
             //上料数据
-//            taskExecutor.submit(() -> {
-//
-//            });
-            boolean materialResult = tl2MaterialService.saveOrUpdate(tl2Material);
+            taskExecutor.submit(() -> {
+                boolean materialResult =  tl2MaterialService.saveOrUpdate(tl2Material);
+            });
+            //boolean materialResult = tl2MaterialService.saveOrUpdate(tl2Material);
 
             TL2Data tl2Data = new TL2Data();
             //l2数据
@@ -77,12 +76,13 @@ public class L2EventListener extends EventListener {
             tl2Data.setPollMm(Double.parseDouble(dataList.get(19)));
             tl2Data.setOpenDepth(Double.parseDouble(dataList.get(20)));
             tl2Data.setAvgTemp(Double.parseDouble(dataList.get(21)));
-//            taskExecutor.submit(() -> {
-//
-//            });
-            boolean dataResult = tl2DataService.saveOrUpdate(tl2Data);
+            taskExecutor.submit(() -> {
+                RedisUtils.addFixedElement("ironElement", tl2Data, 10);
+                boolean dataResult = tl2DataService.saveOrUpdate(tl2Data);
+            });
+            //boolean dataResult = tl2DataService.saveOrUpdate(tl2Data);
 
-            log.info("tl2Material:{},tl2Data:{}", materialResult, dataResult);
+            //log.info("tl2Material:{},tl2Data:{}", materialResult, dataResult);
 
         }
     }

taphole-l2/src/main/java/com/sckj/l2/dto/L2Data.java

@@ -1,105 +0,0 @@
-package com.sckj.l2.dto;
-
-import lombok.Data;
-
-/**
- * @Author feng
- * @Date 2024-12-18 上午 09:47
- * @Description TODO
- */
-@Data
-public class L2Data {
-    //下料批次
-    private String chargeNo;
-
-    //理论出铁量
-    private String theoryWeight;
-
-    //装入时间点
-    private String loadMaterialTime;
-
-    //高炉号
-    private String boilerId;
-
-    //铁口号
-    private String tapholeId;
-
-    //铁次号
-    private String ironNo;
-
-    //铁水成分 硅
-    private String elementSi;
-
-    //铁水成分 硫
-    private String elementS;
-
-    //铁水成分 钛
-    private String elementTi;
-
-    //铁水成分 磷
-    private String elementP;
-
-    //铁水成分 锰
-    private String elementMn;
-
-    //铁水成分 碳
-    private String elementC;
-
-    //出铁开始时间
-    private String ironStarttime;
-
-    //出铁结束时间
-    private String ironEndtime;
-
-    //出铁时间
-    private String ironCosttime;
-
-    //实际出铁量
-    private String ironWeight;
-
-    //估计出铁量
-    private String calcWeight;
-
-    //实际渣量
-    private String slagWeight;
-
-    //泥炮量
-    private String mudWeight;
-
-    // 钻杆直径
-    private String pollMm;
-
-    //开口深度
-    private String openDepth;
-
-    //铁水平均温度
-    private String avgTemp;
-
-    @Override
-    public String toString() {
-        return "L2Data{" +
-                "chargeNo='" + chargeNo + '\'' +
-                ", theoryWeight='" + theoryWeight + '\'' +
-                ", loadMaterialTime='" + loadMaterialTime + '\'' +
-                ", boilerId='" + boilerId + '\'' +
-                ", tapholeId='" + tapholeId + '\'' +
-                ", ironNo='" + ironNo + '\'' +
-                ", elementSi='" + elementSi + '\'' +
-                ", elementS='" + elementS + '\'' +
-                ", elementTi='" + elementTi + '\'' +
-                ", elementP='" + elementP + '\'' +
-                ", elementMn='" + elementMn + '\'' +
-                ", elementC='" + elementC + '\'' +
-                ", ironStarttime='" + ironStarttime + '\'' +
-                ", ironEndtime='" + ironEndtime + '\'' +
-                ", ironCosttime='" + ironCosttime + '\'' +
-                ", ironWeight='" + ironWeight + '\'' +
-                ", calcWeight='" + calcWeight + '\'' +
-                ", slagWeight='" + slagWeight + '\'' +
-                ", mudWeight='" + mudWeight + '\'' +
-                ", pollMm='" + pollMm + '\'' +
-                ", openDepth='" + openDepth + '\'' +
-                ", avgTemp='" + avgTemp + '\'' +
-                '}';
-    }
-}

taphole-l2/src/main/java/com/sckj/l2/dto/L2Material.java

@@ -1,51 +0,0 @@
-package com.sckj.l2.dto;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class L2Material implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-
-    @ApiModelProperty(value = "高炉编号")
-    private String boilerId;
-
-    @ApiModelProperty(value = "铁口区域编号")
-    private String tapholeId;
-
-    @ApiModelProperty(value = "L1发过来的charge号")
-    private String chargeNo;
-
-    @ApiModelProperty(value = "下料时间点")
-    private String downTime;
-
-    @ApiModelProperty(value = "干量")
-    private String dryWeight;
-
-    @ApiModelProperty(value = "矿石装入量")
-    private String oreWeight;
-
-    @ApiModelProperty(value = "焦炭装入量")
-    private String cokeWeight;
-
-    @ApiModelProperty(value = "副原料装入量")
-    private String asstmaterialWeight;
-
-    @ApiModelProperty(value = "综合品味")
-    private String compositeTaste;
-
-
-}

taphole-l2/src/main/java/com/sckj/l2/service/impl/L2DataServiceImpl.java

@@ -64,7 +64,7 @@ public class L2DataServiceImpl {
      */
     public void startTCPServer() {
         try (ServerSocket serverSocket = new ServerSocket(port)) {
-            System.out.println("TCP 服务器已启动，等待客户端连接...");
+            System.out.println(String.format("TCP 服务器(%s)已启动，等待客户端连接...",port));
             while (true) {
                 try (
                         Socket clientSocket = serverSocket.accept();

taphole-l2/src/main/java/com/sckj/l2/service/impl/TL2DataServiceImpl.java

@@ -80,7 +80,7 @@ public class TL2DataServiceImpl extends ServiceImpl<TL2DataMapper, TL2Data> {
     public TL2DataDetailVo detail(Long id) {
         TL2Data model = tL2DataMapper.selectOne(
                 new QueryWrapper<TL2Data>()
-                        .eq("id", id)
+                        .eq("iron_no", id)
                         .last("limit 1"));
 
         Assert.notNull(model, "数据不存在");

taphole-l2/src/main/java/com/sckj/l2/vo/TL2DataDetailVo.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.Date;
 
 @Data
 @ApiModel("出铁数据详情Vo")
@@ -53,22 +52,21 @@ public class TL2DataDetailVo implements Serializable {
     private String ironEndtime;
 
     @ApiModelProperty(value = "碳")
-    private Double elementC;
+    private String elementC;
 
     @ApiModelProperty(value = "硅")
-    private Double elementSi;
+    private String elementSi;
 
     @ApiModelProperty(value = "锰")
-    private Double elementMn;
+    private String elementMn;
 
     @ApiModelProperty(value = "磷")
-    private Double elementP;
+    private String elementP;
 
     @ApiModelProperty(value = "硫")
-    private Double elementS;
+    private String elementS;
 
     @ApiModelProperty(value = "钛")
-    private Double elementTi;
-
+    private String elementTi;
 
 }

taphole-l2/src/main/java/com/sckj/l2/vo/TL2DataListedVo.java

@@ -52,22 +52,22 @@ public class TL2DataListedVo implements Serializable {
     private String ironEndtime;
 
     @ApiModelProperty(value = "碳")
-    private Double elementC;
+    private String elementC;
 
     @ApiModelProperty(value = "硅")
-    private Double elementSi;
+    private String elementSi;
 
     @ApiModelProperty(value = "锰")
-    private Double elementMn;
+    private String elementMn;
 
     @ApiModelProperty(value = "磷")
-    private Double elementP;
+    private String elementP;
 
     @ApiModelProperty(value = "硫")
-    private Double elementS;
+    private String elementS;
 
     @ApiModelProperty(value = "钛")
-    private Double elementTi;
+    private String elementTi;
 
 
 }