From 00aee1ccfa824adc5a72f61fc59d8fedd7b14a41 Mon Sep 17 00:00:00 2001 From: yuyang Date: Thu, 20 Oct 2022 11:27:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86BMS?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/common/core/utils/SecurityUtils.java | 2 ++ .../order/controller/XhpcRealTimeOrderController.java | 1 - .../service/impl/XhpcRealTimeOrderServiceImpl.java | 2 ++ .../main/resources/mapper/XhpcRealTimeOrderMapper.xml | 10 ++++++++-- .../controller/XhpcCommonPaymentController.java | 3 +++ .../xhpc/user/controller/XhpcAppUserController.java | 3 ++- .../xhpc/user/service/impl/XhpcAppUserServiceImpl.java | 2 -- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/utils/SecurityUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/utils/SecurityUtils.java index 09fea09c..01ca42ed 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/utils/SecurityUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/utils/SecurityUtils.java @@ -44,6 +44,8 @@ public class SecurityUtils public static String getToken(HttpServletRequest request) { String token = ServletUtils.getRequest().getHeader(CacheConstants.HEADER); + System.out.println("=============token=============="+token); + System.out.println("=============token=============="+token); if (StringUtils.isNotEmpty(token) && token.startsWith(CacheConstants.TOKEN_PREFIX)) { token = token.replace(CacheConstants.TOKEN_PREFIX, ""); diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java index 46f216cd..5b1be3a1 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java @@ -80,7 +80,6 @@ public class XhpcRealTimeOrderController extends BaseController { @GetMapping("/timeBmsList") public TableDataInfo timeBmsList(@RequestParam Long chargingOrderId) { - startPage(); List> list = xhpcRealTimeOrderService.timeBmsList(chargingOrderId); return getDataTable(list); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java index 1e945236..bec0bfbb 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java @@ -137,6 +137,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe @Override public List> timeBmsList(Long chargingOrderId) { + startPage(); return xhpcRealTimeOrderMapper.timeBmsList(chargingOrderId); } @@ -177,6 +178,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe if(cacheBmsReqChargerOutputData !=null){ XhpcRealTimeOrderBms xhpcRealTimeOrderBms = new XhpcRealTimeOrderBms(); BeanUtils.copyProperties(cacheBmsReqChargerOutputData, xhpcRealTimeOrderBms); + xhpcRealTimeOrderBms.setCreateTime(new Date()); Integer bmsEstRemainingTime = cacheBmsReqChargerOutputData.getBmsEstRemainingTime(); Integer chargingTimeSummary = cacheBmsReqChargerOutputData.getChargingTimeSummary(); if (bmsEstRemainingTime > 60) { diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml index 35107998..b678a42d 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml @@ -239,6 +239,9 @@ bms_charging_current, + + mono_battery_volt, + soc, @@ -286,6 +289,9 @@ #{bmsChargingCurrent}, + + #{monoBatteryVolt}, + #{soc}, @@ -722,11 +728,11 @@ bms_current_request as bmsCurrentRequest, bms_charging_mod as bmsChargingMod, bms_charging_volt as bmsChargingVolt, - bms_charging_current as gunLineTemperature, + bms_charging_current as bmsChargingCurrent, mono_battery_volt as monoBatteryVolt, soc as soc, bms_est_remaining_time as bmsEstRemainingTime, - pileVoltageOutput as pileVoltageOutput, + pile_voltage_output as pileVoltageOutput, pile_current_output as pileCurrentOutput, charging_time_summary as chargingTimeSummary, mono_battery_volt_groupId as monoBatteryVoltGroupId, diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcCommonPaymentController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcCommonPaymentController.java index 34ccd47f..175db7ed 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcCommonPaymentController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcCommonPaymentController.java @@ -30,6 +30,9 @@ public class XhpcCommonPaymentController extends BaseController { */ @GetMapping("/settingConfig") public R settingConfig(Integer status, String tenantId) { + System.out.println("==================获取支付配置========================"); + System.out.println("==================获取支付配置========status==============="+status); + System.out.println("==================获取支付配置========tenantId================"+tenantId); return R.ok(xhpcCommonPayment.getXhpcSettingConfigTenantId(status, tenantId)); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java index 57fd9beb..af3f390b 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java @@ -251,6 +251,7 @@ public class XhpcAppUserController extends BaseController { tenantId="000000"; } R r = settingConfigService.settingConfig(2, tenantId); + System.out.println("======================r========================="+r.getCode()); if(r !=null && r.getCode()==200){ Map map = (Map)r.getData(); /** 初始化 **/ @@ -285,7 +286,7 @@ public class XhpcAppUserController extends BaseController { if (response.isSuccess()) { System.out.println("调用成功"); } else { - return AjaxResult.error("获取失败"); + return AjaxResult.error("获取失败!"); } return AjaxResult.success(response); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java index 0ce2ad23..ebed9b2b 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java @@ -208,8 +208,6 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU String phone = StringUtils.valueOf(map.get("phone")); String type = StringUtils.valueOf(map.get("type")); String tenantId = StringUtils.valueOf(map.get("tenantId")); - logger.info("<<<<<<<<<>>>>>>>>>>>"+code); - logger.info("<<<<<<<<<>>>>>>>>>>>"+tenantId); if("18123374652".equals(phone) && "123456".equals(code)){ if("1".equals(type)){ return appLogin(phone, "1", "ot6ul4nlSC5ZZOC4rTLS5hedFTGk", tenantId);