Merge branch 'dev' into dev-g

This commit is contained in:
Guoqs
2025-02-17 16:16:07 +08:00
2 changed files with 162 additions and 0 deletions

View File

@@ -25,6 +25,7 @@ import com.jsowell.pile.dto.QueryOrderDTO;
import com.jsowell.pile.dto.QueryStationInfoDTO;
import com.jsowell.pile.service.*;
import com.jsowell.pile.thirdparty.CommonParamsDTO;
import com.jsowell.pile.thirdparty.ConnectorInfo;
import com.jsowell.pile.thirdparty.EquipmentInfo;
import com.jsowell.pile.util.MerchantUtils;
import com.jsowell.pile.vo.SupStationStatsVO;
@@ -389,6 +390,11 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
.map(EquipmentInfo::getEquipmentPower)
.reduce(BigDecimal.ZERO, BigDecimal::add);
info.setRatedPower(stationRatedPower);
// NationalStandard
for (EquipmentInfo equipmentInfo : pileList) {
List<ConnectorInfo> connectorInfos = equipmentInfo.getConnectorInfos();
connectorInfos.forEach( x -> x.setNationalStandard(2)); // 2-新国标(2015)
}
// areaCodeCountryside
GeoCodeInfo geoCode = TermRelationTreeCoordinate.completeGeoCode(pileStationInfo.getAddress());
if (geoCode == null) {