首页增加动态展示每个站的表计数量

device_cars/src/main/java/com/xr/device_car/config/getconfigvalue/StaticProperties.java

@@ -35,4 +35,10 @@ public class StaticProperties {
     @Value("${udp.server.port}")
     private Integer udpPort;
 
+    @Value("${station.id}")
+    private Integer stationId;
+
+    @Value("${station.name}")
+    private String stationName;
+
 }

device_cars/src/main/java/com/xr/device_car/config/utils/StaticPropUtil.java

@@ -22,6 +22,10 @@ public class StaticPropUtil {
 
     public static Integer udpPort;
 
+    public static Integer stationId;
+
+    public static String stationName;
+
     public static void initDingDingProp(StaticProperties dingProperties){
         imagePath = dingProperties.getPath();
         imageUrl = dingProperties.getUrl();
@@ -32,6 +36,8 @@ public class StaticPropUtil {
         minioSecret=dingProperties.getMinioSecret();
         udpHost=dingProperties.getUdpHost();
         udpPort=dingProperties.getUdpPort();
+        stationId = dingProperties.getStationId();
+        stationName = dingProperties.getStationName();
     }
 
 }

device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/MeterConfigController.java

@@ -31,8 +31,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
 import java.util.List;
 import java.util.zip.CRC32;
 import java.util.zip.Checksum;
@@ -359,6 +358,55 @@ public class MeterConfigController {
         return sum;
     }
 
+    @RequestMapping("/queryMeterList")
+    public Result<?> queryMeterList(){
+        QueryWrapper<MeterConfig> query = new QueryWrapper<>();
+        query.eq("status",1);
+        List<MeterConfig> list = meterConfigService.list(query);
+        Map<String,Object> map1 = new HashMap<>();
+        map1.put("name",StaticPropUtil.stationName);
+        map1.put("value",list.size());
+
+        List<Map<String,Object>> ml1 = new ArrayList<>();
+        QueryWrapper<MeterConfig> query1 = new QueryWrapper<>();
+        query1.eq("status",1);
+        query1.eq("station_id",StaticPropUtil.stationId);
+        query1.select("owning_interval");
+        query1.groupBy("owning_interval");
+        List<MeterConfig> list1 = meterConfigService.list(query1);
+        for(MeterConfig meter:list1){
+            meter.setStationId(StaticPropUtil.stationId);
+            Map<String,Object> map2 = new HashMap<>();
+            QueryWrapper<MeterConfig> query2 = new QueryWrapper<>();
+            query2.eq("station_id",StaticPropUtil.stationId);
+            query2.eq("status",1);
+            query2.eq("owning_interval",meter.getOwningInterval());
+            List<MeterConfig> list2 = meterConfigService.list(query2);
+            map2.put("name",meter.getOwningInterval());
+            map2.put("value",list2.size());
+            List<MeterConfig> list3 = meterConfigService.selectConfigByTypes(meter);
+            List<Map<String,Object>> ml2 = new ArrayList<>();
+            for (MeterConfig config:list3){
+                Map<String,Object> map3 = new HashMap<>();
+                map3.put("name",config.getMeterType());
+                QueryWrapper<MeterConfig> query3 = new QueryWrapper<>();
+                query3.eq("status",1);
+                query3.eq("station_id",StaticPropUtil.stationId);
+                query3.eq("owning_interval",meter.getOwningInterval());
+                query3.eq("type_id",config.getTypeId());
+                int count = meterConfigService.count(query3);
+                map3.put("value",count);
+                map3.put("children",new ArrayList<>());
+                ml2.add(map3);
+            }
+            map2.put("children",ml2);
+            ml1.add(map2);
+        }
+        map1.put("children",ml1);
+        return Result.OK(map1);
+    }
+
+
 
 
 

device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/MeterConfig.java

@@ -27,6 +27,9 @@ public class MeterConfig implements Serializable {
      */
     private String voltageClass;
 
+    @TableField(exist = false)
+    private String meterType;
+
     /**
      * 所属间隔
      */

device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterConfigMapper.java

@@ -8,6 +8,8 @@ import com.xr.device_car.modules.analysis.entity.MeterConfig;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
 * @author asus
 * @description 针对表【meter_config(表计属性配置表)】的数据库操作Mapper
@@ -19,6 +21,8 @@ public interface MeterConfigMapper extends BaseMapper<MeterConfig> {
 
     IPage<MeterConfig> selectConfigByPage(@Param("page") IPage<MeterConfig> page,
                                    @Param(Constants.WRAPPER) Wrapper<MeterConfig> wrapper);
+
+    List<MeterConfig> selectConfigByTypes(MeterConfig meterConfig);
 }
 
 

device_cars/src/main/java/com/xr/device_car/modules/analysis/service/MeterConfigService.java

@@ -6,6 +6,8 @@ import com.xr.device_car.modules.analysis.entity.MeterConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xr.device_car.modules.analysis.vo.MeterMaxMinSaveVo;
 
+import java.util.List;
+
 /**
 * @author asus
 * @description 针对表【meter_config(表计属性配置表)】的数据库操作Service
@@ -18,4 +20,6 @@ public interface MeterConfigService extends IService<MeterConfig> {
 
     boolean saveMaxMin(MeterMaxMinSaveVo vo);
 
+    List<MeterConfig> selectConfigByTypes(MeterConfig meterConfig);
+
 }

device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterConfigServiceImpl.java

@@ -12,6 +12,8 @@ import com.xr.device_car.modules.analysis.mapper.MeterConfigMapper;
 import com.xr.device_car.modules.analysis.vo.MeterMaxMinSaveVo;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
 * @author asus
 * @description 针对表【meter_config(表计属性配置表)】的数据库操作Service实现
@@ -39,6 +41,11 @@ public class MeterConfigServiceImpl extends ServiceImpl<MeterConfigMapper, Meter
         return update(updateWrapper);
     }
 
+    @Override
+    public List<MeterConfig> selectConfigByTypes(MeterConfig meterConfig) {
+        return ((MeterConfigMapper)this.baseMapper).selectConfigByTypes(meterConfig);
+    }
+
 }
 
 

device_cars/src/main/resources/application-dev.yml → device_cars/src/main/resources/application-jiangcdev.yml

@@ -91,4 +91,7 @@ minio:
 udp:
   server:
     host: 172.26.4.59
-    port: 9300
+    port: 9300
+station:
+  id: 5
+  name: 江场站

device_cars/src/main/resources/application-prod.yml → device_cars/src/main/resources/application-jiangcprod.yml

@@ -91,4 +91,7 @@ minio:
 udp:
   server:
     host: 192.168.1.100
-    port: 9300
+    port: 9300
+station:
+  id: 5
+  name: 江场站

device_cars/src/main/resources/application-jiaocdev.yml

@@ -0,0 +1,97 @@
+server:
+  port: 8085
+  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/
+    path: D:\\service\\fileService\\img\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+netty:
+  address: 192.168.3.20
+  port: 2404
+data:
+  pathUrl: http://192.168.1.82:8081/api/dataAnalysisCamera/getComer
+  #pathUrl: http://192.168.1.44:8081/api/dataAnalysisCamera/getComer
+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
+minio:
+  url: http://192.168.1.210:9000
+  accessKey: minioadmin
+  secretKey: minioadmin
+udp:
+  server:
+    host: 172.26.4.59
+    port: 9300
+station:
+  id: 2
+  name: 交城站

device_cars/src/main/resources/application-test.yml → device_cars/src/main/resources/application-jiaocprod.yml

@@ -13,13 +13,13 @@ spring:
         db1:
           driver-class-name: com.mysql.cj.jdbc.Driver
           type: com.zaxxer.hikari.HikariDataSource
-          url: jdbc:mysql://localhost:3306/device_system?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          url: jdbc:mysql://192.168.1.94:3306/device_system?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
           username: root
           password: 123456
         db2:
           driver-class-name: com.mysql.cj.jdbc.Driver
           type: com.zaxxer.hikari.HikariDataSource
-          url: jdbc:mysql://localhost:3306/image_analysis_zs?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          url: jdbc:mysql://192.168.1.94:3306/image_analysis?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
           username: root
           password: 123456
     #Hikari连接池配置
@@ -62,23 +62,16 @@ swagger:
 analysis:
   url: http://192.168.1.123:9000/vi/syncrec
 
-upLoad:
+upload:
-  path: D:\\device_car\\analysis\\upload\\
+  img:
-  url: http://localhost:85/upload/
+    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
 netty:
   address: 192.168.3.20
   port: 2404
-minio:
-  url: http://192.168.1.210:9000
-  accessKey: minioadmin
-  secretKey: minioadmin
-udp:
-  server:
-    host: localhost
-    port: 9300
 data:
   pathUrl: http://192.168.1.82:8081/api/dataAnalysisCamera/getComer
   #pathUrl: http://192.168.1.44:8081/api/dataAnalysisCamera/getComer
@@ -90,4 +83,15 @@ eureka:
     healthcheck:
       enabled: true
     service-url:
-      defaultZone: http://localhost:8084/eureka
+      defaultZone: http://localhost:8084/eureka
+minio:
+  url: http://192.168.1.210:9000
+  accessKey: minioadmin
+  secretKey: minioadmin
+udp:
+  server:
+    host: 192.168.1.100
+    port: 9300
+station:
+  id: 2
+  name: 交城站

device_cars/src/main/resources/application-ppdev.yml

@@ -0,0 +1,97 @@
+server:
+  port: 8085
+  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/
+    path: D:\\service\\fileService\\img\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+netty:
+  address: 192.168.3.20
+  port: 2404
+data:
+  pathUrl: http://192.168.1.82:8081/api/dataAnalysisCamera/getComer
+  #pathUrl: http://192.168.1.44:8081/api/dataAnalysisCamera/getComer
+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
+minio:
+  url: http://192.168.1.210:9000
+  accessKey: minioadmin
+  secretKey: minioadmin
+udp:
+  server:
+    host: 172.26.4.59
+    port: 9300
+station:
+  id: 4
+  name: 彭浦站

device_cars/src/main/resources/application-ppprod.yml

@@ -0,0 +1,97 @@
+server:
+  port: 8085
+  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://192.168.1.94:3306/device_system?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 123456
+        db2:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://192.168.1.94:3306/image_analysis?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 123456
+    #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.94:18081/file/img/
+    path: E:\\service\\fileService\\img\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+netty:
+  address: 192.168.3.20
+  port: 2404
+data:
+  pathUrl: http://192.168.1.82:8081/api/dataAnalysisCamera/getComer
+  #pathUrl: http://192.168.1.44:8081/api/dataAnalysisCamera/getComer
+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
+minio:
+  url: http://192.168.1.210:9000
+  accessKey: minioadmin
+  secretKey: minioadmin
+udp:
+  server:
+    host: 192.168.1.100
+    port: 9300
+station:
+  id: 4
+  name: 彭浦站

device_cars/src/main/resources/application-psdev.yml

@@ -0,0 +1,97 @@
+server:
+  port: 8085
+  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/
+    path: D:\\service\\fileService\\img\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+netty:
+  address: 192.168.3.20
+  port: 2404
+data:
+  pathUrl: http://192.168.1.82:8081/api/dataAnalysisCamera/getComer
+  #pathUrl: http://192.168.1.44:8081/api/dataAnalysisCamera/getComer
+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
+minio:
+  url: http://192.168.1.210:9000
+  accessKey: minioadmin
+  secretKey: minioadmin
+udp:
+  server:
+    host: 172.26.4.59
+    port: 9300
+station:
+  id: 3
+  name: 平顺站

device_cars/src/main/resources/application-psprod.yml

@@ -0,0 +1,97 @@
+server:
+  port: 8085
+  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://192.168.1.94:3306/device_system?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 123456
+        db2:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://192.168.1.94:3306/image_analysis?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 123456
+    #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.94:18081/file/img/
+    path: E:\\service\\fileService\\img\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+netty:
+  address: 192.168.3.20
+  port: 2404
+data:
+  pathUrl: http://192.168.1.82:8081/api/dataAnalysisCamera/getComer
+  #pathUrl: http://192.168.1.44:8081/api/dataAnalysisCamera/getComer
+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
+minio:
+  url: http://192.168.1.210:9000
+  accessKey: minioadmin
+  secretKey: minioadmin
+udp:
+  server:
+    host: 192.168.1.100
+    port: 9300
+station:
+  id: 3
+  name: 平顺站

device_cars/src/main/resources/application-sbdev.yml

@@ -0,0 +1,97 @@
+server:
+  port: 8085
+  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/
+    path: D:\\service\\fileService\\img\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+netty:
+  address: 192.168.3.20
+  port: 2404
+data:
+  pathUrl: http://192.168.1.82:8081/api/dataAnalysisCamera/getComer
+  #pathUrl: http://192.168.1.44:8081/api/dataAnalysisCamera/getComer
+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
+minio:
+  url: http://192.168.1.210:9000
+  accessKey: minioadmin
+  secretKey: minioadmin
+udp:
+  server:
+    host: 172.26.4.59
+    port: 9300
+station:
+  id: 1
+  name: 市北站

device_cars/src/main/resources/application-sbprod.yml

@@ -0,0 +1,97 @@
+server:
+  port: 8085
+  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://192.168.1.94:3306/device_system?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 123456
+        db2:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          type: com.zaxxer.hikari.HikariDataSource
+          url: jdbc:mysql://192.168.1.94:3306/image_analysis?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useSSL=false
+          username: root
+          password: 123456
+    #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.94:18081/file/img/
+    path: E:\\service\\fileService\\img\\
+python:
+  path: C:\\Users\\admin\\Anaconda3\\envs\\myconda310\\python.exe
+  modelPath: D:\\smartGrid\\smartGrid\\models
+netty:
+  address: 192.168.3.20
+  port: 2404
+data:
+  pathUrl: http://192.168.1.82:8081/api/dataAnalysisCamera/getComer
+  #pathUrl: http://192.168.1.44:8081/api/dataAnalysisCamera/getComer
+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
+minio:
+  url: http://192.168.1.210:9000
+  accessKey: minioadmin
+  secretKey: minioadmin
+udp:
+  server:
+    host: 192.168.1.100
+    port: 9300
+station:
+  id: 1
+  name: 市北站

device_cars/src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
   profiles:
     #active: dev     #开发环境
     #    active: test    #测试环境5
-    active: dev    #生产环境
+    active: jiaocdev    #生产环境
   #   active: prod    #生产环境
   application:
     name: deviceCars

device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml

@@ -52,4 +52,11 @@
         left join substation d on a.station_id = d.id
         ${ew.customSqlSegment}
     </select>
+
+    <select id="selectConfigByTypes" resultType="com.xr.device_car.modules.analysis.entity.MeterConfig">
+        select b.meter_type,a.type_id from meter_config a left join meter_type b
+        on a.type_id = b.id where a.status = 1
+        and a.station_id = #{stationId} and a.owning_interval = #{owningInterval}
+        group by b.meter_type,a.type_id
+    </select>
 </mapper>