yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改车辆BMS数据显示

Browse Source
This commit is contained in:
yuyang 2022-10-20 11:27:48 +08:00
parent c0c72bc3ca
commit 00aee1ccfa
7 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/utils/SecurityUtils.java
View File

@ -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, "");

1
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcRealTimeOrderController.java
View File

@ -80,7 +80,6 @@ public class XhpcRealTimeOrderController extends BaseController {
@GetMapping("/timeBmsList")
public TableDataInfo timeBmsList(@RequestParam Long chargingOrderId)
{
startPage();
List<Map<String,Object>> list = xhpcRealTimeOrderService.timeBmsList(chargingOrderId);
return getDataTable(list);
}

2
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
View File

@ -137,6 +137,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe
@Override
public List<Map<String, Object>> 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) {

10
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml
View File

@ -239,6 +239,9 @@
<if test="null != bmsChargingCurrent ">
bms_charging_current,
</if>
<if test="null != monoBatteryVolt ">
mono_battery_volt,
</if>
<if test="null != soc ">
soc,
</if>
@ -286,6 +289,9 @@
<if test="null != bmsChargingCurrent ">
#{bmsChargingCurrent},
</if>
<if test="null != monoBatteryVolt ">
#{monoBatteryVolt},
</if>
<if test="null != soc ">
#{soc},
</if>
@ -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,

3
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcCommonPaymentController.java
View File

@ -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));
}

3
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java
View File

@ -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<String, Object> map = (Map<String, Object>)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);
}

2
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
View File

@ -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>>>>>>>>>>>>"+code);
logger.info("<<<<<<<<<<tenantId>>>>>>>>>>>>"+tenantId);
if("18123374652".equals(phone) && "123456".equals(code)){
if("1".equals(type)){
return appLogin(phone, "1", "ot6ul4nlSC5ZZOC4rTLS5hedFTGk", tenantId);