Pu Zhibing
2025-02-05 19b7530c7feb8eca1dfecd6502feaf61057fdab8
修改字段大小写
45个文件已修改
455 ■■■■ 已修改文件
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ParkingRecordFallbackFactory.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/AESUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseModel.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseRequest.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseResult.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ChargeDetail.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorInfo.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorStatsInfo.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorStatusInfo.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentInfo.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentStatsInfo.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationChargeOrderInfo.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationChargeOrderInfoResult.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationEquipChargeStatusResult.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationStartCharge.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationStartChargeResult.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationStationStatusResult.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationStopCharge.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationStopChargeResult.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/OperatorInfo.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PlaceHolder.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PlaceHolderPrice.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PolicyInfo.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryEquipAuth.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryEquipAuthResult.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryEquipBusinessPolicy.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryEquipBusinessPolicyResult.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryEquipChargeStatus.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryEquipChargeStatusResult.java 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStartCharge.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStartChargeResult.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStationStats.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStationStatsResult.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStationStatus.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStationStatusResult.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStationsInfo.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStationsInfoResult.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStopCharge.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStopChargeResult.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryToken.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryTokenResult.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/StationInfo.java 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/StationStatsInfo.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/StationStatusInfo.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/factory/ParkingRecordFallbackFactory.java
@@ -41,6 +41,11 @@
            }
    
            @Override
            public R<TParkingRecord> getParkingRecordByChargingOrderId(Long chargingOrderId) {
                return R.fail("根据充电订单id获取数据失败:" + throwable.getMessage());
            }
            @Override
            public void addParkingRecord(TParkingRecord parkingRecord) {
            }
        };
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/AESUtil.java
@@ -99,7 +99,7 @@
    public static void main(String[] ages){
        String encrypt = AESUtil.encrypt("{\"total\":1,\"stationStatusInfo\":{\"operationID\":\"123456789\",\"stationID\":\"111111111111111\",\"connectorStatusInfos\":{\"connectorID\":1,\"equipmentID\":\"10000000000000000000001\",\"status\":4,\"currentA\":0,\"currentB\":0,\"currentC\":0,\"voltageA\":0,\"voltageB\":0,\"voltageC\":0,\"soc\":10,}}}");
        String encrypt = AESUtil.encrypt("{\"OperatorID\":\"MA25CNM38\",\"OperatorSecret\":\"7hUeAsYVBrjw8sup\"}", "YPFVz1OvAS4nSwLW", "5tLoP60aR9QUB5Mx");
        System.err.println(encrypt);
//        String travel = AESUtil.decrypt("IGc1VSVN8ruGbmmXUQQKZQ==");
//        System.err.println(travel);
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java
@@ -28,12 +28,8 @@
 */
@Slf4j
public class TCECUtil {
    /**
     * 运营商标识
     */
    private static final String OperatorID = "";
    
    private static OperatorClient operatorClient = SpringUtils.getBean(OperatorClient.class);
//    private static OperatorClient operatorClient = SpringUtils.getBean(OperatorClient.class);
    
    public static Map<Long, Integer> map = new HashMap<>();
    
@@ -64,7 +60,7 @@
        LocalDateTime localDateTime = Instant.ofEpochSecond(tokenAvailableTime).atOffset(ZoneOffset.UTC).toLocalDateTime();
        operator.setAccessToken(token);
        operator.setTokenAvailableTime(localDateTime);
        operatorClient.editOperator(operator);
//        operatorClient.editOperator(operator);
        return token;
    }
    
@@ -99,28 +95,6 @@
    }
    
    
    /**
     * 站点变更通知
     * @param operator
     * @param type
     * @param siteIds
     * @return
     */
    public static NotificationStationChangeResult notificationStationChange(Operator operator, Integer type, List<Integer> siteIds) {
        StationChange stationChange = new StationChange();
        stationChange.setOperatorId(OperatorID);
        stationChange.setType(type);
        List<String> collect = siteIds.stream().map(String::valueOf).collect(Collectors.toList());
        stationChange.setStationIds(collect);
        HttpRequest post = HttpUtil.createPost(operator.getTestUrl() + InterfaceUrlEnum.NOTIFICATION_STATION_CHANGE.getUrl());
        buildBody(post, stationChange, operator);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("推送站点变更通知失败:" + execute.body());
            return null;
        }
        return JSON.parseObject(execute.body(), NotificationStationChangeResult.class);
    }
    
    
    
@@ -312,4 +286,22 @@
    }
    
    
    public static void main(String[] args) {
        BaseModel model = new BaseModel();
        model.setOperatorID("MA25CNM38");
        model.setData("lkQUXmphG3h5Wf0UIxSfzNoCdqDLYkmDGceCbofJuWFqKBwCYulTUHSn9bJpVMVFNji/4xtSq3o1U5jSZZwIhA==");
        model.setTimeStamp(20250205120800L);
        model.setSeq("0001");
        Operator operator = new Operator();
        operator.setName("XinDianTu");
        operator.setSigSecret("S94xUpTpOIlLJBk8");
        model.setOperator(operator);
        String key = operator.getSigSecret();
        String m = new StringBuilder(model.getOperatorID()).append(model.getData()).append(model.getTimeStamp()).append(model.getSeq()).toString();
        byte[] hmacMd5 = SignUtil.getHMacMD5Bytes(key.getBytes(), m.getBytes());
        // 打印计算得到的签名Sig
        String s = SignUtil.bytesToHexString(hmacMd5);
        System.err.println(s);
    }
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseModel.java
@@ -15,24 +15,24 @@
     * 运营商标识
     */
    @NotNull
    private String OperatorID;
    private String operatorID;
    /**
     * 参数内容
     */
    @NotNull
    private String Data;
    private String data;
    /**
     * 时间戳
     * yyyyMMddHHmmss
     */
    @NotNull
    private Long TimeStamp;
    private Long timeStamp;
    /**
     * 自增序列
     * 4位自增序列取自时间戳,同一秒内按序列自增长,新秒重计。如 0001
     */
    @NotNull
    private String Seq;
    private String seq;
    /**
     * 运营商对象
     */
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseRequest.java
@@ -15,5 +15,5 @@
     * 数字签名
     */
    @NotNull
    private String Sig;
    private String sig;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseResult.java
@@ -23,17 +23,17 @@
     * 500:系统错误
     */
    @NotNull
    private Integer Ret;
    private Integer ret;
    /**
     * 错误信息描述
     */
    @NotNull
    private String Msg;
    private String msg;
    /**
     * 签名
     */
    @NotNull
    private String Sig;
    private String sig;
    
    /**
     * 运营商对象
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ChargeDetail.java
@@ -18,36 +18,36 @@
     * yyyy-MM-dd HH:mm:ss
     */
    @NotNull
    private String DetailStartTime;
    private String detailStartTime;
    /**
     * 结束时间
     * yyyy-MM-dd HH:mm:ss
     */
    @NotNull
    private String DetailEndTime;
    private String detailEndTime;
    /**
     * 时段电价
     */
    @Null
    private BigDecimal ElecPrice;
    private BigDecimal elecPrice;
    /**
     * 时段服务费价格
     */
    @Null
    private BigDecimal SevicePrice;
    private BigDecimal sevicePrice;
    /**
     * 时段充电量
     */
    @Null
    private BigDecimal DetailPower;
    private BigDecimal detailPower;
    /**
     * 时段电费
     */
    @Null
    private BigDecimal DetailElecMoney;
    private BigDecimal detailElecMoney;
    /**
     * 时段服务费
     */
    @Null
    private BigDecimal DetailSeviceMoney;
    private BigDecimal detailSeviceMoney;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorInfo.java
@@ -17,49 +17,49 @@
     * 充电设备接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
    /**
     * 充电设备接口名称
     */
    @Null
    private String ConnectorName;
    private String connectorName;
    /**
     * 充电设备接口类型
     */
    @NotNull
    private Integer ConnectorType;
    private Integer connectorType;
    /**
     * 额定电压上限
     */
    @NotNull
    private Integer VoltageUpperLimits;
    private Integer voltageUpperLimits;
    /**
     * 额定电压下限
     */
    @NotNull
    private Integer VoltageLowerLimits;
    private Integer voltageLowerLimits;
    /**
     * 额定电流
     */
    @NotNull
    private Integer Current;
    private Integer current;
    /**
     * 额定功率
     */
    @NotNull
    private BigDecimal Power;
    private BigDecimal power;
    /**
     * 车位号
     */
    @Null
    private String ParkNo;
    private String parkNo;
    /**
     * 国家标准
     * 1:2011
     * 2:2015
     */
    @NotNull
    private Integer NationalStandard;
    private Integer nationalStandard;
    /**
     * 枪二维码
     */
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorStatsInfo.java
@@ -16,10 +16,10 @@
     * 充电设备接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
    /**
     * 充电设备接口累计电量
     */
    @NotNull
    private BigDecimal ConnectorElectricity;
    private BigDecimal connectorElectricity;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/ConnectorStatusInfo.java
@@ -16,7 +16,7 @@
     * 充电设备接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
    /**
     * 充电设备接口状态
     * 0:离网
@@ -27,7 +27,7 @@
     * 255:故障
     */
    @NotNull
    private Integer Status;
    private Integer status;
    /**
     * 车位状态
     * 0:未知
@@ -35,7 +35,7 @@
     * 50:占用
     */
    @Null
    private Integer ParkStatus;
    private Integer parkStatus;
    /**
     * 地锁状态
     * 0:未知
@@ -43,5 +43,5 @@
     * 50:已上锁
     */
    @Null
    private Integer LookStatus;
    private Integer lookStatus;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentInfo.java
@@ -18,56 +18,56 @@
     * 设备编号
     */
    @NotNull
    private String EquipmentID;
    private String equipmentID;
    /**
     * 设备生产商组织机构代码
     */
    @Null
    private String ManufacturerID;
    private String manufacturerID;
    /**
     * 设备生产商名称
     */
    @Null
    private String ManufacturerName;
    private String manufacturerName;
    /**
     * 设备型号
     */
    @Null
    private String EquipmentModel;
    private String equipmentModel;
    /**
     * 设备生产日期
     * YYYY-MM-DD
     */
    @Null
    private String ProductionDate;
    private String productionDate;
    /**
     * 设备类型
     */
    @NotNull
    private Integer EquipmentType;
    private Integer equipmentType;
    /**
     * 充电设备接口信息列表
     */
    @NotNull
    private List<ConnectorInfo> ConnectorInfos;
    private List<ConnectorInfo> connectorInfos;
    /**
     * 充电设备经度
     */
    @Null
    private BigDecimal EquipmentLng;
    private BigDecimal equipmentLng;
    /**
     * 充电设备纬度
     */
    @Null
    private BigDecimal EquipmentLat;
    private BigDecimal equipmentLat;
    /**
     * 充电设备总功率
     */
    @NotNull
    private BigDecimal Power;
    private BigDecimal power;
    /**
     * 充电设备名称
     */
    @Null
    private String EquipmentName;
    private String equipmentName;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentStatsInfo.java
@@ -17,15 +17,15 @@
     * 设备编码
     */
    @NotNull
    private String EquipmentID;
    private String equipmentID;
    /**
     * 充电设备接口累计电量
     */
    @NotNull
    private BigDecimal EquipmentElectricity;
    private BigDecimal equipmentElectricity;
    /**
     * 充电设备接口统计信息列表
     */
    @NotNull
    private List<ConnectorStatsInfo> ConnectorStatsInfos;
    private List<ConnectorStatsInfo> connectorStatsInfos;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationChargeOrderInfo.java
@@ -18,44 +18,44 @@
     * 充电订单号
     */
    @NotNull
    private String StartChargeSeq;
    private String startChargeSeq;
    /**
     * 充电设备接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
    /**
     * 开始充电时间
     * yyyy-MM-dd HH:mm:ss
     */
    @NotNull
    private String StartTime;
    private String startTime;
    /**
     * 结束充电时间
     * yyyy-MM-dd HH:mm:ss
     */
    @NotNull
    private String EndTime;
    private String endTime;
    /**
     * 累计充电量
     */
    @NotNull
    private BigDecimal TotalPower;
    private BigDecimal totalPower;
    /**
     * 总电费
     */
    @NotNull
    private BigDecimal TotalElecMoney;
    private BigDecimal totalElecMoney;
    /**
     * 总服务费
     */
    @NotNull
    private BigDecimal TotalSeviceMoney;
    private BigDecimal totalSeviceMoney;
    /**
     * 累计总金额
     */
    @NotNull
    private BigDecimal TotalMoney;
    private BigDecimal totalMoney;
    /**
     * 充电结束原因
     * 0:用户手动停止充电
@@ -66,23 +66,23 @@
     * 5·99:自定义
     */
    @NotNull
    private Integer StopReason;
    private Integer stopReason;
    /**
     * 时段数 N
     * 0·32
     */
    @Null
    private Integer SumPeriod;
    private Integer sumPeriod;
    /**
     * 充电明细信息
     */
    @Null
    private List<ChargeDetail> ChargeDetails;
    private List<ChargeDetail> chargeDetails;
    /**
     * 占位费
     */
    @Null
    private BigDecimal TotalDelayMoney;
    private BigDecimal totalDelayMoney;
    /**
     * 车辆识别码
     */
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationChargeOrderInfoResult.java
@@ -15,17 +15,17 @@
     * 充电订单号
     */
    @NotNull
    private String StartChargeSeq;
    private String startChargeSeq;
    /**
     * 充电设备接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
    /**
     * 确认结果
     * 0;成功
     * 1:争议交易
     * 2·99:自定义
     */
    private Integer ConfirmResult;
    private Integer confirmResult;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationEquipChargeStatusResult.java
@@ -15,12 +15,12 @@
     * 充电订单号
     */
    @NotNull
    private String StartChargeSeq;
    private String startChargeSeq;
    /**
     * 操作结果
     * 0:成功
     * 1:失败
     */
    @NotNull
    private Integer SuccStat;
    private Integer succStat;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationStartCharge.java
@@ -15,7 +15,7 @@
     * 充电订单号
     */
    @NotNull
    private String StartChargeSeq;
    private String startChargeSeq;
    /**
     * 充电订单状态
     * 1:启动中
@@ -25,15 +25,15 @@
     * 5:未知
     */
    @NotNull
    private Integer StartChargeSeqStat;
    private Integer startChargeSeqStat;
    /**
     * 充电设别接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
    /**
     * 充电启动时间
     */
    @NotNull
    private String StartTime;
    private String startTime;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationStartChargeResult.java
@@ -15,19 +15,19 @@
     * 充电订单号
     */
    @NotNull
    private String StartChargeSeq;
    private String startChargeSeq;
    /**
     * 操作结果
     * 0:成功
     * 1:失败
     */
    @NotNull
    private Integer SuccStat;
    private Integer succStat;
    /**
     * 失败原因
     * 0:无
     * 1:接收失败
     */
    @NotNull
    private Integer FailReason;
    private Integer failReason;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationStationStatusResult.java
@@ -17,5 +17,5 @@
     * 1:丢弃/忽略,不需要重试
     */
    @NotNull
    private Integer Status;
    private Integer status;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationStopCharge.java
@@ -15,19 +15,19 @@
     * 充电订单号
     */
    @NotNull
    private String StartChargeSeq;
    private String startChargeSeq;
    /**
     * 操作结果
     * 0:成功
     * 1:失败
     */
    @NotNull
    private Integer SuccStat;
    private Integer succStat;
    /**
     * 失败原因
     * 0:无
     * 1:接收失败
     */
    @NotNull
    private Integer FailReason;
    private Integer failReason;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationStopChargeResult.java
@@ -15,7 +15,7 @@
     * 充电订单号
     */
    @NotNull
    private String StartChargeSeq;
    private String startChargeSeq;
    /**
     * 充电订单状态
     * 1:启动中
@@ -25,19 +25,19 @@
     * 5:未知
     */
    @NotNull
    private Integer StartChargeSeqStat;
    private Integer startChargeSeqStat;
    /**
     * 充电设备接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
    /**
     * 操作结果
     * 0:成功
     * 1:失败
     */
    @NotNull
    private Integer SuccStat;
    private Integer succStat;
    /**
     * 失败原因
     * 0:无
@@ -47,5 +47,5 @@
     * 4`9:自定义
     */
    @NotNull
    private Integer FailReason;
    private Integer failReason;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/OperatorInfo.java
@@ -16,30 +16,30 @@
     * 运营商ID
     */
    @NotNull
    private String OperatorID;
    private String operatorID;
    /**
     * 运营商名称
     */
    @NotNull
    private String OperatorName;
    private String operatorName;
    /**
     * 运营商电话1
     */
    @NotNull
    private String OperatorTel1;
    private String operatorTel1;
    /**
     * 运营商电话2
     */
    @Null
    private String OperatorTel2;
    private String operatorTel2;
    /**
     * 运营商注册地址
     */
    @Null
    private String OperatorRegAddress;
    private String operatorRegAddress;
    /**
     * 备注
     */
    @Null
    private String OperatorNote;
    private String operatorNote;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PlaceHolder.java
@@ -17,26 +17,26 @@
     * 免费时长
     */
    @NotNull
    private Integer FreeTime;
    private Integer freeTime;
    /**
     * 嘴阀占位费
     */
    @NotNull
    private BigDecimal MaxFee;
    private BigDecimal maxFee;
    /**
     * 生效开始时间
     * yyyy-MM-dd HH:mm:ss
     */
    @NotNull
    private String EffectStartTime;
    private String effectStartTime;
    /**
     * 生效结束时间
     */
    @NotNull
    private String EffectEndTime;
    private String effectEndTime;
    /**
     * 占位费价格
     */
    @NotNull
    private List<PlaceHolderPrice> PlaceHolderPrices;
    private List<PlaceHolderPrice> placeHolderPrices;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PlaceHolderPrice.java
@@ -17,16 +17,16 @@
     * HH:mm
     */
    @NotNull
    private String StartTime;
    private String startTime;
    /**
     * 结束时段
     * HH:mm
     */
    @NotNull
    private String EndTime;
    private String endTime;
    /**
     * 单价
     */
    @NotNull
    private BigDecimal Price;
    private BigDecimal price;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/PolicyInfo.java
@@ -17,15 +17,15 @@
     * HHmmss
     */
    @NotNull
    private String StartTime;
    private String startTime;
    /**
     * 时段电费
     */
    @NotNull
    private BigDecimal ElecPrice;
    private BigDecimal elecPrice;
    /**
     * 时段服务费
     */
    @NotNull
    private BigDecimal SevicePrice;
    private BigDecimal sevicePrice;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryEquipAuth.java
@@ -15,10 +15,10 @@
     * 设备认证流水
     */
    @NotNull
    private String EquipAuthSeq;
    private String equipAuthSeq;
    /**
     * 充电设备接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryEquipAuthResult.java
@@ -15,19 +15,19 @@
     * 设备认证流水号
     */
    @NotNull
    private String EquipAuthSeq;
    private String equipAuthSeq;
    /**
     * 充电设备接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
    /**
     * 操作结果
     * 0:成功
     * 1:失败
     */
    @NotNull
    private Integer SuccStat;
    private Integer succStat;
    /**
     * 失败原因
     * 0:无
@@ -36,5 +36,5 @@
     * 3·99:自定义
     */
    @NotNull
    private Integer FailReason;
    private Integer failReason;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryEquipBusinessPolicy.java
@@ -16,10 +16,10 @@
     * 格式”运营商ID+唯一编号“。27字符
     */
    @NotNull
    private String EquipBizSeq;
    private String equipBizSeq;
    /**
     * 充电设备接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryEquipBusinessPolicyResult.java
@@ -16,36 +16,36 @@
     * 业务策略查询流水号
     */
    @NotNull
    private String EquipBizSeq;
    private String equipBizSeq;
    /**
     * 充电设备接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
    /**
     * 操作结果
     * 0:成功
     * 1:失败
     */
    @NotNull
    private Integer SuccStat;
    private Integer succStat;
    /**
     * 失败原因
     * 0:无
     * 1:此充电桩业务策略不存在
     */
    @NotNull
    private Integer FailReason;
    private Integer failReason;
    /**
     * 时段数N
     * 0`32
     */
    @NotNull
    private Integer SumPeriod;
    private Integer sumPeriod;
    /**
     * 计策信息
     */
    @NotNull
    private List<PolicyInfo> PolicyInfos;
    private List<PolicyInfo> policyInfos;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryEquipChargeStatus.java
@@ -16,12 +16,12 @@
     * 充电订单号
     */
    @NotNull
    private String StartChargeSeq;
    private String startChargeSeq;
    /**
     * 抢号
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
    /**
     * 车辆识别码
     */
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryEquipChargeStatusResult.java
@@ -18,7 +18,7 @@
     * 充电订单号
     */
    @NotNull
    private String StartChargeSeq;
    private String startChargeSeq;
    /**
     * 充电订单状态
     * 1:启动中
@@ -28,12 +28,12 @@
     * 5:未知
     */
    @NotNull
    private Integer StartChargeSeqStat;
    private Integer startChargeSeqStat;
    /**
     * 充电设备接口编号
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
    /**
     * 充电设备接口状态
     * 1:空闲
@@ -43,83 +43,83 @@
     * 255:故障
     */
    @NotNull
    private Integer ConnectorStatus;
    private Integer connectorStatus;
    /**
     * A相电流
     */
    @NotNull
    private BigDecimal CurrentA;
    private BigDecimal currentA;
    /**
     * B相电流
     */
    @Null
    private BigDecimal CurrentB;
    private BigDecimal currentB;
    /**
     * C相电流
     */
    @Null
    private BigDecimal CurrentC;
    private BigDecimal currentC;
    /**
     * A相电压
     */
    @NotNull
    private BigDecimal VoltageA;
    private BigDecimal voltageA;
    /**
     * B相电压
     */
    @Null
    private BigDecimal VoltageB;
    private BigDecimal voltageB;
    /**
     * C相电压
     */
    @Null
    private BigDecimal VoltageC;
    private BigDecimal voltageC;
    /**
     * 电池剩余电量
     */
    @NotNull
    private BigDecimal Soc;
    private BigDecimal soc;
    /**
     * 开始充电时间
     */
    @NotNull
    private String StartTime;
    private String startTime;
    /**
     * 本次采样时间
     */
    @NotNull
    private String EndTime;
    private String endTime;
    /**
     * 累计充电量
     */
    @NotNull
    private BigDecimal TotalPower;
    private BigDecimal totalPower;
    /**
     * 累计电费
     */
    @Null
    private BigDecimal ElecMoney;
    private BigDecimal elecMoney;
    /**
     * 累计服务费
     */
    @Null
    private BigDecimal SeviceMoney;
    private BigDecimal seviceMoney;
    /**
     * 累计总金额
     */
    @Null
    private BigDecimal TotalMoney;
    private BigDecimal totalMoney;
    /**
     * 时段数N
     * 0`32
     */
    @Null
    private Integer SumPeriod;
    private Integer sumPeriod;
    /**
     * 充电明细信息
     */
    @Null
    private List<ChargeDetail> ChargeDetails;
    private List<ChargeDetail> chargeDetails;
    /**
     * 车辆识别码
     */
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStartCharge.java
@@ -17,12 +17,12 @@
     * 充电订单号
     */
    @NotNull
    private String StartChargeSeq;
    private String startChargeSeq;
    /**
     * 充电设备接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
    /**
     * 二维码其他信息
     */
@@ -37,5 +37,5 @@
     * 充电车牌号
     */
    @Null
    private String PlateNum;
    private String plateNum;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStartChargeResult.java
@@ -16,7 +16,7 @@
     * 充电订单号
     */
    @NotNull
    private String StartChargeSeq;
    private String startChargeSeq;
    /**
     * 充电订单状态
     * 1:启动中
@@ -26,19 +26,19 @@
     * 5:未知
     */
    @NotNull
    private Integer StartChargeSeqStat;
    private Integer startChargeSeqStat;
    /**
     * 充电设别接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
    /**
     * 操作结果
     * 0:成功
     * 1:失败
     */
    @NotNull
    private Integer SuccStat;
    private Integer succStat;
    /**
     * 失败原因
     * 0:无
@@ -47,5 +47,5 @@
     * 3`9:自定义
     */
    @NotNull
    private Integer FailReason;
    private Integer failReason;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStationStats.java
@@ -15,17 +15,17 @@
     * 充电站ID
     */
    @NotNull
    private String StationID;
    private String stationID;
    /**
     * 统计开始时间
     * yyyy-MM-dd
     */
    @NotNull
    private String StartTime;
    private String startTime;
    /**
     * 统计结束时间
     * yyyy-MM-dd
     */
    @NotNull
    private String EndTime;
    private String endTime;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStationStatsResult.java
@@ -15,5 +15,5 @@
     * 充电站统计信息
     */
    @NotNull
    private StationStatsInfo StationStats;
    private StationStatsInfo stationStats;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStationStatus.java
@@ -17,5 +17,5 @@
     * 数组长度不超过50
     */
    @NotNull
    private List<String> StationIDs;
    private List<String> stationIDs;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStationStatusResult.java
@@ -14,9 +14,9 @@
    /**
     * 结果总数
     */
    private Integer Total;
    private Integer total;
    /**
     * 设备接口状态列表
     */
    private List<StationStatusInfo> StationStatusInfos;
    private List<StationStatusInfo> stationStatusInfos;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStationsInfo.java
@@ -15,17 +15,17 @@
     * yyyy-MM-dd HH:mm:ss
     */
    @Null
    private String LastQueryTime;
    private String lastQueryTime;
    /**
     * 查询页码
     * 默认1
     */
    @Null
    private Integer PageNo;
    private Integer pageNo;
    /**
     * 每页数量
     * 默认10
     */
    @Null
    private Integer PageSize;
    private Integer pageSize;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStationsInfoResult.java
@@ -17,20 +17,20 @@
     * 当前页数
     */
    @NotNull
    private Integer PageNo;
    private Integer pageNo;
    /**
     * 页码总数
     */
    @NotNull
    private Integer PageCount;
    private Integer pageCount;
    /**
     * 总记录条数
     */
    @NotNull
    private Integer ItemSize;
    private Integer itemSize;
    /**
     * 充电站信息列表
     */
    @NotNull
    private List<StationInfo> StationInfos;
    private List<StationInfo> stationInfos;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStopCharge.java
@@ -15,10 +15,10 @@
     * 充电订单号
     */
    @NotNull
    private String StartChargeSeq;
    private String startChargeSeq;
    /**
     * 充电设备接口编码
     */
    @NotNull
    private String ConnectorID;
    private String connectorID;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryStopChargeResult.java
@@ -15,7 +15,7 @@
     * 充电订单号
     */
    @NotNull
    private String StartChargeSeq;
    private String startChargeSeq;
    /**
     * 充电订单状态
     * 1:启动中
@@ -25,14 +25,14 @@
     * 5:未知
     */
    @NotNull
    private Integer StartChargeSeqStat;
    private Integer startChargeSeqStat;
    /**
     * 操作结果
     * 0:成功
     * 1:失败
     */
    @NotNull
    private Integer SuccStat;
    private Integer succStat;
    /**
     * 失败原因
     * 0:无
@@ -42,6 +42,6 @@
     * 4`9:自定义
     */
    @NotNull
    private Integer FailReason;
    private Integer failReason;
    
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryToken.java
@@ -15,10 +15,10 @@
     * 运营商标识
     */
    @NotNull
    private String OperatorID;
    private String operatorID;
    /**
     * 运营商秘钥
     */
    @NotNull
    private String OperatorSecret;
    private String operatorSecret;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/QueryTokenResult.java
@@ -15,24 +15,24 @@
     * 运营商标识
     */
    @NotNull
    private String OperatorID;
    private String operatorID;
    /**
     * 成功状态
     * 0:成功
     * 1:失败
     */
    @NotNull
    private Integer SuccStat;
    private Integer succStat;
    /**
     * 获取的凭证
     */
    @NotNull
    private String AccessToken;
    private String accessToken;
    /**
     * 凭证有效期,秒
     */
    @NotNull
    private Long TokenAvailableTime;
    private Long tokenAvailableTime;
    /**
     * 失败原因
     * 0:无
@@ -41,5 +41,5 @@
     * 3`9自定义
     */
    @NotNull
    private Integer FailReason;
    private Integer failReason;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/StationInfo.java
@@ -18,147 +18,147 @@
     * 充电站ID
     */
    @NotNull
    private String StationID;
    private String stationID;
    /**
     * 运营商ID
     */
    @NotNull
    private String OperatorID;
    private String operatorID;
    /**
     * 设备所属方ID
     * 设备所属运营平台组织机构代码
     */
    @NotNull
    private String EquipmentOwnerID;
    private String equipmentOwnerID;
    /**
     * 充电站名称
     */
    @NotNull
    private String StationName;
    private String stationName;
    /**
     * 充电站国家代码
     */
    @NotNull
    private String CountryCode;
    private String countryCode;
    /**
     * 充电站省市辖区编码
     */
    @NotNull
    private String AreaCode;
    private String areaCode;
    /**
     * 详细地址
     */
    @NotNull
    private String Address;
    private String address;
    /**
     * 站点电话
     */
    @Null
    private String StationTel;
    private String stationTel;
    /**
     * 站点电话
     */
    @NotNull
    private String ServiceTel;
    private String serviceTel;
    /**
     * 站点类型
     */
    @NotNull
    private Integer StationType;
    private Integer stationType;
    /**
     * 站点状态
     */
    @NotNull
    private Integer StationStatus;
    private Integer stationStatus;
    /**
     * 车位数量,0:未知
     */
    @NotNull
    private Integer ParkNums;
    private Integer parkNums;
    /**
     * 经度(保留6位小数)
     */
    @NotNull
    private BigDecimal StationLng;
    private BigDecimal stationLng;
    /**
     * 纬度(保留6位小数)
     */
    @NotNull
    private BigDecimal StationLat;
    private BigDecimal stationLat;
    /**
     * 站点引导
     */
    @Null
    private String SiteGuide;
    private String siteGuide;
    /**
     * 建设场所
     */
    @NotNull
    private Integer Construction;
    private Integer construction;
    /**
     * 站点照片
     * 字符串数组
     */
    @Null
    private List<String> Pictures;
    private List<String> pictures;
    /**
     * 使用车型描述
     */
    @Null
    private String MatchCars;
    private String matchCars;
    /**
     * 车位楼层及数量描述
     */
    @Null
    private String ParkInfo;
    private String parkInfo;
    /**
     * 营业时间
     */
    @Null
    private String BusineHours;
    private String busineHours;
    /**
     * 充电电费率描述
     */
    @Null
    private String ElectricityFee;
    private String electricityFee;
    /**
     * 服务费率描述
     */
    @Null
    private String ServiceFee;
    private String serviceFee;
    /**
     * 停车费率描述
     */
    @Null
    private String ParkFee;
    private String parkFee;
    /**
     * 支付方式:刷卡、线上、现金
     */
    @Null
    private String Payment;
    private String payment;
    /**
     * 是否支持预约
     */
    @Null
    private Integer SupportOrder;
    private Integer supportOrder;
    /**
     * 备注
     */
    @Null
    private String Remark;
    private String remark;
    /**
     * 充电设备信息列表
     */
    @NotNull
    private List<EquipmentInfo> EquipmentInfos;
    private List<EquipmentInfo> equipmentInfos;
    /**
     * 占位费描述
     */
    @Null
    private String OvertimeFee;
    private String overtimeFee;
    /**
     * 占位费信息
     */
    @Null
    private PlaceHolder PlaceHolder;
    private PlaceHolder placeHolder;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/StationStatsInfo.java
@@ -17,27 +17,27 @@
     * 充电站ID
     */
    @NotNull
    private String StationID;
    private String stationID;
    /**
     * 统计的开始时间
     * yyyy-MM-dd
     */
    @NotNull
    private String StartTime;
    private String startTime;
    /**
     * 统计的结束时间
     * yyyy-MM-dd
     */
    @NotNull
    private String EndTime;
    private String endTime;
    /**
     * 充电站累计电量 kw/h
     */
    @NotNull
    private BigDecimal StationElectricity;
    private BigDecimal stationElectricity;
    /**
     * 充电设备统计信息列表
     */
    @NotNull
    private List<EquipmentStatsInfo> EquipmentStatsInfos;
    private List<EquipmentStatsInfo> equipmentStatsInfos;
}
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/StationStatusInfo.java
@@ -16,9 +16,9 @@
     * 充电站ID
     */
    @NotNull
    private String StationID;
    private String stationID;
    /**
     * 充电设备接口状态列表
     */
    private List<ConnectorStatusInfo> ConnectorStatusInfos;
    private List<ConnectorStatusInfo> connectorStatusInfos;
}