From c390e3fc30448578995b30d749f4d70563bd6eab Mon Sep 17 00:00:00 2001
From: yj <913944315@qq.com>
Date: Thu, 4 Jul 2024 16:34:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=87=E9=9B=86=E7=AB=99?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xr/device/model/entity/MeterConfig.java   | 2 ++
 .../java/com/xr/device/model/entity/MeterReadingRecord.java     | 2 ++
 .../src/main/java/com/xr/device/schedule/GetMeterSchedule.java  | 1 +
 3 files changed, 5 insertions(+)

diff --git a/device_gather/src/main/java/com/xr/device/model/entity/MeterConfig.java b/device_gather/src/main/java/com/xr/device/model/entity/MeterConfig.java
index d3137f1..d5351b1 100644
--- a/device_gather/src/main/java/com/xr/device/model/entity/MeterConfig.java
+++ b/device_gather/src/main/java/com/xr/device/model/entity/MeterConfig.java
@@ -102,6 +102,8 @@ public class MeterConfig implements Serializable {
      */
     private Integer status;
 
+    private Integer stationId;
+
     /**
      * 首次识别时间
      */
diff --git a/device_gather/src/main/java/com/xr/device/model/entity/MeterReadingRecord.java b/device_gather/src/main/java/com/xr/device/model/entity/MeterReadingRecord.java
index 756860b..96ed5e4 100644
--- a/device_gather/src/main/java/com/xr/device/model/entity/MeterReadingRecord.java
+++ b/device_gather/src/main/java/com/xr/device/model/entity/MeterReadingRecord.java
@@ -32,6 +32,8 @@ public class MeterReadingRecord implements Serializable {
      */
     private String meterCode;
 
+    private Integer stationId;
+
     /**
      * 表计类型id
      */
diff --git a/device_gather/src/main/java/com/xr/device/schedule/GetMeterSchedule.java b/device_gather/src/main/java/com/xr/device/schedule/GetMeterSchedule.java
index 5788fdc..729cbd2 100644
--- a/device_gather/src/main/java/com/xr/device/schedule/GetMeterSchedule.java
+++ b/device_gather/src/main/java/com/xr/device/schedule/GetMeterSchedule.java
@@ -172,6 +172,7 @@ public class GetMeterSchedule {
         meterReadingRecord.setCreateUser("SYSTEM");
         meterReadingRecord.setCreateTime(new Date());
         meterReadingRecord.setReadingUrl(url1);
+        meterReadingRecord.setStationId(config.getStationId());
         meterReadingRecord.setMeterTypeId(config.getTypeId());
         meterReadingRecord.setOwningInterval(config.getOwningInterval());
         meterReadingRecordService.save(meterReadingRecord);