|
|
@@ -323,34 +323,36 @@ public class ChargingReceptionServiceImpl implements ChargingReceptionService {
|
|
|
*/
|
|
|
private void saveOrUpdateChargeStatus(JsonNode jsonNode) {
|
|
|
try {
|
|
|
+ log.info("保存或更新充电状态数据 - StartChargeSeq: {}", jsonNode);
|
|
|
String startChargeSeq = jsonNode.get("StartChargeSeq").asText();
|
|
|
- //修改订单状态
|
|
|
- ChargeOrderInfo chargeOrderInfo = chargeOrderInfoService.getOne(new LambdaQueryWrapper<ChargeOrderInfo>()
|
|
|
- .eq(ChargeOrderInfo::getStartChargeSeq, startChargeSeq).last("limit 1"));
|
|
|
- if(ObjUtil.isNotEmpty(chargeOrderInfo)){
|
|
|
- Integer connectorStatus = getIntValue(jsonNode, "ConnectorStatus");
|
|
|
- if (Objects.equals(connectorStatus, SystemConstants.STATUS_THREE) && Objects.equals(chargeOrderInfo.getStatus(), SystemConstants.STATUS_ZERO)) {
|
|
|
- // 充电中
|
|
|
- log.info("充电中 - StartChargeSeq: {}", startChargeSeq);
|
|
|
- chargeOrderInfo.setStatus(SystemConstants.STATUS_ONE);
|
|
|
- chargeOrderInfoService.updateById(chargeOrderInfo);
|
|
|
- }
|
|
|
- if (Objects.equals(connectorStatus, SystemConstants.STATUS_FOUR) && Objects.equals(chargeOrderInfo.getStatus(),
|
|
|
- SystemConstants.STATUS_ONE)) {
|
|
|
- // 结算中
|
|
|
- log.info("结算中 - StartChargeSeq: {}", startChargeSeq);
|
|
|
- chargeOrderInfo.setStatus(SystemConstants.STATUS_TWO);
|
|
|
- chargeOrderInfoService.updateById(chargeOrderInfo);
|
|
|
- }
|
|
|
- }
|
|
|
+// //修改订单状态
|
|
|
+// ChargeOrderInfo chargeOrderInfo = chargeOrderInfoService.getOne(new LambdaQueryWrapper<ChargeOrderInfo>()
|
|
|
+// .eq(ChargeOrderInfo::getStartChargeSeq, startChargeSeq).last("limit 1"));
|
|
|
+// if(ObjUtil.isNotEmpty(chargeOrderInfo)){
|
|
|
+// Integer connectorStatus = getIntValue(jsonNode, "ConnectorStatus");
|
|
|
+// if (Objects.equals(connectorStatus, SystemConstants.STATUS_THREE) && Objects.equals(chargeOrderInfo.getStatus(), SystemConstants.STATUS_ZERO)) {
|
|
|
+// // 充电中
|
|
|
+// log.info("充电中 - StartChargeSeq: {}", startChargeSeq);
|
|
|
+// chargeOrderInfo.setStatus(SystemConstants.STATUS_ONE);
|
|
|
+// chargeOrderInfoService.updateById(chargeOrderInfo);
|
|
|
+// }
|
|
|
+// if (Objects.equals(connectorStatus, SystemConstants.STATUS_FOUR) && Objects.equals(chargeOrderInfo.getStatus(),
|
|
|
+// SystemConstants.STATUS_ONE)) {
|
|
|
+// // 结算中
|
|
|
+// log.info("结算中 - StartChargeSeq: {}", startChargeSeq);
|
|
|
+// chargeOrderInfo.setStatus(SystemConstants.STATUS_TWO);
|
|
|
+// chargeOrderInfoService.updateById(chargeOrderInfo);
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
// 查询是否已存在该订单
|
|
|
- ThirdPartyChargeStatus existing = chargeStatusMapper.selectOne(
|
|
|
- Wrappers.<ThirdPartyChargeStatus>lambdaQuery()
|
|
|
- .eq(ThirdPartyChargeStatus::getStartChargeSeq, startChargeSeq)
|
|
|
- );
|
|
|
+// ThirdPartyChargeStatus existing = chargeStatusMapper.selectOne(
|
|
|
+// Wrappers.<ThirdPartyChargeStatus>lambdaQuery()
|
|
|
+// .eq(ThirdPartyChargeStatus::getStartChargeSeq, startChargeSeq)
|
|
|
+// );
|
|
|
|
|
|
- ThirdPartyChargeStatus chargeStatus = (existing != null) ? existing : new ThirdPartyChargeStatus();
|
|
|
+// ThirdPartyChargeStatus chargeStatus = (existing != null) ? existing : new ThirdPartyChargeStatus();
|
|
|
+ ThirdPartyChargeStatus chargeStatus = new ThirdPartyChargeStatus();
|
|
|
|
|
|
// 设置字段值
|
|
|
chargeStatus.setStartChargeSeq(startChargeSeq);
|
|
|
@@ -376,15 +378,19 @@ public class ChargingReceptionServiceImpl implements ChargingReceptionService {
|
|
|
chargeStatus.setChargeDetails(jsonNode.get("ChargeDetails").toString());
|
|
|
}
|
|
|
|
|
|
- if (existing != null) {
|
|
|
- chargeStatus.setUpdateTime(LocalDateTime.now());
|
|
|
- chargeStatusMapper.updateById(chargeStatus);
|
|
|
- log.info("更新充电状态成功 - startChargeSeq: {}", startChargeSeq);
|
|
|
- } else {
|
|
|
- chargeStatus.setCreateTime(LocalDateTime.now());
|
|
|
- chargeStatusMapper.insert(chargeStatus);
|
|
|
- log.info("新增充电状态成功 - startChargeSeq: {}", startChargeSeq);
|
|
|
- }
|
|
|
+// if (existing != null) {
|
|
|
+// chargeStatus.setUpdateTime(LocalDateTime.now());
|
|
|
+// chargeStatusMapper.updateById(chargeStatus);
|
|
|
+// log.info("更新充电状态成功 - startChargeSeq: {}", startChargeSeq);
|
|
|
+// } else {
|
|
|
+// chargeStatus.setCreateTime(LocalDateTime.now());
|
|
|
+// chargeStatusMapper.insert(chargeStatus);
|
|
|
+// log.info("新增充电状态成功 - startChargeSeq: {}", startChargeSeq);
|
|
|
+// }
|
|
|
+ chargeStatus.setCreateTime(LocalDateTime.now());
|
|
|
+ chargeStatusMapper.insert(chargeStatus);
|
|
|
+ log.info("新增充电状态成功 - startChargeSeq: {}", startChargeSeq);
|
|
|
+
|
|
|
//熔断保护
|
|
|
isNeedBreak(chargeStatus);
|
|
|
} catch (Exception e) {
|