Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-18 51e30a5f25ed53c9c65aa177f4869e4bcb8f6d55

Merge remote-tracking branch 'origin/master'

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECPushUtil.java

@@ -72,7 +72,11 @@
        connectorStatusInfo.setStationID(String.valueOf(chargingGun.getSiteId()));
        connectorStatusInfo.setEquipmentID(String.valueOf(chargingGun.getChargingPileId()));
        connectorStatusInfo.setConnectorID(chargingGun.getFullNumber());
        connectorStatusInfo.setEquipmentClassification(1);
        if (chargingGun.getEquipmentClassification()!=null){
            connectorStatusInfo.setEquipmentClassification(chargingGun.getEquipmentClassification());
        }else {
            connectorStatusInfo.setEquipmentClassification(1);
        }
        switch (chargingGun.getStatus()){
            case 1:
                connectorStatusInfo.setStatus(0);

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/util/TCECCJianGuanontroller.java

@@ -293,7 +293,8 @@
        for (Site datum : sites) {
            StationInfo stationInfo = new StationInfo();
            stationInfo.setStationUniqueNumber(datum.getCode());
            stationInfo.setAreaCodeCountryside(datum.getCountryCode());
            stationInfo.setAreaCodeCountryside(datum.getDistrictsCode());
            stationInfo.setAreaCode((Integer.parseInt(datum.getCityCode())+1)+"");
            stationInfo.setStationClassification(datum.getStationClassification());
            stationInfo.setGeneralApplicationType(datum.getGeneralApplicationType());
            if (org.springframework.util.StringUtils.hasLength(datum.getSwapMatchCars())){
@@ -340,7 +341,6 @@
            stationInfo.setEquipmentOwnerID("906171535");
            stationInfo.setStationName(datum.getName());
            stationInfo.setCountryCode(StringUtils.isNotEmpty(datum.getCountryCode()) ? datum.getCountryCode() : "CN");
            stationInfo.setAreaCode(datum.getDistrictsCode());
            stationInfo.setAddress(datum.getAddress());
            stationInfo.setStationTel(datum.getPhone());
            stationInfo.setServiceTel(serviceTel);