diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterConfigController.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterConfigController.java
index 2e4e48d..9312983 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterConfigController.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterConfigController.java
@@ -154,7 +154,7 @@ public class MeterConfigController {
         UpdateWrapper<MeterConfig> updateWrapper=new UpdateWrapper<>();
         updateWrapper.in("id",ids).set("status",status);
         meterConfigService.update(null,updateWrapper);
-        scheduleSettingService.meterStart(ids,Integer.valueOf(status));
+        //scheduleSettingService.meterStart(ids,Integer.valueOf(status));
         return Result.OK(status.equals("1")?"启动":"停止"+"成功！");
     }
     @RequestMapping("/saveCamera")
@@ -232,6 +232,21 @@ public class MeterConfigController {
         return Result.OK("解绑成功！");
     }
 
+    @RequestMapping("/saveCalibration")
+    public Result<?> saveCalibration(MeterConfig config){
+        if(StringUtils.isEmpty(config.getJzVal())){
+            return Result.error("保存失败，校准值不能为空");
+        }
+        UpdateWrapper<MeterConfig> update = new UpdateWrapper<>();
+        if(StringUtils.isNotEmpty(config.getIsJz())){
+            update.set("is_jz",config.getIsJz());
+        }
+        update.set("jz_val",config.getJzVal());
+        update.eq("id",config.getId());
+        meterConfigService.update(update);
+        return Result.OK("保存成功！");
+    }
+
     @RequestMapping("/hisFocal")
     public Result<?> hisFocal(@RequestBody String str){
         List<Integer> ids = JSONObject.parseObject(str,List.class);
@@ -344,4 +359,7 @@ public class MeterConfigController {
         return sum;
     }
 
+
+
+
 }
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java
index 74488a7..75ff989 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterReadController.java
@@ -34,6 +34,7 @@ public class MeterReadController {
         if(StringUtils.isNotEmpty(readingRecord.getDeviceIp())){
             query.like("d.device_ip",readingRecord.getDeviceIp());
         }
+        query.orderByDesc("reading_time");
         IPage<MeterReadingRecord> ipage = meterReadingRecordService.pageList(page,query);
         return ipage;
     }
diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java
index 4e58fde..7188760 100644
--- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java
+++ b/device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java
@@ -145,6 +145,10 @@ public class MeterConfig implements Serializable {
 
     private Integer stationId;
 
+    private Integer isJz;
+
+    private String jzVal;
+
     /**
      * 修改时间
      */
diff --git a/device_cars/src/main/resources/application-dev.yml b/device_cars/src/main/resources/application-dev.yml
index 4fd6c63..7325b1f 100644
--- a/device_cars/src/main/resources/application-dev.yml
+++ b/device_cars/src/main/resources/application-dev.yml
@@ -64,8 +64,8 @@ analysis:
 
 upload:
   img:
-    url: http://192.168.1.83:18081/file/img/zs/
-    path: D:\\service\\fileService\\img\\zs\\
+    url: http://192.168.1.83:18081/file/img/
+    path: D:\\service\\fileService\\img\\
 python:
   path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
   modelPath: D:\\smartGrid\\smartGrid\\models
diff --git a/device_cars/src/main/resources/application-prod.yml b/device_cars/src/main/resources/application-prod.yml
index c5a8db5..b1c7ce3 100644
--- a/device_cars/src/main/resources/application-prod.yml
+++ b/device_cars/src/main/resources/application-prod.yml
@@ -64,8 +64,8 @@ analysis:
 
 upload:
   img:
-    url: http://192.168.1.94:18081/file/img/zs/
-    path: E:\\service\\fileService\\img\\zs\\
+    url: http://192.168.1.94:18081/file/img/
+    path: E:\\service\\fileService\\img\\
 python:
   path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
   modelPath: D:\\smartGrid\\smartGrid\\models
diff --git a/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml b/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml
index 6e688a0..bb48628 100644
--- a/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml
+++ b/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml
@@ -41,7 +41,7 @@
         a.type_id,a.status,a.first_time,
         a.algorithm_type,a.interval_time,a.focal_number,
         a.parameter_config,a.remarks,a.init_status,a.create_user,
-        a.create_time,a.update_user,a.update_time,a.station_id,
+        a.create_time,a.update_user,a.update_time,a.station_id,a.jz_val,
     </sql>
     <select id="selectConfigByPage" resultType="com.xr.device_car.modules.analysis.entity.MeterConfig">
         select
diff --git a/device_gather/src/main/java/com/xr/device/common/configvalue/StaticProperties.java b/device_gather/src/main/java/com/xr/device/common/configvalue/StaticProperties.java
index 6cb46d4..d45a945 100644
--- a/device_gather/src/main/java/com/xr/device/common/configvalue/StaticProperties.java
+++ b/device_gather/src/main/java/com/xr/device/common/configvalue/StaticProperties.java
@@ -20,4 +20,7 @@ public class StaticProperties {
     @Value("${python.modelPath}")
     private String modelPath;
 
+    @Value("${station.id}")
+    private Integer stationId;
+
 }
diff --git a/device_gather/src/main/java/com/xr/device/common/utils/StaticPropUtil.java b/device_gather/src/main/java/com/xr/device/common/utils/StaticPropUtil.java
index c0a1a26..0c746ce 100644
--- a/device_gather/src/main/java/com/xr/device/common/utils/StaticPropUtil.java
+++ b/device_gather/src/main/java/com/xr/device/common/utils/StaticPropUtil.java
@@ -13,11 +13,14 @@ public class StaticPropUtil {
 
     public static String modelPath;
 
+    public static Integer stationId;
+
     public static void initDingDingProp(StaticProperties dingProperties){
         imgUrl = dingProperties.getImgUrl();
         imgPath = dingProperties.getImgPath();
         pythonPath = dingProperties.getPythonPath();
-        modelPath=dingProperties.getModelPath();
+        modelPath = dingProperties.getModelPath();
+        stationId = dingProperties.getStationId();
     }
 
 }
diff --git a/device_gather/src/main/java/com/xr/device/common/utils/UploadUtil.java b/device_gather/src/main/java/com/xr/device/common/utils/UploadUtil.java
index c108c70..2133dfa 100644
--- a/device_gather/src/main/java/com/xr/device/common/utils/UploadUtil.java
+++ b/device_gather/src/main/java/com/xr/device/common/utils/UploadUtil.java
@@ -153,19 +153,21 @@ public class UploadUtil {
         g2d.drawString(currentTime, currentTimeX, currentTimeY);
 
         // 绘制文本2的背景矩形
-        int text2Width = fm.stringWidth(text2);
-        int text2Height = fm.getHeight();
-        g2d.setColor(new Color(0, 0, 0, 50)); // 黑色半透明背景
-        g2d.fillRect(padding, padding + currentTimeHeight + rectPadding * 2, text2Width + 2 * rectPadding, text2Height + 2 * rectPadding);
-
+        if(text2!=null){
+            int text2Width = fm.stringWidth(text2);
+            int text2Height = fm.getHeight();
+            g2d.setColor(new Color(0, 0, 0, 50)); // 黑色半透明背景
+            g2d.fillRect(padding, padding + currentTimeHeight + rectPadding * 2, text2Width + 2 * rectPadding, text2Height + 2 * rectPadding);
         // 绘制文本2在时间的下面，内边距为20px
-        g2d.setColor(Color.WHITE);
-        int text2X = padding + rectPadding + (text2Width + rectPadding - text2Width) / 2;
-        int text2Y = padding + currentTimeHeight + rectPadding * 3 + fm.getAscent();
-        g2d.drawString(text2, text2X, text2Y);
+            g2d.setColor(Color.WHITE);
+            int text2X = padding + rectPadding + (text2Width + rectPadding - text2Width) / 2;
+            int text2Y = padding + currentTimeHeight + rectPadding * 3 + fm.getAscent();
+            g2d.drawString(text2, text2X, text2Y);
+        }
+
+
 
         // 计算文本1的右上角位置
-        int text1Width = fm.stringWidth(text1);
         int text1X = (int) (x1 + wid); // 框的右上角位置
         int text1Y = (int) (y1 + fm.getAscent()); // 框的右上角紧挨着框
         g2d.setColor(Color.RED);
diff --git a/device_gather/src/main/java/com/xr/device/model/mapper/MeterConfigMapper.java b/device_gather/src/main/java/com/xr/device/model/mapper/MeterConfigMapper.java
index 6de48f9..6c92c59 100644
--- a/device_gather/src/main/java/com/xr/device/model/mapper/MeterConfigMapper.java
+++ b/device_gather/src/main/java/com/xr/device/model/mapper/MeterConfigMapper.java
@@ -15,7 +15,7 @@ import java.util.List;
 @Mapper
 public interface MeterConfigMapper extends BaseMapper<MeterConfig> {
 
-    List<MeterConfig> getMeterList();
+    List<MeterConfig> getMeterList(Integer stationId);
 
 }
 
diff --git a/device_gather/src/main/java/com/xr/device/model/service/MeterConfigService.java b/device_gather/src/main/java/com/xr/device/model/service/MeterConfigService.java
index 35618a5..34a48dc 100644
--- a/device_gather/src/main/java/com/xr/device/model/service/MeterConfigService.java
+++ b/device_gather/src/main/java/com/xr/device/model/service/MeterConfigService.java
@@ -12,6 +12,6 @@ import java.util.List;
 */
 public interface MeterConfigService extends IService<MeterConfig> {
 
-    List<MeterConfig> getMeterList();
+    List<MeterConfig> getMeterList(Integer station);
 
 }
diff --git a/device_gather/src/main/java/com/xr/device/model/service/impl/MeterConfigServiceImpl.java b/device_gather/src/main/java/com/xr/device/model/service/impl/MeterConfigServiceImpl.java
index 2338b72..3bc38cb 100644
--- a/device_gather/src/main/java/com/xr/device/model/service/impl/MeterConfigServiceImpl.java
+++ b/device_gather/src/main/java/com/xr/device/model/service/impl/MeterConfigServiceImpl.java
@@ -20,8 +20,8 @@ public class MeterConfigServiceImpl extends ServiceImpl<MeterConfigMapper, Meter
     implements MeterConfigService{
 
     @Override
-    public List<MeterConfig> getMeterList() {
-        return ((MeterConfigMapper)this.baseMapper).getMeterList();
+    public List<MeterConfig> getMeterList(Integer stationId) {
+        return ((MeterConfigMapper)this.baseMapper).getMeterList(stationId);
     }
 }
 
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 8bdab65..5788fdc 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
@@ -44,9 +44,9 @@ public class GetMeterSchedule {
 
     private final MeterTypeService meterTypeService;
 
-    @Scheduled(cron = "0 0 0/3 * * ?")
+    @Scheduled(cron = "0 0/3 * * * ?")
     public void getMeterSchedule(){
-        List<MeterConfig> configs = meterConfigService.getMeterList();
+        List<MeterConfig> configs = meterConfigService.getMeterList(StaticPropUtil.stationId);
         int pageSize = 10; // 每页的设备数量
         int totalDevices = configs.size(); // 总设备数量
         int totalPages = (int) Math.ceil((double) totalDevices / pageSize); // 总页数
@@ -138,7 +138,7 @@ public class GetMeterSchedule {
         meterReadingRecord.setReadingType(2);
         String value = "";
         if(config.getTypeId() == 5 || config.getTypeId() == 7){
-
+            value = ValueFormatUtil.getZZl(f,config);
         }
         if(config.getTypeId() == 3 ){
             value = ValueFormatUtil.getYwj(f,config);
@@ -153,10 +153,7 @@ public class GetMeterSchedule {
         if(config.getTypeId() == 10){//放电计数器
             value=ValueFormatUtil.getfdjsq(f);
         }
-        if(config.getIsJz() == 1){
-            value = config.getJzVal();
-        }
-        if(config.getIsJz() == 1){
+        if(config.getIsJz()!=null && config.getIsJz() == 1){
             value = config.getJzVal();
         }
         meterReadingRecord.setReadingValue(value);
diff --git a/device_gather/src/main/resources/application-jc-dev.yml b/device_gather/src/main/resources/application-jcDev.yml
similarity index 92%
rename from device_gather/src/main/resources/application-jc-dev.yml
rename to device_gather/src/main/resources/application-jcDev.yml
index 7130e22..743d432 100644
--- a/device_gather/src/main/resources/application-jc-dev.yml
+++ b/device_gather/src/main/resources/application-jcDev.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8085
+  port: 8173
   servlet:
     context-path: /cars-api
     #context-path: /
@@ -19,7 +19,7 @@ spring:
         db2:
           driver-class-name: com.mysql.cj.jdbc.Driver
           type: com.zaxxer.hikari.HikariDataSource
-          url: jdbc:mysql://116.196.120.81:3306/image_analysis_zs?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          url: jdbc:mysql://116.196.120.81:3306/image_analysix_wz?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
           username: root
           password: 5ea47c0bdd7146ebbd53020eca@672307
     #Hikari连接池配置
@@ -77,4 +77,6 @@ eureka:
     healthcheck:
       enabled: true
     service-url:
-      defaultZone: http://localhost:8084/eureka
\ No newline at end of file
+      defaultZone: http://localhost:8084/eureka
+station:
+  id: 2
\ No newline at end of file
diff --git a/device_gather/src/main/resources/application-jc-prod.yml b/device_gather/src/main/resources/application-jcProd.yml
similarity index 92%
rename from device_gather/src/main/resources/application-jc-prod.yml
rename to device_gather/src/main/resources/application-jcProd.yml
index 7130e22..743d432 100644
--- a/device_gather/src/main/resources/application-jc-prod.yml
+++ b/device_gather/src/main/resources/application-jcProd.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8085
+  port: 8173
   servlet:
     context-path: /cars-api
     #context-path: /
@@ -19,7 +19,7 @@ spring:
         db2:
           driver-class-name: com.mysql.cj.jdbc.Driver
           type: com.zaxxer.hikari.HikariDataSource
-          url: jdbc:mysql://116.196.120.81:3306/image_analysis_zs?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          url: jdbc:mysql://116.196.120.81:3306/image_analysix_wz?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
           username: root
           password: 5ea47c0bdd7146ebbd53020eca@672307
     #Hikari连接池配置
@@ -77,4 +77,6 @@ eureka:
     healthcheck:
       enabled: true
     service-url:
-      defaultZone: http://localhost:8084/eureka
\ No newline at end of file
+      defaultZone: http://localhost:8084/eureka
+station:
+  id: 2
\ No newline at end of file
diff --git a/device_gather/src/main/resources/application-jiangcDev.yml b/device_gather/src/main/resources/application-jiangcDev.yml
new file mode 100644
index 0000000..d7de24c
--- /dev/null
+++ b/device_gather/src/main/resources/application-jiangcDev.yml
@@ -0,0 +1,82 @@
+server:
+  port: 8173
+  servlet:
+    context-path: /cars-api
+    #context-path: /
+
+spring:
+  datasource:
+    dynamic:
+      primary: db1
+      strict: false
+      datasource:
+        db1:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/device_system?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+        db2:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/image_analysix_wz?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+    #Hikari连接池配置
+    hikari:
+      #池中维护的最小空闲连接数
+      minimum-idle: 5
+      #池中最大连接数，包括闲置和使用中的连接
+      maximum-pool-size: 15
+      #自动提交从池中返回的连接
+      auto-commit: true
+      #连接允许在池中闲置的最长时间
+      idle-timeout: 30000
+      #连接池的用户定义名称，主要出现在日志记录和JMX管理控制台中以识别池和池配置
+      pool-name: DatebookHikariCP
+      #池中连接最长生命周期
+      max-lifetime: 18000000
+      #等待来自池的连接的最大毫秒数
+      connection-timeout: 30000
+      #验证该连接是否是有效的查询语句
+      connection-test-query: select 1 from dual
+  cloud:
+    inetutils:
+      timeout-seconds: 1000
+    config:
+      enabled: false
+  # redis 相关
+  redis:
+    host: ${REDIS_URL:localhost}
+    port: ${REDIS_PORT:6379}
+    password: ${REDIS_PWD:111111}
+    timeout: 10000
+    jedis:
+      pool:
+        max-active: 1000
+        max-wait: -1ms
+        max-idle: 10
+        min-idle: 5
+swagger:
+  show: true
+analysis:
+  url: http://192.168.1.123:9000/vi/syncrec
+
+upload:
+  img:
+    url: http://192.168.1.83:18081/file/img/zs/
+    path: D:\\service\\fileService\\img\\zs\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+eureka:
+  instance:
+    instance-id: ${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    healthcheck:
+      enabled: true
+    service-url:
+      defaultZone: http://localhost:8084/eureka
+station:
+  id: 5
\ No newline at end of file
diff --git a/device_gather/src/main/resources/application-jiangcProd.yml b/device_gather/src/main/resources/application-jiangcProd.yml
new file mode 100644
index 0000000..d7de24c
--- /dev/null
+++ b/device_gather/src/main/resources/application-jiangcProd.yml
@@ -0,0 +1,82 @@
+server:
+  port: 8173
+  servlet:
+    context-path: /cars-api
+    #context-path: /
+
+spring:
+  datasource:
+    dynamic:
+      primary: db1
+      strict: false
+      datasource:
+        db1:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/device_system?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+        db2:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/image_analysix_wz?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+    #Hikari连接池配置
+    hikari:
+      #池中维护的最小空闲连接数
+      minimum-idle: 5
+      #池中最大连接数，包括闲置和使用中的连接
+      maximum-pool-size: 15
+      #自动提交从池中返回的连接
+      auto-commit: true
+      #连接允许在池中闲置的最长时间
+      idle-timeout: 30000
+      #连接池的用户定义名称，主要出现在日志记录和JMX管理控制台中以识别池和池配置
+      pool-name: DatebookHikariCP
+      #池中连接最长生命周期
+      max-lifetime: 18000000
+      #等待来自池的连接的最大毫秒数
+      connection-timeout: 30000
+      #验证该连接是否是有效的查询语句
+      connection-test-query: select 1 from dual
+  cloud:
+    inetutils:
+      timeout-seconds: 1000
+    config:
+      enabled: false
+  # redis 相关
+  redis:
+    host: ${REDIS_URL:localhost}
+    port: ${REDIS_PORT:6379}
+    password: ${REDIS_PWD:111111}
+    timeout: 10000
+    jedis:
+      pool:
+        max-active: 1000
+        max-wait: -1ms
+        max-idle: 10
+        min-idle: 5
+swagger:
+  show: true
+analysis:
+  url: http://192.168.1.123:9000/vi/syncrec
+
+upload:
+  img:
+    url: http://192.168.1.83:18081/file/img/zs/
+    path: D:\\service\\fileService\\img\\zs\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+eureka:
+  instance:
+    instance-id: ${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    healthcheck:
+      enabled: true
+    service-url:
+      defaultZone: http://localhost:8084/eureka
+station:
+  id: 5
\ No newline at end of file
diff --git a/device_gather/src/main/resources/application-ppDev.yml b/device_gather/src/main/resources/application-ppDev.yml
new file mode 100644
index 0000000..608eee6
--- /dev/null
+++ b/device_gather/src/main/resources/application-ppDev.yml
@@ -0,0 +1,82 @@
+server:
+  port: 8173
+  servlet:
+    context-path: /cars-api
+    #context-path: /
+
+spring:
+  datasource:
+    dynamic:
+      primary: db1
+      strict: false
+      datasource:
+        db1:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/device_system?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+        db2:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/image_analysix_wz?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+    #Hikari连接池配置
+    hikari:
+      #池中维护的最小空闲连接数
+      minimum-idle: 5
+      #池中最大连接数，包括闲置和使用中的连接
+      maximum-pool-size: 15
+      #自动提交从池中返回的连接
+      auto-commit: true
+      #连接允许在池中闲置的最长时间
+      idle-timeout: 30000
+      #连接池的用户定义名称，主要出现在日志记录和JMX管理控制台中以识别池和池配置
+      pool-name: DatebookHikariCP
+      #池中连接最长生命周期
+      max-lifetime: 18000000
+      #等待来自池的连接的最大毫秒数
+      connection-timeout: 30000
+      #验证该连接是否是有效的查询语句
+      connection-test-query: select 1 from dual
+  cloud:
+    inetutils:
+      timeout-seconds: 1000
+    config:
+      enabled: false
+  # redis 相关
+  redis:
+    host: ${REDIS_URL:localhost}
+    port: ${REDIS_PORT:6379}
+    password: ${REDIS_PWD:111111}
+    timeout: 10000
+    jedis:
+      pool:
+        max-active: 1000
+        max-wait: -1ms
+        max-idle: 10
+        min-idle: 5
+swagger:
+  show: true
+analysis:
+  url: http://192.168.1.123:9000/vi/syncrec
+
+upload:
+  img:
+    url: http://192.168.1.83:18081/file/img/zs/
+    path: D:\\service\\fileService\\img\\zs\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+eureka:
+  instance:
+    instance-id: ${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    healthcheck:
+      enabled: true
+    service-url:
+      defaultZone: http://localhost:8084/eureka
+station:
+  id: 4
\ No newline at end of file
diff --git a/device_gather/src/main/resources/application-ppProd.yml b/device_gather/src/main/resources/application-ppProd.yml
new file mode 100644
index 0000000..608eee6
--- /dev/null
+++ b/device_gather/src/main/resources/application-ppProd.yml
@@ -0,0 +1,82 @@
+server:
+  port: 8173
+  servlet:
+    context-path: /cars-api
+    #context-path: /
+
+spring:
+  datasource:
+    dynamic:
+      primary: db1
+      strict: false
+      datasource:
+        db1:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/device_system?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+        db2:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/image_analysix_wz?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+    #Hikari连接池配置
+    hikari:
+      #池中维护的最小空闲连接数
+      minimum-idle: 5
+      #池中最大连接数，包括闲置和使用中的连接
+      maximum-pool-size: 15
+      #自动提交从池中返回的连接
+      auto-commit: true
+      #连接允许在池中闲置的最长时间
+      idle-timeout: 30000
+      #连接池的用户定义名称，主要出现在日志记录和JMX管理控制台中以识别池和池配置
+      pool-name: DatebookHikariCP
+      #池中连接最长生命周期
+      max-lifetime: 18000000
+      #等待来自池的连接的最大毫秒数
+      connection-timeout: 30000
+      #验证该连接是否是有效的查询语句
+      connection-test-query: select 1 from dual
+  cloud:
+    inetutils:
+      timeout-seconds: 1000
+    config:
+      enabled: false
+  # redis 相关
+  redis:
+    host: ${REDIS_URL:localhost}
+    port: ${REDIS_PORT:6379}
+    password: ${REDIS_PWD:111111}
+    timeout: 10000
+    jedis:
+      pool:
+        max-active: 1000
+        max-wait: -1ms
+        max-idle: 10
+        min-idle: 5
+swagger:
+  show: true
+analysis:
+  url: http://192.168.1.123:9000/vi/syncrec
+
+upload:
+  img:
+    url: http://192.168.1.83:18081/file/img/zs/
+    path: D:\\service\\fileService\\img\\zs\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+eureka:
+  instance:
+    instance-id: ${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    healthcheck:
+      enabled: true
+    service-url:
+      defaultZone: http://localhost:8084/eureka
+station:
+  id: 4
\ No newline at end of file
diff --git a/device_gather/src/main/resources/application-psDev.yml b/device_gather/src/main/resources/application-psDev.yml
new file mode 100644
index 0000000..1f57926
--- /dev/null
+++ b/device_gather/src/main/resources/application-psDev.yml
@@ -0,0 +1,82 @@
+server:
+  port: 8173
+  servlet:
+    context-path: /cars-api
+    #context-path: /
+
+spring:
+  datasource:
+    dynamic:
+      primary: db1
+      strict: false
+      datasource:
+        db1:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/device_system?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+        db2:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/image_analysix_wz?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+    #Hikari连接池配置
+    hikari:
+      #池中维护的最小空闲连接数
+      minimum-idle: 5
+      #池中最大连接数，包括闲置和使用中的连接
+      maximum-pool-size: 15
+      #自动提交从池中返回的连接
+      auto-commit: true
+      #连接允许在池中闲置的最长时间
+      idle-timeout: 30000
+      #连接池的用户定义名称，主要出现在日志记录和JMX管理控制台中以识别池和池配置
+      pool-name: DatebookHikariCP
+      #池中连接最长生命周期
+      max-lifetime: 18000000
+      #等待来自池的连接的最大毫秒数
+      connection-timeout: 30000
+      #验证该连接是否是有效的查询语句
+      connection-test-query: select 1 from dual
+  cloud:
+    inetutils:
+      timeout-seconds: 1000
+    config:
+      enabled: false
+  # redis 相关
+  redis:
+    host: ${REDIS_URL:localhost}
+    port: ${REDIS_PORT:6379}
+    password: ${REDIS_PWD:111111}
+    timeout: 10000
+    jedis:
+      pool:
+        max-active: 1000
+        max-wait: -1ms
+        max-idle: 10
+        min-idle: 5
+swagger:
+  show: true
+analysis:
+  url: http://192.168.1.123:9000/vi/syncrec
+
+upload:
+  img:
+    url: http://192.168.1.83:18081/file/img/zs/
+    path: D:\\service\\fileService\\img\\zs\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+eureka:
+  instance:
+    instance-id: ${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    healthcheck:
+      enabled: true
+    service-url:
+      defaultZone: http://localhost:8084/eureka
+station:
+  id: 3
\ No newline at end of file
diff --git a/device_gather/src/main/resources/application-psProd.yml b/device_gather/src/main/resources/application-psProd.yml
new file mode 100644
index 0000000..1f57926
--- /dev/null
+++ b/device_gather/src/main/resources/application-psProd.yml
@@ -0,0 +1,82 @@
+server:
+  port: 8173
+  servlet:
+    context-path: /cars-api
+    #context-path: /
+
+spring:
+  datasource:
+    dynamic:
+      primary: db1
+      strict: false
+      datasource:
+        db1:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/device_system?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+        db2:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/image_analysix_wz?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+    #Hikari连接池配置
+    hikari:
+      #池中维护的最小空闲连接数
+      minimum-idle: 5
+      #池中最大连接数，包括闲置和使用中的连接
+      maximum-pool-size: 15
+      #自动提交从池中返回的连接
+      auto-commit: true
+      #连接允许在池中闲置的最长时间
+      idle-timeout: 30000
+      #连接池的用户定义名称，主要出现在日志记录和JMX管理控制台中以识别池和池配置
+      pool-name: DatebookHikariCP
+      #池中连接最长生命周期
+      max-lifetime: 18000000
+      #等待来自池的连接的最大毫秒数
+      connection-timeout: 30000
+      #验证该连接是否是有效的查询语句
+      connection-test-query: select 1 from dual
+  cloud:
+    inetutils:
+      timeout-seconds: 1000
+    config:
+      enabled: false
+  # redis 相关
+  redis:
+    host: ${REDIS_URL:localhost}
+    port: ${REDIS_PORT:6379}
+    password: ${REDIS_PWD:111111}
+    timeout: 10000
+    jedis:
+      pool:
+        max-active: 1000
+        max-wait: -1ms
+        max-idle: 10
+        min-idle: 5
+swagger:
+  show: true
+analysis:
+  url: http://192.168.1.123:9000/vi/syncrec
+
+upload:
+  img:
+    url: http://192.168.1.83:18081/file/img/zs/
+    path: D:\\service\\fileService\\img\\zs\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+eureka:
+  instance:
+    instance-id: ${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    healthcheck:
+      enabled: true
+    service-url:
+      defaultZone: http://localhost:8084/eureka
+station:
+  id: 3
\ No newline at end of file
diff --git a/device_gather/src/main/resources/application-sbDev.yml b/device_gather/src/main/resources/application-sbDev.yml
new file mode 100644
index 0000000..e5545f4
--- /dev/null
+++ b/device_gather/src/main/resources/application-sbDev.yml
@@ -0,0 +1,82 @@
+server:
+  port: 8173
+  servlet:
+    context-path: /cars-api
+    #context-path: /
+
+spring:
+  datasource:
+    dynamic:
+      primary: db1
+      strict: false
+      datasource:
+        db1:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/device_system?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+        db2:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/image_analysix_wz?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+    #Hikari连接池配置
+    hikari:
+      #池中维护的最小空闲连接数
+      minimum-idle: 5
+      #池中最大连接数，包括闲置和使用中的连接
+      maximum-pool-size: 15
+      #自动提交从池中返回的连接
+      auto-commit: true
+      #连接允许在池中闲置的最长时间
+      idle-timeout: 30000
+      #连接池的用户定义名称，主要出现在日志记录和JMX管理控制台中以识别池和池配置
+      pool-name: DatebookHikariCP
+      #池中连接最长生命周期
+      max-lifetime: 18000000
+      #等待来自池的连接的最大毫秒数
+      connection-timeout: 30000
+      #验证该连接是否是有效的查询语句
+      connection-test-query: select 1 from dual
+  cloud:
+    inetutils:
+      timeout-seconds: 1000
+    config:
+      enabled: false
+  # redis 相关
+  redis:
+    host: ${REDIS_URL:localhost}
+    port: ${REDIS_PORT:6379}
+    password: ${REDIS_PWD:111111}
+    timeout: 10000
+    jedis:
+      pool:
+        max-active: 1000
+        max-wait: -1ms
+        max-idle: 10
+        min-idle: 5
+swagger:
+  show: true
+analysis:
+  url: http://192.168.1.123:9000/vi/syncrec
+
+upload:
+  img:
+    url: http://192.168.1.83:18081/file/img/zs/
+    path: D:\\service\\fileService\\img\\zs\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+eureka:
+  instance:
+    instance-id: ${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    healthcheck:
+      enabled: true
+    service-url:
+      defaultZone: http://localhost:8084/eureka
+station:
+  id: 1
\ No newline at end of file
diff --git a/device_gather/src/main/resources/application-sbProd.yml b/device_gather/src/main/resources/application-sbProd.yml
new file mode 100644
index 0000000..e5545f4
--- /dev/null
+++ b/device_gather/src/main/resources/application-sbProd.yml
@@ -0,0 +1,82 @@
+server:
+  port: 8173
+  servlet:
+    context-path: /cars-api
+    #context-path: /
+
+spring:
+  datasource:
+    dynamic:
+      primary: db1
+      strict: false
+      datasource:
+        db1:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/device_system?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+        db2:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://116.196.120.81:3306/image_analysix_wz?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 5ea47c0bdd7146ebbd53020eca@672307
+    #Hikari连接池配置
+    hikari:
+      #池中维护的最小空闲连接数
+      minimum-idle: 5
+      #池中最大连接数，包括闲置和使用中的连接
+      maximum-pool-size: 15
+      #自动提交从池中返回的连接
+      auto-commit: true
+      #连接允许在池中闲置的最长时间
+      idle-timeout: 30000
+      #连接池的用户定义名称，主要出现在日志记录和JMX管理控制台中以识别池和池配置
+      pool-name: DatebookHikariCP
+      #池中连接最长生命周期
+      max-lifetime: 18000000
+      #等待来自池的连接的最大毫秒数
+      connection-timeout: 30000
+      #验证该连接是否是有效的查询语句
+      connection-test-query: select 1 from dual
+  cloud:
+    inetutils:
+      timeout-seconds: 1000
+    config:
+      enabled: false
+  # redis 相关
+  redis:
+    host: ${REDIS_URL:localhost}
+    port: ${REDIS_PORT:6379}
+    password: ${REDIS_PWD:111111}
+    timeout: 10000
+    jedis:
+      pool:
+        max-active: 1000
+        max-wait: -1ms
+        max-idle: 10
+        min-idle: 5
+swagger:
+  show: true
+analysis:
+  url: http://192.168.1.123:9000/vi/syncrec
+
+upload:
+  img:
+    url: http://192.168.1.83:18081/file/img/zs/
+    path: D:\\service\\fileService\\img\\zs\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+eureka:
+  instance:
+    instance-id: ${spring.cloud.client.ip-address}:${server.port}
+    prefer-ip-address: true
+  client:
+    healthcheck:
+      enabled: true
+    service-url:
+      defaultZone: http://localhost:8084/eureka
+station:
+  id: 1
\ No newline at end of file
diff --git a/device_gather/src/main/resources/application.yml b/device_gather/src/main/resources/application.yml
index c3d0e0e..983addc 100644
--- a/device_gather/src/main/resources/application.yml
+++ b/device_gather/src/main/resources/application.yml
@@ -2,7 +2,7 @@ spring:
   profiles:
     #active: dev     #开发环境
     #    active: test    #测试环境5
-    active: jc-dev
+    active: jcDev
   #   active: prod    #生产环境
   application:
     name: gather
diff --git a/device_gather/src/main/resources/mapper/MeterConfigMapper.xml b/device_gather/src/main/resources/mapper/MeterConfigMapper.xml
index b1dc5f9..dc17080 100644
--- a/device_gather/src/main/resources/mapper/MeterConfigMapper.xml
+++ b/device_gather/src/main/resources/mapper/MeterConfigMapper.xml
@@ -54,6 +54,6 @@
 
     <select id="getMeterList" resultType="com.xr.device.model.entity.MeterConfig">
         select a.*,b.device_ip from meter_config a left join device_camera b
-        on a.camera_id = b.id where a.status = 1
+        on a.camera_id = b.id where a.status = 1 and a.station_id = #{stationId}
     </select>
 </mapper>