修改readBH

src/main/java/com/gct/etl/BHModbusDataBody.java

@@ -16,61 +16,61 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 public class BHModbusDataBody {
 
-    private Float maxLoad;
+    public Float maxLoad;
 
-    private Float minLoad;
+    public Float minLoad;
 
-    private Float theoryUpLoad;
+    public Float theoryUpLoad;
 
-    private Float theoryDownLoad;
+    public Float theoryDownLoad;
 
-    private Float fillCoefficient;
+    public Float fillCoefficient;
 
-    private Float emptyFillCoefficient;
+    public Float emptyFillCoefficient;
 
-    private Float liqProdMass;
+    public Float liqProdMass;
 
-    private Float oilProdMass;
+    public Float oilProdMass;
 
-    private Float waterProdMass;
+    public Float waterProdMass;
 
-    private Float liqProdVolume;
+    public Float liqProdVolume;
 
-    private Float oilProdVolume;
+    public Float oilProdVolume;
 
-    private Float waterProdVolume;
+    public Float waterProdVolume;
 
-    private Float theoryDisplacement;
+    public Float theoryDisplacement;
 
-    private Float pumpEfficient;
+    public Float pumpEfficient;
 
-    private Integer gkCode;
+    public Integer gkCode;
 
-    private Float inversionDynamicLiquidLevel;
+    public Float inversionDynamicLiquidLevel;
 
-    private Float liquidCorrectDifference;
+    public Float liquidCorrectDifference;
 
-    private Float submergenceDegree;
+    public Float submergenceDegree;
 
-    private Float downStrokeMaxElec;
+    public Float downStrokeMaxElec;
 
-    private Float upStrokeMaxElec;
+    public Float upStrokeMaxElec;
 
-    private Float elecBalance;
+    public Float elecBalance;
 
-    private Float downStrokeMaxPower;
+    public Float downStrokeMaxPower;
 
-    private Float upStrokeMaxPower;
+    public Float upStrokeMaxPower;
 
-    private Float powerBalance;
+    public Float powerBalance;
 
-    private Float stroke;
+    public Float stroke;
 
-    private Float downholeSystemEfficient;
+    public Float downholeSystemEfficient;
 
-    private Float  upholeSystemEfficient;
+    public Float  upholeSystemEfficient;
 
-    private Float systemEfficient;
+    public Float systemEfficient;
 
-    private Float elecCostPerHundredMeter;
+    public Float elecCostPerHundredMeter;
 }

src/main/java/com/gct/etl/BHModbusReadConfig.java

@@ -1,70 +1,82 @@
 package com.gct.etl;
 
 import com.gct.etl.ModbusReadConfig.Section;
+import com.gct.etl.parser.ByteToFloat;
+import com.gct.etl.parser.DefaultParser;
 import lombok.Data;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author xusirui 2024/7/9
  */
 @Data
 public class BHModbusReadConfig {
-    private int offset = 7501;
+    public int offset = 7501;
+    public int stationId = 1;
+    public Map<Class, RegisterParser> parsers = new HashMap<Class, RegisterParser>();
+
+    {
+        parsers.put(Float.class, new ByteToFloat());
+        parsers.put(Integer.class, new DefaultParser());
+    }
 
-    private Section maxLoad = new Section(1, 9500 - offset, 2);
+    public Section maxLoad = new Section(stationId, 9500 - offset, 2);
 
-    private Section minLoad = new Section(1, 9502 - offset, 2);
+    public Section minLoad = new Section(stationId, 9502 - offset, 2);
 
-    private Section theoryUpLoad = new Section(1, 9504 - offset, 2);
+    public Section theoryUpLoad = new Section(stationId, 9504 - offset, 2);
 
-    private Section theoryDownLoad = new Section(1, 9506 - offset, 2);
+    public Section theoryDownLoad = new Section(stationId, 9506 - offset, 2);
 
-    private Section fillCoefficient = new Section(1, 9508 - offset, 2);
+    public Section fillCoefficient = new Section(stationId, 9508 - offset, 2);
 
-    private Section emptyFillCoefficient = new Section(1, 9510 - offset, 2);
+    public Section emptyFillCoefficient = new Section(stationId, 9510 - offset, 2);
 
-    private Section liqProdMass = new Section(1, 9512 - offset, 2);
+    public Section liqProdMass = new Section(stationId, 9512 - offset, 2);
 
-    private Section oilProdMass = new Section(1, 9514 - offset, 2);
+    public Section oilProdMass = new Section(stationId, 9514 - offset, 2);
 
-    private Section waterProdMass = new Section(1, 9516 - offset, 2);
+    public Section waterProdMass = new Section(stationId, 9516 - offset, 2);
 
-    private Section liqProdVolume = new Section(1, 9518 - offset, 2);
+    public Section liqProdVolume = new Section(stationId, 9518 - offset, 2);
 
-    private Section oilProdVolume = new Section(1, 9520 - offset, 2);
+    public Section oilProdVolume = new Section(stationId, 9520 - offset, 2);
 
-    private Section waterProdVolume = new Section(1, 9522 - offset, 2);
+    public Section waterProdVolume = new Section(stationId, 9522 - offset, 2);
 
-    private Section theoryDisplacement = new Section(1, 9524 - offset, 2);
+    public Section theoryDisplacement = new Section(stationId, 9524 - offset, 2);
 
-    private Section pumpEfficient = new Section(1, 9526 - offset, 2);
+    public Section pumpEfficient = new Section(stationId, 9526 - offset, 2);
 
-    private Section gkCode = new Section(1, 9528 - offset, 1);
+    public Section gkCode = new Section(stationId, 9528 - offset, 1);
 
-    private Section inversionDynamicLiquidLevel = new Section(1, 9529 - offset, 2);
+    public Section inversionDynamicLiquidLevel = new Section(stationId, 9529 - offset, 2);
 
-    private Section liquidCorrectDifference = new Section(1, 9531 - offset, 2);
+    public Section liquidCorrectDifference = new Section(stationId, 9531 - offset, 2);
 
-    private Section submergenceDegree = new Section(1, 9533 - offset, 2);
+    public Section submergenceDegree = new Section(stationId, 9533 - offset, 2);
 
-    private Section downStrokeMaxElec = new Section(1, 9535 - offset, 2);
+    public Section downStrokeMaxElec = new Section(stationId, 9535 - offset, 2);
 
-    private Section upStrokeMaxElec = new Section(1, 9537 - offset, 2);
+    public Section upStrokeMaxElec = new Section(stationId, 9537 - offset, 2);
 
-    private Section elecBalance = new Section(1, 9539 - offset, 2);
+    public Section elecBalance = new Section(stationId, 9539 - offset, 2);
 
-    private Section downStrokeMaxPower = new Section(1, 9541 - offset, 2);
+    public Section downStrokeMaxPower = new Section(stationId, 9541 - offset, 2);
 
-    private Section upStrokeMaxPower = new Section(1, 9543 - offset, 2);
+    public Section upStrokeMaxPower = new Section(stationId, 9543 - offset, 2);
 
-    private Section powerBalance = new Section(1, 9545 - offset, 2);
+    public Section powerBalance = new Section(stationId, 9545 - offset, 2);
 
-    private Section stroke = new Section(1, 9547 - offset, 2);
+    public Section stroke = new Section(stationId, 9547 - offset, 2);
 
-    private Section downholeSystemEfficient = new Section(1, 9549 - offset, 2);
+    public Section downholeSystemEfficient = new Section(stationId, 9549 - offset, 2);
 
-    private Section upholeSystemEfficient = new Section(1, 9551 - offset, 2);
+    public Section upholeSystemEfficient = new Section(stationId, 9551 - offset, 2);
 
-    private Section systemEfficient = new Section(1, 9553 - offset, 2);
+    public Section systemEfficient = new Section(stationId, 9553 - offset, 2);
 
-    private Section elecCostPerHundredMeter = new Section(1, 9555 - offset, 2);
+    public Section elecCostPerHundredMeter = new Section(stationId, 9555 - offset, 2);
 }

src/main/java/com/gct/etl/ModbusRTUReader.java

@@ -233,17 +233,7 @@ public class ModbusRTUReader {
         return arr;
     }
 
-    private static Double readDoubleSingle(ModbusReadConfig.Section reg, RegisterParser<Double> parser) {
-        Register[] registers = tryReadMultipleRegisters(reg.stationId, reg.register, reg.length);
-        return parser.apply(registers);
-    }
-
-    private static Integer readIntegerSingle(ModbusReadConfig.Section reg, RegisterParser<Integer> parser) {
-        Register[] registers = tryReadMultipleRegisters(reg.stationId, reg.register, reg.length);
-        return parser.apply(registers);
-    }
-
-    private static Float readFloatSingle(ModbusReadConfig.Section reg, RegisterParser<Float> parser) {
+    private static <T> T readSingle(ModbusReadConfig.Section reg, RegisterParser<T> parser) {
         Register[] registers = tryReadMultipleRegisters(reg.stationId, reg.register, reg.length);
         return parser.apply(registers);
     }
@@ -267,9 +257,9 @@ public class ModbusRTUReader {
 
         ModbusDataBody body = new ModbusDataBody();
         body.card = readDiagramCard();
-        body.s = readDoubleSingle(regConfig.sReg, regConfig.sParser);
-        body.n = readDoubleSingle(regConfig.nReg, regConfig.nParser);
-        body.pointNum = readIntegerSingle(regConfig.pointNumReg, regConfig.pointNumParser);
+        body.s = readSingle(regConfig.sReg, regConfig.sParser);
+        body.n = readSingle(regConfig.nReg, regConfig.nParser);
+        body.pointNum = readSingle(regConfig.pointNumReg, regConfig.pointNumParser);
         body.prodTime = readTime(regConfig.prodTimeReg, regConfig.dateTimeParser);
         return body;
     }
@@ -280,16 +270,10 @@ public class ModbusRTUReader {
             BHModbusDataBody body = new BHModbusDataBody();
             BHModbusReadConfig readConfig = new BHModbusReadConfig();
             for (Field element : BHModbusDataBody.class.getDeclaredFields()) {
-                String filedName = element.getName().substring(0, 1).toUpperCase() + element.getName().substring(1);
-                String getMethodName = "get" + filedName;
-                String setMethodName = "set" + filedName;
-                ModbusReadConfig.Section regConfig = (ModbusReadConfig.Section) BHModbusReadConfig.class.getMethod(getMethodName).invoke(readConfig);
+                ModbusReadConfig.Section regConfig = (ModbusReadConfig.Section) BHModbusReadConfig.class.getDeclaredField(element.getName()).get(readConfig);
                 if (Objects.isNull(regConfig)) continue;
-                if (element.getType().equals(Float.class)) {
-                    BHModbusDataBody.class.getMethod(setMethodName,Float.class).invoke(body, readFloatSingle(regConfig, new ByteToFloat()));
-                } else if (element.getType().equals(Integer.class)) {
-                    BHModbusDataBody.class.getMethod(setMethodName,Integer.class).invoke(body, readIntegerSingle(regConfig, new DefaultParser()));
-                }
+                Object val = readSingle(regConfig, readConfig.parsers.get(element.getType()));
+                element.set(body, val);
             }
             return body;
         } catch (Exception e) {