Merge branch 'dev-new' into dev-new-rabbitmq

jsowell-pile/src/main/java/com/jsowell/pile/dto/BluetoothChargingRecordDTO.java

@@ -2,6 +2,8 @@ package com.jsowell.pile.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 蓝牙充电记录
@@ -95,7 +97,6 @@ public class BluetoothChargingRecordDTO {
     @JsonProperty(value = "MoneyValley")
     private String moneyValley;
 
-
     // 电表总起值
     @JsonProperty(value = "StartKwh")
     private String startKwh;
@@ -135,4 +136,42 @@ public class BluetoothChargingRecordDTO {
     // 物理卡号
     @JsonProperty(value = "PCardID")
     private String pCardID;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
+                .append("memberId", memberId)
+                .append("trxSN", trxSN)
+                .append("pileNo", pileNo)
+                .append("plugNo", plugNo)
+                .append("startTime", startTime)
+                .append("endTime", endTime)
+                .append("priceSharp", priceSharp)
+                .append("energySharp", energySharp)
+                .append("lossKwhSharp", lossKwhSharp)
+                .append("moneySharp", moneySharp)
+                .append("pricePeak", pricePeak)
+                .append("energyPeak", energyPeak)
+                .append("lossKwhPeak", lossKwhPeak)
+                .append("moneyPeak", moneyPeak)
+                .append("priceFlat", priceFlat)
+                .append("energyFlat", energyFlat)
+                .append("lossKwhFlat", lossKwhFlat)
+                .append("moneyFlat", moneyFlat)
+                .append("priceValley", priceValley)
+                .append("energyValley", energyValley)
+                .append("lossKwhValley", lossKwhValley)
+                .append("moneyValley", moneyValley)
+                .append("startKwh", startKwh)
+                .append("stopKwh", stopKwh)
+                .append("totalEnergy", totalEnergy)
+                .append("lossTotalKwh", lossTotalKwh)
+                .append("totalMoney", totalMoney)
+                .append("vin", vin)
+                .append("startMode", startMode)
+                .append("tradeTime", tradeTime)
+                .append("stopReason", stopReason)
+                .append("pCardID", pCardID)
+                .toString();
+    }
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/PileFirmwareInfoDTO.java

@@ -0,0 +1,30 @@
+package com.jsowell.pile.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 查询桩固件DTO
+ *
+ * @author Lemon
+ * @Date 2024/11/21 16:03:18
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class PileFirmwareInfoDTO {
+
+    private Integer pageNo;
+
+    private Integer pageSize;
+
+    /**
+     * 使用范围
+     * 1-4G；2-蓝牙
+     */
+    private String useRange;
+
+}