博海数据同步发送测试

.gitignore

@@ -12,4 +12,6 @@ target
 
 logs
 !**/nacos/target
-data/gtcvr.db
+data/gtcvr.db
+/data/dump/
+/data/

src/main/java/com/gct/edge/entity/BhRtuData.java

@@ -19,8 +19,6 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class BhRtuData extends Model<BhRtuData> {
 
-    private static final long serialVersionUID=1L;
-    
     private String wellId;
     
     private String prodDate;

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

@@ -3,6 +3,7 @@ package com.gct.edge.service.excutor;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.gct.edge.entity.BhRtuData;
 import com.gct.edge.entity.DumpRecord;
 import com.gct.edge.service.abst.DumpRecordService;
 import com.gct.edge.service.abst.AoidProdStateService;

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

@@ -67,7 +67,15 @@ public class ModbusReadService {
                 List<List<Double>> sgt = readBody.card;
                 Double s = readBody.s;
                 Double n = readBody.n;
-                String prodTime = readBody.prodTime;
+                String prodTime = LocalDateTime.now().format(df);
+                String checkTime = readBody.prodTime;
+                //bh  data read save
+                BHModbusDataBody bhModbusDataBody = ModbusRTUReader.readBHBody();
+                BhRtuData data = JSONObject.toJavaObject((JSON) JSONObject.toJSON(bhModbusDataBody), BhRtuData.class);
+                data.setWellId(aoidConfigData.getJh());
+                data.setProdDate(prodTime);
+                bhRtuDataService.save(data);
+
                 if (Objects.isNull(sgt) || Objects.isNull(s) || Objects.isNull(n) ||Objects.isNull(prodTime) || s < 1e-6 || n < 1e-6) {
                     log.error("read Rtu modbus failed, sgt: {},s: {},n: {},prodTime: {}", sgt, s, n, prodTime);
                     continue;
@@ -78,12 +86,12 @@ public class ModbusReadService {
                 if (Objects.isNull(lastDumpRecord)){
                     lastDumpRecord = new DumpRecord();
                     lastDumpRecord.setTableName(aoidConfigData.getJh());
-                    lastDumpRecord.setDumpTime(prodTime);
+                    lastDumpRecord.setDumpTime(checkTime);
                     dumpRecordService.save(lastDumpRecord);
                 }else {
-                    if (lastDumpRecord.getDumpTime().equals(prodTime))continue;
+                    if (lastDumpRecord.getDumpTime().equals(checkTime))continue;
                     else {
-                        lastDumpRecord.setDumpTime(prodTime);
+                        lastDumpRecord.setDumpTime(checkTime);
                         dumpRecordService.update(lastDumpRecord,new QueryWrapper<DumpRecord>().eq("table_name", aoidConfigData.getJh()));
                     }
                 }
@@ -97,12 +105,7 @@ public class ModbusReadService {
                 executor.submit(new CalculateInputData(aoidConfigData.getJh(), LocalDateTime.parse(prodTime, df), s, n, sgtDouble));
 
 
-                //bh  data read save
-                BHModbusDataBody bhModbusDataBody = ModbusRTUReader.readBHBody();
-                BhRtuData data = JSONObject.toJavaObject((JSON) JSONObject.toJSON(bhModbusDataBody), BhRtuData.class);
-                data.setWellId(aoidConfigData.getJh());
-                data.setProdDate(prodTime);
-                bhRtuDataService.save(data);
+
             } catch (Exception e) {
                 log.error("readDataAndSubmitTask error, detail: {}, cause: {}", e.getMessage(),e.getCause());
             }

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

@@ -186,6 +186,8 @@ public class ModbusRTUReader {
     }
 
     private static void connect() {
+        regConfig.serial.serialName = "COM3";
+        regConfig.serial.baudRate = 115200;//232口使用115200,485口注释此行
         System.out.printf("serial: %s, baudRate: %d, is485mode: %s%n", regConfig.serial.serialName, regConfig.serial.baudRate, regConfig.serial.isRs485);
         ModbusSerialMaster master = masterCache.get(regConfig.serial);
         if (Objects.nonNull(master) && master.isConnected()) return;
@@ -283,8 +285,8 @@ public class ModbusRTUReader {
                 String setMethodName = "set" + filedName;
                 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,Double.class).invoke(body, readFloatSingle(regConfig, new ByteToFloat()));
+                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()));
                 }