autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 19:45:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2024-03-26 15:35:16 +08:00
parent c6c7dd5b29 7db83ee738
commit b775074cfd
28 changed files with 1434 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorInfo.java vendored
View File

@@ -1,72 +0,0 @@
package com.jsowell.thirdparty.lianlian.domain;
import com.alibaba.fastjson2.annotation.JSONField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* 充电设备接口信息
*/
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Data
public class ConnectorInfo {
/**
* 充电设备接口编码 Y
* 充电设备接口编码，同一对接平台内唯一
*/
@JSONField(name = "ConnectorID")
private String connectorID;
/**
* 充电设备接口名称 N
*/
// private String ConnectorName;
/**
* 充电设备接口类型 Y
* 1：家用插座（模式2）
* 2：交流接口插座（模式3，连接方式B ）
* 3：交流接口插头（带枪线，模式3，连接方式C）
* 4：直流接口枪头（带枪线，模式4）
*/
@JSONField(name = "ConnectorType")
private Integer connectorType;
/**
* 额定电压上限(单位：V) Y
*/
@JSONField(name = "VoltageUpperLimits")
private Integer voltageUpperLimits;
/**
* 额定电压下限(单位：V) Y
*/
@JSONField(name = "VoltageLowerLimits")
private Integer voltageLowerLimits;
/**
* 额定电流(单位：A) Y
*/
@JSONField(name = "Current")
private Integer current;
/**
* 额定功率(单位：kW) Y
*/
@JSONField(name = "Power")
private BigDecimal power;
/**
* 车位号 N
* 停车场车位编号
*/
@JSONField(name = "ParkNo")
private String parkNo;
}

112
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentInfo.java vendored
View File

@@ -1,112 +0,0 @@
package com.jsowell.thirdparty.lianlian.domain;
import com.alibaba.fastjson2.annotation.JSONField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.List;
/**
* 充电设备信息
*/
@Builder
@AllArgsConstructor
@NoArgsConstructor
@Data
public class EquipmentInfo {
/**
* 设备编码 Y
* 设备唯一编码，对同一对接平台，保证唯一
*/
@JSONField(name = "EquipmentID")
private String equipmentID;
/**
* 设备生产商组织机构代码 Y
*/
@JSONField(name = "ManufacturerID")
private String manufacturerID;
/**
* 设备型号 N
* 由设备生厂商定义的设备型号
*/
// private String EquipmentModel;
/**
* 设备名称 N
*/
// private String EquipmentName;
/**
* 设备生产日期 N
* YYYY-MM-DD
*/
// private String ProductionDate;
/**
* 建设时间 Y
* YYYY-MM-DD
*/
@JSONField(name = "ConstructionTime")
private String constructionTime;
/**
* 设备类型(1-直流设备；2-交流设备；3-交直流一体设备) Y
*/
@JSONField(name = "EquipmentType")
private Integer equipmentType;
/**
* 设备状态 Y
* 0：未知
* 1：建设中
* 5：关闭下线
* 6：维护中
* 50：正常使用
*/
@JSONField(name = "EquipmentStatus")
private Integer equipmentStatus;
/**
* 额定功率(单位：kW) Y
*/
@JSONField(name = "EquipmentPower")
private BigDecimal equipmentPower;
/**
* 新国标(0-否；1-是) Y
* 是否新国标
*/
@JSONField(name = "NewNationalStandard")
private Integer newNationalStandard;
/**
* 充电设备接口列表 Y
* 该充电设备所有的充电设备接口的信息对象集合
*/
@JSONField(name = "ConnectorInfos")
private List<ConnectorInfo> connectorInfos;
/**
* 充电设备经度 N
* GCJ-02坐标系
*/
// private BigDecimal EquipmentLng;
/**
* 充电设备纬度 N
* GCJ-02坐标系
*/
// private BigDecimal EquipmentLat;
/**
* 是否支持VIN码识别(0-否；1-是) Y
*/
@JSONField(name = "VinFlag")
private Integer vinFlag;
}

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationInfo.java vendored
View File

@@ -2,6 +2,7 @@ package com.jsowell.thirdparty.lianlian.domain;
import com.alibaba.fastjson2.annotation.JSONField;
import com.jsowell.pile.thirdparty.EquipmentInfo;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -12,6 +13,7 @@ import java.util.List;
/**
* 充电站信息
* 第三方平台使用
*/
@Builder
@AllArgsConstructor

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/LianLianService.java vendored
View File

@@ -18,8 +18,6 @@ public interface LianLianService {
* 根据充电站id，推送充电站信息
* @param dto
*/
// String pushStationInfo(PushStationInfoDTO dto);
String pushStationInfoV2(PushStationInfoDTO dto);
/**

7
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java vendored
View File

@@ -9,6 +9,8 @@ import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.jsowell.common.constant.Constants;
import com.jsowell.pile.thirdparty.ConnectorInfo;
import com.jsowell.pile.thirdparty.EquipmentInfo;
import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
import com.jsowell.common.enums.lianlian.LianLianPileStatusEnum;
import com.jsowell.common.enums.lianlian.PayChannelEnum;
@@ -256,11 +258,6 @@ public class LianLianServiceImpl implements LianLianService {
// }
public String pushStationInfoV2(PushStationInfoDTO dto) {
// String OperatorID = "987654321";
// String SigSecret = "1234567890abcdef"; // 签名秘钥
// String DataSecret = "1234567890abcdef"; // 消息密钥
// String DataSecretIV = "1234567890abcdef"; // 消息密钥初始化向量
// String token = "c548f9276c1c4ea8b88b1f7b1eb7cf07"; //QueryToken类查询接口获取到的token
// 通过id查询站点相关信息
PileStationInfo pileStationInfo = pileStationInfoService.selectPileStationInfoById(dto.getStationId());