Merge branch 'dev-zza' into dev

# Conflicts: # jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
2026-04-20 11:05:18 +08:00 · 2025-09-23 10:46:38 +08:00
parent 297405471e 896f69f496
commit 625a577aeb
29 changed files with 1304 additions and 90 deletions
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/BatteryChargeReportData.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/BatteryChargeReportData.java
@@ -0,0 +1,102 @@
+package com.jsowell.thirdparty.platform.domain;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 电池充电报告Data
+ *
+ * @author Lemon
+ * @Date 2025/9/10 14:29:28
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class BatteryChargeReportData {
+    private String mfrID;
+    private String siteName;
+    private String siteAddress;
+    private String siteLongitude;
+    private String siteLatitude;
+    private String businessHours;
+    private String serviceHotline;
+    private String businessStatus;
+    private Integer sitePileNumber;
+    private Integer siteGunNumber;
+    private String phone;
+    private String siteCode;
+    private String pileCode;
+    private String gunNo;
+    private String readBeforeCharge;
+
+    private Integer doorStatus;
+
+    private Integer bmsChargeMode;
+
+
+    private String vin;
+    private String batteryType;
+    private String nominalEnergy;
+    private String ratedCapacity;
+    private String ratedVoltage;
+    private String maxAllowTemp;
+    private Integer initSoc;
+    private String orderCode;
+    private String beginTime;
+    private Integer totalChargeTime;
+    private Integer remainChargeTime;
+    private String totalCharge;
+    private String alarmCode;
+    private String bmsVersion;
+
+    @JSONField(name = "data")
+    private List<BatteryChargeReportData.ChargeData> chargeData;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @Builder
+    public static class ChargeData{
+        private String dcv;
+        private String dca;
+        private String measuringChargeVoltage;
+        private Integer bmsVoltageFault;
+        private String gunTemp;
+        private String singleMaxAllowVoltage;
+        private String beforeChargeTotalVoltage;
+        private String readCurrentCharge;
+        private String singleMinVoltage;
+        private String bmsDemandElectricity;
+        private String chargePower;
+        private String maxAllowTotalVoltage;
+        private String bmsDemandVoltage;
+        private String maxAllowElectricity;
+        private String measuringChargeElectricity;
+        private String singleMaxVoltage;
+        private String singleMaxTemp;
+        private String singleMinTemp;
+        private String reportTime;
+        private Integer currentSoc;
+        private Integer socStatus;
+        private Integer maxTempPointNum;
+        private Integer minTempPointNum;
+        private Integer maxSingleVoltageNum;
+        private Integer maxSingleVoltageGroupNum;
+        private Integer singleVoltageStatus;
+        private String batteryInsulation;
+        private Integer outputConnectStatus;
+        private Integer bmsConnectError;
+        private Integer bmsVoltageError;
+        private Integer bmsInsulationError;
+        private Integer bmsOverTempError;
+        private Integer bmsHighVoltageError;
+        private Integer bmsElectricityOverFault;
+        private Integer bmsBatteryOverTempError;
+    }
+}
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/BatteryReportResult.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/BatteryReportResult.java
@@ -0,0 +1,38 @@
+package com.jsowell.thirdparty.platform.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 电池报告 result 部分
+ *
+ * @author Lemon
+ * @Date 2025/9/11 13:48:33
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class BatteryReportResult {
+    private String pdfUrl;
+
+    private String webUrl;
+
+    private String fileName;
+
+    private String expireTime;
+
+    private String reportId;
+
+    private String fileSize;
+
+    private String generateTime;
+
+    private String taskId;
+
+    private String directUrl;
+
+    private String timestamp;
+}
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/dto/BatteryChargeReportDTO.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/dto/BatteryChargeReportDTO.java
@@ -0,0 +1,26 @@
+package com.jsowell.thirdparty.platform.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 电池报告DTO
+ *
+ * @author Lemon
+ * @Date 2025/9/11 10:44:48
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class BatteryChargeReportDTO {
+    private String orderCode;
+
+    /**
+     * 报告类型
+     * 1-web; 2-pdf
+     */
+    private String reportType;
+}
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/BatteryChargeReportService.java
@@ -0,0 +1,410 @@
+package com.jsowell.thirdparty.platform.service.impl;
+
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.jsowell.common.constant.CacheConstants;
+import com.jsowell.common.constant.Constants;
+import com.jsowell.common.core.domain.ykc.*;
+import com.jsowell.common.core.redis.RedisCache;
+import com.jsowell.common.util.DateUtils;
+import com.jsowell.common.util.StringUtils;
+import com.jsowell.pile.service.OrderBasicInfoService;
+import com.jsowell.pile.service.PileBasicInfoService;
+import com.jsowell.pile.service.PileConnectorInfoService;
+import com.jsowell.pile.service.PileStationInfoService;
+import com.jsowell.pile.thirdparty.ParameterConfigData;
+import com.jsowell.pile.vo.uniapp.customer.OrderVO;
+import com.jsowell.pile.vo.web.PileConnectorInfoVO;
+import com.jsowell.pile.vo.web.PileDetailVO;
+import com.jsowell.pile.vo.web.PileStationVO;
+import com.jsowell.thirdparty.platform.domain.BatteryChargeReportData;
+import com.jsowell.thirdparty.platform.domain.BatteryReportResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 电池充电报告Service
+ *
+ * @author Lemon
+ * @Date 2025/9/10 13:42:28
+ */
+@Service
+public class BatteryChargeReportService {
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+
+    @Value("${batteryChargeReport.webDomainPrefix}")
+    private String webDomainPrefix;
+
+    @Value("${batteryChargeReport.getTaskIdApi}")
+    private String getTaskIdApi;
+
+    @Value("${batteryChargeReport.apiPrefix}")
+    private String apiPrefix;
+
+    @Value("${batteryChargeReport.token}")
+    private String token;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    @Autowired
+    private OrderBasicInfoService orderBasicInfoService;
+
+    @Autowired
+    private PileBasicInfoService pileBasicInfoService;
+
+    @Autowired
+    private PileConnectorInfoService pileConnectorInfoService;
+
+    @Autowired
+    private PileStationInfoService pileStationInfoService;
+
+    /**
+     * 通过订单号统一发送充电电池数据获取 taskId
+     *
+     * @param orderCode
+     */
+    public String getTaskIdByOrderCode(String orderCode) {
+        // 根据订单号查询订单信息
+        OrderVO orderVO = orderBasicInfoService.getChargeOrderInfoByOrderCode(orderCode);
+        if (orderVO == null) {
+            log.error("统一发送orderCode:{} 充电电池数据 error, 订单信息为空", orderCode);
+            return null;
+        }
+        // 先判断直流桩还是交流桩，如果是交流桩就不进行计算
+        PileDetailVO pileDetailVO = pileBasicInfoService.selectPileDetailByPileSn(orderVO.getPileSn());
+        if (StringUtils.equals(Constants.TWO, pileDetailVO.getChargePortType())) {
+            log.info("订单:{} 为交流桩订单，不进行充电算法计算", orderCode);
+            return null;
+        }
+
+        // 查询站点信息
+        PileStationVO stationVO = pileStationInfoService.getStationInfo(orderVO.getStationId());
+
+        // 获取各项数据
+        Map<String, Object> map = getDatasByOrderVO(orderVO);
+        String taskId = pushInfoGetTaskId(map, stationVO, orderVO);
+
+        return taskId;
+    }
+
+    /**
+     * 通过taskId获取链接
+     * @param taskId
+     * @param reportType 1-web链接；2-pdf链接
+     * @return
+     */
+    public String getUrlByTaskId(String taskId, String reportType) {
+        // 根据 taskId 获取链接·
+        // 默认 web 端 url
+        String apiUrl = webDomainPrefix + apiPrefix + "web/" + taskId;
+        if (StringUtils.equals(Constants.TWO, reportType)) {
+            // 2- pdf 端
+            apiUrl = webDomainPrefix + apiPrefix + "pdf/" + taskId;
+        }
+        // 发送请求
+        String result = HttpRequest.get(apiUrl).execute().body();
+        log.info("发送获取报告result:{}", result);
+
+        // 将返回结果转化为json
+        Map<String, Object> resultMap = (Map<String, Object>) JSON.parse(result);
+        String resultCode = String.valueOf(resultMap.get("code"));
+        if (!StringUtils.equals(Constants.TWO_HUNDRED, resultCode)) {
+            return null;
+        }
+        // 获取对应的 url
+        // 将 result 部分转换成 BatteryReportResult 对象
+        // BatteryReportResult batteryReportResult = (BatteryReportResult) resultMap.get("result");
+        BatteryReportResult batteryReportResult = JSONObject.parseObject(resultMap.get("result").toString(), BatteryReportResult.class);;
+        String pdfUrl = batteryReportResult.getPdfUrl();
+        if (StringUtils.isBlank(pdfUrl)) {
+            String webUrl = batteryReportResult.getWebUrl();
+            return webUrl;
+        }
+        return pdfUrl;
+    }
+
+
+    public static void main(String[] args) {
+        String taskId = "8b8c2fed952f41d39eb583d0021c9908";
+        String url = "https://wx.btiger.net/jeecg-boot" + "/api/docking/report/" + "web/" + taskId;
+        String result = HttpRequest.get(url).execute().body();
+
+        System.out.println(result);
+    }
+
+    /**
+     * 推送信息获取taskId
+     *
+     * @param map
+     * @param stationVO
+     * @param orderVO
+     * @return
+     */
+    private String pushInfoGetTaskId(Map<String, Object> map, PileStationVO stationVO, OrderVO orderVO) {
+        ChargingHandshakeData chargingHandshakeData = (ChargingHandshakeData) map.get("chargingHandshakeData"); // 0X15
+        ParameterConfigData parameterConfigData = (ParameterConfigData) map.get("parameterConfigData"); // 0X17
+        TransactionRecordsData transactionRecordsData = (TransactionRecordsData) map.get("transactionRecordsData"); // 0x3b
+        List<BMSDemandAndChargerOutputData> chargerOutputInfoList = (List<BMSDemandAndChargerOutputData>) map.get("chargerOutputInfoList"); // 0x23List
+
+        BMSDemandAndChargerOutputData bmsDemandAndChargerOutputData = chargerOutputInfoList.get(0);
+        // 计算充电时长
+        long chargingTime = DateUtils.intervalTime(orderVO.getStartTime(), orderVO.getEndTime());
+        // 查询枪口、桩数量
+        List<PileConnectorInfoVO> pileConnectorInfoVOS = pileConnectorInfoService.selectConnectorListByStationId(Long.parseLong(stationVO.getId()));
+        if (CollectionUtils.isEmpty(pileConnectorInfoVOS)) {
+            return null;
+        }
+        // 将桩号进行去重汇总
+        // Set<String> strings = pileConnectorInfoVOS.stream()
+        //         .collect(Collectors.toMap(
+        //                 PileConnectorInfoVO::getPileSn,
+        //                 Function.identity(),
+        //                 (x1, x2) -> x1
+        //         )).keySet();
+
+        Set<String> snList = pileConnectorInfoVOS.stream()
+                .map(PileConnectorInfoVO::getPileSn)
+                .collect(Collectors.toSet());
+
+        BatteryChargeReportData data = BatteryChargeReportData.builder()
+                .mfrID("")
+                .siteName(stationVO.getStationName())
+                .siteAddress(stationVO.getAddress())
+                .siteLongitude(stationVO.getStationLng())
+                .siteLatitude(stationVO.getStationLat())
+                .businessHours(stationVO.getBusinessHours())
+                .serviceHotline(stationVO.getStationTel())
+                .businessStatus(Constants.ZERO) // 营业状态 0-正常; 1-停运
+                .sitePileNumber(snList.size()) // 桩数量
+                .siteGunNumber(pileConnectorInfoVOS.size())
+                .phone("") // 用户手机号码
+                .siteCode(stationVO.getId())
+                .pileCode(orderVO.getPileSn())
+                .gunNo(orderVO.getConnectorCode())
+                .readBeforeCharge(transactionRecordsData.getAmmeterTotalStart())
+                .doorStatus(Constants.zero)
+                .bmsChargeMode(Integer.parseInt(bmsDemandAndChargerOutputData.getBmsChargingModel()))
+                .vin(chargingHandshakeData.getVinCode())
+                .batteryType(chargingHandshakeData.getBmsBatteryType())
+                .nominalEnergy(new BigDecimal(parameterConfigData.getBmsSumEnergy()).toBigInteger().toString())
+                .ratedCapacity(new BigDecimal(parameterConfigData.getBmsSumEnergy()).toBigInteger().toString())
+                .ratedVoltage(chargingHandshakeData.getBmsBatteryVoltage())
+                .maxAllowTemp(parameterConfigData.getBmsMaxTemperature())
+                .initSoc(new BigDecimal(orderVO.getStartSoc()).intValue())
+                .orderCode(orderVO.getOrderCode())
+                .beginTime(orderVO.getStartTime())
+                .totalChargeTime(Math.toIntExact(chargingTime))
+                .remainChargeTime(Constants.zero)
+                .totalCharge(orderVO.getTotalPower())
+                .alarmCode(Constants.ZERO)
+                .bmsVersion("V1.1")
+
+                .build();
+
+        List<BatteryChargeReportData
+                .ChargeData> chargingDetailInfos = transformData(map);
+
+        chargingDetailInfos.stream()
+                .filter(info -> info.getCurrentSoc() > 100) // 只处理 currentSoc > 100 的元素
+                .forEach(info -> info.setCurrentSoc(100));
+        Collections.reverse(chargingDetailInfos);
+
+        data.setChargeData(chargingDetailInfos);
+
+        // 发送请求
+        String postUrl = webDomainPrefix + getTaskIdApi;
+        String response = HttpRequest.post(postUrl).header("token", token).body(JSON.toJSONString(data)).execute().body();
+        log.info("获取taskId发送请求收到回复 response:{}", response);
+
+        // 将返回结果转化为json
+        Map<String, Object> resultMap = (Map<String, Object>) JSON.parse(response);
+        String resultCode = String.valueOf(resultMap.get("code"));
+        String taskId = "";
+        if (StringUtils.equals(Constants.TWO_HUNDRED, resultCode)) {
+            // 获取 taskId
+            Map<String, Object> result = (Map<String, Object>)resultMap.get("result");
+            taskId = String.valueOf(result.get("taskId"));
+            log.info("taskId:{}", taskId);
+        }
+        return taskId;
+    }
+
+
+    /**
+     * 根据订单号查询各项充电数据
+     *
+     * @param orderVO
+     * @return
+     */
+    private Map<String, Object> getDatasByOrderVO(OrderVO orderVO) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        // 0x15数据Data
+        ChargingHandshakeData chargingHandshakeData = null;
+        // 0x17数据data
+        ParameterConfigData parameterConfigData = null;
+        // 0x3b数据data
+        TransactionRecordsData transactionRecordsData = null;
+        // 0x23数据data
+        BMSDemandAndChargerOutputData bmsDemandAndChargerOutputData = null;
+
+        String orderCode = orderVO.getOrderCode();
+        String transactionCode = orderVO.getTransactionCode();
+
+        // 获取0x15
+        String chargingHandshakeKey = CacheConstants.CHARGING_HANDSHAKE_DATA_BY_TRANSACTION_CODE + transactionCode;
+        chargingHandshakeData = redisCache.getCacheObject(chargingHandshakeKey);
+        if (chargingHandshakeData == null) {
+            log.info("orderCode:{}, 0x15信息为空", orderCode);
+        }
+
+        // 获取0x17
+        String redisKey = CacheConstants.PARAMETER_CONFIGURATION_BY_TRANSACTION_CODE + transactionCode;
+        parameterConfigData = redisCache.getCacheObject(redisKey);
+        if (parameterConfigData == null) {
+            log.info("orderCode:{}, 0x17信息为空", orderCode);
+        }
+
+        // 获取0x3b缓存信息
+        String transactionDataKey = CacheConstants.TRANSACTION_RECORD_BY_TRANSACTION_CODE + transactionCode;
+        transactionRecordsData = redisCache.getCacheObject(transactionDataKey);
+
+        // 获取最后一条0x23
+        List<BMSDemandAndChargerOutputData> chargerOutputInfoList = pileBasicInfoService.getBMSDemandAndChargerOutputInfoList(transactionCode);
+        if (CollectionUtils.isEmpty(chargerOutputInfoList)) {
+            log.info("orderCode:{}, 0x23信息为空", orderCode);
+        }
+
+        // 获取0x25
+        List<BMSChargeInfoData> bmsChargeInfoList = pileBasicInfoService.getBMSChargeInfoList(transactionCode);
+        // 0x13
+        List<RealTimeMonitorData> chargingRealTimeDataList = orderBasicInfoService.getChargingRealTimeData(transactionCode);
+
+        Map<String, List<BMSChargeInfoData>> collect_0x25 = new LinkedHashMap<>();
+        Map<String, List<RealTimeMonitorData>> collect_0x13 = new LinkedHashMap<>();
+        if (bmsChargeInfoList != null) {
+            // 按照dateTime分组（将key设置为 yyyy-MM-dd HH:mm:00 格式）
+            collect_0x25 = bmsChargeInfoList.stream()
+                    .map(x -> {
+                        x.setDateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00", DateUtils.parseDate(x.getDateTime())));
+                        return x;
+                    })
+                    .collect(Collectors.groupingBy(BMSChargeInfoData::getDateTime));
+
+        }
+        if (chargingRealTimeDataList != null) {
+            collect_0x13 = chargingRealTimeDataList.stream()
+                    .map(x -> {
+                        x.setDateTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00", DateUtils.parseDate(x.getDateTime())));
+                        return x;
+                    })
+                    .collect(Collectors.groupingBy(RealTimeMonitorData::getDateTime));
+        }
+
+        map.put("chargingHandshakeData", chargingHandshakeData); // 0x15
+        map.put("parameterConfigData", parameterConfigData); // 0x17
+        map.put("transactionRecordsData", transactionRecordsData); // 0x3b
+        map.put("chargerOutputInfoList", chargerOutputInfoList); // 0x23List
+        map.put("collect_0x25", collect_0x25);
+        map.put("collect_0x13", collect_0x13);
+
+        return map;
+    }
+
+    /**
+     * 封装充电数据 Datas
+     * @param map
+     * @return
+     */
+    private List<BatteryChargeReportData.ChargeData> transformData(Map<String, Object> map) {
+        List<BatteryChargeReportData.ChargeData> resultList = new ArrayList<>();
+        BatteryChargeReportData.ChargeData chargeData;
+
+        ParameterConfigData parameterConfigData = (ParameterConfigData) map.get("parameterConfigData"); // 0X17
+        TransactionRecordsData transactionRecordsData = (TransactionRecordsData) map.get("transactionRecordsData"); // 0x3b
+        List<BMSDemandAndChargerOutputData> chargerOutputInfoList = (List<BMSDemandAndChargerOutputData>) map.get("chargerOutputInfoList"); // 0x23List
+        Map<String, List<BMSChargeInfoData>> collect_0x25 = (Map<String, List<BMSChargeInfoData>>) map.get("collect_0x25");
+        Map<String, List<RealTimeMonitorData>> collect_0x13 = (Map<String, List<RealTimeMonitorData>>) map.get("collect_0x13");
+
+        if (CollectionUtils.isEmpty(chargerOutputInfoList)) {
+            return new ArrayList<>();
+        }
+
+        for (BMSDemandAndChargerOutputData realTimeData_0x23 : chargerOutputInfoList) {
+            chargeData = new BatteryChargeReportData.ChargeData();
+            String dateStr = DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:00", DateUtils.parseDate(realTimeData_0x23.getDateTime()));
+
+            // 获取该时间的0x13数据
+            List<RealTimeMonitorData> RealTimeDataList = collect_0x13.get(dateStr);
+            if (RealTimeDataList != null) {
+                RealTimeMonitorData realTimeData_0x13 = RealTimeDataList.get(0);
+
+                chargeData.setGunTemp(realTimeData_0x13.getGunLineTemperature());
+                chargeData.setCurrentSoc(new BigDecimal(realTimeData_0x13.getSOC()).intValue());
+                chargeData.setSocStatus(new BigDecimal(realTimeData_0x13.getSOC()).intValue());
+            } else {
+                chargeData.setGunTemp("0");
+                chargeData.setCurrentSoc(new BigDecimal(realTimeData_0x23.getSoc()).intValue());
+                chargeData.setSocStatus(new BigDecimal(realTimeData_0x23.getSoc()).intValue());
+            }
+            chargeData.setDcv(new BigDecimal(realTimeData_0x23.getPileVoltageOutput()).toBigInteger().toString());
+            chargeData.setDca(new BigDecimal(realTimeData_0x23.getPileCurrentOutput()).toBigInteger().toString());
+            chargeData.setMeasuringChargeVoltage(new BigDecimal(realTimeData_0x23.getBmsChargingVoltage()).toBigInteger().toString());
+            chargeData.setBmsVoltageFault(Constants.zero);
+            chargeData.setSingleMaxAllowVoltage(new BigDecimal(parameterConfigData.getBmsMaxVoltage()).setScale(1, RoundingMode.HALF_DOWN).toString());
+            chargeData.setBeforeChargeTotalVoltage(new BigDecimal(parameterConfigData.getBmsRealTimeVoltage()).toBigInteger().toString());
+            chargeData.setReadCurrentCharge(transactionRecordsData.getAmmeterTotalEnd());
+            chargeData.setSingleMinVoltage(new BigDecimal(realTimeData_0x23.getBmsMaxVoltageAndGroup()).setScale(1, RoundingMode.HALF_DOWN).toString());
+            chargeData.setBmsDemandElectricity(new BigDecimal(realTimeData_0x23.getBmsCurrentDemand()).toBigInteger().toString());
+            chargeData.setChargePower(realTimeData_0x23.getOutputPower());
+            chargeData.setMaxAllowTotalVoltage(new BigDecimal(parameterConfigData.getBmsMaxChargingVoltage()).toBigInteger().toString());
+            chargeData.setBmsDemandVoltage(new BigDecimal(realTimeData_0x23.getBmsVoltageDemand()).toBigInteger().toString());
+            chargeData.setMaxAllowElectricity(new BigDecimal(parameterConfigData.getBmsMaxCurrent()).toBigInteger().toString());
+            chargeData.setMeasuringChargeElectricity(new BigDecimal(realTimeData_0x23.getBmsChargingCurrent()).toBigInteger().toString());
+            chargeData.setSingleMaxVoltage(new BigDecimal(realTimeData_0x23.getBmsMaxVoltageAndGroup()).setScale(1, RoundingMode.HALF_DOWN).toString());
+            chargeData.setReportTime(realTimeData_0x23.getDateTime().replaceAll("[^0-9]", ""));
+            chargeData.setSingleVoltageStatus(Constants.zero);
+            chargeData.setOutputConnectStatus(Constants.zero);
+            chargeData.setBmsConnectError(Constants.zero);
+            chargeData.setBmsVoltageError(Constants.zero);
+            chargeData.setBmsInsulationError(Constants.zero);
+            chargeData.setBmsOverTempError(Constants.zero);
+            chargeData.setBmsHighVoltageError(Constants.zero);
+            chargeData.setBmsElectricityOverFault(Constants.zero);
+            chargeData.setBmsBatteryOverTempError(Constants.zero);
+
+
+            // 获取该时间的0x25数据
+            List<BMSChargeInfoData> bmsChargeInfoDataList = collect_0x25.get(dateStr);
+
+            if (bmsChargeInfoDataList != null) {
+                BMSChargeInfoData realTimeData_0x25 = bmsChargeInfoDataList.get(0);
+
+                chargeData.setSingleMaxTemp(realTimeData_0x25.getBmsMaxBatteryTemperature());
+                chargeData.setSingleMinTemp(realTimeData_0x25.getMinBatteryTemperature());
+                chargeData.setMaxSingleVoltageNum(Integer.parseInt(realTimeData_0x25.getBmsMaxVoltageNum()));
+                chargeData.setMaxSingleVoltageGroupNum(Integer.parseInt(realTimeData_0x23.getBmsMaxVoltageAndGroup().replace(".", "")));
+                chargeData.setMaxTempPointNum(Integer.parseInt(realTimeData_0x25.getMaxTemperatureDetectionNum()));
+                chargeData.setMinTempPointNum(Integer.parseInt(realTimeData_0x25.getMinTemperatureDetectionNum()));
+                chargeData.setBatteryInsulation(realTimeData_0x25.getBmsBatteryInsulationStatus());
+
+                // detailInfo.setVentTemp();
+                // detailInfo.setEnvironmentTemp();
+            }
+            resultList.add(chargeData);
+        }
+
+        return resultList;
+    }
+}
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChargeAlgorithmService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChargeAlgorithmService.java
@@ -31,31 +31,32 @@ import java.util.*;
 import java.util.stream.Collectors;

 /**
- * 订单算法平台Service
+ * 订单算法平台Service （已过时）
 *
 * @author Lemon
 * @Date 2024/11/19 13:49:45
 */
@Service
+@Deprecated
 public class ChargeAlgorithmService {

-    @Value("${chargeAlgorithm.url}")
-    private String url;
-
-    @Value("${chargeAlgorithm.clientId}")
-    private String clientId;
-
-    @Value("${chargeAlgorithm2pdf.url}")
-    private String send2PdfUrl;
-
-    @Value("${chargeAlgorithm2pdf.getTaskIdUrl}")
-    private String getTaskIdUrl;
-
-    @Value("${chargeAlgorithm2pdf.getPdfLinkUrl}")
-    private String getPdfLinkUrl;
-
-    @Value("${chargeAlgorithm2pdf.token}")
-    private String token;
+    // @Value("${chargeAlgorithm.url}")
+    // private String url;
+    //
+    // @Value("${chargeAlgorithm.clientId}")
+    // private String clientId;
+    //
+    // @Value("${chargeAlgorithm2pdf.url}")
+    // private String send2PdfUrl;
+    //
+    // @Value("${chargeAlgorithm2pdf.getTaskIdUrl}")
+    // private String getTaskIdUrl;
+    //
+    // @Value("${chargeAlgorithm2pdf.getPdfLinkUrl}")
+    // private String getPdfLinkUrl;
+    //
+    // @Value("${chargeAlgorithm2pdf.token}")
+    // private String token;

    @Autowired
    private OrderBasicInfoService orderBasicInfoService;
@@ -193,7 +194,9 @@ public class ChargeAlgorithmService {
        data.setChargeData(chargingDetailInfos);

        // 发送请求
-        String postUrl = send2PdfUrl + getTaskIdUrl;
+        // String postUrl = send2PdfUrl + getTaskIdUrl;
+        String postUrl = "";
+        String token = "";
        String response = HttpRequest.post(postUrl).header("token", token).body(JSON.toJSONString(data)).execute().body();

        log.info("获取taskId发送请求收到回复 response:{}", response);
@@ -291,7 +294,8 @@ public class ChargeAlgorithmService {
        log.info("web页面发送请求前封装数据 data:{}", JSON.toJSONString(jsonObject));

        // 发送请求
-        String response = HttpRequest.post(url).header("clientId", clientId).body(JSON.toJSONString(jsonObject)).execute().body();
+        // String response = HttpRequest.post(url).header("clientId", clientId).body(JSON.toJSONString(jsonObject)).execute().body();
+        String response = "";

        log.info("web页面发送请求收到回复 response:{}", response);
        // 将返回结果转化为json
@@ -315,7 +319,8 @@ public class ChargeAlgorithmService {
     * @return
     */
    private String getPDFDownloadUrlByTaskId(String taskId) {
-        String postUrl = send2PdfUrl + getPdfLinkUrl + taskId;
+        // String postUrl = send2PdfUrl + getPdfLinkUrl + taskId;
+        String postUrl = "";
        // 发送请求
        String result = HttpRequest.get(postUrl).execute().body();
        // 将返回结果转化为json
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HeNanPlatformServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HeNanPlatformServiceImpl.java
@@ -206,6 +206,18 @@ public class HeNanPlatformServiceImpl implements ThirdPartyPlatformService {
            if (construction == 12) {
                construction = 23;
            }
+            if (construction == 24) {
+                // 国（省）道公路沿线
+                construction = 21;
+            }
+            if (construction == 25) {
+                // 城际快速公路沿线
+                construction = 22;
+            }
+            if (construction == 26) {
+                // 景区停车场
+                construction = 23;
+            }
            stationInfo.setConstruction(construction);
            // 停车费率描述
            if (StringUtils.isNotBlank(pileStationInfo.getParkFeeDescribe())) {