From bcad0b0230e59cc36bb568c602302d65c3a6e62a Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Fri, 13 Aug 2021 19:12:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E5=9C=BA=E7=AB=99=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XhpcChargingStationController.java | 4 +- .../mapper/XhpcChargingStationMapper.java | 2 +- .../XhpcChargingStationServiceImpl.java | 42 +------ .../mapper/XhpcChargingStationMapper.xml | 105 +++++++++++------- xhpc-modules/xhpc-order/pom.xml | 1 - .../mapper/XhpcChargeOrderMapper.xml | 2 +- 6 files changed, 69 insertions(+), 87 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 e4fb7a3c..2157409b 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 @@ -200,7 +200,7 @@ public class XhpcChargingStationController extends BaseController { * @return */ @GetMapping(value = "/getWXXhpcRateTimeMassage") - public AjaxResult getXhpcRateTimeMassage(@RequestParam(value = "chargingStationId", required = true) Long chargingStationId) { + public AjaxResult getXhpcRateTimeMassage(@RequestParam Long chargingStationId) { return AjaxResult.success(xhpcChargingStationService.getWXXhpcRateTimeMassage(chargingStationId)); } @@ -212,7 +212,7 @@ public class XhpcChargingStationController extends BaseController { * @return */ @GetMapping(value = "/getWXXhpcTerminalMassage") - public AjaxResult getWXXhpcTerminalMassage(@RequestParam(value = "chargingStationId", required = true) Long chargingStationId) { + public AjaxResult getWXXhpcTerminalMassage(@RequestParam Long chargingStationId) { return AjaxResult.success(xhpcChargingStationService.getWXXhpcTerminalMassage(chargingStationId)); } 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 686fb72e..e58f00ef 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 @@ -115,7 +115,7 @@ public interface XhpcChargingStationMapper { * @param clientVisible 微信小程序是否可见 2可见 * @return */ - 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); + 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,@Param("date") String date); /** 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 63fad47b..5ed2cedc 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 @@ -573,30 +573,13 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi String[] split = serviceFacilities.split(","); stringList = Arrays.asList(split); } - List> list = xhpcChargingStationMapper.getWXList(name, stringList, code, longitude, latitude, 2); + String date = DateUtil.formatTime(new Date()); + List> list = xhpcChargingStationMapper.getWXList(name, stringList, code, longitude, latitude, 2,date); if (list != null && list.size() > 0) { 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); - } - 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> label_type = xhpcChargingStationMapper.getCode("service_facilities", serviceFacilitiesList); - map.put("serviceFacilities", label_type); //桩（空闲和使用从redis获取） map.put("free", 10); - - map.put("common", 12); } } return list; @@ -607,29 +590,10 @@ public class XhpcChargingStationServiceImpl implements IXhpcChargingStationServi //获取基本信息 Map map = xhpcChargingStationMapper.getWXXhpcChargingStationMessage(chargingStationId, longitude, latitude); + //桩（空闲和使用从redis获取） map.put("free", 10); - map.put("common", 12); - - //服务设施 - 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 peripheryFacilities =new ArrayList<>(); -// if(map.get("peripheryFacilities") !=null && map.get("peripheryFacilities").toString() !=""){ -// String[] split = map.get("peripheryFacilities").toString().split(","); -// peripheryFacilities=Arrays.asList(split); -// } -// List> charging_periphery_facilities = xhpcChargingStationMapper.getCode("charging_periphery_facilities",peripheryFacilities); -// map.put("peripheryFacilities",charging_periphery_facilities); - //图片信息 List imgList = new ArrayList<>(); if (map.get("imgId") != null && map.get("imgId").toString() != "") { 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 9681bd28..362c8261 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 @@ -212,32 +212,34 @@ select - charging_station_id as chargingStationId, - name as name, - parking_instructions as parkingInstructions, - detailed_address as detailedAddress, - service_facilities as serviceFacilities, - ROUND(ACOS(SIN((#{latitude} * 3.141593) / 180 ) *SIN((latitude * 3.141593) / 180 ) + - COS((#{latitude} * 3.141593) / 180 ) * COS((latitude * 3.141593) / 180 ) * - COS((#{longitude} * 3.141593) / 180 - (longitude * 3.141593) / 180 ) ) * 6370.9968,4)AS distance - from xhpc_charging_station - where del_flag =0 and status =0 - and FIND_IN_SET(#{clientVisible},client_visible)>0 + cs.charging_station_id as chargingStationId, + cs.name as name, + cs.parking_instructions as parkingInstructions, + cs.detailed_address as detailedAddress, + cs.service_facilities as serviceFacilities, + (select count(terminal_id) from xhpc_terminal where status=0 and del_flag =0 and + charging_station_id=cs.charging_station_id) as common, + (select (ra.power_fee+ra.service_fee) as serviceFee + from xhpc_rate as ra + where ra.status = 0 + and ra.del_flag = 0 + and ra.rate_id = ( + select rate_id from xhpc_rate_time + where charging_station_id = cs.charging_station_id + and start_time <= #{date} + and end_time >= #{date} + and status = 0 + and del_flag = 0)) money, + (select GROUP_CONCAT(dict_value) from xhpc_dict_biz where FIND_IN_SET(dict_key,cs.service_facilities ) and code + = 'service_facilities' and parent_id > 0 and del_flag = 0) as serviceFacilitiesName, + ROUND(ACOS(SIN((#{latitude} * 3.141593) / 180 ) *SIN((cs.latitude * 3.141593) / 180 ) + + COS((#{latitude} * 3.141593) / 180 ) * COS((cs.latitude * 3.141593) / 180 ) * + COS((#{longitude} * 3.141593) / 180 - (cs.longitude * 3.141593) / 180 ) ) * 6370.9968,4)AS distance + from xhpc_charging_station as cs + where cs.del_flag =0 and cs.status =0 + and FIND_IN_SET(#{clientVisible},cs.client_visible)>0 - and name like CONCAT('%',#{name},'%') + and cs.name like CONCAT('%',#{name},'%') and - service_facilities like CONCAT('%',#{item},'%') + cs.service_facilities like CONCAT('%',#{item},'%') - and (area_code in (select - code + and (cs.area_code in (select + cscode from xhpc_area where pcode=#{code}) or area_code=#{code}) ORDER BY distance asc @@ -287,10 +304,14 @@