mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-15 23:38:32 +08:00
update
This commit is contained in:
@@ -8,8 +8,6 @@ import com.google.common.collect.Lists;
|
|||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
import com.jsowell.common.constant.Constants;
|
import com.jsowell.common.constant.Constants;
|
||||||
import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
|
import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
|
||||||
import com.jsowell.common.enums.lianlian.LianLianPileStatusEnum;
|
|
||||||
import com.jsowell.common.enums.lianlian.PayChannelEnum;
|
|
||||||
import com.jsowell.common.enums.thirdparty.BusinessInformationExchangeEnum;
|
import com.jsowell.common.enums.thirdparty.BusinessInformationExchangeEnum;
|
||||||
import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
|
import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
|
||||||
import com.jsowell.common.enums.ykc.*;
|
import com.jsowell.common.enums.ykc.*;
|
||||||
@@ -29,7 +27,6 @@ import com.jsowell.pile.vo.ThirdPartySecretInfoVO;
|
|||||||
import com.jsowell.pile.vo.base.ConnectorInfoVO;
|
import com.jsowell.pile.vo.base.ConnectorInfoVO;
|
||||||
import com.jsowell.pile.vo.base.MerchantInfoVO;
|
import com.jsowell.pile.vo.base.MerchantInfoVO;
|
||||||
import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
|
import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
|
||||||
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
|
|
||||||
import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO;
|
import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO;
|
||||||
import com.jsowell.pile.vo.web.PileConnectorInfoVO;
|
import com.jsowell.pile.vo.web.PileConnectorInfoVO;
|
||||||
import com.jsowell.pile.vo.web.PileMerchantInfoVO;
|
import com.jsowell.pile.vo.web.PileMerchantInfoVO;
|
||||||
@@ -38,10 +35,7 @@ import com.jsowell.pile.vo.web.PileStationVO;
|
|||||||
import com.jsowell.pile.vo.zdl.EquipBusinessPolicyVO;
|
import com.jsowell.pile.vo.zdl.EquipBusinessPolicyVO;
|
||||||
import com.jsowell.thirdparty.lianlian.domain.*;
|
import com.jsowell.thirdparty.lianlian.domain.*;
|
||||||
import com.jsowell.thirdparty.lianlian.vo.*;
|
import com.jsowell.thirdparty.lianlian.vo.*;
|
||||||
import com.jsowell.thirdparty.platform.common.ChargeDetail;
|
|
||||||
import com.jsowell.thirdparty.platform.common.OrderInfo;
|
|
||||||
import com.jsowell.thirdparty.platform.domain.*;
|
import com.jsowell.thirdparty.platform.domain.*;
|
||||||
import com.jsowell.thirdparty.platform.domain.StationStatusInfo;
|
|
||||||
import com.jsowell.thirdparty.platform.dto.ChargeOrderInfoDTO;
|
import com.jsowell.thirdparty.platform.dto.ChargeOrderInfoDTO;
|
||||||
import com.jsowell.thirdparty.platform.dto.SupStationInfoDTO;
|
import com.jsowell.thirdparty.platform.dto.SupStationInfoDTO;
|
||||||
import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
|
import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
|
||||||
@@ -49,26 +43,21 @@ import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
|
|||||||
import com.jsowell.thirdparty.platform.util.Cryptos;
|
import com.jsowell.thirdparty.platform.util.Cryptos;
|
||||||
import com.jsowell.thirdparty.platform.util.HttpRequestUtil;
|
import com.jsowell.thirdparty.platform.util.HttpRequestUtil;
|
||||||
import com.jsowell.thirdparty.platform.util.ThirdPartyPlatformUtils;
|
import com.jsowell.thirdparty.platform.util.ThirdPartyPlatformUtils;
|
||||||
|
import com.jsowell.thirdparty.platform.vo.StationStatusInfoVO;
|
||||||
import com.jsowell.thirdparty.service.ThirdpartySecretInfoService;
|
import com.jsowell.thirdparty.service.ThirdpartySecretInfoService;
|
||||||
import com.yi.business.geo.GeoCodeInfo;
|
import com.yi.business.geo.GeoCodeInfo;
|
||||||
import com.yi.business.geo.TermRelationTreeCoordinate;
|
import com.yi.business.geo.TermRelationTreeCoordinate;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.collections4.CollectionUtils;
|
import org.apache.commons.collections4.CollectionUtils;
|
||||||
import org.bouncycastle.crypto.CryptoException;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.io.Serializable;
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.math.RoundingMode;
|
import java.math.RoundingMode;
|
||||||
import java.security.NoSuchAlgorithmException;
|
|
||||||
import java.security.NoSuchProviderException;
|
|
||||||
import java.security.spec.InvalidKeySpecException;
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.logging.Logger;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@@ -520,10 +509,10 @@ public class JiLinPlatformServiceImpl implements ThirdPartyPlatformService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
List<StationStatusInfo> stationStatusInfos = new ArrayList<>();
|
List<StationStatusInfoVO> stationStatusInfos = new ArrayList<>();
|
||||||
for (String stationId : stationIds) {
|
for (String stationId : stationIds) {
|
||||||
//每个站点对应的充电设备接口状态列表
|
//每个站点对应的充电设备接口状态列表
|
||||||
StationStatusInfo stationStatusInfo = new StationStatusInfo();
|
StationStatusInfoVO stationStatusInfo = new StationStatusInfoVO();
|
||||||
List<ConnectorStatusInfo> connectorStatusInfoList = new ArrayList<>();
|
List<ConnectorStatusInfo> connectorStatusInfoList = new ArrayList<>();
|
||||||
for (Object connectorStatusInfo : connectorStatusInfos) {
|
for (Object connectorStatusInfo : connectorStatusInfos) {
|
||||||
if (((ConnectorStatusInfo) connectorStatusInfo).getStationId().equals(stationId)){
|
if (((ConnectorStatusInfo) connectorStatusInfo).getStationId().equals(stationId)){
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.jsowell.thirdparty.platform.domain;
|
package com.jsowell.thirdparty.platform.vo;
|
||||||
|
|
||||||
import com.alibaba.fastjson2.annotation.JSONField;
|
import com.alibaba.fastjson2.annotation.JSONField;
|
||||||
import com.jsowell.thirdparty.lianlian.domain.ConnectorStatusInfo;
|
import com.jsowell.thirdparty.lianlian.domain.ConnectorStatusInfo;
|
||||||
@@ -14,7 +14,7 @@ import java.util.List;
|
|||||||
@Builder
|
@Builder
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
public class StationStatusInfo implements Serializable {
|
public class StationStatusInfoVO implements Serializable {
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
@JSONField(name = "StationId")
|
@JSONField(name = "StationId")
|
||||||
Reference in New Issue
Block a user