From 7ee6a9d044e163ecd96f4ae0c2e665bc98e28d2e Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Thu, 22 Jul 2021 13:52:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E7=AB=99=E8=AF=A6=E6=83=85=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E7=AB=99=E7=82=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XhpcChargingStationController.java | 18 ++++ .../station/domain/XhpcChargingStation.java | 28 ++++++ .../charging/station/domain/XhpcRate.java | 87 ++++++++++++++++++- .../mapper/XhpcChargingStationMapper.java | 10 +++ .../station/mapper/XhpcRateTimeMapper.java | 2 +- .../service/IXhpcChargingStationService.java | 12 +++ .../XhpcChargingStationServiceImpl.java | 40 ++++++++- .../service/XhpcRateTimeServiceImpl.java | 15 +++- .../mapper/XhpcChargingStationMapper.xml | 34 ++++++++ .../resources/mapper/XhpcRateTimeMapper.xml | 9 +- 10 files changed, 244 insertions(+), 11 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java index 7a50284b..97a1eaad 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java @@ -169,4 +169,22 @@ public class XhpcChargingStationController extends BaseController { } + /** + * 电站详情（站点详情） + * @param chargingStationId 站点id + * @param longitude 经度 + * @param latitude 维度 + * @return + */ + @GetMapping(value = "/getXhpcChargingStationMassage") + public AjaxResult getXhpcChargingStationMassage(@Param("chargingStationId") Long chargingStationId,@Param("longitude")String longitude,@Param("latitude")String latitude) + { + return AjaxResult.success(xhpcChargingStationService.getXhpcChargingStationMassage(chargingStationId,longitude,latitude)); + } + + + + + + } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcChargingStation.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcChargingStation.java index 4272b955..49137334 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcChargingStation.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcChargingStation.java @@ -88,6 +88,14 @@ public class XhpcChargingStation extends BaseEntity { @Excel(name = "图片id") private String imgId; + /** 营业说明 */ + @Excel(name = "营业说明") + private String pbusinessInstructions; + + /** 温馨提示说明 */ + @Excel(name = "温馨提示说明") + private String reminderInstructions; + public void setChargingStationId(Long chargingStationId) { this.chargingStationId = chargingStationId; @@ -261,4 +269,24 @@ public class XhpcChargingStation extends BaseEntity { this.imgId = imgId; } + public String getPbusinessInstructions() { + + return pbusinessInstructions; + } + + public void setPbusinessInstructions(String pbusinessInstructions) { + + this.pbusinessInstructions = pbusinessInstructions; + } + + public String getReminderInstructions() { + + return reminderInstructions; + } + + public void setReminderInstructions(String reminderInstructions) { + + this.reminderInstructions = reminderInstructions; + } + } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcRate.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcRate.java index f42b0395..15ef3c61 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcRate.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcRate.java @@ -1,7 +1,8 @@ package com.xhpc.charging.station.domain; import com.ruoyi.common.core.web.domain.BaseEntity; -import org.apache.poi.hpsf.Decimal; + +import java.math.BigDecimal; /** * 费率对象 xhpc_rate @@ -20,10 +21,10 @@ public class XhpcRate extends BaseEntity { private Long chargingStationId; /** 电费 */ - private Decimal powerFee; + private BigDecimal powerFee; /** 服务费 */ - private Decimal serviceFee; + private BigDecimal serviceFee; /** 名称 */ private String name; @@ -37,4 +38,84 @@ public class XhpcRate extends BaseEntity { /** 费率模型id */ private Long rateModelId; + public Long getRateId() { + + return rateId; + } + + public void setRateId(Long rateId) { + + this.rateId = rateId; + } + + public Long getChargingStationId() { + + return chargingStationId; + } + + public void setChargingStationId(Long chargingStationId) { + + this.chargingStationId = chargingStationId; + } + + public BigDecimal getPowerFee() { + + return powerFee; + } + + public void setPowerFee(BigDecimal powerFee) { + + this.powerFee = powerFee; + } + + public BigDecimal getServiceFee() { + + return serviceFee; + } + + public void setServiceFee(BigDecimal serviceFee) { + + this.serviceFee = serviceFee; + } + + public String getName() { + + return name; + } + + public void setName(String name) { + + this.name = name; + } + + public Integer getStatus() { + + return status; + } + + public void setStatus(Integer status) { + + this.status = status; + } + + public Integer getDelFlag() { + + return delFlag; + } + + public void setDelFlag(Integer delFlag) { + + this.delFlag = delFlag; + } + + public Long getRateModelId() { + + return rateModelId; + } + + public void setRateModelId(Long rateModelId) { + + this.rateModelId = rateModelId; + } + } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java index 95372111..6c80f621 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java @@ -110,5 +110,15 @@ public interface XhpcChargingStationMapper { */ List> getCode(@Param("code")String code,@Param("serviceFacilities")List serviceFacilities); + /** + * 电站详情（站点详情） + * + * @param chargingStationId 电站ID + * @return 电站 + */ + Map getXhpcChargingStationMassage(@Param("chargingStationId")Long chargingStationId,@Param("longitude")String longitude,@Param("latitude")String latitude); + + + List> getImageList(@Param("imgIds")List imgIds); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcRateTimeMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcRateTimeMapper.java index 18545bb6..fbc21ee8 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcRateTimeMapper.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcRateTimeMapper.java @@ -13,7 +13,7 @@ public interface XhpcRateTimeMapper { * @param datchargingStationId 电站id * @return */ - Long getXhpcRateTime(@Param("date")String date,@Param("datchargingStationId")Long datchargingStationId); + Map getXhpcRateTime(@Param("date")String date,@Param("datchargingStationId")Long datchargingStationId); /** * 获取在这个时间段的费率 diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java index f9722832..ffaf00bd 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java @@ -111,4 +111,16 @@ public interface IXhpcChargingStationService { */ public List> wxList(String name,String serviceFacilities,Integer code,String longitude,String latitude); + + /** + * 电站详情（站点详情） + * + * @param chargingStationId 电站ID + * @return 电站 + */ + Map getXhpcChargingStationMassage(Long chargingStationId,String longitude,String latitude); + + + + } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java index ef55983b..e5cf5e10 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java @@ -207,7 +207,7 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi //判断结束时间是否小于开始时间 //检查格式是否正确 //冒泡排序（结束时间小于开始时间） - + //每个时间段都要存 @@ -241,7 +241,7 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi serviceFacilitiesList=Arrays.asList(split); } //获取标签 - List> label_type = xhpcChargingStationMapper.getCode("label_type",serviceFacilitiesList); + List> label_type = xhpcChargingStationMapper.getCode("service_facilities",serviceFacilitiesList); map.put("serviceFacilities",label_type); //桩（空闲和使用从redis获取） @@ -250,5 +250,41 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi return list; } + @Override + public Map getXhpcChargingStationMassage(Long chargingStationId,String longitude,String latitude) { + + //获取基本信息 + Map map = xhpcChargingStationMapper.getXhpcChargingStationMassage(chargingStationId,longitude,latitude); + //桩空闲数量，从redis获取 + + //标签 + List serviceFacilitiesList =new ArrayList<>(); + if(map.get("serviceFacilities") !=null && map.get("serviceFacilities").toString() !=""){ + String[] split = map.get("serviceFacilities").toString().split(","); + serviceFacilitiesList=Arrays.asList(split); + } + List> service_facilities = xhpcChargingStationMapper.getCode("service_facilities",serviceFacilitiesList); + map.put("serviceFacilitiesList",service_facilities); + + //图片信息 + List imgList =new ArrayList<>(); + if(map.get("imgId") !=null && map.get("imgId").toString() !=""){ + String[] split = map.get("imgId").toString().split(","); + imgList=Arrays.asList(split); + List> imgLists = xhpcChargingStationMapper.getImageList(imgList); + map.put("imgIdList",imgLists); + }else{ + map.put("imgIdList",new ArrayList<>()); + } + + //获取该时段电费 + //HH:mm:ss + String tiem = DateUtil.formatTime(new Date()); + Map xhpcRateTime = xhpcRateTimeService.getXhpcRateTime(tiem, chargingStationId); + if(xhpcRateTime!=null){ + map.putAll(xhpcRateTime); + } + return map; + } } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcRateTimeServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcRateTimeServiceImpl.java index f549ff8d..e731af15 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcRateTimeServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcRateTimeServiceImpl.java @@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.HashMap; import java.util.Map; /** @@ -26,12 +27,20 @@ public class XhpcRateTimeServiceImpl implements IXhpcRateTimeService{ @Override public Map getXhpcRateTime(String date,Long datchargingStationIde) { - Long rateId = xhpcRateTimeMapper.getXhpcRateTime(date, datchargingStationIde); - if(rateId ==null){ + //判断本时间段的电费 + Map hpcRateTimeMap = xhpcRateTimeMapper.getXhpcRateTime(date, datchargingStationIde); + //该判断防止某个时间段费率没有录入 + if(hpcRateTimeMap ==null){ //获取剩余时间费率 return xhpcRateTimeMapper.getXhpcRateTimeType(datchargingStationIde); } - return xhpcRateTimeMapper.getXhpcTimeType(datchargingStationIde,rateId); + Map map =new HashMap<>(); + Long rateId = Long.valueOf(hpcRateTimeMap.get("rateId").toString()); + Map xhpcTimeType = xhpcRateTimeMapper.getXhpcTimeType(datchargingStationIde, rateId); + map.put("startTime",hpcRateTimeMap.get("startTime")); + map.put("endTime",hpcRateTimeMap.get("endTime")); + map.putAll(xhpcTimeType); + return map; } } diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml index 07d8171a..ea656115 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -29,6 +29,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -207,4 +209,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcRateTimeMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcRateTimeMapper.xml index ca41eee3..d30f2e8e 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcRateTimeMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcRateTimeMapper.xml @@ -21,8 +21,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select + rate_time_id as rateTimeId, + rate_id as rateId, + start_time as startTime, + end_time as endTime + from xhpc_rate_time where charging_station_id =#{datchargingStationId} and start_time <=#{date} and end_time >=#{date} and status=0 and del_flag=0 and type=0