停止充电校验设备离线状态

common/src/main/java/com/kym/common/constant/ResponseEnum.java

@@ -44,7 +44,7 @@ public enum ResponseEnum implements BusinessExceptionAssert {
     PLATFORM_EQUIP_CHECK_FAIL(20008, "设备检测失败"),
     PLATFORM_EQUIP_START_FAIL(20009, "设备启动充电失败"),
     PLATFORM_EQUIP_NOT_EXIST(20010, "设备不存在"),
-    PLATFORM_EQUIP_OFFLINE(20011, "设备离线"),
+    PLATFORM_EQUIP_OFFLINE(20011, "设备离线，请稍后重试"),
     PLATFORM_EQUIP_STOP_FAIL(20012, "设备停止充电失败"),
     PLATFORM_EQUIP_EXIST_ORDER_UNFINISHED(20013, "设备存在未完成的订单"),
     ORDER_IN_BOOKING(20014, "用户有预约中的订单"),

service/src/main/java/com/kym/service/miniapp/impl/ChargeServiceImpl.java

@@ -483,7 +483,7 @@ public class ChargeServiceImpl implements ChargeService {
 
 
     /**
-     * 请求EN+设备充电状态
+     * 请求设备充电状态
      *
      * @return
      */
@@ -571,6 +571,10 @@ public class ChargeServiceImpl implements ChargeService {
     public void queryStopCharge(long userId, String connectorId) {
         connectorId = getConnectorId(connectorId);
         LOGGER.info("用户：{},设备：{}请求停止充电", userId, connectorId);
+        // 设备状态校验，如果设备离线则提示用户
+        if (EquipmentInfo.SERVICE_STATUS_离线 == KymCache.INSTANCE.getConnectorStatus(connectorId)) {
+            throw new BusinessException(ResponseEnum.PLATFORM_EQUIP_OFFLINE);
+        }
         // 查询充电订单
         var chargeOrder = chargeOrderService.lambdaQuery()
                 .eq(ChargeOrder::getUserId, userId)
@@ -588,7 +592,7 @@ public class ChargeServiceImpl implements ChargeService {
             LOGGER.error("订单：{}停止充电失败，返回结果:{}", chargeOrder.getStartChargeSeq(), data);
             throw new BusinessException(ResponseEnum.PLATFORM_EQUIP_STOP_FAIL);
         }
-        // 这里不更新订单状态，等待EN+推送停止充电结果信息再处理
+        // 这里不更新订单状态，等待互联互通平台推送停止充电结果信息再处理
 
     }
 

service/src/main/java/com/kym/service/miniapp/impl/CollectServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.kym.entity.miniapp.Collect;
 import com.kym.mapper.miniapp.CollectMapper;
-import com.kym.service.admin.StationService;
 import com.kym.service.miniapp.CollectService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -24,11 +23,6 @@ import java.util.List;
 @DS("db-miniapp")
 public class CollectServiceImpl extends MPJBaseServiceImpl<CollectMapper, Collect> implements CollectService {
 
-    private final StationService stationService;
-
-    public CollectServiceImpl(StationService stationService) {
-        this.stationService = stationService;
-    }
 
     /**
      * 添加/取消收藏