From 2347cce36c2e0b15da8778c412388a223f0dddb4 Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Tue, 20 Jul 2021 16:51:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E7=AB=99=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xhpc-modules/xhpc-charging-station/pom.xml | 5 + .../charging/station/domain/XhpcRateTime.java | 139 ++++++++++++++++ .../charging/station/domain/XhpcTerminal.java | 150 ++++++++++++++++++ .../mapper/XhpcChargingStationMapper.java | 12 +- .../station/mapper/XhpcRateTimeMapper.java | 35 ++++ .../station/mapper/XhpcTerminalMapper.java | 21 +++ .../station/service/IXhpcRateTimeService.java | 23 +++ .../station/service/IXhpcTerminalService.java | 23 +++ .../XhpcChargingStationServiceImpl.java | 25 ++- .../service/XhpcRateTimeServiceImpl.java | 37 +++++ .../service/XhpcTerminalServiceImpl.java | 32 ++++ .../mapper/XhpcChargingStationMapper.xml | 4 +- .../resources/mapper/XhpcRateTimeMapper.xml | 45 ++++++ .../resources/mapper/XhpcTerminalMapper.xml | 33 ++++ 14 files changed, 575 insertions(+), 9 deletions(-) create mode 100644 xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcRateTime.java create mode 100644 xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcTerminal.java create mode 100644 xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcRateTimeMapper.java create mode 100644 xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java create mode 100644 xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcRateTimeService.java create mode 100644 xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcTerminalService.java create mode 100644 xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcRateTimeServiceImpl.java create mode 100644 xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java create mode 100644 xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcRateTimeMapper.xml create mode 100644 xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml diff --git a/xhpc-modules/xhpc-charging-station/pom.xml b/xhpc-modules/xhpc-charging-station/pom.xml index b4872501..81e1e2ef 100644 --- a/xhpc-modules/xhpc-charging-station/pom.xml +++ b/xhpc-modules/xhpc-charging-station/pom.xml @@ -91,6 +91,11 @@ okhttp + + cn.hutool + hutool-all + 5.7.5 + ${project.artifactId} diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcRateTime.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcRateTime.java new file mode 100644 index 00000000..73b2514d --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcRateTime.java @@ -0,0 +1,139 @@ +package com.xhpc.charging.station.domain; + +import com.ruoyi.common.core.web.domain.BaseEntity; + +import java.util.Date; + +/** + * 费率时段 + * + * @author yuyang + * @date 2021-07-20 + */ +public class XhpcRateTime extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 费率时段id */ + private Long rateTimeId; + + /** 电站id */ + private Long chargingStationId; + + /** 费率id */ + private Long rateId; + + /** 启始时间 */ + private Date startTime; + + /** 结束时间 */ + private Date endTime; + + /** 状态（0正常 1停用） */ + private Integer status; + + /** 状态（0正常 1停用） */ + private Integer delFlag; + + /** 计费模型id */ + private Long rateModelId; + + /** 0 全部时间排列完 1 有剩余时间 */ + private Integer type; + + public static long getSerialVersionUID() { + + return serialVersionUID; + } + + public Long getRateTimeId() { + + return rateTimeId; + } + + public void setRateTimeId(Long rateTimeId) { + + this.rateTimeId = rateTimeId; + } + + public Long getChargingStationId() { + + return chargingStationId; + } + + public void setChargingStationId(Long chargingStationId) { + + this.chargingStationId = chargingStationId; + } + + public Long getRateId() { + + return rateId; + } + + public void setRateId(Long rateId) { + + this.rateId = rateId; + } + + public Date getStartTime() { + + return startTime; + } + + public void setStartTime(Date startTime) { + + this.startTime = startTime; + } + + public Date getEndTime() { + + return endTime; + } + + public void setEndTime(Date endTime) { + + this.endTime = endTime; + } + + 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; + } + + public Integer getType() { + + return type; + } + + public void setType(Integer type) { + + this.type = type; + } + +} diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcTerminal.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcTerminal.java new file mode 100644 index 00000000..e5d6f3dd --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/domain/XhpcTerminal.java @@ -0,0 +1,150 @@ +package com.xhpc.charging.station.domain; + +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 终端 + * + * @author yuyang + * @date 2021-07-20 + */ +public class XhpcTerminal extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 终端id */ + private Long terminalId; + + /** 电桩id */ + private Long chargingPileId; + + /** 电站id */ + private Long chargingStationId; + + /** 名称 */ + private String name; + + /** 编号 */ + private String serialNumber; + + /** 电桩编号 */ + private String pileSerialNumber; + + /** 插枪状态 */ + private Integer gunStatus; + + /** 工作状态(0离线 1故障 2空闲 3充电) */ + private Integer workStatus; + + /** 状态（0正常 1停用） */ + private Integer status; + + /** 删除标志（0代表存在 2代表删除） */ + private Integer delFlag; + + public static long getSerialVersionUID() { + + return serialVersionUID; + } + + public Long getTerminalId() { + + return terminalId; + } + + public void setTerminalId(Long terminalId) { + + this.terminalId = terminalId; + } + + public Long getChargingPileId() { + + return chargingPileId; + } + + public void setChargingPileId(Long chargingPileId) { + + this.chargingPileId = chargingPileId; + } + + public Long getChargingStationId() { + + return chargingStationId; + } + + public void setChargingStationId(Long chargingStationId) { + + this.chargingStationId = chargingStationId; + } + + public String getName() { + + return name; + } + + public void setName(String name) { + + this.name = name; + } + + public String getSerialNumber() { + + return serialNumber; + } + + public void setSerialNumber(String serialNumber) { + + this.serialNumber = serialNumber; + } + + public String getPileSerialNumber() { + + return pileSerialNumber; + } + + public void setPileSerialNumber(String pileSerialNumber) { + + this.pileSerialNumber = pileSerialNumber; + } + + public Integer getGunStatus() { + + return gunStatus; + } + + public void setGunStatus(Integer gunStatus) { + + this.gunStatus = gunStatus; + } + + public Integer getWorkStatus() { + + return workStatus; + } + + public void setWorkStatus(Integer workStatus) { + + this.workStatus = workStatus; + } + + 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; + } + +} 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 8c2e21c8..7ce7b93c 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 @@ -19,7 +19,7 @@ public interface XhpcChargingStationMapper { * @param chargingStationId 电站ID * @return 电站 */ - public XhpcChargingStation selectXhpcChargingStationById(Long chargingStationId); + XhpcChargingStation selectXhpcChargingStationById(Long chargingStationId); /** * 查询电站列表 @@ -27,7 +27,7 @@ public interface XhpcChargingStationMapper { * @param xhpcChargingStation 电站 * @return 电站集合 */ - public List> selectXhpcChargingStationList(XhpcChargingStation xhpcChargingStation); + List> selectXhpcChargingStationList(XhpcChargingStation xhpcChargingStation); /** * 新增电站 @@ -35,7 +35,7 @@ public interface XhpcChargingStationMapper { * @param xhpcChargingStation 电站 * @return 结果 */ - public int insertXhpcChargingStation(XhpcChargingStation xhpcChargingStation); + int insertXhpcChargingStation(XhpcChargingStation xhpcChargingStation); /** * 修改电站 @@ -43,7 +43,7 @@ public interface XhpcChargingStationMapper { * @param xhpcChargingStation 电站 * @return 结果 */ - public int updateXhpcChargingStation(XhpcChargingStation xhpcChargingStation); + int updateXhpcChargingStation(XhpcChargingStation xhpcChargingStation); /** * 删除电站 @@ -51,7 +51,7 @@ public interface XhpcChargingStationMapper { * @param chargingStationId 电站ID * @return 结果 */ - public int updateXhpcChargingStationById(Long chargingStationId); + int updateXhpcChargingStationById(Long chargingStationId); /** * 批量删除电站 @@ -59,5 +59,5 @@ public interface XhpcChargingStationMapper { * @param chargingStationIds 需要删除的数据ID * @return 结果 */ - public int updateXhpcChargingStationByIds(Long[] chargingStationIds); + int updateXhpcChargingStationByIds(Long[] chargingStationIds); } 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 new file mode 100644 index 00000000..18545bb6 --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcRateTimeMapper.java @@ -0,0 +1,35 @@ +package com.xhpc.charging.station.mapper; + +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.Map; + +public interface XhpcRateTimeMapper { + + /** + * 判断本时间段的电费 + * @param date 本地时间（时分秒） + * @param datchargingStationId 电站id + * @return + */ + Long getXhpcRateTime(@Param("date")String date,@Param("datchargingStationId")Long datchargingStationId); + + /** + * 获取在这个时间段的费率 + * @param datchargingStationId 电站id + * @return + */ + Map getXhpcTimeType(@Param("datchargingStationId")Long datchargingStationId,@Param("rateId")Long rateId); + + + /** + * 获取剩余时间费率 + * @param datchargingStationId 电站id + * @return + */ + Map getXhpcRateTimeType(@Param("datchargingStationId")Long datchargingStationId); + + + +} diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java new file mode 100644 index 00000000..a4c0b6b0 --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java @@ -0,0 +1,21 @@ +package com.xhpc.charging.station.mapper; + +import java.util.List; +import java.util.Map; + +/** + * 终端Mapper接口 + * + * @author yuyang + * @date 2021-07-19 + */ +public interface XhpcTerminalMapper { + + + /** + * PC端页面统计 + * @param chargingStationId 电站id + * @return + */ + Map countXhpcTerminalWorkStatus(Long chargingStationId); +} diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcRateTimeService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcRateTimeService.java new file mode 100644 index 00000000..24ecfab8 --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcRateTimeService.java @@ -0,0 +1,23 @@ +package com.xhpc.charging.station.service; + + +import java.util.Date; +import java.util.Map; + +/** + * 费率时段Service接口 + * + * @author yuyang + * @date 2021-07-20 + */ +public interface IXhpcRateTimeService { + + + /** + * 获取本时间段的电费 + * @param date + * @return + */ + public Map getXhpcRateTime(String date,Long datchargingStationIde); + +} diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcTerminalService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcTerminalService.java new file mode 100644 index 00000000..1e06de5d --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcTerminalService.java @@ -0,0 +1,23 @@ +package com.xhpc.charging.station.service; + +import java.util.List; +import java.util.Map; + +/** + * 终端Service接口 + * + * @author yuyang + * @date 2021-07-20 + */ +public interface IXhpcTerminalService { + + + /** + * PC端页面统计 + * @param chargingStationId 电站id + * @return + */ + public Map countXhpcTerminalWorkStatus(Long chargingStationId); + + +} 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 5479a72a..f553d474 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 @@ -1,11 +1,13 @@ package com.xhpc.charging.station.service; +import cn.hutool.core.date.DateUtil; import com.ruoyi.common.core.utils.DateUtils; import com.xhpc.charging.station.domain.XhpcChargingStation; import com.xhpc.charging.station.mapper.XhpcChargingStationMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; import java.util.Map; @@ -20,6 +22,10 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi @Autowired private XhpcChargingStationMapper xhpcChargingStationMapper; + @Autowired + private IXhpcRateTimeService xhpcRateTimeService; + @Autowired + private IXhpcTerminalService xhpcTerminalService; /** * 查询电站 @@ -43,7 +49,24 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi public List> selectXhpcChargingStationList(XhpcChargingStation xhpcChargingStation) { //桩的统计、该时段金额 - return xhpcChargingStationMapper.selectXhpcChargingStationList(xhpcChargingStation); + List> list = xhpcChargingStationMapper.selectXhpcChargingStationList(xhpcChargingStation); + for (int i = 0; i < list.size(); i++) { + Map map = list.get(i); + Long chargingStationId = Long.valueOf(map.get("chargingStationId").toString()); + //获取该时段电费 + //HH:mm:ss + String tiem = DateUtil.formatTime(new Date()); + Map xhpcRateTime = xhpcRateTimeService.getXhpcRateTime(tiem, chargingStationId); + if(xhpcRateTime!=null){ + map.putAll(xhpcRateTime); + } + //获取桩的统计 + Map chargingId = xhpcTerminalService.countXhpcTerminalWorkStatus(chargingStationId); + if(chargingId!=null){ + map.putAll(chargingId); + } + } + return list; } /** 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 new file mode 100644 index 00000000..f549ff8d --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcRateTimeServiceImpl.java @@ -0,0 +1,37 @@ +package com.xhpc.charging.station.service; + +import com.xhpc.charging.station.mapper.XhpcRateTimeMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.Map; + +/** + * 费率时段Service业务层处理 + * + * @author yuyang + * @date 2021-07-20 + */ +@Service +public class XhpcRateTimeServiceImpl implements IXhpcRateTimeService{ + + @Autowired + private XhpcRateTimeMapper xhpcRateTimeMapper; + /** + * 获取本时间段的电费 + * @param date + * @return + */ + @Override + public Map getXhpcRateTime(String date,Long datchargingStationIde) { + + Long rateId = xhpcRateTimeMapper.getXhpcRateTime(date, datchargingStationIde); + if(rateId ==null){ + //获取剩余时间费率 + return xhpcRateTimeMapper.getXhpcRateTimeType(datchargingStationIde); + } + return xhpcRateTimeMapper.getXhpcTimeType(datchargingStationIde,rateId); + } + +} diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java new file mode 100644 index 00000000..e03e4789 --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java @@ -0,0 +1,32 @@ +package com.xhpc.charging.station.service; + +import com.xhpc.charging.station.mapper.XhpcTerminalMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * 终端Service业务层处理 + * + * @author yuyang + * @date 2021-07-20 + */ +@Service +public class XhpcTerminalServiceImpl implements IXhpcTerminalService{ + + @Autowired + private XhpcTerminalMapper xhpcTerminalMapper; + + /** + * PC端页面统计 + * @param chargingStationId 电站id + * @return + */ + @Override + public Map countXhpcTerminalWorkStatus(Long chargingStationId) { + return xhpcTerminalMapper.countXhpcTerminalWorkStatus(chargingStationId); + } + +} 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 094abe26..5879311c 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 @@ -139,11 +139,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update xhpc_charging_station set delFlag =1 where charging_station_id = #{chargingStationId} + update xhpc_charging_station set del_flag =1 where charging_station_id = #{chargingStationId} - update xhpc_charging_station set delFlag =1 where charging_station_id in + update xhpc_charging_station set del_flag =1 where charging_station_id in #{chargingStationId} 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 new file mode 100644 index 00000000..ca41eee3 --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcRateTimeMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml new file mode 100644 index 00000000..9cf1b85b --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file