diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLConnectorInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLConnectorInfo.java new file mode 100644 index 000000000..963b7da25 --- /dev/null +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLConnectorInfo.java @@ -0,0 +1,35 @@ +package com.jsowell.thirdparty.zhongdianlian.domain; + +import com.alibaba.fastjson2.annotation.JSONField; +import lombok.Data; + +/** + * TODO + * + * @author Lemon + * @Date 2023/9/7 14:03 + */ +@Data +public class ZDLConnectorInfo { + @JSONField(name = "ConnectorID") + private String connectorId; + + @JSONField(name = "ConnectorType") + private String connectorType; + + @JSONField(name = "VoltageUpperLimits") + private String voltageUpperLimits; + + @JSONField(name = "VoltageLowerLimits") + private String voltageLowerLimits; + + @JSONField(name = "Current") + private String current; + + @JSONField(name = "Power") + private String power; + + @JSONField(name = "NationalStandard") + private String nationalStandard; + +} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLEquipmentInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLEquipmentInfo.java index 16f3fb068..c964e09d5 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLEquipmentInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLEquipmentInfo.java @@ -1,7 +1,11 @@ package com.jsowell.thirdparty.zhongdianlian.domain; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; +import java.math.BigDecimal; +import java.util.List; + /** * 设备基本信息 * @@ -10,7 +14,15 @@ import lombok.Data; */ @Data public class ZDLEquipmentInfo { + @JSONField(name = "EquipmentID") private String equipmentId; - private String EquipmentType; + @JSONField(name = "EquipmentType") + private String equipmentType; + + @JSONField(name = "Power") + private BigDecimal power; + + @JSONField(name = "ConnectorInfos") + private List connectorInfos; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLStationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLStationInfo.java index dd3126a3b..b720e84ec 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLStationInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/domain/ZDLStationInfo.java @@ -1,5 +1,6 @@ package com.jsowell.thirdparty.zhongdianlian.domain; +import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import java.math.BigDecimal; @@ -13,19 +14,48 @@ import java.util.List; */ @Data public class ZDLStationInfo { + @JSONField(name = "StationID") private String stationId; + + @JSONField(name = "OperatorID") private String operatorId; + + @JSONField(name = "EquipmentOwnerID") private String equipmentOwnerId; + + @JSONField(name = "StationName") private String stationName; + + @JSONField(name = "CountryCode") private String countryCode; + + @JSONField(name = "AreaCode") private String areaCode; + + @JSONField(name = "Address") private String address; + + @JSONField(name = "ServiceTel") private String serviceTel; + + @JSONField(name = "StationType") private Integer stationType; + + @JSONField(name = "StationStatus") private Integer stationStatus; + + @JSONField(name = "ParkNums") private Integer parkNums; + + @JSONField(name = "StationLng") private BigDecimal stationLng; + + @JSONField(name = "StationLat") private BigDecimal stationLat; + + @JSONField(name = "Construction") private Integer construction; + + @JSONField(name = "EquipmentInfos") private List equipmentInfos; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/ZDLService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/ZDLService.java index e3da64206..ea0f119ec 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/ZDLService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/ZDLService.java @@ -1,7 +1,10 @@ package com.jsowell.thirdparty.zhongdianlian.service; +import com.jsowell.pile.dto.QueryStationInfoDTO; import com.jsowell.thirdparty.zhongdianlian.dto.ZDLGetTokenDTO; +import java.util.Map; + /** * 中电联 Service * @@ -10,5 +13,17 @@ import com.jsowell.thirdparty.zhongdianlian.dto.ZDLGetTokenDTO; */ public interface ZDLService { + /** + * 获取令牌 + * @param dto + * @return + */ public String ZDLGetToken(ZDLGetTokenDTO dto); + + /** + * 查询站点信息 + * @param dto + * @return + */ + public Map queryStationsInfo(QueryStationInfoDTO dto); } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java index 8141c89f1..c68940cce 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java @@ -1,11 +1,14 @@ package com.jsowell.thirdparty.zhongdianlian.service.impl; +import com.jsowell.pile.dto.QueryStationInfoDTO; import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.zhongdianlian.dto.ZDLGetTokenDTO; import com.jsowell.thirdparty.zhongdianlian.service.ZDLService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Map; + /** * 中电联 Service * @@ -32,5 +35,14 @@ public class ZDLServiceImpl implements ZDLService { dto.getOperatorSecret(), dto.getDataSecretIv(), dto.getSignSecret(), dto.getDataSecret()); } + /** + * 查询站点信息 + * @return + */ + @Override + public Map queryStationsInfo(QueryStationInfoDTO dto) { + return null; + } + }