chore(config): 更新开发环境数据库和Redis配置

- 将MySQL数据源地址更改为阿里云RDS实例
- 更新MySQL数据库用户名密码
- 修改Redis服务器地址为公网IP
- 更新Redis访问密码以匹配新环境配置

src/main/java/com/zsElectric/boot/charging/controller/ChargingBusinessController.java

@@ -109,7 +109,7 @@ public class ChargingBusinessController {
     @Operation(summary = "查询充电状态")
     @PostMapping("/queryChargingStatus")
     @Log(value = "查询充电状态", module = LogModuleEnum.PARKING_CALL, params = true, result = true)
-    public Result<ChargingStatusQueryResponseVO> queryChargingStatus(@RequestParam("StartChargeSeq") @Schema(description = "充电订单号(格式:运营商ID+唯一编号)") String StartChargeSeq) throws JsonProcessingException {
+    public Result<Object> queryChargingStatus(@RequestParam("StartChargeSeq") @Schema(description = "充电订单号(格式:运营商ID+唯一编号)") String StartChargeSeq) throws JsonProcessingException {
         return Result.success(chargingBusinessService.queryChargingStatus(StartChargeSeq));
     }
 

src/main/java/com/zsElectric/boot/charging/dto/StartChargingRequestDTO.java

@@ -1,5 +1,7 @@
 package com.zsElectric.boot.charging.dto;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
@@ -10,6 +12,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 @Schema(description = "请求启动充电DTO")
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
 public class StartChargingRequestDTO {
 
     @NotBlank(message = "充电订单号不能为空")
@@ -17,27 +20,33 @@ public class StartChargingRequestDTO {
     @Schema(description = "充电订单号(格式:运营商ID+唯一编号,27位)",
             example = "123456789201805071630123456",
             required = true)
+    @JsonProperty("StartChargeSeq")
     private String StartChargeSeq;
 
     @NotBlank(message = "充电设备接口编码不能为空")
     @Schema(description = "充电设备接口编码(见中电联协议 102.2-2016)",
             example = "3702120244102_1",
             required = true)
+    @JsonProperty("ConnectorID")
     private String ConnectorID;
 
     @Schema(description = "手机号(平台扩展字段)",
             example = "13800138000")
+    @JsonProperty("PhoneNum")
     private String PhoneNum;
 
     @Schema(description = "车牌号(平台扩展字段)",
             example = "京A12345")
+    @JsonProperty("PlateNum")
     private String PlateNum;
 
     @Schema(description = "预付金额(单位元)(平台扩展字段)",
             example = "50.00")
+    @JsonProperty("ChargingAmt")
     private String ChargingAmt;
 
     @Schema(description = "二维码其他信息(二维码中含有自定义部分的,需要将二维码自定义部分的原文传输)",
             example = "custom_qr_info_123456")
+    @JsonProperty("QRCode")
     private String QRCode;
 }

src/main/java/com/zsElectric/boot/charging/service/ChargingBusinessService.java

@@ -63,7 +63,7 @@ public interface ChargingBusinessService {
      * <p>查询充电状态</p>
      * @author SheepHy
      */
-    ChargingStatusQueryResponseVO queryChargingStatus(String StartChargeSeq) throws JsonProcessingException;
+    Object queryChargingStatus(String StartChargeSeq) throws JsonProcessingException;
 
     /**
      * <p>请求停止充电</p>

src/main/java/com/zsElectric/boot/charging/service/impl/ChargingBusinessServiceImpl.java

@@ -162,7 +162,7 @@ public class ChargingBusinessServiceImpl implements ChargingBusinessService {
     }
 
     @Override
-    public ChargingStatusQueryResponseVO queryChargingStatus(String StartChargeSeq) throws JsonProcessingException {
+    public Object queryChargingStatus(String StartChargeSeq) throws JsonProcessingException {
         Map<String, Object> queryParms = new HashMap<>();
         queryParms.put("StartChargeSeq", StartChargeSeq);
         log.info("查询充电订单状态请求参数：{}", queryParms);
@@ -170,7 +170,7 @@ public class ChargingBusinessServiceImpl implements ChargingBusinessService {
         log.info("查询充电订单状态返回结果：{}", jsonObject);
         JsonNode responseDecode = chargingUtil.responseDecode(jsonObject);
         log.info("查询充电订单状态返回结果解密后：{}", responseDecode);
-        return objectMapper.readValue(responseDecode.toString(), ChargingStatusQueryResponseVO.class);
+        return objectMapper.readValue(responseDecode.toString(), Object.class);
     }
 
     @Override

src/main/java/com/zsElectric/boot/charging/vo/ChargingOrderVO.java

@@ -1,5 +1,7 @@
 package com.zsElectric.boot.charging.vo;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -10,95 +12,115 @@ import java.util.List;
 @Data
 @Accessors(chain = true)
 @Schema(description = "充电订单信息VO")
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
 public class ChargingOrderVO {
 
     @Schema(description = "充电订单号(格式:运营商ID+唯一编号)",
             example = "123456789201805071630123456",
             required = true)
+    @JsonProperty("StartChargeSeq")
     private String StartChargeSeq;
 
     @Schema(description = "充电设备接口编码",
             example = "3702120244102_1",
             required = true)
+    @JsonProperty("ConnectorID")
     private String ConnectorID;
 
     @Schema(description = "开始充电时间,格式\"yyyy-MM-dd HH:mm:ss\"",
             example = "2024-01-15 10:30:00",
             required = true)
+    @JsonProperty("StartTime")
     private String StartTime;
 
     @Schema(description = "结束充电时间,格式\"yyyy-MM-dd HH:mm:ss\"",
             example = "2024-01-15 12:45:30",
             required = true)
+    @JsonProperty("EndTime")
     private String EndTime;
 
     @Schema(description = "累计充电量,单位：度，小数点后4位",
             example = "25.6845",
             required = true)
+    @JsonProperty("TotalPower")
     private BigDecimal TotalPower;
 
     @Schema(description = "总电费,单位：元，小数点后2位",
             example = "15.80",
             required = true)
+    @JsonProperty("TotalElecMoney")
     private BigDecimal TotalElecMoney;
 
     @Schema(description = "总服务费,单位：元，小数点后2位",
             example = "3.20",
             required = true)
+    @JsonProperty("TotalSeviceMoney")
     private BigDecimal TotalSeviceMoney;
 
     @Schema(description = "累计总金额,单位：元，小数点后2位",
             example = "19.00",
             required = true)
+    @JsonProperty("TotalMoney")
     private BigDecimal TotalMoney;
 
     @Schema(description = "充电结束原因(0:用户手动停止充电;1:客户归属地运营商平台停止充电;2:BMS停止充电;3:充电机设备故障;4:连接器断开;其它:自定义)",
             example = "0",
             allowableValues = {"0", "1", "2", "3", "4"},
             required = true)
+    @JsonProperty("StopReason")
     private Integer StopReason;
 
     @Schema(description = "时段数N,范围：0～32",
             example = "5")
+    @JsonProperty("SumPeriod")
     private Integer SumPeriod;
 
     @Schema(description = "单时段充电明细信息")
+    @JsonProperty("ChargeDetails")
     private List<ChargeDetail> ChargeDetails;
 
     @Data
     @Accessors(chain = true)
     @Schema(description = "充电明细信息体")
+    @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
     public static class ChargeDetail {
 
         @Schema(description = "开始时间,格式\"yyyy-MM-dd HH:mm:ss\"",
                 example = "2024-01-15 10:30:00",
                 required = true)
+        @JsonProperty("DetailStartTime")
         private String DetailStartTime;
 
         @Schema(description = "结束时间,格式\"yyyy-MM-dd HH:mm:ss\"",
                 example = "2024-01-15 11:30:00",
                 required = true)
+        @JsonProperty("DetailEndTime")
         private String DetailEndTime;
 
         @Schema(description = "时段电价,小数点后2位",
                 example = "0.65")
+        @JsonProperty("ElecPrice")
         private BigDecimal ElecPrice;
 
         @Schema(description = "时段服务费价格,小数点后2位",
                 example = "0.15")
+        @JsonProperty("SevicePrice")
         private BigDecimal SevicePrice;
 
         @Schema(description = "时段充电量,单位：度，小数点后4位",
                 example = "12.3456",
                 required = true)
+        @JsonProperty("DetailPower")
         private BigDecimal DetailPower;
 
         @Schema(description = "时段电费,小数点后2位",
                 example = "8.02")
+        @JsonProperty("DetailElecMoney")
         private BigDecimal DetailElecMoney;
 
         @Schema(description = "时段服务费,小数点后2位",
                 example = "1.85")
+        @JsonProperty("DetailSeviceMoney")
         private BigDecimal DetailSeviceMoney;
     }
 }

src/main/java/com/zsElectric/boot/charging/vo/ChargingStatusResponseVO.java

@@ -1,5 +1,7 @@
 package com.zsElectric.boot.charging.vo;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -7,34 +9,41 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 @Schema(description = "充电状态查询响应VO")
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
 public class ChargingStatusResponseVO {
 
     @Schema(description = "充电订单号(格式:运营商ID+唯一编号)",
             example = "123456789201805141125123456",
             required = true)
+    @JsonProperty("StartChargeSeq")
     private String StartChargeSeq;
 
     @Schema(description = "充电订单状态(1：启动中；2：充电中；3：停止中；4：已结束；5：未知)",
             example = "2",
             allowableValues = {"1", "2", "3", "4", "5"},
             required = true)
+    @JsonProperty("StartChargeSeqStat")
     private Integer StartChargeSeqStat;
 
     @Schema(description = "充电设备接口编码",
             example = "3702120244403_1",
             required = true)
+    @JsonProperty("ConnectorID")
     private String ConnectorID;
 
     @Schema(description = "充电启动时间(格式:yyyy-MM-dd HH:mm:ss)",
             example = "2018-05-17 09:08:00",
             required = true)
+    @JsonProperty("StartTime")
     private String StartTime;
 
     @Schema(description = "停止充电验证码",
             example = "886543")
+    @JsonProperty("IdentCode")
     private String IdentCode;
 
     @Schema(description = "失败原因描述",
             example = "设备离线")
+    @JsonProperty("FailReasonMsg")
     private String FailReasonMsg;
 }

src/main/java/com/zsElectric/boot/charging/vo/EquipChargeStatusResponseVO.java

@@ -1,5 +1,7 @@
 package com.zsElectric.boot.charging.vo;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -10,67 +12,88 @@ import java.util.List;
 @Data
 @Accessors(chain = true)
 @Schema(description = "推送充电状态响应VO")
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
 public class EquipChargeStatusResponseVO {
     @Schema(description = "充电订单号,27位", example = "123456789201805071630123456", required = true)
+    @JsonProperty("StartChargeSeq")
     private String StartChargeSeq;
 
     @Schema(description = "订单状态(1-启动中,2-启动成功,3-启动失败,4-结束)", example = "2", allowableValues = {"1", "2", "3", "4"}, required = true)
+    @JsonProperty("StartChargeSeqStat")
     private Integer StartChargeSeqStat;
 
     @Schema(description = "充电设备接口编码", example = "3702120244102_1", required = true)
+    @JsonProperty("ConnectorID")
     private String ConnectorID;
 
     @Schema(description = "设备接口状态(0-离网,1-空闲,2-占用(未充电),3-占用(充电中),4-占用(预约锁定),255-故障)", example = "3", allowableValues = {"0", "1", "2", "3", "4", "255"}, required = true)
+    @JsonProperty("ConnectorStatus")
     private Integer ConnectorStatus;
 
     @Schema(description = "A相电流,单位:A", example = "15.5", required = true)
+    @JsonProperty("CurrentA")
     private BigDecimal CurrentA;
 
     @Schema(description = "A相电压,单位:V", example = "220.0", required = true)
+    @JsonProperty("VoltageA")
     private BigDecimal VoltageA;
 
     @Schema(description = "荷电状态,0-100", example = "80", required = true)
+    @JsonProperty("Soc")
     private Integer Soc;
 
     @Schema(description = "累计充电电量,单位:kWh", example = "25.68", required = true)
+    @JsonProperty("TotalPower")
     private BigDecimal TotalPower;
 
     @Schema(description = "电费,单位:元", example = "15.80", required = true)
+    @JsonProperty("ElecMoney")
     private BigDecimal ElecMoney;
 
     @Schema(description = "服务费,单位:元", example = "3.20", required = true)
+    @JsonProperty("SeviceMoney")
     private BigDecimal SeviceMoney;
 
     @Schema(description = "总金额,单位:元", example = "19.00", required = true)
+    @JsonProperty("TotalMoney")
     private BigDecimal TotalMoney;
 
     @Schema(description = "充电明细信息体列表", required = true)
+    @JsonProperty("ChargeDetails")
     private List<ChargeDetail> ChargeDetails;
 
     @Data
     @Accessors(chain = true)
     @Schema(description = "充电明细信息体")
+    @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
     public static class ChargeDetail {
 
         @Schema(description = "开始时间,格式\"yyyy-MM-dd HH:mm:ss\"", example = "2024-01-15 10:30:00", required = true)
+        @JsonProperty("DetailStartTime")
         private String DetailStartTime;
 
         @Schema(description = "结束时间,格式\"yyyy-MM-dd HH:mm:ss\"", example = "2024-01-15 11:30:00", required = true)
+        @JsonProperty("DetailEndTime")
         private String DetailEndTime;
 
         @Schema(description = "时段电价,小数点后2位", example = "0.65")
+        @JsonProperty("ElecPrice")
         private BigDecimal ElecPrice;
 
         @Schema(description = "时段服务费价格,小数点后2位", example = "0.15")
+        @JsonProperty("SevicePrice")
         private BigDecimal SevicePrice;
 
         @Schema(description = "时段充电量,单位：度，小数点后4位", example = "12.3456", required = true)
+        @JsonProperty("DetailPower")
         private BigDecimal DetailPower;
 
         @Schema(description = "时段电费,小数点后2位", example = "8.02")
+        @JsonProperty("DetailElecMoney")
         private BigDecimal DetailElecMoney;
 
         @Schema(description = "时段服务费,小数点后2位", example = "1.85")
+        @JsonProperty("DetailSeviceMoney")
         private BigDecimal DetailSeviceMoney;
     }
 }

src/main/java/com/zsElectric/boot/charging/vo/StopChargingResponseVO.java

@@ -1,5 +1,7 @@
 package com.zsElectric.boot.charging.vo;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -7,37 +9,44 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 @Schema(description = "停止充电响应VO")
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
 public class StopChargingResponseVO {
 
     @Schema(description = "充电订单号(格式:运营商ID+唯一编号)",
             example = "123456789201805071630123456",
             required = true)
+    @JsonProperty("StartChargeSeq")
     private String StartChargeSeq;
 
     @Schema(description = "充电订单状态(1-启动中,2-充电中,3-停止中,4-已结束,5-未知)",
             example = "4",
             allowableValues = {"1", "2", "3", "4", "5"},
             required = true)
+    @JsonProperty("StartChargeSeqStat")
     private Integer StartChargeSeqStat;
 
     @Schema(description = "充电设备接口编码",
             example = "3702120244102_1",
             required = true)
+    @JsonProperty("ConnectorID")
     private String ConnectorID;
 
     @Schema(description = "操作结果(0-成功,1-失败)",
             example = "0",
             allowableValues = {"0", "1"},
             required = true)
+    @JsonProperty("SuccStat")
     private Integer SuccStat;
 
     @Schema(description = "停止失败原因(0-无,1-此设备不存在,2-此设备离线,3-设备已停止充电,其它-自定义)",
             example = "0",
             allowableValues = {"0", "1", "2", "3"},
             required = true)
+    @JsonProperty("FailReason")
     private Integer FailReason;
 
     @Schema(description = "失败原因描述",
             example = "无错误")
+    @JsonProperty("FailReasonMsg")
     private String FailReasonMsg;
 }