Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java

zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java

@@ -720,15 +720,8 @@ public class DcDeviceController extends BaseController {
     }
 
     @GetMapping("/deviceParameter")
-    public TableDataInfo selectDeviceParameterProperties(DcDevice dcDevice) {
-        if (dcDevice == null || dcDevice.getDeviceType() == null) {
-            TableDataInfo tableDataInfo = new TableDataInfo();
-            tableDataInfo.setCode(UniversalEnum.FIVE_HUNDRED.getNumber());
-            tableDataInfo.setMsg(UniversalEnum.PARAMETER_ERROR.getValue());
-            return tableDataInfo;
-        }
-        startPage();
-        return getDataTable(dcDeviceService.selectDeviceParameterProperties(dcDevice));
+    public AjaxResult selectDeviceParameterProperties(DcDevice dcDevice) {
+        return AjaxResult.success(dcDeviceService.selectDeviceParameterProperties(dcDevice));
     }
 
     /**
@@ -832,6 +825,95 @@ public class DcDeviceController extends BaseController {
         String key = configService.selectConfigByKey(UniversalEnum.SBX_FUN_KL.getValue());//密钥
         return AjaxResult.success(key.equals(secretKey));
     }
+    //设备分析
+    @PostMapping("/properties/deviceAnalysis")
+    public AjaxResult deviceAnalysis(@RequestBody HashMap map) throws IOException, HttpException {
+        if (map==null||!map.containsKey("deviceId")||!map.containsKey("deviceType") ||!map.containsKey("dateTime")){
+            return AjaxResult.error(UniversalEnum.PARAMETER_ERROR.getValue());
+        }
+        String type = map.get("deviceType").toString();//设备类型
+        String deviceId = map.get("deviceId").toString();//设备id
+        DcDevice dcDevice = new DcDevice();
+        dcDevice.setDeviceType(type);
+        HashMap<String, Object> props = new HashMap<>();
+        // 设置查询条件的键为“timestamp$BTW”，表示时间戳在一定范围内
+        props.put("terms[0].column", "timestamp$BTW");
+        ArrayList<String> dateList = new ArrayList<>();
+        // 添加当前日期的开始和结束时间到列表，用于设定时间范围
+        SimpleDateFormat dateFormat = new SimpleDateFormat(UniversalEnum.TIME_FORMAT_YEARS_MONTH_DAY.getValue());
+        try {
+            Date date = dateFormat.parse((String) map.get("dateTime"));
+            dateList.add(DateUtil.beginOfDay(date).toString());
+            dateList.add(DateUtil.endOfDay(date).toString());
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        // 将日期列表以逗号分隔并设置为查询条件的值
+        props.put("terms[0].value", String.join(UniversalEnum.COMMA.getValue(), dateList));
+        props.put("paging", false);
+        props.put("sorts[0].order", "asc");
+        props.put("sorts[0].name", "timestamp");
+        List<HashMap<String, Object>> mapList = dcDeviceService.selectDeviceParameterProperties(dcDevice);//属性的参数信息
+        List<HashMap> resultsMapValue=new ArrayList<>();
+        for (HashMap<String, Object> hashMap : mapList) {
+            HashMap<String, Object> resultsMap = new HashMap<>();
+            String name = hashMap.get("name").toString();//属性名称
+            String propertyId = hashMap.get("propertyId").toString();//属性id
+            String propertyName = hashMap.get("propertyName").toString();//属性取值
+            AjaxResult ajaxResult = queryDeviceProperties(deviceId, propertyId, props);//取出属性全部信息
+            String code = ajaxResult.get("code").toString();
+            if ("500".equals(code)) {
+                return ajaxResult;
+            }
+            if (UniversalEnum.THIRTEEN.getValue().equals(type) || UniversalEnum.SIXTEEN.getValue().equals(type)) {  //判断是否为设备箱/远端机
+                JSONObject data = (JSONObject) ajaxResult.get("data");
+                JSONArray dataVale = (JSONArray) data.get("data");
+                List<JSONObject> jsonObjectList = dataVale.toJavaList(JSONObject.class);
+                // 定义一个时间格式转换的工具
+                SimpleDateFormat sdf = new SimpleDateFormat(UniversalEnum.TIME_FORMAT_ALL.getValue(), Locale.getDefault());
+                // 使用Stream API提取每个JSONObject中的timestamp和propertyName值
+                List<Map<String, String>> results = jsonObjectList.stream()
+                        .map(jsonObject -> {
+                            long timestamp = jsonObject.getLongValue("timestamp"); // 假设timestamp是long类型
+                            Date date = new Date(timestamp); // 将时间戳转换为Date对象
+                            String formattedTime = sdf.format(date); // 将Date对象格式化为字符串
+                            JSONObject formatValue = jsonObject.getJSONObject("formatValue"); // 获取嵌套的JSONObject
+                            String result = formatValue.getString(propertyName); // 从嵌套的JSONObject中获取电压值
+                            Map<String, String> hashMaps = new HashMap<>();
+                            hashMaps.put("timestamp", formattedTime); // 使用"timestamp"作为键来存储格式化后的时间
+                            hashMaps.put("result", result); // 使用"voltage"作为键来存储电压值
+                            return hashMaps;
+                        }).collect(Collectors.toList());
+                results.sort(Comparator.comparing(hashMaps -> hashMaps.get("timestamp")));
+                resultsMap.put("name", name);
+                resultsMap.put("results", results);
+            }
+            if (UniversalEnum.THREE.getValue().equals(type) || UniversalEnum.SEVENTEEN.getValue().equals(type) ||
+                    UniversalEnum.FIFTEEN.getValue().equals(type)) { //气象预警/ups设备/太阳能板
+                JSONObject data = (JSONObject) ajaxResult.get("data");
+                JSONArray dataValue = (JSONArray) data.get("data");
+                List<JSONObject> jsonObjectList = dataValue.toJavaList(JSONObject.class);
+                // 定义一个时间格式转换的工具
+                SimpleDateFormat sdf = new SimpleDateFormat(UniversalEnum.TIME_FORMAT_ALL.getValue(), Locale.getDefault());
+                List<HashMap<String, String>> results = jsonObjectList.stream()
+                        .map(jsonObject -> {
+                            long timestamp = jsonObject.getLongValue("timestamp"); // 假设timestamp是long类型
+                            Date date = new Date(timestamp); // 将时间戳转换为Date对象
+                            String formattedTime = sdf.format(date); // 将Date对象格式化为字符串
+                            String result = jsonObject.getString(propertyName);
+                            HashMap<String, String> hashMaps = new HashMap<>();
+                            hashMaps.put("timestamp", formattedTime); // 使用时间戳作为键可能不是最佳实践，但这里保持与原始逻辑一致
+                            hashMaps.put("result", result);
+                            return hashMaps;
+                        }).collect(Collectors.toList());
+                results.sort(Comparator.comparing(hashMaps -> hashMaps.get("timestamp")));
+                resultsMap.put("name", name);
+                resultsMap.put("results", results);
+            }
+            resultsMapValue.add(resultsMap);
+        }
+        return AjaxResult.success(resultsMapValue);
+    }
 
     ///***
     // * 合流区预警设备设备电量不足警告

zc-business/src/main/java/com/zc/business/controller/DcMeteorologicalDetectorController.java

@@ -2,11 +2,9 @@ package com.zc.business.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.zc.business.domain.DcEvent;
 import com.zc.business.domain.DcMeteorologicalDetectorData;
-import com.zc.business.service.IDcEventService;
+import com.zc.business.enums.UniversalEnum;
 import com.zc.business.service.IDcMeteorologicalDetectorDataService;
-import com.zc.business.service.impl.DcMeteorologicalDetectorDataServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +27,8 @@ public class DcMeteorologicalDetectorController  extends BaseController {
     @GetMapping("/deviceName")
     public TableDataInfo list(String deviceName)
     {
+        deviceName = deviceName.replace(UniversalEnum.BLANK_SPACE.getValue(), UniversalEnum.PLUS_SIGN.getValue());
+
         List<Map<String,String>> list = dcMeteorologicalDetectorDataService.selectStatistics(deviceName);
         return getDataTable(list);
     }
@@ -36,6 +36,8 @@ public class DcMeteorologicalDetectorController  extends BaseController {
     @GetMapping("/device/{deviceName}")
     public TableDataInfo deviceNameList(@PathVariable("deviceName") String deviceName)
     {
+        deviceName = deviceName.replace(UniversalEnum.BLANK_SPACE.getValue(), UniversalEnum.PLUS_SIGN.getValue());
+
         List<DcMeteorologicalDetectorData>  list = dcMeteorologicalDetectorDataService.selectDeviceNameList(deviceName);
         return getDataTable(list);
     }
@@ -59,6 +61,8 @@ public class DcMeteorologicalDetectorController  extends BaseController {
     @GetMapping("/deviceHour")
     public TableDataInfo deviceHour(String deviceName,String specificDate)
     {
+        deviceName = deviceName.replace(UniversalEnum.BLANK_SPACE.getValue(), UniversalEnum.PLUS_SIGN.getValue());
+
         List<Map<String,String>> list = dcMeteorologicalDetectorDataService.selectStatisticsTime(deviceName,specificDate);
         return getDataTable(list);
     }
@@ -66,6 +70,8 @@ public class DcMeteorologicalDetectorController  extends BaseController {
     @GetMapping("/deviceDay")
     public TableDataInfo deviceDay(String deviceName,String specificDate)
     {
+        deviceName = deviceName.replace(UniversalEnum.BLANK_SPACE.getValue(), UniversalEnum.PLUS_SIGN.getValue());
+
         List<Map<String,String>> list = dcMeteorologicalDetectorDataService.selectStatisticsDay(deviceName,specificDate);
         return getDataTable(list);
     }
@@ -73,6 +79,8 @@ public class DcMeteorologicalDetectorController  extends BaseController {
     @GetMapping("/deviceYears")
     public TableDataInfo deviceYears(String deviceName,String specificDate)
     {
+        deviceName = deviceName.replace(UniversalEnum.BLANK_SPACE.getValue(), UniversalEnum.PLUS_SIGN.getValue());
+
         List<Map<String,String>> list = dcMeteorologicalDetectorDataService.selectStatisticsYears(deviceName,specificDate);
         return getDataTable(list);
     }

zc-business/src/main/java/com/zc/business/controller/DcTrafficStatisticsController.java

@@ -11,10 +11,7 @@ import com.ruoyi.common.utils.StakeMarkUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.zc.business.domain.*;
-import com.zc.business.domain.export.RealTimeTrafficFlow;
-import com.zc.business.domain.export.SectionTrafficIndexAnalysis;
-import com.zc.business.domain.export.SectionTrafficRanking;
-import com.zc.business.domain.export.TrafficPeriodAnalysis;
+import com.zc.business.domain.export.*;
 import com.zc.business.enums.StakeMarkRange;
 import com.zc.business.enums.UniversalEnum;
 import com.zc.business.request.DcTrafficMetricsDataRequest;
@@ -32,9 +29,11 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.text.DecimalFormat;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 
@@ -454,7 +453,7 @@ public AjaxResult realTimeTrafficFlow(String startDate, String direction,String
             String sectionName = value.getDescription();
             SectionTrafficIndexAnalysis sectionTrafficIndexAnalysis = new SectionTrafficIndexAnalysis();
             sectionTrafficIndexAnalysis.setName(value.getDescription());
-            if (thisYearData.containsKey(sectionName)){
+            if (thisYearData != null && thisYearData.containsKey(sectionName)){
                 Map<String, Object> sectionData = thisYearData.get(sectionName).get(UniversalEnum.ZERO.getNumber());
                 sectionTrafficIndexAnalysis.setCrowdingRate(sectionData.get("crowdingRate").toString());
                 sectionTrafficIndexAnalysis.setSaturationRate(sectionData.get("saturationRate").toString());
@@ -465,7 +464,7 @@ public AjaxResult realTimeTrafficFlow(String startDate, String direction,String
                 sectionTrafficIndexAnalysis.setTrafficCompositionRate(UniversalEnum.ZERO.getValue());
             }
 
-            if (lastYearData.containsKey(sectionName)){
+            if (lastYearData != null && lastYearData.containsKey(sectionName)){
                 Map<String, Object> sectionData = lastYearData.get(sectionName).get(UniversalEnum.ZERO.getNumber());
                 sectionTrafficIndexAnalysis.setCrowdingRateLastYear(sectionData.get("crowdingRate").toString());
                 sectionTrafficIndexAnalysis.setSaturationRateLastYear(sectionData.get("saturationRate").toString());
@@ -491,6 +490,73 @@ public AjaxResult realTimeTrafficFlow(String startDate, String direction,String
         // 将查询结果封装为成功响应并返回
         return AjaxResult.success(mapList);
     }
+
+    @ApiOperation(value="导出交通指标时间分布",tags = {"ECharts导出"})
+    @GetMapping("/history/exportPassIndicatorTimeDistribution")
+    public void exportPassIndicatorTimeDistribution(HttpServletResponse response,String startDate, String direction,String periodType){
+        List<PassIndicatorTimeDistribution> list = new ArrayList<>();
+
+        String endDate = UniversalEnum.EMPTY_STRING.getValue();
+        if (UniversalEnum.FOUR.getValue().equals(periodType)){
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UniversalEnum.TIME_FORMAT_YEARS_MONTH_DAY.getValue());
+            LocalDate inputDate = LocalDate.parse(startDate, formatter);
+            // 获取一年前的日期
+            LocalDate end = inputDate.minusYears(1);
+            endDate = end.format(formatter);
+        } else if (UniversalEnum.THREE.getValue().equals(periodType)){
+            String[] parts = startDate.split(UniversalEnum.SHORT_BAR.getValue());
+            int year = Integer.parseInt(parts[UniversalEnum.ZERO.getNumber()]);
+            int month = Integer.parseInt(parts[UniversalEnum.ONE.getNumber()]);
+
+            // 计算一年前的年份和月份
+            year -= UniversalEnum.ONE.getNumber();
+            // 如果计算后月份为0，则调整为上一年的12月
+            if (month == UniversalEnum.ZERO.getNumber()) {
+                year -= UniversalEnum.ONE.getNumber();
+                month = UniversalEnum.TWELVE.getNumber();
+            }
+            endDate = String.format("%04d-%02d", year, month);
+        } else if (UniversalEnum.ONE.getValue().equals(periodType)){
+            int year = Integer.parseInt(startDate) - UniversalEnum.ONE.getNumber();
+            endDate = String.valueOf(year);
+        }
+        List<Map<String, Object>>  thisYearList = dcGantryMetricsStatisticsDataService.passIndicatorTimeDistribution(startDate,direction,periodType);
+        Map<String,List<Map<String, Object>>> thisYearData = thisYearList.stream().collect(Collectors.groupingBy(item -> item.get("groupTime").toString()));
+        List<Map<String, Object>>  lastYearList = dcGantryMetricsStatisticsDataService.passIndicatorTimeDistribution(endDate,direction,periodType);
+        Map<String,List<Map<String, Object>>> lastYearData = lastYearList.stream().collect(Collectors.groupingBy(item -> item.get("groupTime").toString()));
+
+        Set<String> allKey = new HashSet<>();
+        if (thisYearData != null){
+            allKey.addAll(thisYearData.keySet());
+        }
+        if (lastYearData != null){
+            allKey.addAll(lastYearData.keySet());
+        }
+
+        for (String key : allKey) {
+            PassIndicatorTimeDistribution passIndicatorTimeDistribution = new PassIndicatorTimeDistribution();
+            passIndicatorTimeDistribution.setTime(key);
+            if (thisYearData != null && thisYearData.containsKey(key)){
+                Map<String, Object> sectionData = thisYearData.get(key).get(UniversalEnum.ZERO.getNumber());
+                passIndicatorTimeDistribution.setCrowdingRate(sectionData.get("crowdingRate").toString());
+                passIndicatorTimeDistribution.setSaturationRate(sectionData.get("saturationRate").toString());
+                passIndicatorTimeDistribution.setTrafficCompositionRate(sectionData.get("trafficCompositionRate").toString());
+            }
+
+            if (lastYearData != null && lastYearData.containsKey(key)){
+                Map<String, Object> sectionData = lastYearData.get(key).get(UniversalEnum.ZERO.getNumber());
+                passIndicatorTimeDistribution.setCrowdingRateLastYear(sectionData.get("crowdingRate").toString());
+                passIndicatorTimeDistribution.setSaturationRateLastYear(sectionData.get("saturationRate").toString());
+                passIndicatorTimeDistribution.setTrafficCompositionRateLastYear(sectionData.get("trafficCompositionRate").toString());
+            }
+            list.add(passIndicatorTimeDistribution);
+        }
+
+        ExcelUtil<PassIndicatorTimeDistribution> util = new ExcelUtil<>(PassIndicatorTimeDistribution.class);
+        util.exportExcel(response, list, "交通指标时间分布");
+        // 将查询结果封装为成功响应并返回
+    }
+
     @ApiOperation("交通指标雷达图")
     @GetMapping("/history/radarMapOfTrafficIndicators")
     public AjaxResult radarMapOfTrafficIndicators(String startDate, String direction,String periodType ){
@@ -498,6 +564,73 @@ public AjaxResult realTimeTrafficFlow(String startDate, String direction,String
         // 将查询结果封装为成功响应并返回
         return AjaxResult.success(map);
     }
+
+    @ApiOperation(value="导出交通指标雷达图",tags = {"ECharts导出"})
+    @GetMapping("/history/exportRadarMapOfTrafficIndicators")
+    public void exportRadarMapOfTrafficIndicators(HttpServletResponse response,String startDate, String direction,String periodType,Long ranking){
+        List<RadarMapOfTrafficIndicators> list = new ArrayList<>();
+
+        String endDate = UniversalEnum.EMPTY_STRING.getValue();
+        if (UniversalEnum.FOUR.getValue().equals(periodType)){
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UniversalEnum.TIME_FORMAT_YEARS_MONTH_DAY.getValue());
+            LocalDate inputDate = LocalDate.parse(startDate, formatter);
+            // 获取一年前的日期
+            LocalDate end = inputDate.minusYears(1);
+            endDate = end.format(formatter);
+        } else if (UniversalEnum.THREE.getValue().equals(periodType)){
+            String[] parts = startDate.split(UniversalEnum.SHORT_BAR.getValue());
+            int year = Integer.parseInt(parts[UniversalEnum.ZERO.getNumber()]);
+            int month = Integer.parseInt(parts[UniversalEnum.ONE.getNumber()]);
+
+            // 计算一年前的年份和月份
+            year -= UniversalEnum.ONE.getNumber();
+            // 如果计算后月份为0，则调整为上一年的12月
+            if (month == UniversalEnum.ZERO.getNumber()) {
+                year -= UniversalEnum.ONE.getNumber();
+                month = UniversalEnum.TWELVE.getNumber();
+            }
+            endDate = String.format("%04d-%02d", year, month);
+        } else if (UniversalEnum.ONE.getValue().equals(periodType)){
+            int year = Integer.parseInt(startDate) - UniversalEnum.ONE.getNumber();
+            endDate = String.valueOf(year);
+        }
+        Map<String, Object>  map = dcGantryMetricsStatisticsDataService.radarMapOfTrafficIndicators(startDate,direction,periodType);
+        Map<String, Object>  mapLastYear = dcGantryMetricsStatisticsDataService.radarMapOfTrafficIndicators(endDate,direction,periodType);
+
+        RadarMapOfTrafficIndicators radarMapOfTrafficIndicators = new RadarMapOfTrafficIndicators();
+        radarMapOfTrafficIndicators.setName("拥挤度");
+        radarMapOfTrafficIndicators.setCurrentData(map.get("crowdingRate").toString());
+        radarMapOfTrafficIndicators.setContemporaneousData(mapLastYear.get("crowdingRate").toString());
+        list.add(radarMapOfTrafficIndicators);
+
+        radarMapOfTrafficIndicators = new RadarMapOfTrafficIndicators();
+        radarMapOfTrafficIndicators.setName("饱和度");
+        if (map.get("saturationRate") instanceof Double){
+            double saturationRate = (Double)map.get("saturationRate");
+            radarMapOfTrafficIndicators.setCurrentData(String.format("%.4f", saturationRate));
+        } else {
+            radarMapOfTrafficIndicators.setCurrentData("0");
+        }
+
+        if (mapLastYear.get("saturationRate") instanceof Double){
+            double saturationRate = (Double)mapLastYear.get("saturationRate");
+            radarMapOfTrafficIndicators.setContemporaneousData(String.format("%.4f", saturationRate));
+        } else {
+            radarMapOfTrafficIndicators.setContemporaneousData("0");
+        }
+        list.add(radarMapOfTrafficIndicators);
+
+        radarMapOfTrafficIndicators = new RadarMapOfTrafficIndicators();
+        radarMapOfTrafficIndicators.setName("交通特征组成指数");
+        radarMapOfTrafficIndicators.setCurrentData(map.get("trafficCompositionRate").toString());
+        radarMapOfTrafficIndicators.setContemporaneousData(mapLastYear.get("trafficCompositionRate").toString());
+        list.add(radarMapOfTrafficIndicators);
+
+
+        ExcelUtil<RadarMapOfTrafficIndicators> util = new ExcelUtil<>(RadarMapOfTrafficIndicators.class);
+        util.exportExcel(response, list, "交通指标雷达图");
+    }
+
     @ApiOperation("综合指标查询")
     @GetMapping("/history/comprehensiveIndexQuery")
     public TableDataInfo comprehensiveIndexQuery(ComprehensiveIndexQuery comprehensiveIndexQuery){
@@ -630,6 +763,182 @@ public AjaxResult trafficFlowAtTollStationEntranceHour(String startDate, String
     return AjaxResult.success(jsonArray);
 }
 
+    /**
+     * 导出收费站出入口实时车流量
+     */
+    @ApiOperation(value = "导出收费站出入口实时车流量",tags = {"ECharts导出"})
+    @GetMapping("/history/exportTrafficFlowAtTollStationEntranceHour")
+    public void exportTrafficFlowAtTollStationEntranceHour(HttpServletResponse response) throws IOException, HttpException {
+
+        response.setContentType(UniversalEnum.DERIVE_THE_TWO_WAY_REAL_TIME_TRAFFIC_FLOW_OF_THE_WHOLE_SECTION.getValue());
+        response.setCharacterEncoding(UniversalEnum.LOWERCASE_UTF_8.getValue());
+        String fileName = "收费站出入口实时车流量.xlsx";
+        response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UniversalEnum.TIME_FORMAT_YEARS_MONTH_DAY.getValue());
+        LocalDate currentDate = LocalDate.now();
+        String now = currentDate.format(formatter);
+
+        // 获取一年前的日期
+        LocalDate oneYearAgo = currentDate.minusYears(UniversalEnum.ONE.getNumber());
+        String lastYear = oneYearAgo.format(formatter);
+
+        Set<String> stationList = new HashSet<>();
+
+        // 本期入口
+        List<Map<String, String>> thisYearEntrance = dcTrafficStatisticsService.trafficFlowAtTollStationEntrance(now, now, "1");
+        Map<String,List<Map<String, String>>> thisYearEntranceData = new HashMap<>();
+        if (thisYearEntrance != null && thisYearEntrance.size() > 0){
+            thisYearEntranceData = thisYearEntrance.stream().collect(Collectors.groupingBy(item -> item.get("name")));
+            stationList.addAll(thisYearEntranceData.keySet());
+        }
+
+        // 本期出口
+        List<Map<String, String>> thisYearExport = dcTrafficStatisticsService.trafficFlowAtTollStationEntrance(now, now, "2");
+        Map<String,List<Map<String, String>>> thisYearExportData = new HashMap<>();
+        if (thisYearExport != null && thisYearExport.size() > 0){
+            thisYearExportData = thisYearExport.stream().collect(Collectors.groupingBy(item -> item.get("name")));
+            stationList.addAll(thisYearExportData.keySet());
+        }
+
+        // 去年入口
+        List<Map<String, String>> lastYearEntrance = dcTrafficStatisticsService.trafficFlowAtTollStationEntrance(lastYear, lastYear, "1");
+        Map<String, List<Map<String, String>>> lastYearEntranceData = new HashMap<>();
+        if (lastYearEntrance != null && lastYearEntrance.size() > 0) {
+            lastYearEntranceData = lastYearEntrance.stream().collect(Collectors.groupingBy(item -> item.get("name")));
+            stationList.addAll(lastYearEntranceData.keySet());
+        }
+
+        // 去年出口
+        List<Map<String, String>> lastYearExport = dcTrafficStatisticsService.trafficFlowAtTollStationEntrance(lastYear, lastYear, "2");
+        Map<String, List<Map<String, String>>> lastYearExportData = new HashMap<>();
+        if (lastYearExport != null && lastYearExport.size() > 0) {
+            lastYearExportData = lastYearExport.stream().collect(Collectors.groupingBy(item -> item.get("name")));
+            stationList.addAll(lastYearExportData.keySet());
+        }
+        XSSFWorkbook workbook = new XSSFWorkbook(); // 创建工作簿
+        Sheet sheet = workbook.createSheet(UniversalEnum.THE_WHOLE_SECTION_TWO_WAY_REAL_TIME_TRAFFIC_FLOW.getValue()); // 创建工作表
+
+        // 创建数据行样式
+        CellStyle dataStyle = workbook.createCellStyle();
+        dataStyle.setAlignment(HorizontalAlignment.CENTER);
+        dataStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        dataStyle.setBorderRight(BorderStyle.THIN);
+        dataStyle.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        dataStyle.setBorderLeft(BorderStyle.THIN);
+        dataStyle.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        dataStyle.setBorderTop(BorderStyle.THIN);
+        dataStyle.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        dataStyle.setBorderBottom(BorderStyle.THIN);
+        dataStyle.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        Font dataFont = workbook.createFont();
+        dataFont.setFontName(UniversalEnum.ARIAL.getValue());
+        dataFont.setFontHeightInPoints((short) UniversalEnum.TEN.getNumber());
+        dataStyle.setFont(dataFont);
+
+        // 创建表头样式
+        CellStyle headerStyle = workbook.createCellStyle();
+        headerStyle.cloneStyleFrom(dataStyle);
+        headerStyle.setAlignment(HorizontalAlignment.CENTER);
+        headerStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        headerStyle.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        headerStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        Font headerFont = workbook.createFont();
+        headerFont.setFontName(UniversalEnum.ARIAL.getValue());
+        headerFont.setFontHeightInPoints((short) UniversalEnum.TEN.getNumber());
+        headerFont.setBold(true);
+        headerFont.setColor(IndexedColors.WHITE.getIndex());
+        headerStyle.setFont(headerFont);
+
+        // 添加第一层级表头
+        Row row = sheet.createRow(UniversalEnum.ZERO.getNumber());
+        Cell cell = row.createCell(UniversalEnum.ZERO.getNumber());
+        cell.setCellValue(UniversalEnum.TOLL_STATION.getValue());
+        cell.setCellStyle(headerStyle);
+        cell = row.createCell(UniversalEnum.ONE.getNumber());
+        cell.setCellValue(UniversalEnum.ENTRANCE.getValue());
+        cell.setCellStyle(headerStyle);
+        cell = row.createCell(UniversalEnum.TWO.getNumber());
+        cell.setCellValue(UniversalEnum.EMPTY_STRING.getValue());
+        cell.setCellStyle(headerStyle);;
+        cell = row.createCell(UniversalEnum.THREE.getNumber());
+        cell.setCellValue(UniversalEnum.EXIT.getValue());
+        cell.setCellStyle(headerStyle);
+        cell = row.createCell(UniversalEnum.FOUR.getNumber());
+        cell.setCellValue(UniversalEnum.EMPTY_STRING.getValue());
+        cell.setCellStyle(headerStyle);
+
+        // 添加第二层级表头（与第一层级对齐）
+        Row subHeaderRow1 = sheet.createRow(UniversalEnum.ONE.getNumber());
+        cell = subHeaderRow1.createCell(UniversalEnum.ZERO.getNumber());
+        cell.setCellValue(UniversalEnum.EMPTY_STRING.getValue());
+        cell.setCellStyle(headerStyle);
+        cell = subHeaderRow1.createCell(UniversalEnum.ONE.getNumber());
+        cell.setCellValue(UniversalEnum.CURRENT_TRAFFIC_FLOW.getValue());
+        cell.setCellStyle(headerStyle);
+
+        cell = subHeaderRow1.createCell(UniversalEnum.TWO.getNumber());
+        cell.setCellValue(UniversalEnum.THE_SAME_PERIOD_LAST_YEAR.getValue());
+        cell.setCellStyle(headerStyle);
+        cell = subHeaderRow1.createCell(UniversalEnum.THREE.getNumber());
+        cell.setCellValue(UniversalEnum.CURRENT_TRAFFIC_FLOW.getValue());
+        cell.setCellStyle(headerStyle);
+
+        cell = subHeaderRow1.createCell(UniversalEnum.FOUR.getNumber());
+        cell.setCellValue(UniversalEnum.THE_SAME_PERIOD_LAST_YEAR.getValue());
+        cell.setCellStyle(headerStyle);
+
+        //合并单元格，参数依次为起始行，结束行，起始列，结束列 （从0开始）
+        //路段名称
+        sheet.addMergedRegion(new CellRangeAddress(UniversalEnum.ZERO.getNumber(), UniversalEnum.ONE.getNumber(), UniversalEnum.ZERO.getNumber(), UniversalEnum.ZERO.getNumber()));
+        //济南方向
+        sheet.addMergedRegion(new CellRangeAddress(UniversalEnum.ZERO.getNumber(), UniversalEnum.ZERO.getNumber(), UniversalEnum.ONE.getNumber(), UniversalEnum.TWO.getNumber()));
+        //菏泽方向
+        sheet.addMergedRegion(new CellRangeAddress(UniversalEnum.ZERO.getNumber(), UniversalEnum.ZERO.getNumber(), UniversalEnum.THREE.getNumber(), UniversalEnum.FOUR.getNumber()));
+
+        int i = 2;
+        for (String station : stationList) {
+            Row subHeaderRow = sheet.createRow(i);
+            cell = subHeaderRow.createCell(UniversalEnum.ZERO.getNumber());
+            cell.setCellValue(station);
+            cell.setCellStyle(dataStyle);
+
+            if (thisYearEntranceData.containsKey(station)){
+                cell = subHeaderRow.createCell(UniversalEnum.ONE.getNumber());
+                cell.setCellValue(thisYearEntranceData.get(station).get(0).get("value"));
+                cell.setCellStyle(dataStyle);
+            }
+
+            if (lastYearEntranceData.containsKey(station)){
+                cell = subHeaderRow.createCell(UniversalEnum.TWO.getNumber());
+                cell.setCellValue(lastYearEntranceData.get(station).get(0).get("value"));
+                cell.setCellStyle(dataStyle);
+            }
+
+            if (thisYearExportData.containsKey(station)){
+                cell = subHeaderRow.createCell(UniversalEnum.THREE.getNumber());
+                cell.setCellValue(thisYearExportData.get(station).get(0).get("value"));
+                cell.setCellStyle(dataStyle);
+            }
+
+            if (lastYearExportData.containsKey(station)){
+                cell = subHeaderRow.createCell(UniversalEnum.THREE.getNumber());
+                cell.setCellValue(lastYearExportData.get(station).get(0).get("value"));
+                cell.setCellStyle(dataStyle);
+            }
+            i++;
+        }
+
+        // 写入文件
+        try (ServletOutputStream outputStream = response.getOutputStream()){
+            workbook.write(outputStream);
+        } finally {
+            workbook.close();
+        }
+
+
+    }
+
 /**
  * 各收费站入口分车型小时车流量
  */
@@ -685,15 +994,6 @@ public AjaxResult trafficFlowAtTollStationEntrance(String startDate, String endD
         String fileName = UniversalEnum.REAL_TIME_TRAFFIC_FLOW_IN_BOTH_DIRECTIONS_XLSX.name();
         response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
 
-
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UniversalEnum.TIME_FORMAT_YEARS_MONTH_DAY.getValue());
-        LocalDate currentDate = LocalDate.now();
-        String now = currentDate.format(formatter);
-
-        // 获取一年前的日期
-        LocalDate oneYearAgo = currentDate.minusYears(UniversalEnum.ONE.getNumber());
-        String lastYear = oneYearAgo.format(formatter);
-
         Map<String,List<Map<String,Object>>> map = dcTrafficStatisticsService.realTimeTrafficFlowHour();
         if (map != null){
             List<Map<String,Object>> thisYearHZ = map.get(UniversalEnum.ONE.getValue());

zc-business/src/main/java/com/zc/business/domain/export/PassIndicatorTimeDistribution.java

@@ -0,0 +1,111 @@
+package com.zc.business.domain.export;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 导出交通指标时间分布对象
+ *
+ * @author ruoyi
+ * @date 2024-01-13
+ */
+public class PassIndicatorTimeDistribution extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+
+    /** 时间 */
+    @Excel(name = "时间")
+    private String time;
+
+    /** 饱和度 */
+    @Excel(name = "饱和度")
+    private String saturationRate;
+    /** 拥挤度 */
+    @Excel(name = "拥挤度")
+    private String crowdingRate;
+    /** 交通组成特征指数 */
+    @Excel(name = "交通组成特征指数")
+    private String trafficCompositionRate;
+
+    /** 饱和度去年同期 */
+    @Excel(name = "饱和度去年同期")
+    private String saturationRateLastYear;
+    /** 拥挤度去年同期 */
+    @Excel(name = "拥挤度去年同期")
+    private String crowdingRateLastYear;
+    /** 交通组成特征指数去年同期 */
+    @Excel(name = "交通组成特征指数去年同期")
+    private String trafficCompositionRateLastYear;
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getSaturationRate() {
+        return saturationRate;
+    }
+
+    public void setSaturationRate(String saturationRate) {
+        this.saturationRate = saturationRate;
+    }
+
+    public String getCrowdingRate() {
+        return crowdingRate;
+    }
+
+    public void setCrowdingRate(String crowdingRate) {
+        this.crowdingRate = crowdingRate;
+    }
+
+    public String getTrafficCompositionRate() {
+        return trafficCompositionRate;
+    }
+
+    public void setTrafficCompositionRate(String trafficCompositionRate) {
+        this.trafficCompositionRate = trafficCompositionRate;
+    }
+
+    public String getSaturationRateLastYear() {
+        return saturationRateLastYear;
+    }
+
+    public void setSaturationRateLastYear(String saturationRateLastYear) {
+        this.saturationRateLastYear = saturationRateLastYear;
+    }
+
+    public String getCrowdingRateLastYear() {
+        return crowdingRateLastYear;
+    }
+
+    public void setCrowdingRateLastYear(String crowdingRateLastYear) {
+        this.crowdingRateLastYear = crowdingRateLastYear;
+    }
+
+    public String getTrafficCompositionRateLastYear() {
+        return trafficCompositionRateLastYear;
+    }
+
+    public void setTrafficCompositionRateLastYear(String trafficCompositionRateLastYear) {
+        this.trafficCompositionRateLastYear = trafficCompositionRateLastYear;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("time", getTime())
+            .append("saturationRate", getSaturationRate())
+            .append("crowdingRate", getCrowdingRate())
+            .append("trafficCompositionRate", getTrafficCompositionRate())
+            .append("saturationRateLastYear", getSaturationRateLastYear())
+            .append("crowdingRateLastYear", getCrowdingRateLastYear())
+            .append("trafficCompositionRateLastYear", getTrafficCompositionRateLastYear())
+            .toString();
+    }
+}

zc-business/src/main/java/com/zc/business/domain/export/RadarMapOfTrafficIndicators.java

@@ -0,0 +1,62 @@
+package com.zc.business.domain.export;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 导出交通指标雷达图对象
+ *
+ * @author ruoyi
+ * @date 2024-01-13
+ */
+public class RadarMapOfTrafficIndicators extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 本期指标 */
+    @Excel(name = "本期指标")
+    private String currentData;
+    /** 去年同期 */
+    @Excel(name = "去年同期")
+    private String contemporaneousData;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCurrentData() {
+        return currentData;
+    }
+
+    public void setCurrentData(String currentData) {
+        this.currentData = currentData;
+    }
+
+    public String getContemporaneousData() {
+        return contemporaneousData;
+    }
+
+    public void setContemporaneousData(String contemporaneousData) {
+        this.contemporaneousData = contemporaneousData;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("name", getName())
+            .append("currentData", getCurrentData())
+            .append("contemporaneousData", getContemporaneousData())
+            .toString();
+    }
+}

zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java

@@ -580,7 +580,7 @@ public class DeviceMessageHandler {
 
         JSONObject jsonObjectHeaders = (JSONObject) msg.get("headers");
         String parts = jsonObjectHeaders.getString("deviceName");
-        String[] strings = parts.split(UniversalEnum.SHORT_BAR.toString());
+        String[] strings = parts.split(UniversalEnum.SHORT_BAR.getValue());
         String deviceName = strings[UniversalEnum.ZERO.getNumber()];
         String stakeMark = strings[UniversalEnum.ONE.getNumber()];
         String direction = strings[UniversalEnum.TWO.getNumber()];

zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java

@@ -1553,7 +1553,8 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                         || UniversalEnum.DC_EVENT_VEHICLE_ACCIDENT_CONGESTION_AHEAD.getValue().equals(result.getRightPath())
                         || UniversalEnum.DC_EVENT_VEHICLE_ACCIDENT_AT_INTERSECTION.getValue().equals(result.getRightPath())
                         || UniversalEnum.DC_EVENT_VEHICLE_ACCIDENT_ON_CURVE.getValue().equals(result.getRightPath())
-                        || UniversalEnum.DC_EVENT_VEHICLE_ACCIDENT_IS_PRIVATE.getValue().equals(result.getRightPath())) {
+                        || UniversalEnum.DC_EVENT_VEHICLE_ACCIDENT_IS_PRIVATE.getValue().equals(result.getRightPath())
+                        || UniversalEnum.IN_TUNNEL.getValue().equals(result.getRightPath())) {
                     if (UniversalEnum.ZERO.getValue().equals(result.getRight())) {
                         result.setRight(UniversalEnum.NO.getValue());
                     } else if (UniversalEnum.ONE.getValue().equals(result.getRight())) {

zc-business/src/main/java/com/zc/business/service/impl/DcTrafficStatisticsServiceImpl.java

@@ -700,7 +700,7 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
     }
 
     @Override
-    public Map<String,List<Map<String, Object>>> realTimeTrafficFlowHour() throws HttpException, IOException {
+    public Map<String, List<Map<String, Object>>> realTimeTrafficFlowHour() throws HttpException, IOException {
 
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(UniversalEnum.TIME_FORMAT_YEARS_MONTH_DAY.getValue());
         LocalDate currentDate = LocalDate.now();
@@ -717,24 +717,25 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
         JSONArray body = getResponseBody(nowYear, requestParams, okHttp);
 
         JSONArray bodylast = getResponseBody(lastYear, requestParams, okHttp);
-        Map<String,List<Map<String, Object>>> map = new HashMap<>();
+        Map<String, List<Map<String, Object>>> map = new HashMap<>();
 
         if (body != null) {
             List<Map<String, Object>> mapList = getMaps(UniversalEnum.ONE.getValue(), body);
-            map.put(UniversalEnum.ONE.getValue(),mapList);
+            map.put(UniversalEnum.ONE.getValue(), mapList);
             List<Map<String, Object>> mapList2 = getMaps(UniversalEnum.THREE.getValue(), body);
-            map.put(UniversalEnum.TWO.getValue(),mapList2);
+            map.put(UniversalEnum.TWO.getValue(), mapList2);
         }
         if (bodylast != null) {
             List<Map<String, Object>> mapList = getMaps(UniversalEnum.ONE.getValue(), bodylast);
-            map.put(UniversalEnum.THREE.getValue(),mapList);
+            map.put(UniversalEnum.THREE.getValue(), mapList);
             List<Map<String, Object>> mapList2 = getMaps(UniversalEnum.THREE.getValue(), bodylast);
-            map.put(UniversalEnum.FOUR.getValue(),mapList2);
+            map.put(UniversalEnum.FOUR.getValue(), mapList2);
         }
 
         return map;
     }
-//处理 接口响应数据
+
+    //处理 接口响应数据
     private List<Map<String, Object>> getMaps(String direction, JSONArray jsonArray) throws IOException {
 
 
@@ -792,7 +793,8 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
         }
         return mapList;
     }
-// 获取车流量接口 返回 jsonArray
+
+    // 获取车流量接口 返回 jsonArray
     private JSONArray getResponseBody(String startDate, RequestParams requestParams, OkHttp okHttp) throws HttpException, IOException {
         JSONObject parameters = new JSONObject() {
             {
@@ -815,7 +817,7 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
         return jsonArray;
     }
 
-//格式化桩号
+    //格式化桩号
     private static String extract(String input) {
         Pattern pattern = Pattern.compile("K(\\d{3})\\+(\\d{3})");
         Matcher matcher = pattern.matcher(input);
@@ -839,17 +841,17 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
         return UniversalEnum.EMPTY_STRING.getValue();
     }
 
-    public List<Map<String,Object>>  queryTheGantryDataByPileNumber(String startDate,String stakeMark) throws HttpException, IOException {
+    public List<Map<String, Object>> queryTheGantryDataByPileNumber(String startDate, String stakeMark) throws HttpException, IOException {
 
         if (stakeMark != null) {
             //处理URl地址栏获取参数+号消失
-            stakeMark= stakeMark.replace(UniversalEnum.BLANK_SPACE.getValue(), UniversalEnum.PLUS_SIGN.getValue());
+            stakeMark = stakeMark.replace(UniversalEnum.BLANK_SPACE.getValue(), UniversalEnum.PLUS_SIGN.getValue());
         }
-        List<Map<String,Object>> mapList =new ArrayList<>();
+        List<Map<String, Object>> mapList = new ArrayList<>();
         DcFacility dcFacilityAll = new DcFacility();
         dcFacilityAll.setFacilityType(UniversalEnum.TEN.getNumber());
         List<DcFacility> dcFacilityList = facilityService.listFacility(dcFacilityAll);
-        DcFacility nearestFacility = findNearestFacility(dcFacilityList,stakeMark);
+        DcFacility nearestFacility = findNearestFacility(dcFacilityList, stakeMark);
 
         OkHttp okHttp = new OkHttp();
 
@@ -886,8 +888,8 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
                     Map<String, Object> map = new HashMap<>();
                     int totalFlow = jsonObject.getInteger("total_flow");
                     int data_hour = jsonObject.getInteger("data_hour");
-                   map.put("hour",data_hour);
-                   map.put("totalFlow",totalFlow);
+                    map.put("hour", data_hour);
+                    map.put("totalFlow", totalFlow);
                     mapList.add(map);
                 }
             }
@@ -902,6 +904,7 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
 
     /**
      * 获取路况信息
+     *
      * @return
      * @throws HttpException
      * @throws IOException
@@ -930,9 +933,16 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
             for (Object object : jsonArray) {
                 JSONObject jsonObject = (JSONObject) object;
                 Integer asOneRoad = jsonObject.getInteger("as_one_road");
+                double endPileNo = jsonObject.getDouble("end_pile_no");
+                double startPileNo = jsonObject.getDouble("start_pile_no");
+                String stakeMark = formatNumber(startPileNo);
+                String endMark = formatNumber(endPileNo);
+                jsonObject.put("stakeMark", stakeMark);//当前拥堵距离
+                jsonObject.put("endMark", endMark);//当前拥堵距离
+
                 //as_one_road
                 //是否为同一条路，1-是，0-否
-                if (asOneRoad == UniversalEnum.ZERO.getNumber()){
+                if (asOneRoad == UniversalEnum.ZERO.getNumber()) {
 
                     String string = jsonObject.getString("list_link_info");
                     JSONArray jsonlist = JSON.parseArray(string);
@@ -944,11 +954,11 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
                     String[] lngLatsString = lngLats.split(";");
                     double s = Double.parseDouble(lngLatsString[0].split(",")[0]);
                     double s2 = Double.parseDouble(lngLatsString[0].split(",")[1]);
-                    double s3 = Double.parseDouble(lngLatsString[lngLatsString.length-1].split(",")[0]);
-                    double s4 = Double.parseDouble(lngLatsString[lngLatsString.length-1].split(",")[1]);
-                    double distanceM = calculateDistance(s2, s, s4, s3)* 1000;
+                    double s3 = Double.parseDouble(lngLatsString[lngLatsString.length - 1].split(",")[0]);
+                    double s4 = Double.parseDouble(lngLatsString[lngLatsString.length - 1].split(",")[1]);
+                    double distanceM = calculateDistance(s2, s, s4, s3) * 1000;
                     //  System.out.printf("最大距离为: %.2f 米%n", distanceM);
-                    jsonObject.put("max_jam_dist",distanceM);//最大拥堵距离
+                    jsonObject.put("max_jam_dist", distanceM);//最大拥堵距离
                     String[] split = string1.split(",");
                     double firstLon = Double.parseDouble(split[0]);
                     double firstLat = Double.parseDouble(split[1]);
@@ -962,7 +972,7 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
                     double distanceKm = calculateDistance(firstLat, firstLon, lastLat, lastLon);
                     double distanceMeters = distanceKm * 1000; // 将距离转换为米
                     //System.out.printf("两点之间的距离为: %.2f 米%n", distanceMeters);
-                    jsonObject.put("jam_dist",distanceMeters);//当前拥堵距离
+                    jsonObject.put("jam_dist", distanceMeters);//当前拥堵距离
 
                 }
 
@@ -999,6 +1009,17 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
 
         return nearestFacility; // 返回最近的桩号信息
     }
+
+    //桩号转换
+    public static String formatNumber(double number) {
+//将数字分成整数和四舍五入的小数部分
+        int integerPart = (int) number;
+        int decimalPart = (int) Math.round((number - integerPart) * 1000); // 四舍五入到最接近的整数
+
+        // 将数字格式化为 "K 000+000"
+        String formattedString = String.format("K%03d+%03d", integerPart, decimalPart);
+        return formattedString;
+    }
 //经纬度计算距离
 
     public static double calculateDistance(double startLat, double startLon, double endLat, double endLon) {
@@ -1022,7 +1043,7 @@ public class DcTrafficStatisticsServiceImpl implements IDcTrafficStatisticsServi
         // 计算两点间的距离
         double distance = EARTH_RADIUS * c;
         // 保留两位小数，四舍五入
-         distance= Double.parseDouble(String.format("%.5f", distance));
+        distance = Double.parseDouble(String.format("%.5f", distance));
 
         return distance;
     }