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

update 订单记录停止原因码

Browse Source
This commit is contained in:
Lemon
2024-12-20 13:25:22 +08:00
parent 5869e8d5f3
commit bd59654994
6 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/service/TempService.java
View File

@@ -649,7 +649,7 @@ public class TempService {
return Lists.newArrayList();
}
BigDecimal multiple = new BigDecimal("2");
BigDecimal multiple = new BigDecimal("0.5");
// 查询订单主表数据
List<OrderBasicInfo> orderBasicInfos = orderBasicInfoService.queryOrderList(orderCodeList);
for (OrderBasicInfo orderBasicInfo : orderBasicInfos) {

18
jsowell-common/src/main/java/com/jsowell/common/enums/ykc/YKCChargingStopReasonEnum.java
View File

@@ -112,6 +112,24 @@ public enum YKCChargingStopReasonEnum {
*/
UNKNOWN_REASON_STOP_CHARGING(0x90, "未知原因停止"),
/**
* 功率板故障
*/
OUTPUT_UNDER_VOLTAGE(0x92, "功率板告警，输出欠压"),
OUTPUT_OVER_VOLTAGE(0x93, "功率板告警，输出过压故障"),
INPUT_OVER_VOLTAGE(0x94, "功率板告警，输入过压"),
INPUT_UNDER_VOLTAGE(0x95, "功率板告警，输入欠压"),
TRANSFORMER_OVER_TEMPERATURE(0x96, "功率板告警，变压器过温"),
A_OVER_CURRENT(0x97, "功率板告警，谐振A过流"),
B_OVER_CURRENT(0x98, "功率板告警，谐振B过流"),
OUTPUT_OVER_CURRENT(0x99, "功率板告警，输出过流"),
HARDWARE_OUTPUT_OVER_CURRENT(0x9A, "功率板告警，硬件输出过流"),
AB_OUTPUT_UNBALANCE(0x9B, "功率板告警，AB输出不平衡"),
LLC_PFC_COMMUNICATION_FAULT(0x9C, "功率板告警，LLC和PFC通信故障"),
LLC_MAIN_CONTROLLER_COMMUNICATION_FAULT(0x9D, "功率板告警，LLC和主控通信故障"),
OTHER_EIGHTY_G(0x9E, "预留"),
;

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

@@ -611,6 +611,7 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler {
String pileSn = data.getPileSn(); // 充电桩编号
PileBasicInfo pileBasicInfo = pileBasicInfoService.selectPileBasicInfoBySN(pileSn);
if (StringUtils.equals(pileBasicInfo.getBusinessType(), Constants.TWO)) {
// 个人桩处理逻辑
personalChargingRecordService.processPersonalChargingRecord(data);
// return;
}
@@ -620,7 +621,7 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler {
OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
if (orderBasicInfo != null) {
// 平台存在订单
orderBasicInfo.setReason(data.getStopReasonMsg());
// 如果订单状态为 异常，则改为 待结算
if (StringUtils.equals(OrderStatusEnum.ABNORMAL.getValue(), orderBasicInfo.getOrderStatus())) {
orderBasicInfo.setOrderStatus(OrderStatusEnum.STAY_SETTLEMENT.getValue());
@@ -640,6 +641,10 @@ public class TransactionRecordsRequestHandler extends AbstractYkcHandler {
// 将停止原因码存库
orderBasicInfo.setStopReasonCode("0x" + data.getStopReasonCode());
// 停止原因
if (StringUtils.isNotBlank(data.getStopReasonMsg())) {
orderBasicInfo.setReason(data.getStopReasonMsg());
}
orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo);

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1904,6 +1904,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
orderBasicInfo.setChargeStartTime(DateUtils.parseDate(data.getStartTime()));
// 充电结束时间
orderBasicInfo.setChargeEndTime(DateUtils.parseDate(data.getEndTime()));
// 停止原因码
orderBasicInfo.setStopReasonCode("0x" + data.getStopReasonCode());
// 停止原因
orderBasicInfo.setReason(data.getStopReasonMsg());
// 结算时间

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

@@ -3,6 +3,7 @@ package com.jsowell.pile.service.impl;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.PersonalChargingRecord;
import com.jsowell.pile.domain.PileBasicInfo;
@@ -130,7 +131,10 @@ public class PersonalChargingRecordServiceImpl implements PersonalChargingRecord
chargingRecord.setValleyUsedElectricity(valleyUsedElectricity);
BigDecimal totalUsedElectricity = sharpUsedElectricity.add(peakUsedElectricity).add(flatUsedElectricity).add(valleyUsedElectricity);
chargingRecord.setTotalUsedElectricity(totalUsedElectricity);
chargingRecord.setReason(data.getStopReasonMsg());
chargingRecord.setStopReasonCode("0x" + data.getStopReasonCode());
if (StringUtils.isNotBlank(data.getStopReasonMsg())) {
chargingRecord.setReason(data.getStopReasonMsg());
}
// 创建或更新
this.insertOrUpdateSelective(chargingRecord);
}

6
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java vendored
View File

@@ -165,10 +165,8 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService {
}
public static void main(String[] args) {
String msg = "880B24831B56238914534606391D2902";
String signSecret = "iz54GKP9oOeCCYSp";
String result = Cryptos.aesDecrypt(msg, signSecret);
String address = "贵州省黔西南州安龙县社保局后侧";
GeoCodeInfo geoCode = TermRelationTreeCoordinate.completeGeoCode(address);
}
/**