skyline 10 月之前
父節點
當前提交
f52f8c5399

+ 1 - 0
admin-web/src/views/admin/ordering/index.vue

@@ -281,6 +281,7 @@ const state = reactive({
       // {label: '站点ID',  prop: 'stationId',width:100, resizable: true, fixed: 'left'},
       // {label: '站点', prop: 'stationName', width: 150, resizable: true, fixed: 'left'},
       {label: '充电订单号', prop: 'startChargeSeq', width: 170, resizable: true, fixed: 'left'},
+      {label: '互联平台', prop: 'platformName', width: 120, resizable: true, fixed: 'left'},
       {label: '设备编号', prop: 'shortId', width: 90, resizable: true},
       {label: '充电设备接口编码', prop: 'connectorId', width: 160, resizable: true},
       {label: '充电开始/结束时间', prop: 'startTime', sortable: 'custom', width: 175, resizable: true},

+ 1 - 0
entity/src/main/java/com/kym/entity/admin/vo/CustomOrderVo.java

@@ -19,6 +19,7 @@ public class CustomOrderVo {
     private String startChargeSeq;
     private String stationId;
     private String stationName;
+    private String platformName;
     private String connectorId;
     private String shortId;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

+ 0 - 5
miniapp/src/main/java/com/kym/miniapp/jobs/StationPolicyInfoJob.java

@@ -4,7 +4,6 @@ import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.kym.entity.miniapp.vo.PlatformPolicyInfoVo;
 import com.kym.entity.platform.PlatformPolicyInfo;
 import com.kym.mapper.admin.EquipmentRelationMapper;
-import com.kym.service.admin.StationService;
 import com.kym.service.cache.KymCache;
 import com.kym.service.miniapp.ChargeService;
 import jakarta.annotation.PostConstruct;
@@ -24,18 +23,14 @@ import java.util.List;
 @Slf4j
 public class StationPolicyInfoJob {
 
-    private final StationService stationService;
-
     private final EquipmentRelationMapper equipmentRelationMapper;
 
     private final ChargeService chargeService;
 
     public StationPolicyInfoJob(
-            StationService stationService,
             EquipmentRelationMapper equipmentRelationMapper,
             ChargeService chargeService) {
         this.equipmentRelationMapper = equipmentRelationMapper;
-        this.stationService = stationService;
         this.chargeService = chargeService;
     }
 

+ 2 - 0
service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.github.pagehelper.PageHelper;
+import com.kym.common.cache.PlatformCache;
 import com.kym.common.exception.BusinessException;
 import com.kym.common.utils.CommUtil;
 import com.kym.common.utils.HttpUtil;
@@ -115,6 +116,7 @@ public class ChargeOrderServiceImpl extends MyBaseServiceImpl<ChargeOrderMapper,
         var page = new PageBean<>(result);
         page.setList(result.stream().map(item ->
                 item.setShortId(KymCache.INSTANCE.getShortIdByEquipmentIdOrConnectorId(item.getConnectorId()))
+                        .setPlatformName(PlatformCache.INSTANCE.getPlatformNameByConnectorId(item.getConnectorId()))
                         .setStationName(KymCache.INSTANCE.getStationNameById(item.getStationId()))).collect(Collectors.toList()));
         var map = baseMapper.statChargeOrders(params);
         return page.setExtraData(map);

+ 1 - 0
service/src/main/java/com/kym/service/platform/impl/PlatformApiServiceImpl.java

@@ -75,6 +75,7 @@ public class PlatformApiServiceImpl implements PlatformApiService {
                 .url(url)
                 .build();
         var response = parse(synchronizedCall(request), PlatformResponse.class);
+        CommUtil.asserts(null != response, "互联互通平台:" + platformName + "接口异常");
 
         if (0 == response.getRet()) {
             return response;