From b77c3ca16376eacd5dc697cd5d3cbee1759dde9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 13 Aug 2024 09:48:54 +0800 Subject: [PATCH] 'commit' --- .../ZhuQue/Ylt/Controller/YltController.java | 21 +++++++++--------- .../dsideal/ZhuQue/Ylt/Model/YltModel.java | 12 ++++++++++ ...外统一标准接口_充电桩抵扣.docx | Bin 162 -> 0 bytes ...$特收到的需求、分析与现状.docx | Bin 162 -> 0 bytes ...标准接口(收费系统)文档254.docx | Bin 162 -> 0 bytes 5 files changed, 22 insertions(+), 11 deletions(-) delete mode 100644 业务梳理/~$对外统一标准接口_充电桩抵扣.docx delete mode 100644 业务梳理/~$特收到的需求、分析与现状.docx delete mode 100644 资料/~$对外统一标准接口(收费系统)文档254.docx diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java index 4768e84..d3a0846 100644 --- a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java +++ b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Controller/YltController.java @@ -2,6 +2,7 @@ package com.dsideal.ZhuQue.Ylt.Controller; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; +import com.dsideal.ZhuQue.Interceptor.EmptyInterface; import com.dsideal.ZhuQue.Interceptor.IsLoginInterface; import com.dsideal.ZhuQue.Util.CommonUtil; import com.dsideal.ZhuQue.Util.SignUtils; @@ -14,6 +15,7 @@ import com.jfinal.plugin.activerecord.Record; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.List; import java.util.UUID; @@ -21,33 +23,31 @@ public class YltController extends Controller { Logger log = LoggerFactory.getLogger(YltController.class); YltModel ym = new YltModel(); + /** - * 功能：测试依赖JWT的TOKEN数据的方法 + * 功能：获取用户的车牌列表 */ @Before({GET.class}) @IsLoginInterface({}) - public void getListWithAuth() { + public void getCarList() { //获取当前登录人员信息 Record user = ym.getUser(getRequest()); - String userId = user.get("userId"); - String phone = user.get("phone"); - - System.out.println(userId); - System.out.println(phone); - renderJson(CommonUtil.getRet(true, "获取成功！")); + int userId = Integer.parseInt(user.get("userId")); + List list = ym.getCarList(userId); + renderJson(CommonUtil.getRet(list, true, "获取成功！")); } - /** * 功能: 向第三方道闸同步充电桩支付信息 */ @Before({POST.class}) @IsLoginInterface({}) + @EmptyInterface({"order_no","charge_plate_no"}) // 非指定闸机场地 // http://10.10.21.20:8888/ZhuQue/Ylt/SyncChargePilePay?order_no=2020092315154430479 // 科拓闸机场地 // http://10.10.21.20:8888/ZhuQue/Ylt/SyncChargePilePay?order_no=2022012911045715187 - public void SyncChargePilePay(String order_no) { + public void SyncChargePilePay(String order_no,String charge_plate_no) { //订单号，车牌号 //根据订单号获取到第三方方面提供的车场信息 Record thirdPartyStation = ym.getThirdPartyStation(order_no); if (thirdPartyStation == null) { @@ -68,7 +68,6 @@ public class YltController extends Controller { //订单信息 Record dingDanRecord = ym.getOrderByNo(order_no); - String charge_plate_no = dingDanRecord.getStr("charge_plate_no");//车牌号 String charge_begin_time = dingDanRecord.getStr("charge_begin_time");//充电开始时间 String charge_end_time = dingDanRecord.getStr("charge_end_time");//充电结束时间 int stationId = dingDanRecord.getInt("station_id");//电站ID diff --git a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java index 2a0542a..8898758 100644 --- a/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java +++ b/ZhuQue/src/main/java/com/dsideal/ZhuQue/Ylt/Model/YltModel.java @@ -8,6 +8,8 @@ import javax.servlet.http.HttpServletRequest; import com.jfinal.plugin.activerecord.Record; +import java.util.List; + public class YltModel { /** * 功能：根据JWT的token获取当前用户信息 @@ -90,4 +92,14 @@ public class YltModel { String sql = "select * from t_equipment where id =?"; return Db.findFirst(sql, equipment_id); } + + /** + * 功能：获取用户绑定的汽车列表 + * @param user_id + * @return + */ + public List getCarList(int user_id) { + String sql = "select * from t_user_car where user_id=?"; + return Db.find(sql, user_id); + } } diff --git a/业务梳理/~$对外统一标准接口_充电桩抵扣.docx b/业务梳理/~$对外统一标准接口_充电桩抵扣.docx deleted file mode 100644 index e4e31b2c302c9ce887fbb6c76f7e28c45b48e5c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;eOv%m6%PcM_N-W7QVjvRmGB`4%Fyu01GUNeqF+&MM5kn%7%m>oQfC~F@1H!Cp89!KUqObrQhCSgz4dvwpaR5&%h7@69CcxbVeC` diff --git a/业务梳理/~$特收到的需求、分析与现状.docx b/业务梳理/~$特收到的需求、分析与现状.docx deleted file mode 100644 index a445cca953879af3ad4cf14d7399b4047d3a10a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;eOv%m6%PcM_N-W7QVjvRmGB`4%Fyu01GUNeqF+&MM5kn%7%m>oQfC-$! rvORF=iTK-FjE3o}BR;7yFm&DAZYBZb!}Rb;+bjL3XJ9aa2>@vTn1&hw diff --git a/资料/~$对外统一标准接口(收费系统)文档254.docx b/资料/~$对外统一标准接口(收费系统)文档254.docx deleted file mode 100644 index 5ee492b99fda517e5e2dacf7a4dafe6244fa8f1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;eOv%m6%PcM_N-W7QVjvRmGB`4%Fyu01GUNeqF+&MM5kn%7%m>oQfC