读取博海粤能约定字段测试完成

src/main/java/com/gct/edge/EdgeCalculateApplication.java

@@ -12,21 +12,7 @@ import java.io.IOException;
 @Slf4j
 public class EdgeCalculateApplication {
 
-    public static void init(){
-        try {
-            Runtime.getRuntime().exec("bash ./shell/dbm.sh init");
-            Runtime.getRuntime().exec("bash ./shell.dbm.sh load");
-            Thread.sleep(2000);
-            log.info("Database checked,it's available.");
-        } catch (Exception e) {
-            log.info("Database check failed");
-            System.exit(-1);
-        }
-
-    }
-
     public static void main(String[] args) {
-        init();
         SpringApplication.run(EdgeCalculateApplication.class, args);
     }
 

src/main/java/com/gct/edge/service/excutor/DataSendService.java

@@ -99,7 +99,6 @@ public class DataSendService {
 
     private <T> String serialRow(T t, Class<T> clz) {
         StringBuilder res = new StringBuilder();
-        res.append("|");
         try {
             for (Field field : clz.getDeclaredFields()) {
                 String getMethodName = "get" + field.getName().substring(0, 1).toUpperCase() + field.getName().substring(1);
@@ -107,6 +106,7 @@ public class DataSendService {
                 if (Objects.isNull(val)) res.append("|");
                 else res.append(val.toString()).append("|");
             }
+            if(res.charAt(res.length()-1) == '|') res.deleteCharAt(res.length()-1);
             res.append("\n");
         } catch (Exception e) {
             log.error("serial data failed: {}, message: {}", JSONObject.toJSONString(t), e.getMessage());

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

@@ -3,6 +3,7 @@ package com.gct.etl;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import java.time.LocalDateTime;
 
@@ -15,7 +16,6 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 public class BHModbusDataBody {
 
-    private LocalDateTime prodTime;
 
     private Double maxLoad;
 
@@ -75,4 +75,235 @@ public class BHModbusDataBody {
 
     private Double elecCostPerHundredMeter;
 
+    public Double getMaxLoad() {
+        return maxLoad;
+    }
+
+    public void setMaxLoad(Double maxLoad) {
+        this.maxLoad = maxLoad;
+    }
+
+    public Double getMinLoad() {
+        return minLoad;
+    }
+
+    public void setMinLoad(Double minLoad) {
+        this.minLoad = minLoad;
+    }
+
+    public Double getTheoryUpLoad() {
+        return theoryUpLoad;
+    }
+
+    public void setTheoryUpLoad(Double theoryUpLoad) {
+        this.theoryUpLoad = theoryUpLoad;
+    }
+
+    public Double getTheoryDownLoad() {
+        return theoryDownLoad;
+    }
+
+    public void setTheoryDownLoad(Double theoryDownLoad) {
+        this.theoryDownLoad = theoryDownLoad;
+    }
+
+    public Double getFillCoefficient() {
+        return fillCoefficient;
+    }
+
+    public void setFillCoefficient(Double fillCoefficient) {
+        this.fillCoefficient = fillCoefficient;
+    }
+
+    public Double getEmptyFillCoefficient() {
+        return emptyFillCoefficient;
+    }
+
+    public void setEmptyFillCoefficient(Double emptyFillCoefficient) {
+        this.emptyFillCoefficient = emptyFillCoefficient;
+    }
+
+    public Double getLiqProdMass() {
+        return liqProdMass;
+    }
+
+    public void setLiqProdMass(Double liqProdMass) {
+        this.liqProdMass = liqProdMass;
+    }
+
+    public Double getOilProdMass() {
+        return oilProdMass;
+    }
+
+    public void setOilProdMass(Double oilProdMass) {
+        this.oilProdMass = oilProdMass;
+    }
+
+    public Double getWaterProdMass() {
+        return waterProdMass;
+    }
+
+    public void setWaterProdMass(Double waterProdMass) {
+        this.waterProdMass = waterProdMass;
+    }
+
+    public Double getLiqProdVolume() {
+        return liqProdVolume;
+    }
+
+    public void setLiqProdVolume(Double liqProdVolume) {
+        this.liqProdVolume = liqProdVolume;
+    }
+
+    public Double getOilProdVolume() {
+        return oilProdVolume;
+    }
+
+    public void setOilProdVolume(Double oilProdVolume) {
+        this.oilProdVolume = oilProdVolume;
+    }
+
+    public Double getWaterProdVolume() {
+        return waterProdVolume;
+    }
+
+    public void setWaterProdVolume(Double waterProdVolume) {
+        this.waterProdVolume = waterProdVolume;
+    }
+
+    public Double getTheoryDisplacement() {
+        return theoryDisplacement;
+    }
+
+    public void setTheoryDisplacement(Double theoryDisplacement) {
+        this.theoryDisplacement = theoryDisplacement;
+    }
+
+    public Double getPumpEfficient() {
+        return pumpEfficient;
+    }
+
+    public void setPumpEfficient(Double pumpEfficient) {
+        this.pumpEfficient = pumpEfficient;
+    }
+
+    public Integer getGkCode() {
+        return gkCode;
+    }
+
+    public void setGkCode(Integer gkCode) {
+        this.gkCode = gkCode;
+    }
+
+    public Double getInversionDynamicLiquidLevel() {
+        return inversionDynamicLiquidLevel;
+    }
+
+    public void setInversionDynamicLiquidLevel(Double inversionDynamicLiquidLevel) {
+        this.inversionDynamicLiquidLevel = inversionDynamicLiquidLevel;
+    }
+
+    public Double getLiquidCorrectDifference() {
+        return liquidCorrectDifference;
+    }
+
+    public void setLiquidCorrectDifference(Double liquidCorrectDifference) {
+        this.liquidCorrectDifference = liquidCorrectDifference;
+    }
+
+    public Double getSubmergenceDegree() {
+        return submergenceDegree;
+    }
+
+    public void setSubmergenceDegree(Double submergenceDegree) {
+        this.submergenceDegree = submergenceDegree;
+    }
+
+    public Double getDownStrokeMaxElec() {
+        return downStrokeMaxElec;
+    }
+
+    public void setDownStrokeMaxElec(Double downStrokeMaxElec) {
+        this.downStrokeMaxElec = downStrokeMaxElec;
+    }
+
+    public Double getUpStrokeMaxElec() {
+        return upStrokeMaxElec;
+    }
+
+    public void setUpStrokeMaxElec(Double upStrokeMaxElec) {
+        this.upStrokeMaxElec = upStrokeMaxElec;
+    }
+
+    public Double getElecBalance() {
+        return elecBalance;
+    }
+
+    public void setElecBalance(Double elecBalance) {
+        this.elecBalance = elecBalance;
+    }
+
+    public Double getDownStrokeMaxPower() {
+        return downStrokeMaxPower;
+    }
+
+    public void setDownStrokeMaxPower(Double downStrokeMaxPower) {
+        this.downStrokeMaxPower = downStrokeMaxPower;
+    }
+
+    public Double getUpStrokeMaxPower() {
+        return upStrokeMaxPower;
+    }
+
+    public void setUpStrokeMaxPower(Double upStrokeMaxPower) {
+        this.upStrokeMaxPower = upStrokeMaxPower;
+    }
+
+    public Double getPowerBalance() {
+        return powerBalance;
+    }
+
+    public void setPowerBalance(Double powerBalance) {
+        this.powerBalance = powerBalance;
+    }
+
+    public Double getStroke() {
+        return stroke;
+    }
+
+    public void setStroke(Double stroke) {
+        this.stroke = stroke;
+    }
+
+    public Double getDownholeSystemEfficient() {
+        return downholeSystemEfficient;
+    }
+
+    public void setDownholeSystemEfficient(Double downholeSystemEfficient) {
+        this.downholeSystemEfficient = downholeSystemEfficient;
+    }
+
+    public Double getUpholeSystemEfficient() {
+        return upholeSystemEfficient;
+    }
+
+    public void setUpholeSystemEfficient(Double upholeSystemEfficient) {
+        this.upholeSystemEfficient = upholeSystemEfficient;
+    }
+
+    public Double getSystemEfficient() {
+        return systemEfficient;
+    }
+
+    public void setSystemEfficient(Double systemEfficient) {
+        this.systemEfficient = systemEfficient;
+    }
+
+    public Double getElecCostPerHundredMeter() {
+        return elecCostPerHundredMeter;
+    }
+
+    public void setElecCostPerHundredMeter(Double elecCostPerHundredMeter) {
+        this.elecCostPerHundredMeter = elecCostPerHundredMeter;
+    }
 }

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

@@ -1,75 +1,70 @@
 package com.gct.etl;
 
 import com.gct.etl.ModbusReadConfig.Section;
+import lombok.Data;
+
 /**
  * @author xusirui 2024/7/9
  */
+@Data
 public class BHModbusReadConfig {
+    private int offset = 7501;
 
-    public static class SerialConfig {
-        public String serialName = "serial";
-        public int baudRate = 9600;
-
-        public int openDaly = 1000;
-        public boolean isRs485 = false;
-    }
-
-
-    private Section maxLoad = new Section(1, 9500, 2);
+    private Section maxLoad = new Section(1, 9500 - offset, 2);
 
-    private Section minLoad = new Section(1, 9502, 2);
+    private Section minLoad = new Section(1, 9502 - offset, 2);
 
-    private Section theoryUpLoad = new Section(1, 9504, 2);
+    private Section theoryUpLoad = new Section(1, 9504 - offset, 2);
 
-    private Section theoryDownLoad = new Section(1, 9506, 2);
+    private Section theoryDownLoad = new Section(1, 9506 - offset, 2);
 
-    private Section fillCoefficient = new Section(1, 9508, 2);
+    private Section fillCoefficient = new Section(1, 9508 - offset, 2);
 
-    private Section emptyFillCoefficient = new Section(1, 9510, 2);
+    private Section emptyFillCoefficient = new Section(1, 9510 - offset, 2);
 
-    private Section liqProdMass = new Section(1, 9512, 2);
+    private Section liqProdMass = new Section(1, 9512 - offset, 2);
 
-    private Section oilProdMass = new Section(1, 9514, 2);
+    private Section oilProdMass = new Section(1, 9514 - offset, 2);
 
-    private Section waterProdMass = new Section(1, 9516, 2);
+    private Section waterProdMass = new Section(1, 9516 - offset, 2);
 
-    private Section liqProdVolume = new Section(1, 9518, 2);
+    private Section liqProdVolume = new Section(1, 9518 - offset, 2);
 
-    private Section oilProdVolume = new Section(1, 9520, 2);
+    private Section oilProdVolume = new Section(1, 9520 - offset, 2);
 
-    private Section waterProdVolume = new Section(1, 9522, 2);
+    private Section waterProdVolume = new Section(1, 9522 - offset, 2);
 
-    private Section theoryDisplacement = new Section(1, 9524, 2);
+    private Section theoryDisplacement = new Section(1, 9524 - offset, 2);
 
-    private Section pumpEfficient = new Section(1, 9526, 2);
+    private Section pumpEfficient = new Section(1, 9526 - offset, 2);
 
-    private Section gkCode = new Section(1, 9528, 1);
+    private Section gkCode = new Section(1, 9528 - offset, 1);
 
-    private Section inversionDynamicLiquidLevel = new Section(1, 9529, 2);
+    private Section inversionDynamicLiquidLevel = new Section(1, 9529 - offset, 2);
 
-    private Section liquidCorrectDifference = new Section(1, 9531, 2);
+    private Section liquidCorrectDifference = new Section(1, 9531 - offset, 2);
 
-    private Section submergenceDegree = new Section(1, 9533, 2);
+    private Section submergenceDegree = new Section(1, 9533 - offset, 2);
 
-    private Section downStrokeMaxElec = new Section(1, 9535, 2);
+    private Section downStrokeMaxElec = new Section(1, 9535 - offset, 2);
 
-    private Section upStrokeMaxElec = new Section(1, 9537, 2);
+    private Section upStrokeMaxElec = new Section(1, 9537 - offset, 2);
 
-    private Section elecBalance = new Section(1, 9539, 2);
+    private Section elecBalance = new Section(1, 9539 - offset, 2);
 
-    private Section downStrokeMaxPower = new Section(1, 9541, 2);
+    private Section downStrokeMaxPower = new Section(1, 9541 - offset, 2);
 
-    private Section upStrokeMaxPower = new Section(1, 9543, 2);
+    private Section upStrokeMaxPower = new Section(1, 9543 - offset, 2);
 
-    private Section powerBalance = new Section(1, 9545, 2);
+    private Section powerBalance = new Section(1, 9545 - offset, 2);
 
-    private Section stroke = new Section(1, 9547, 2);
+    private Section stroke = new Section(1, 9547 - offset, 2);
 
-    private Section downholeSystemEfficient = new Section(1, 9549, 2);
+    private Section downholeSystemEfficient = new Section(1, 9549 - offset, 2);
 
-    private Section  upholeSystemEfficient = new Section(1, 9551, 2);
+    private Section upholeSystemEfficient = new Section(1, 9551 - offset, 2);
 
-    private Section systemEfficient = new Section(1, 9553, 2);
+    private Section systemEfficient = new Section(1, 9553 - offset, 2);
 
-    private Section elecCostPerHundredMeter = new Section(1, 9555, 2);
+    private Section elecCostPerHundredMeter = new Section(1, 9555 - offset, 2);
 }

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

@@ -42,8 +42,9 @@ public class ModbusRTUReader {
 //        手动调试串口数据
 //        debugSerial();
 //        测试功图读取
-        writeSample(true);//true 只刷新功图时间
-        testReadDataBody();
+//        writeSample(true);//true 只刷新功图时间
+//        testReadDataBody();
+        testReadFloat();
 //        testReadMultiBody();
     }
 
@@ -143,7 +144,7 @@ public class ModbusRTUReader {
             offset[i] = new SimpleRegister(Double.valueOf(arr[i][0] * 1000).intValue());
         }
         LocalDateTime now = LocalDateTime.now();
-        SimpleRegister[] time = new SimpleRegister[]{new SimpleRegister(now.getYear()-2000),
+        SimpleRegister[] time = new SimpleRegister[]{new SimpleRegister(now.getYear() - 2000),
                 new SimpleRegister(now.getMonthValue()),
                 new SimpleRegister(now.getDayOfMonth()),
                 new SimpleRegister(now.getHour()),
@@ -152,7 +153,7 @@ public class ModbusRTUReader {
 
         try {
             master.writeMultipleRegisters(regConfig.prodTimeReg.stationId, regConfig.prodTimeReg.register, time);
-            if(onlyRefreshTime) return;
+            if (onlyRefreshTime) return;
             master.writeMultipleRegisters(regConfig.sReg.stationId, regConfig.sReg.register, new Register[]{s});
             master.writeMultipleRegisters(regConfig.nReg.stationId, regConfig.nReg.register, new Register[]{n});
             master.writeMultipleRegisters(regConfig.pointNumReg.stationId, regConfig.pointNumReg.register, new Register[]{new SimpleRegister(arr.length)});
@@ -161,7 +162,7 @@ public class ModbusRTUReader {
 
         } catch (ModbusException e) {
             throw new RuntimeException(e);
-        }finally {
+        } finally {
             System.out.println("模拟功图运行完成");
         }
 
@@ -171,7 +172,7 @@ public class ModbusRTUReader {
         for (int i = 0; i < payloadRegs.size(); i++) {
             ModbusReadConfig.Section reg = payloadRegs.get(i);
             master.writeMultipleRegisters(reg.stationId, reg.register,
-                    Arrays.stream(payload).skip((i)*reg.length).limit(reg.length).collect(Collectors.toList()).toArray(new SimpleRegister[]{}));
+                    Arrays.stream(payload).skip((i) * reg.length).limit(reg.length).collect(Collectors.toList()).toArray(new SimpleRegister[]{}));
         }
     }
     //endregion
@@ -266,30 +267,42 @@ public class ModbusRTUReader {
         return body;
     }
 
-    public static synchronized  BHModbusDataBody readBHBody(){
+    public static synchronized BHModbusDataBody readBHBody() {
         connect();
-        try{
+        try {
             BHModbusDataBody body = new BHModbusDataBody();
             BHModbusReadConfig readConfig = new BHModbusReadConfig();
-            for (Field element : BHModbusDataBody.class.getFields()) {
+            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);
-                if (Objects.isNull(regConfig))continue;
+                ModbusReadConfig.Section regConfig = (ModbusReadConfig.Section) BHModbusReadConfig.class.getMethod(getMethodName).invoke(readConfig);
+                if (Objects.isNull(regConfig)) continue;
                 if (element.getType().equals(Double.class)) {
-                    BHModbusDataBody.class.getMethod(setMethodName).invoke(body,readDoubleSingle(regConfig,new ByteToFloat()));
-                }else if(element.getType().equals(Integer.class)){
-                    BHModbusDataBody.class.getMethod(setMethodName).invoke(body,readIntegerSingle(regConfig,new DefaultParser()));
+                    BHModbusDataBody.class.getMethod(setMethodName,Double.class).invoke(body, readDoubleSingle(regConfig, new ByteToFloat()));
+                } else if (element.getType().equals(Integer.class)) {
+                    BHModbusDataBody.class.getMethod(setMethodName,Integer.class).invoke(body, readIntegerSingle(regConfig, new DefaultParser()));
                 }
             }
             return body;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return null;
     }
 
+    public static void testReadFloat() {
+        regConfig.serial.serialName = "COM3";
+        regConfig.serial.baudRate = 115200;//232口使用115200,485口注释此行
+        BHModbusDataBody body = readBHBody();
+        System.out.println(body);
+//        connect();
+//
+//        Register[] regs = tryReadMultipleRegisters(1, 2000, 2);
+//        for (int i = 0; i < regs.length; i++) {
+//            System.out.println(regs[i].getValue());
+//        }
+    }
 
     public static synchronized ModbusDataBody readBody(int stationId) {
         regConfig = configLoader.loadById(stationId);

src/main/java/com/gct/etl/parser/ByteToFloat.java

@@ -14,9 +14,9 @@ public class ByteToFloat implements RegisterParser<Double> {
 
     @Override
     public Double apply(Register... register) {
-        byte[] array = new byte[9];
+        byte[] array = new byte[4];
         int index = 0;
-        for (int i = 0; i <= 1; i++) {
+        for (int i = 1; i >= 0; i--) {
             for (byte b : register[i].toBytes()) {
                 array[index++] = b;
             }