Browse Source

fix 可能出现的启动充电异常,添加日志

skyline 2 years ago
parent
commit
377f9b88f5

+ 5 - 1
service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -40,7 +40,11 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
 
     @Override
     public ChargeOrder getChargingOrderByUserId(Long userId) {
-        return lambdaQuery().eq(ChargeOrder::getUserId, userId).eq(ChargeOrder::getChargeStatus, 2).one();
+        return lambdaQuery().eq(ChargeOrder::getUserId, userId)
+                .eq(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_启动中)
+                .or()
+                .eq(ChargeOrder::getChargeStatus,ChargeOrder.CHARGE_STATUS_充电中)
+                .one();
     }
 
     @Override

+ 3 - 2
service/src/main/java/com/kym/service/miniapp/impl/ChargeServiceImpl.java

@@ -59,7 +59,7 @@ public class ChargeServiceImpl implements ChargeService {
         var map = getConnectorIdAndStationId(connectorId);
         connectorId = map.get("connectorId");
         var stationId = map.get("stationId");
-
+        LOGGER.info("用户:{},设备:{}请求启动充电", userId, connectorId);
         // 二维码文本
         var qrCode = "";
         // 当前设备是是否有正在进行中的订单
@@ -167,7 +167,7 @@ public class ChargeServiceImpl implements ChargeService {
     public Map<String, String> getConnectorIdAndStationId(String connectorId) {
         var stationId = "";
         if (connectorId.length() == 17) {
-            var equipmentRelation = equipmentRelationService.getByEquipmentId(connectorId.substring(0,16));
+            var equipmentRelation = equipmentRelationService.getByEquipmentId(connectorId.substring(0, 16));
             stationId = equipmentRelation.getStationId();
         } else if (connectorId.length() == 6) {
             // 查询EN+设备SN
@@ -215,6 +215,7 @@ public class ChargeServiceImpl implements ChargeService {
     public void queryStopCharge(String connectorId) {
         var userId = StpUtil.getLoginIdAsLong();
         connectorId = getConnectorId(connectorId);
+        LOGGER.info("用户:{},设备:{}请求停止充电", userId, connectorId);
         // 查询充电订单
         var chargeOrder = chargeOrderService.lambdaQuery()
                 .eq(ChargeOrder::getUserId, userId)