diff --git a/device_cars/src/main/java/com/xr/device_car/config/getconfigvalue/StaticProperties.java b/device_cars/src/main/java/com/xr/device_car/config/getconfigvalue/StaticProperties.java index d33a555..657de17 100644 --- a/device_cars/src/main/java/com/xr/device_car/config/getconfigvalue/StaticProperties.java +++ b/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; + } diff --git a/device_cars/src/main/java/com/xr/device_car/config/utils/StaticPropUtil.java b/device_cars/src/main/java/com/xr/device_car/config/utils/StaticPropUtil.java index b138ba2..19a0d64 100644 --- a/device_cars/src/main/java/com/xr/device_car/config/utils/StaticPropUtil.java +++ b/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(); } } 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 9312983..4e1b234 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 @@ -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.Date; +import java.util.*; 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 query = new QueryWrapper<>(); + query.eq("status",1); + List list = meterConfigService.list(query); + Map map1 = new HashMap<>(); + map1.put("name",StaticPropUtil.stationName); + map1.put("value",list.size()); + + List> ml1 = new ArrayList<>(); + QueryWrapper query1 = new QueryWrapper<>(); + query1.eq("status",1); + query1.eq("station_id",StaticPropUtil.stationId); + query1.select("owning_interval"); + query1.groupBy("owning_interval"); + List list1 = meterConfigService.list(query1); + for(MeterConfig meter:list1){ + meter.setStationId(StaticPropUtil.stationId); + Map map2 = new HashMap<>(); + QueryWrapper query2 = new QueryWrapper<>(); + query2.eq("station_id",StaticPropUtil.stationId); + query2.eq("status",1); + query2.eq("owning_interval",meter.getOwningInterval()); + List list2 = meterConfigService.list(query2); + map2.put("name",meter.getOwningInterval()); + map2.put("value",list2.size()); + List list3 = meterConfigService.selectConfigByTypes(meter); + List> ml2 = new ArrayList<>(); + for (MeterConfig config:list3){ + Map map3 = new HashMap<>(); + map3.put("name",config.getMeterType()); + QueryWrapper 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); + } + + 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 7188760..172cb72 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 @@ -27,6 +27,9 @@ public class MeterConfig implements Serializable { */ private String voltageClass; + @TableField(exist = false) + private String meterType; + /** * 所属间隔 */ diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterConfigMapper.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterConfigMapper.java index 719c3cf..9ee7c41 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/mapper/MeterConfigMapper.java +++ b/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 { IPage selectConfigByPage(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); + + List selectConfigByTypes(MeterConfig meterConfig); } diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/MeterConfigService.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/MeterConfigService.java index 60fc985..ca353d2 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/MeterConfigService.java +++ b/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 { boolean saveMaxMin(MeterMaxMinSaveVo vo); + List selectConfigByTypes(MeterConfig meterConfig); + } diff --git a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterConfigServiceImpl.java b/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterConfigServiceImpl.java index a7a3baa..03fdf9b 100644 --- a/device_cars/src/main/java/com/xr/device_car/modules/analysis/service/impl/MeterConfigServiceImpl.java +++ b/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 selectConfigByTypes(MeterConfig meterConfig) { + return ((MeterConfigMapper)this.baseMapper).selectConfigByTypes(meterConfig); + } + } diff --git a/device_cars/src/main/resources/application-dev.yml b/device_cars/src/main/resources/application-jiangcdev.yml similarity index 98% rename from device_cars/src/main/resources/application-dev.yml rename to device_cars/src/main/resources/application-jiangcdev.yml index 7325b1f..9c9fdbf 100644 --- a/device_cars/src/main/resources/application-dev.yml +++ b/device_cars/src/main/resources/application-jiangcdev.yml @@ -91,4 +91,7 @@ minio: udp: server: host: 172.26.4.59 - port: 9300 \ No newline at end of file + port: 9300 +station: + id: 5 + name: 江场站 \ No newline at end of file diff --git a/device_cars/src/main/resources/application-prod.yml b/device_cars/src/main/resources/application-jiangcprod.yml similarity index 98% rename from device_cars/src/main/resources/application-prod.yml rename to device_cars/src/main/resources/application-jiangcprod.yml index b1c7ce3..0f46cea 100644 --- a/device_cars/src/main/resources/application-prod.yml +++ b/device_cars/src/main/resources/application-jiangcprod.yml @@ -91,4 +91,7 @@ minio: udp: server: host: 192.168.1.100 - port: 9300 \ No newline at end of file + port: 9300 +station: + id: 5 + name: 江场站 \ No newline at end of file diff --git a/device_cars/src/main/resources/application-jiaocdev.yml b/device_cars/src/main/resources/application-jiaocdev.yml new file mode 100644 index 0000000..f7e4b91 --- /dev/null +++ b/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: 交城站 \ No newline at end of file diff --git a/device_cars/src/main/resources/application-test.yml b/device_cars/src/main/resources/application-jiaocprod.yml similarity index 83% rename from device_cars/src/main/resources/application-test.yml rename to device_cars/src/main/resources/application-jiaocprod.yml index 95a1939..9326b18 100644 --- a/device_cars/src/main/resources/application-test.yml +++ b/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: - path: D:\\device_car\\analysis\\upload\\ - url: http://localhost:85/upload/ +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 -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 \ No newline at end of file + 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: 交城站 \ No newline at end of file diff --git a/device_cars/src/main/resources/application-ppdev.yml b/device_cars/src/main/resources/application-ppdev.yml new file mode 100644 index 0000000..064934b --- /dev/null +++ b/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: 彭浦站 \ No newline at end of file diff --git a/device_cars/src/main/resources/application-ppprod.yml b/device_cars/src/main/resources/application-ppprod.yml new file mode 100644 index 0000000..3bb5e95 --- /dev/null +++ b/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: 彭浦站 \ No newline at end of file diff --git a/device_cars/src/main/resources/application-psdev.yml b/device_cars/src/main/resources/application-psdev.yml new file mode 100644 index 0000000..c8a9121 --- /dev/null +++ b/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: 平顺站 \ No newline at end of file diff --git a/device_cars/src/main/resources/application-psprod.yml b/device_cars/src/main/resources/application-psprod.yml new file mode 100644 index 0000000..be5d576 --- /dev/null +++ b/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: 平顺站 \ No newline at end of file diff --git a/device_cars/src/main/resources/application-sbdev.yml b/device_cars/src/main/resources/application-sbdev.yml new file mode 100644 index 0000000..90e4aae --- /dev/null +++ b/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: 市北站 \ No newline at end of file diff --git a/device_cars/src/main/resources/application-sbprod.yml b/device_cars/src/main/resources/application-sbprod.yml new file mode 100644 index 0000000..c7344e9 --- /dev/null +++ b/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: 市北站 \ No newline at end of file diff --git a/device_cars/src/main/resources/application.yml b/device_cars/src/main/resources/application.yml index 8d7945b..7a7eead 100644 --- a/device_cars/src/main/resources/application.yml +++ b/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 diff --git a/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml b/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml index bb48628..34e6020 100644 --- a/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml +++ b/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} + +