diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcDataBigScreenController.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcDataBigScreenController.java index a9632f54..38d04482 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcDataBigScreenController.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcDataBigScreenController.java @@ -129,7 +129,11 @@ public class XhpcDataBigScreenController extends BaseController { return xhpcDataBigScreenService.returnCoreLocation(coreParam); } + @GetMapping("/core-chargingStation") + public R>> returnCoreChargingStation(CoreParam coreParam) { + return xhpcDataBigScreenService.returnCoreChargingStation(coreParam); + } /** * 工单 */ diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcChargingStationMapper.java index 06af97bd..0156e5d5 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcChargingStationMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcChargingStationMapper.java @@ -27,6 +27,8 @@ public interface XhpcChargingStationMapper { */ List> selectByTenantIdAndChargingStationId(@Param("tenantIdsStr") String tenantIdsStr, @Param("chargingStationId") Long chargingStationId); + List> returnCoreChargingStation(@Param("tenantIdsStr") String tenantIdsStr, @Param("chargingStationId") Long chargingStationId, @Param("areaCode") Integer areaCode,@Param("number") Integer number); + /** * @author WH * @date 2022/3/3 15:20 diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/XhpcDataBigScreenService.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/XhpcDataBigScreenService.java index 18b7d61b..a27d8cae 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/XhpcDataBigScreenService.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/XhpcDataBigScreenService.java @@ -25,6 +25,8 @@ public interface XhpcDataBigScreenService { */ R>> returnCoreLocation(CoreParam coreParam); + R returnCoreChargingStation(CoreParam coreParam); + /** * query total count of user * diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java index 7f3084b5..45ddd633 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java @@ -90,6 +90,30 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { } } + @Override + public R returnCoreChargingStation(CoreParam coreParam) { + String tenantIdsStr = coreParam.getTenantIds(); + if (coreParam.getParamType() == null) { + return R.fail("ParamType不能为null"); + } + Integer areaCode = coreParam.getAreaCode(); + int number =0; + if(areaCode !=null){ + number = xhpcChargingStationMapper.getXhpcAreaLevel(areaCode); + } + String chargingStationIdStr = coreParam.getChargingStationIds(); + if(chargingStationIdStr==null || "".equals(chargingStationIdStr)){ + List> list = xhpcChargingStationMapper.returnCoreChargingStation(tenantIdsStr, null, areaCode, number+1); + Object[] objects = list.toArray(); + return R.ok(objects); + } + long chargingStationId = Long.parseLong(chargingStationIdStr); + //judge care param function + List> list = xhpcChargingStationMapper.returnCoreChargingStation(tenantIdsStr, chargingStationId, areaCode, number+1); + Object[] objects = list.toArray(); + return R.ok(objects); + } + @Override public R queryUserTotalCount(CoreParam coreParam) { diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml index c08c6f88..e5bbe391 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -71,6 +71,63 @@ AND xhpc_charging_station.charging_station_id = #{chargingStationId} + + +