From f969d2dc9a6297d6216bad3ccabac0b133479171 Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Mon, 26 Jul 2021 19:41:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E7=AB=99=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XhpcChargingStationController.java | 40 +++++--- .../station/domain/XhpcChargingStation.java | 18 +++- .../charging/station/domain/XhpcRateTime.java | 13 +++ .../mapper/XhpcChargingStationMapper.java | 43 +++++++- .../service/IXhpcChargingStationService.java | 33 ++++--- .../XhpcChargingStationServiceImpl.java | 89 +++++++++++++---- .../mapper/XhpcChargingStationMapper.xml | 97 ++++++++++++++++++- .../resources/mapper/XhpcRateTimeMapper.xml | 1 + 8 files changed, 279 insertions(+), 55 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 e378e625..9d2bf677 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 @@ -150,6 +150,24 @@ public class XhpcChargingStationController extends BaseController { return xhpcChargingStationService.addXhpcChargingStation(xhpcChargingStationDto); } + /** + * 场站详情接口 + * @param chargingStationId + * @param type 1详情使用 2编辑使用 + * @return + */ + @GetMapping(value = "/getXhpcChargingStationMessage") + public AjaxResult getXhpcChargingStationMessage(Long chargingStationId,Integer type) + { + return AjaxResult.success(xhpcChargingStationService.getXhpcChargingStationMessage(chargingStationId,type)); + } + + + + + + + /** * 微信小程序电站列表 * @param name 电站名称 @@ -160,11 +178,11 @@ public class XhpcChargingStationController extends BaseController { * @return */ //@PreAuthorize(hasPermi = "system:station:list") - @GetMapping("/wxList") - public TableDataInfo wxList(String name,String serviceFacilities,Integer code,String longitude,String latitude) + @GetMapping("/getWXList") + public TableDataInfo getWXList(String name,String serviceFacilities,Integer code,String longitude,String latitude) { startPage(); - List> list = xhpcChargingStationService.wxList(name,serviceFacilities,code,longitude,latitude); + List> list = xhpcChargingStationService.getWXList(name,serviceFacilities,code,longitude,latitude); return getDataTable(list); } @@ -176,10 +194,10 @@ public class XhpcChargingStationController extends BaseController { * @param latitude 维度 * @return */ - @GetMapping(value = "/getXhpcChargingStationMassage") - public AjaxResult getXhpcChargingStationMassage(@Param("chargingStationId") Long chargingStationId,@Param("longitude")String longitude,@Param("latitude")String latitude) + @GetMapping(value = "/getWXXhpcChargingStationMessage") + public AjaxResult getWXXhpcChargingStationMessage(@Param("chargingStationId") Long chargingStationId,@Param("longitude")String longitude,@Param("latitude")String latitude) { - return AjaxResult.success(xhpcChargingStationService.getXhpcChargingStationMassage(chargingStationId,longitude,latitude)); + return AjaxResult.success(xhpcChargingStationService.getWXXhpcChargingStationMessage(chargingStationId,longitude,latitude)); } /** @@ -187,10 +205,10 @@ public class XhpcChargingStationController extends BaseController { * @param chargingStationId 站点id * @return */ - @GetMapping(value = "/getXhpcRateTimeMassage") + @GetMapping(value = "/getWXXhpcRateTimeMassage") public AjaxResult getXhpcRateTimeMassage(@Param("chargingStationId") Long chargingStationId) { - return AjaxResult.success(xhpcChargingStationService.getXhpcRateTimeMassage(chargingStationId)); + return AjaxResult.success(xhpcChargingStationService.getWXXhpcRateTimeMassage(chargingStationId)); } /** @@ -198,10 +216,10 @@ public class XhpcChargingStationController extends BaseController { * @param chargingStationId 站点id * @return */ - @GetMapping(value = "/getXhpcTerminalMassage") - public AjaxResult getXhpcTerminalMassage(@Param("chargingStationId") Long chargingStationId) + @GetMapping(value = "/getWXXhpcTerminalMassage") + public AjaxResult getWXXhpcTerminalMassage(@Param("chargingStationId") Long chargingStationId) { - return AjaxResult.success(xhpcChargingStationService.getXhpcTerminalMassage(chargingStationId)); + return AjaxResult.success(xhpcChargingStationService.getWXXhpcTerminalMassage(chargingStationId)); } } 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 50cfe7f3..23de65fc 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 @@ -25,14 +25,18 @@ public class XhpcChargingStation extends BaseEntity { @Excel(name = "运营商id") private Long operatorId; - /** 电站类型 */ - @Excel(name = "电站类型") + /** 电站地址 */ + @Excel(name = "电站地址") private Integer type; /** 建设场所 */ @Excel(name = "建设场所") private String constructionSite; + /** 电站类型 */ + @Excel(name = "电站类型") + private String stationType; + /** 服务设施 */ @Excel(name = "服务设施") private String serviceFacilities; @@ -289,4 +293,14 @@ public class XhpcChargingStation extends BaseEntity { this.reminderInstructions = reminderInstructions; } + public String getStationType() { + + return stationType; + } + + public void setStationType(String stationType) { + + this.stationType = stationType; + } + } 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 index 16c44f2a..b63a69ba 100644 --- 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 @@ -42,6 +42,9 @@ public class XhpcRateTime extends BaseEntity { /** 时间排序有小到大 */ private Integer sort; + /** 1 设置时间段 2默认时间段 */ + private Integer type; + public static long getSerialVersionUID() { return serialVersionUID; @@ -137,4 +140,14 @@ public class XhpcRateTime extends BaseEntity { this.sort = sort; } + 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/mapper/XhpcChargingStationMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingStationMapper.java index 1eff4fce..d1b65d4b 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 @@ -91,6 +91,16 @@ public interface XhpcChargingStationMapper { */ List> stationInternetBlackList(Long chargingStationId); + + /** + * 电站详情信息 + * + * @param chargingStationId 电站ID + * @return 电站 + */ + Map getXhpcChargingStationMessage(@Param("chargingStationId")Long chargingStationId); + + /** * 微信小程序电站列表 * @param name 电站名称 @@ -101,7 +111,7 @@ public interface XhpcChargingStationMapper { * @param clientVisible 微信小程序是否可见 2可见 * @return */ - List> wxList(@Param("name") String name,@Param("serviceFacilities")List serviceFacilities,@Param("code")Integer code,@Param("longitude")String longitude,@Param("latitude")String latitude,@Param("clientVisible")Integer clientVisible); + List> getWXList(@Param("name") String name,@Param("serviceFacilities")List serviceFacilities,@Param("code")Integer code,@Param("longitude")String longitude,@Param("latitude")String latitude,@Param("clientVisible")Integer clientVisible); /** @@ -119,7 +129,7 @@ public interface XhpcChargingStationMapper { * @param chargingStationId 电站ID * @return 电站 */ - Map getXhpcChargingStationMassage(@Param("chargingStationId")Long chargingStationId,@Param("longitude")String longitude,@Param("latitude")String latitude); + Map getWXXhpcChargingStationMessage(@Param("chargingStationId")Long chargingStationId,@Param("longitude")String longitude,@Param("latitude")String latitude); /** @@ -135,7 +145,7 @@ public interface XhpcChargingStationMapper { * @param chargingStationId 电站ID * @return 电站 */ - List> getXhpcRateTimeMassage(@Param("chargingStationId")Long chargingStationId); + List> getWXXhpcRateTimeMassage(@Param("chargingStationId")Long chargingStationId); /** @@ -143,7 +153,7 @@ public interface XhpcChargingStationMapper { * @param chargingStationId 电站ID * @return 电站 */ - List> getXhpcTerminalMassage(@Param("chargingStationId")Long chargingStationId); + List> getWXXhpcTerminalMassage(@Param("chargingStationId")Long chargingStationId); /** @@ -166,4 +176,29 @@ public interface XhpcChargingStationMapper { * 添加费率时段 */ int addXhpcRateTime(XhpcRateTime xhpcRateTime); + + + /** + * 返回费率 + */ + List> getXhpcRateList(@Param("chargingStationId")Long chargingStationId); + + + /** + * 返回费率时段（设置时段） + */ + List> getXhpcRateTimeTypeList(@Param("chargingStationId")Long chargingStationId,@Param("type")Integer type); + + + /** + * 今日充电量、今日充电用户、今日充电次数 + */ + Map getXhpcRateTimeOrderStatistics(@Param("chargingStationId")Long chargingStationId); + + /** + * 获取终端列表 + * @param chargingStationId + * @return + */ + List> getXhpcTerminalList(@Param("chargingStationId")Long chargingStationId); } 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 074f6539..a33023b7 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 @@ -21,7 +21,7 @@ public interface IXhpcChargingStationService { * @param chargingStationId 电站ID * @return 电站 */ - public XhpcChargingStation selectXhpcChargingStationById(Long chargingStationId); + XhpcChargingStation selectXhpcChargingStationById(Long chargingStationId); /** * 查询电站列表 @@ -30,7 +30,7 @@ public interface IXhpcChargingStationService { * @param operatorName 运营商名称 * @return 电站集合 */ - public List> selectXhpcChargingStationList(String name,String operatorName); + List> selectXhpcChargingStationList(String name,String operatorName); /** * 新增电站 @@ -38,7 +38,7 @@ public interface IXhpcChargingStationService { * @param xhpcChargingStation 电站 * @return 结果 */ - public int insertXhpcChargingStation(XhpcChargingStation xhpcChargingStation); + int insertXhpcChargingStation(XhpcChargingStation xhpcChargingStation); /** * 修改电站 @@ -46,7 +46,7 @@ public interface IXhpcChargingStationService { * @param xhpcChargingStation 电站 * @return 结果 */ - public int updateXhpcChargingStation(XhpcChargingStation xhpcChargingStation); + int updateXhpcChargingStation(XhpcChargingStation xhpcChargingStation); /** * 批量删除电站 @@ -54,7 +54,7 @@ public interface IXhpcChargingStationService { * @param chargingStationIds 需要删除的电站ID * @return 结果 */ - public int updateXhpcChargingStationByIds(Long[] chargingStationIds); + int updateXhpcChargingStationByIds(Long[] chargingStationIds); /** * 删除电站信息 @@ -62,7 +62,7 @@ public interface IXhpcChargingStationService { * @param chargingStationId 电站ID * @return 结果 */ - public int updateXhpcChargingStationById(Long chargingStationId); + int updateXhpcChargingStationById(Long chargingStationId); /** * 状态（0正常 1停用） @@ -71,7 +71,7 @@ public interface IXhpcChargingStationService { * @param chargingStationId 场站id * @return 结果 */ - public int status(Integer status,Long chargingStationId); + int status(Integer status,Long chargingStationId); /** * APP端、小程序是否可见 @@ -81,7 +81,7 @@ public interface IXhpcChargingStationService { * @param chargingStationId 场站id * @return 结果 */ - public int clientVisible(Integer type,String clientVisible,Long chargingStationId); + int clientVisible(Integer type,String clientVisible,Long chargingStationId); /** * 合作的电站 @@ -99,6 +99,13 @@ public interface IXhpcChargingStationService { AjaxResult addXhpcChargingStation(XhpcChargingStationDto xhpcChargingStationDto); + /** + * 电站详情（站点详情） + * + * @param chargingStationId 电站ID + * @return 电站 + */ + Map getXhpcChargingStationMessage(Long chargingStationId,Integer type); /** * 微信小程序电站列表 @@ -109,16 +116,16 @@ public interface IXhpcChargingStationService { * @param latitude 维度 * @return */ - public List> wxList(String name,String serviceFacilities,Integer code,String longitude,String latitude); + List> getWXList(String name,String serviceFacilities,Integer code,String longitude,String latitude); /** - * 电站详情（站点详情） + * 电站详情（站点详情-小程序） * * @param chargingStationId 电站ID * @return 电站 */ - Map getXhpcChargingStationMassage(Long chargingStationId,String longitude,String latitude); + Map getWXXhpcChargingStationMessage(Long chargingStationId,String longitude,String latitude); /** @@ -126,7 +133,7 @@ public interface IXhpcChargingStationService { * @param chargingStationId 电站ID * @return 电站 */ - List> getXhpcRateTimeMassage(Long chargingStationId); + List> getWXXhpcRateTimeMassage(Long chargingStationId); /** @@ -134,6 +141,6 @@ public interface IXhpcChargingStationService { * @param chargingStationId 电站ID * @return 电站 */ - List> getXhpcTerminalMassage(Long chargingStationId); + List> getWXXhpcTerminalMassage(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 1b50f452..f723c9e8 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 @@ -268,7 +268,7 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi Date startTwo = DateUtil.parse(xhpcRateTimeTwo.getStartTime()); Date endTwo = DateUtil.parse(xhpcRateTimeTwo.getEndTime()); if (DateUtil.compare(startOne, endTwo)<0&&DateUtil.compare(startTwo, endOne)<0){ - return AjaxResult.error("1003","时间段有重叠"); + return AjaxResult.error("1004","时间段有重叠"); } } } @@ -278,7 +278,7 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi BeanUtils.copyProperties(xhpcChargingStationDto,xhpcRateModel); int i = xhpcChargingStationMapper.addXhpcRateModel(xhpcRateModel); if(i==0){ - return AjaxResult.error("1004","费率计费模型添加失败"); + return AjaxResult.error("1005","费率计费模型添加失败"); } //费率模型id Long rateModelId = xhpcRateModel.getRateModelId(); @@ -288,7 +288,7 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi xhpcChargingStation.setRateModelId(rateModelId); int j = xhpcChargingStationMapper.addXhpcChargingStation(xhpcChargingStation); if(j==0){ - return AjaxResult.error("1003","电站基本信息添加失败"); + return AjaxResult.error("1006","电站基本信息添加失败"); } Long chargingStationId = xhpcChargingStation.getChargingStationId(); @@ -333,52 +333,99 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi if(k==0){ if(!"00:00:00".equals(xhpcRateTimeDto.getStartTime())){ //添加一条默认费率时段 - sort = addXhpcRateTime(rateModelId,defaultPeriodId,"00:00:00",startTime,sort); + sort = addXhpcRateTime(chargingStationId,rateModelId,defaultPeriodId,"00:00:00",startTime,sort,2); } //并把本条数据也添加上 - sort = addXhpcRateTime(rateModelId,defaultPeriodIdMap,startTime,endTime,sort); - }else{ + sort = addXhpcRateTime(chargingStationId,rateModelId,defaultPeriodIdMap,startTime,endTime,sort,1); + }else if(k getXhpcChargingStationMessage(Long chargingStationId,Integer type) { - private int addXhpcRateTime(Long rateModelId, Long defaultPeriodId,String startTime,String endTime, int sort) { + + Map map = xhpcChargingStationMapper.getXhpcChargingStationMessage(chargingStationId); + //图片信息 + 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<>()); + } + //费率 + List> xhpcRateList = xhpcChargingStationMapper.getXhpcRateList(chargingStationId); + map.put("rateList",xhpcRateList); + + //费率时段,先反设置时段，在反默认时段 + List> xhpcRateTimeTypeList = xhpcChargingStationMapper.getXhpcRateTimeTypeList(chargingStationId, 1); + xhpcRateTimeTypeList.addAll(xhpcChargingStationMapper.getXhpcRateTimeTypeList(chargingStationId, 2)); + map.put("rateTimeList",xhpcRateTimeTypeList); + if(type ==2){ + //统计终端（充redis获取终端信息） + map.putAll(xhpcChargingStationMapper.getXhpcRateTimeOrderStatistics(chargingStationId)); + //桩列表 + List> xhpcTerminalList = xhpcChargingStationMapper.getXhpcTerminalList(chargingStationId); + map.put("terminalList",xhpcTerminalList); + } + return map; + } + + private int addXhpcRateTime(Long chargingStationId,Long rateModelId, Long defaultPeriodId,String startTime,String endTime, int sort,int type) { XhpcRateTime xhpcRateTime =new XhpcRateTime(); + xhpcRateTime.setChargingStationId(chargingStationId); xhpcRateTime.setRateId(defaultPeriodId); Date start = DateUtil.parse(startTime); xhpcRateTime.setStartTime(start); Date emd = DateUtil.parse(endTime); xhpcRateTime.setEndTime(emd); - xhpcRateTime.setRateTimeId(rateModelId); + xhpcRateTime.setRateModelId(rateModelId); xhpcRateTime.setSort(sort); + xhpcRateTime.setType(type); xhpcChargingStationMapper.addXhpcRateTime(xhpcRateTime); sort++; return sort; } @Override - public List> wxList(String name, String serviceFacilities, Integer code, String longitude, String latitude) { + public List> getWXList(String name, String serviceFacilities, Integer code, String longitude, String latitude) { List stringList =new ArrayList<>(); if(serviceFacilities !=null && serviceFacilities !=""){ String[] split = serviceFacilities.split(","); stringList=Arrays.asList(split); } - List> list = xhpcChargingStationMapper.wxList(name, stringList, code, longitude, latitude,2); + List> list = xhpcChargingStationMapper.getWXList(name, stringList, code, longitude, latitude,2); if(list !=null && list.size()>0){ for (int i = 0; i < list.size(); i++) { Map map = list.get(i); @@ -406,10 +453,10 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi } @Override - public Map getXhpcChargingStationMassage(Long chargingStationId,String longitude,String latitude) { + public Map getWXXhpcChargingStationMessage(Long chargingStationId,String longitude,String latitude) { //获取基本信息 - Map map = xhpcChargingStationMapper.getXhpcChargingStationMassage(chargingStationId,longitude,latitude); + Map map = xhpcChargingStationMapper.getWXXhpcChargingStationMessage(chargingStationId,longitude,latitude); //桩空闲数量，从redis获取 //标签 @@ -443,14 +490,14 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi } @Override - public List> getXhpcRateTimeMassage(Long chargingStationId) { - return xhpcChargingStationMapper.getXhpcRateTimeMassage(chargingStationId); + public List> getWXXhpcRateTimeMassage(Long chargingStationId) { + return xhpcChargingStationMapper.getWXXhpcRateTimeMassage(chargingStationId); } @Override - public List> getXhpcTerminalMassage(Long chargingStationId) { + public List> getWXXhpcTerminalMassage(Long chargingStationId) { - List> list = xhpcChargingStationMapper.getXhpcTerminalMassage(chargingStationId); + List> list = xhpcChargingStationMapper.getWXXhpcTerminalMassage(chargingStationId); if(list !=null && list.size()>0){ for (int i = 0; i < list.size(); i++) { 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 eaa252b6..6b1e39df 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 @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -170,7 +171,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select name from xhpc_internet_user where del_flag=0 and internet_user_id not in (select internet_user_id from xhpc_station_internet_blacklist where charging_station_id=#{chargingStationId}) - + select + ct.charging_station_id as chargingStationId, + ct.name as name, + ct.operator_id as operatorId, + op.name as operatorName, + ct.type as type, + ct.station_type as stationType, + (select dict_value from xhpc_dict_biz where code ='charging_station_type' and dict_key =ct.station_type) as stationTypeName, + ct.serial_number as serialNumber, + ct.construction_site as constructionSite, + (select dict_value from xhpc_dict_biz where code ='charging_construction_site' and dict_key =ct.construction_site) as constructionSiteName, + ct.address as address, + ct.detailed_address as detailedAddress, + ct.periphery_facilities as peripheryFacilities, + ct.service_facilities as erviceFacilities, + ct.parking_instructions as parkingInstructions, + ct.business_instructions as businessInstructions, + ct.reminder_instructions as reminderInstructions, + ct.img_id as imgId + from xhpc_charging_station as ct + left join xhpc_operator as op on op.operator_id = ct.operator_id + where ct.charging_station_id = 4 and ct.del_flag =0 + + + - select charging_station_id as chargingStationId, (select type from xhpc_charging_pile where charging_station_id = charging_station_id and del_flag=0 and status=0) as type, @@ -242,7 +268,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select xrt.start_time as startTime, xrt.end_time as endTime, @@ -255,7 +281,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select te.name as name, cp.power as power, @@ -588,6 +614,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark + + type + @@ -629,8 +658,68 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{remark} + + #{type} + + + + + + + \ 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 c111f343..8fc3315a 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 @@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +