autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 03:25:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-01-06 15:13:50 +08:00
parent caf9eb21bf
commit d685d12723
35 changed files with 2352 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java
View File

@@ -10,9 +10,9 @@ import com.jsowell.common.util.YKCUtils;
import com.jsowell.netty.factory.YKCOperateFactory;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.ThirdPartyStationRelation;
import com.jsowell.pile.service.IOrderBasicInfoService;
import com.jsowell.pile.service.IThirdPartySettingInfoService;
import com.jsowell.pile.service.IThirdPartyStationRelationService;
import com.jsowell.pile.service.OrderBasicInfoService;
import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
import com.jsowell.thirdparty.lianlian.service.LianLianService;
import com.jsowell.thirdparty.xindiantu.service.XDTService;
@@ -38,7 +38,7 @@ public class ChargeEndHandler extends AbstractHandler{
private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.CHARGE_END_CODE.getBytes());
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Autowired
private IThirdPartySettingInfoService thirdPartySettingInfoService;
@@ -132,7 +132,7 @@ public class ChargeEndHandler extends AbstractHandler{
if (StringUtils.equals(OrderStatusEnum.IN_THE_CHARGING.getValue(), orderInfo.getOrderStatus())) {
orderInfo.setOrderStatus(OrderStatusEnum.STAY_SETTLEMENT.getValue());
}
orderInfo.setEndSOC(stopSoc);
orderInfo.setEndSoc(stopSoc);
if (orderInfo.getChargeEndTime() == null) {
orderInfo.setChargeEndTime(new Date()); // 结束充电时间
}

4
jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java
View File

@@ -18,8 +18,8 @@ import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.domain.PileAuthCard;
import com.jsowell.pile.dto.GenerateOrderDTO;
import com.jsowell.pile.service.IMemberPlateNumberRelationService;
import com.jsowell.pile.service.IOrderBasicInfoService;
import com.jsowell.pile.service.IPileMsgRecordService;
import com.jsowell.pile.service.OrderBasicInfoService;
import com.jsowell.pile.service.PileAuthCardService;
import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
@@ -44,7 +44,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{
private PileAuthCardService pileAuthCardService;
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Autowired
private IMemberPlateNumberRelationService memberPlateNumberRelationService;

6
jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java
View File

@@ -6,7 +6,7 @@ import com.jsowell.common.util.BytesUtil;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.netty.factory.YKCOperateFactory;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.service.IOrderBasicInfoService;
import com.jsowell.pile.service.OrderBasicInfoService;
import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +25,7 @@ import java.util.Objects;
@Component
public class ParameterConfigurationHandler extends AbstractHandler{
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.PARAMETER_CONFIGURATION_CODE.getBytes());
@@ -117,7 +117,7 @@ public class ParameterConfigurationHandler extends AbstractHandler{
if (Objects.nonNull(orderInfo)) {
OrderBasicInfo orderBasicInfo = OrderBasicInfo.builder()
.id(orderInfo.getId())
.startSOC(soc)
.startSoc(soc)
.build();
orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo);

4
jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java
View File

@@ -8,7 +8,7 @@ import com.jsowell.common.util.BytesUtil;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.netty.factory.YKCOperateFactory;
import com.jsowell.pile.service.IOrderBasicInfoService;
import com.jsowell.pile.service.OrderBasicInfoService;
import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@ public class RemoteStartChargingRequestHandler extends AbstractHandler{
private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_START_CHARGING_ANSWER_CODE.getBytes());
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Override
public void afterPropertiesSet() throws Exception {

4
jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java
View File

@@ -9,7 +9,7 @@ import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.netty.factory.YKCOperateFactory;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.service.IOrderBasicInfoService;
import com.jsowell.pile.service.OrderBasicInfoService;
import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +29,7 @@ public class RemoteStopChargingRequestHandler extends AbstractHandler{
private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_STOP_CHARGING_ANSWER_CODE.getBytes());
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Override
public void afterPropertiesSet() throws Exception {

2
jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java
View File

@@ -76,7 +76,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler {
private IPileMsgRecordService pileMsgRecordService;
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Autowired
private IPileMerchantInfoService pileMerchantInfoService;

4
jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java
View File

@@ -17,10 +17,10 @@ import com.jsowell.netty.factory.YKCOperateFactory;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.PileBasicInfo;
import com.jsowell.pile.domain.ThirdPartyStationRelation;
import com.jsowell.pile.service.IOrderBasicInfoService;
import com.jsowell.pile.service.IPileBasicInfoService;
import com.jsowell.pile.service.IPileConnectorInfoService;
import com.jsowell.pile.service.IThirdPartyStationRelationService;
import com.jsowell.pile.service.OrderBasicInfoService;
import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
import com.jsowell.thirdparty.lianlian.service.LianLianService;
import com.jsowell.thirdparty.nanrui.service.NRService;
@@ -58,7 +58,7 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler {
private IPileBasicInfoService pileBasicInfoService;
@Autowired
private IOrderBasicInfoService orderBasicInfoService;
private OrderBasicInfoService orderBasicInfoService;
@Autowired
private IPileConnectorInfoService pileConnectorInfoService;