From aced369575f242a0b8734d13a61b21c9edfc361b Mon Sep 17 00:00:00 2001 From: yj <913944315@qq.com> Date: Wed, 10 Jul 2024 14:39:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=87=E9=9B=86=E7=AB=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../getconfigvalue/StaticProperties.java | 6 +++ .../config/utils/StaticPropUtil.java | 6 +++ .../controller/MeterConfigController.java | 47 ++++++++++++++++++- .../modules/analysis/entity/MeterConfig.java | 3 ++ .../analysis/mapper/MeterConfigMapper.java | 4 ++ .../analysis/service/MeterConfigService.java | 4 ++ .../service/impl/MeterConfigServiceImpl.java | 7 +++ .../src/main/resources/application-dev.yml | 5 +- .../src/main/resources/application-prod.yml | 5 +- .../modules/analysis/MeterConfigMapper.xml | 6 +++ 10 files changed, 89 insertions(+), 4 deletions(-) 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 7594303..e22ab1d 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; @@ -356,4 +355,48 @@ 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.select("owning_interval"); + query1.groupBy("owning_interval"); + List list1 = meterConfigService.list(query1); + for(MeterConfig meter:list1){ + Map map2 = new HashMap<>(); + QueryWrapper query2 = new QueryWrapper<>(); + 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("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 f36d4d5..2ede0f3 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 @@ -68,6 +68,9 @@ public class MeterConfig implements Serializable { @TableField(exist = false) private String cameraName; + @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-dev.yml index a86a2b4..32525f0 100644 --- a/device_cars/src/main/resources/application-dev.yml +++ b/device_cars/src/main/resources/application-dev.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: 1 + 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-prod.yml index c5a8db5..61b7046 100644 --- a/device_cars/src/main/resources/application-prod.yml +++ b/device_cars/src/main/resources/application-prod.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: 1 + name: 中山站 \ No newline at end of file diff --git a/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml b/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml index d827a87..3754ec2 100644 --- a/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml +++ b/device_cars/src/main/resources/modules/analysis/MeterConfigMapper.xml @@ -51,4 +51,10 @@ left join meter_type c on a.type_id=c.id ${ew.customSqlSegment} + +