From eaf35ce6e7ce572afa5bdbdfa4fb59506b6320b7 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 1 Apr 2023 15:33:36 +0800 Subject: [PATCH] update --- .../src/test/java/SpringBootTestController.java | 11 +++++++++++ .../handler/ConfirmStartChargingRequestHandler.java | 2 +- .../handler/TransactionRecordsRequestHandler.java | 1 + .../java/com/jsowell/pile/dto/QueryPersonPileDTO.java | 4 ++-- .../pile/vo/uniapp/PersonPileConnectorSumInfoVO.java | 6 ++++++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 425e4dd00..2256afb2a 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -24,6 +24,7 @@ import com.jsowell.netty.handler.HeartbeatRequestHandler; import com.jsowell.netty.service.yunkuaichong.YKCBusinessService; import com.jsowell.netty.service.yunkuaichong.YKCPushCommandService; import com.jsowell.pile.domain.OrderBasicInfo; +import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.domain.PileBillingDetail; import com.jsowell.pile.domain.PileBillingTemplate; import com.jsowell.pile.domain.PileStationInfo; @@ -39,6 +40,7 @@ import com.jsowell.pile.dto.WeixinPayDTO; import com.jsowell.pile.mapper.MemberBasicInfoMapper; import com.jsowell.pile.mapper.PileBillingTemplateMapper; import com.jsowell.pile.service.IOrderBasicInfoService; +import com.jsowell.pile.service.IPileAuthCardService; import com.jsowell.pile.service.IPileBasicInfoService; import com.jsowell.pile.service.IPileBillingTemplateService; import com.jsowell.pile.service.IPileMsgRecordService; @@ -149,6 +151,15 @@ public class SpringBootTestController { @Autowired private RedisCache redisCache; + @Autowired + private IPileAuthCardService pileAuthCardService; + + @Test + public void testSelectSomeStatusCardInfo() { + PileAuthCard pileAuthCard = pileAuthCardService.selectCardInfoByLogicCard("1111111111111111"); + System.out.println(pileAuthCard); + } + @Test public void testRefundForBalance() { BigDecimal refundAmount = new BigDecimal("2"); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java index 3c8e1a79a..83a8ef843 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java @@ -101,7 +101,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ length = 8; byte[] cardNumByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); String physicsCard = BytesUtil.binary(cardNumByteArr, 16); - log.info("物理卡号：{}", physicsCard); + log.info("桩号:{}申请充电物理卡号:{}", pileSn, physicsCard); // 输入密码 对用户输入的密码进行16 位MD5 加密，采用小写上传 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java index a668e9a69..6b065a3dc 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java @@ -442,6 +442,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { byte[] cardNumByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); // byte[] logicCardNum = BytesUtil.checkLengthAndBehindAppendZero(cardNumByteArr, 16); String logicCard = BytesUtil.binary(cardNumByteArr, 16); + log.info("桩号:{}发送交易记录物理卡号:{}", pileSn, logicCard); log.info("[===交易记录===]交易流水号:{}, 桩编号:{}, 枪号:{}, 开始时间:{}, 结束时间:{}, 尖单价:{}, 尖电量:{}, 计损尖电量:{}, 尖金额:{}, " + "峰单价:{}, 峰电量:{}, 计损峰电量:{}, 峰金额:{}, 平单价:{}, 平电量:{}, 计损平电量:{}, 平金额:{}, " + diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryPersonPileDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryPersonPileDTO.java index fb067cbda..19b63696c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryPersonPileDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryPersonPileDTO.java @@ -30,8 +30,8 @@ public class QueryPersonPileDTO { */ private String endTime; - private int pageSize; + private Integer pageSize; - private int pageNum; + private Integer pageNum; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonPileConnectorSumInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonPileConnectorSumInfoVO.java index 9d3883138..4e5f2662b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonPileConnectorSumInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonPileConnectorSumInfoVO.java @@ -1,6 +1,9 @@ package com.jsowell.pile.vo.uniapp; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; /** * 个人桩枪口累计数据 @@ -9,6 +12,9 @@ import lombok.Data; * @date 2023/2/25 8:42 */ @Data +@AllArgsConstructor +@NoArgsConstructor +@Builder public class PersonPileConnectorSumInfoVO { private String memberId;