From 0f8a2fa2344e291f9a045423a9461010e60e8ab6 Mon Sep 17 00:00:00 2001
From: yuyang <2265829957@qq.com>
Date: Thu, 29 Jul 2021 13:47:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/XhpcTerminalController.java    | 16 ++++++++++----
 .../station/mapper/XhpcTerminalMapper.java    |  8 +++++++
 .../station/service/IXhpcTerminalService.java |  8 +++++++
 .../service/XhpcTerminalServiceImpl.java      | 21 +++++++++++++++++++
 .../resources/mapper/XhpcTerminalMapper.xml   | 15 +++++++++++++
 5 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java
index 770338fe..d54e6229 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java
@@ -5,10 +5,7 @@ import com.xhpc.common.core.web.domain.AjaxResult;
 import com.xhpc.common.core.web.page.TableDataInfo;
 import com.xhpc.charging.station.service.IXhpcTerminalService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -82,4 +79,15 @@ public class XhpcTerminalController extends BaseController {
         return AjaxResult.success(xhpcTerminalService.selectXhpcTerminalPileMessage(terminalId));
     }
 
+
+    /**
+     * 通过终端编号进入小程序开始充电页面
+     */
+    @GetMapping(value = "/getWXpNumMessage")
+    public AjaxResult getWXpNumMessage(@RequestParam(value = "pNum") String pNum)
+    {
+        return AjaxResult.success(xhpcTerminalService.getWXpNumMessage(pNum));
+    }
+
+
 }
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
index 953b7f61..238b3963 100644
--- 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
@@ -1,5 +1,6 @@
 package com.xhpc.charging.station.mapper;
 
+import com.xhpc.common.core.web.domain.AjaxResult;
 import com.xhpc.common.domain.XhpcChargingStation;
 import com.xhpc.common.domain.XhpcTerminal;
 import org.apache.ibatis.annotations.Param;
@@ -73,4 +74,11 @@ public interface XhpcTerminalMapper {
      * 今日充电量、今日充电用户、今日充电次数
      */
     Map<String,Object> getXhpcRateTimeOrderStatistics(@Param("chargingStationId")Long chargingStationId,@Param("gunNumber")String gunNumber);
+
+    /**
+     * 通过终端编号进入小程序开始充电页面
+     * @param pNum   终端编号
+     * @return
+     */
+    Map<String,Object> getWXpNumMessage(@Param("pNum")String pNum);
 }
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
index 10c1b90d..5839f07f 100644
--- 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
@@ -47,4 +47,12 @@ public interface IXhpcTerminalService {
      * 终端详情
      */
     AjaxResult selectXhpcTerminalPileMessage(Long terminalId);
+
+
+    /**
+     * 通过终端编号进入小程序开始充电页面
+     * @param pNum   终端编号
+     * @return
+     */
+    AjaxResult getWXpNumMessage(String pNum);
 }
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
index c0e58beb..3d4f3135 100644
--- 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
@@ -1,11 +1,13 @@
 package com.xhpc.charging.station.service;
 
+import cn.hutool.core.date.DateUtil;
 import com.xhpc.common.core.web.domain.AjaxResult;
 import com.xhpc.common.domain.XhpcTerminal;
 import com.xhpc.charging.station.mapper.XhpcTerminalMapper;
 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,8 @@ public class XhpcTerminalServiceImpl implements IXhpcTerminalService{
 
     @Autowired
     private XhpcTerminalMapper xhpcTerminalMapper;
+    @Autowired
+    private IXhpcRateTimeService xhpcRateTimeService;
 
     /**
      * PC端页面统计
@@ -76,4 +80,21 @@ public class XhpcTerminalServiceImpl implements IXhpcTerminalService{
         return AjaxResult.success(map);
     }
 
+    @Override
+    public AjaxResult getWXpNumMessage(String pNum) {
+
+        //获取枪的状态
+
+        Map<String, Object> map = xhpcTerminalMapper.getWXpNumMessage(pNum);
+
+        Long chargingStationId = Long.parseLong(map.get("chargingStationId").toString());
+        //HH:mm:ss
+        String tiem = DateUtil.formatTime(new Date());
+        Map<String, Object> xhpcRateTime = xhpcRateTimeService.getXhpcRateTime(tiem, chargingStationId);
+        if(xhpcRateTime!=null){
+            map.putAll(xhpcRateTime);
+        }
+        return AjaxResult.success(map);
+    }
+
 }
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
index 5a71655a..9d4a24de 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml
+++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml
@@ -249,4 +249,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where real_time_order_id in (
             select max(real_time_order_id) from xhpc_real_time_order WHERE to_days(create_time) = to_days(now()) and charging_station_id=#{chargingStationId} and gun_number =#{gunNumber} group by charging_order_id )
     </select>
+
+    <select id="getWXpNumMessage" resultType="map">
+        select
+            ter.name as terminalName,
+            ter.serial_number as serialNumber,
+            cp.power as power,
+            cp.max_voltage as maxVoltage,
+            cp.auxiliary_power_supply as auxiliaryPowerSupply,
+            ct.parking_instructions as parkingInstructions,
+            ter.charging_station_id as chargingStationId
+        from xhpc_terminal as ter
+        left join xhpc_charging_pile as cp on cp.charging_pile_id=ter.charging_pile_id
+        left join xhpc_charging_station as ct on ct.charging_station_id =ter.charging_station_id
+        where ter.serial_number=#{pNum} and ter.del_flag = 0
+    </select>
 </mapper>