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

# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java

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

@@ -0,0 +1,138 @@
+package com.jsowell.pile.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 蓝牙充电记录
+ */
+@Data
+public class BluetoothChargingRecordDTO {
+    // 会员id
+    private String memberId;
+
+    // 充电流水号
+    @JsonProperty(value = "TrxSN")
+    private String trxSN;
+
+    // 桩号
+    @JsonProperty(value = "PileNo")
+    private String pileNo;
+
+    // 枪号
+    @JsonProperty(value = "PlugNo")
+    private String plugNo;
+
+    // 启动充电时间
+    @JsonProperty(value = "StartTime")
+    private String startTime;
+
+    // 结束充电时间
+    @JsonProperty(value = "EndTime")
+    private String endTime;
+
+    // 尖单价
+    @JsonProperty(value = "PriceSharp")
+    private String priceSharp;
+
+    // 尖电量
+    @JsonProperty(value = "EnergySharp")
+    private String energySharp;
+
+    // 记损尖电量
+    @JsonProperty(value = "LossKwhSharp")
+    private String lossKwhSharp;
+
+    // 尖金额
+    @JsonProperty(value = "MoneySharp")
+    private String moneySharp;
+
+    // 峰单价
+    @JsonProperty(value = "PricePeak")
+    private String pricePeak;
+
+    // 峰电量
+    @JsonProperty(value = "EnergyPeak")
+    private String energyPeak;
+
+    // 记损峰电量
+    @JsonProperty(value = "LossKwhPeak")
+    private String lossKwhPeak;
+
+    // 峰金额
+    @JsonProperty(value = "MoneyPeak")
+    private String moneyPeak;
+
+    // 平单价
+    @JsonProperty(value = "PriceFlat")
+    private String priceFlat;
+
+    // 平电量
+    @JsonProperty(value = "EnergyFlat")
+    private String energyFlat;
+
+    // 记损平电量
+    @JsonProperty(value = "LossKwhFlat")
+    private String lossKwhFlat;
+
+    // 平金额
+    @JsonProperty(value = "MoneyFlat")
+    private String moneyFlat;
+
+    // 谷单价
+    @JsonProperty(value = "PriceValley")
+    private String priceValley;
+
+    // 谷电量
+    @JsonProperty(value = "EnergyValley")
+    private String energyValley;
+
+    // 记损谷电量
+    @JsonProperty(value = "LossKwhValley")
+    private String lossKwhValley;
+
+    // 谷金额
+    @JsonProperty(value = "MoneyValley")
+    private String moneyValley;
+
+
+    // 电表总起值
+    @JsonProperty(value = "StartKwh")
+    private String startKwh;
+
+    // 电表总止值
+    @JsonProperty(value = "StopKwh")
+    private String stopKwh;
+
+    // 总电量
+    @JsonProperty(value = "TotalEnergy")
+    private String totalEnergy;
+
+    // 记损总电量
+    @JsonProperty(value = "LossTotalKwh")
+    private String lossTotalKwh;
+
+    // 消费金额
+    @JsonProperty(value = "TotalMoney")
+    private String totalMoney;
+
+    // 电动汽车唯一标识
+    @JsonProperty(value = "VIN")
+    private String vin;
+
+    // 电动汽车唯一标识
+    @JsonProperty(value = "StartMode")
+    private String startMode;
+
+    // 交易日期时间
+    @JsonProperty(value = "TradeTime")
+    private String tradeTime;
+
+    // 停止原因
+    @JsonProperty(value = "StopReason")
+    private String stopReason;
+
+    // 物理卡号
+    @JsonProperty(value = "PCardID")
+    private String pCardID;
+}

jsowell-pile/src/main/java/com/jsowell/pile/mapper/PersonalChargingRecordMapper.java

@@ -1,9 +1,11 @@
 package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.PersonalChargingRecord;
-import java.util.List;
+import com.jsowell.pile.dto.QueryPersonPileDTO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface PersonalChargingRecordMapper {
     int deleteByPrimaryKey(Integer id);
 
@@ -28,4 +30,6 @@ public interface PersonalChargingRecordMapper {
     int batchInsert(@Param("list") List<PersonalChargingRecord> list);
 
     PersonalChargingRecord selectByTransactionCode(String transactionCode);
+
+    List<PersonalChargingRecord> getPersonalChargingRecord(QueryPersonPileDTO dto);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/PersonalChargingRecordService.java

@@ -1,10 +1,11 @@
 package com.jsowell.pile.service;
 
-import java.util.List;
-
 import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
 import com.jsowell.pile.domain.OrderBasicInfo;
 import com.jsowell.pile.domain.PersonalChargingRecord;
+import com.jsowell.pile.dto.QueryPersonPileDTO;
+
+import java.util.List;
 public interface PersonalChargingRecordService{
 
 
@@ -38,4 +39,9 @@ public interface PersonalChargingRecordService{
     void processPersonalChargingRecord(TransactionRecordsData data);
 
     void processPersonalChargingRecord(OrderBasicInfo orderBasicInfo);
+
+    /**
+     * 获取个人桩充电记录
+     */
+    List<PersonalChargingRecord> getPersonalChargingRecord(QueryPersonPileDTO dto);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PersonalChargingRecordServiceImpl.java

@@ -4,16 +4,18 @@ import com.jsowell.common.constant.Constants;
 import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.pile.domain.OrderBasicInfo;
+import com.jsowell.pile.domain.PersonalChargingRecord;
 import com.jsowell.pile.domain.PileBasicInfo;
+import com.jsowell.pile.dto.QueryPersonPileDTO;
+import com.jsowell.pile.mapper.PersonalChargingRecordMapper;
+import com.jsowell.pile.service.PersonalChargingRecordService;
 import com.jsowell.pile.service.PileBasicInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.List;
-import com.jsowell.pile.mapper.PersonalChargingRecordMapper;
-import com.jsowell.pile.domain.PersonalChargingRecord;
-import com.jsowell.pile.service.PersonalChargingRecordService;
 @Service
 public class PersonalChargingRecordServiceImpl implements PersonalChargingRecordService{
 
@@ -177,4 +179,9 @@ public class PersonalChargingRecordServiceImpl implements PersonalChargingRecord
         personalChargingRecordMapper.insertOrUpdateSelective(chargingRecord);
     }
 
+    @Override
+    public List<PersonalChargingRecord> getPersonalChargingRecord(QueryPersonPileDTO dto) {
+        return personalChargingRecordMapper.getPersonalChargingRecord(dto);
+    }
+
 }