mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-21 11:35:12 +08:00
绑定蓝牙桩
This commit is contained in:
@@ -34,6 +34,16 @@ public class PileMemberRelation extends BaseEntity
|
||||
@Excel(name = "会员id")
|
||||
private String memberId;
|
||||
|
||||
/**
|
||||
* 设备id 蓝牙桩
|
||||
*/
|
||||
private String deviceId;
|
||||
|
||||
/**
|
||||
* 设备名称 蓝牙桩
|
||||
*/
|
||||
private String deviceName;
|
||||
|
||||
/** 身份类型(1-管理员,2-用户) */
|
||||
@Excel(name = "身份类型", readConverterExp = "1=-管理员,2-用户")
|
||||
private String type;
|
||||
|
||||
@@ -39,4 +39,14 @@ public class PileMemberBindingDTO {
|
||||
* 一级运营商id
|
||||
*/
|
||||
private String firstLevelMerchantId;
|
||||
|
||||
/**
|
||||
* 设备名称
|
||||
*/
|
||||
private String deviceName;
|
||||
|
||||
/**
|
||||
* 设备id
|
||||
*/
|
||||
private String deviceId;
|
||||
}
|
||||
|
||||
@@ -891,24 +891,25 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
|
||||
if(CollectionUtils.isEmpty(list)){
|
||||
return null;
|
||||
}
|
||||
|
||||
for (PersonalPileInfoVO personalPileInfoVO : list) {
|
||||
String pileSn = personalPileInfoVO.getPileSn();
|
||||
|
||||
// 获取桩状态
|
||||
Map<String, String> pileStatus = pileConnectorInfoService.getPileStatus(Lists.newArrayList(pileSn));
|
||||
personalPileInfoVO.setPileStatus(pileStatus.get(pileSn));
|
||||
personalPileInfoVO.setPileStatusDesc(PileStatusEnum.getStatusDesc(pileStatus.get(pileSn)));
|
||||
if (StringUtils.equals("1", personalPileInfoVO.getType())) {
|
||||
personalPileInfoVO.setType("管理员用户");
|
||||
}else {
|
||||
personalPileInfoVO.setType("普通用户");
|
||||
}
|
||||
if (StringUtils.equals("1", personalPileInfoVO.getSpeedType())) {
|
||||
personalPileInfoVO.setSpeedType("快充");
|
||||
}else {
|
||||
personalPileInfoVO.setSpeedType("慢充");
|
||||
}
|
||||
// if (StringUtils.equals(Constants.ONE, personalPileInfoVO.getType())) {
|
||||
// personalPileInfoVO.setType("管理员用户");
|
||||
// }else {
|
||||
// personalPileInfoVO.setType("普通用户");
|
||||
// }
|
||||
personalPileInfoVO.setType(StringUtils.equals(Constants.ONE, personalPileInfoVO.getType()) ? "管理员用户" : "普通用户");
|
||||
// if (StringUtils.equals(Constants.ONE, personalPileInfoVO.getSpeedType())) {
|
||||
// personalPileInfoVO.setSpeedType("快充");
|
||||
// }else {
|
||||
// personalPileInfoVO.setSpeedType("慢充");
|
||||
// }
|
||||
personalPileInfoVO.setSpeedType(StringUtils.equals(Constants.ONE, personalPileInfoVO.getSpeedType()) ? "快充" : "慢充");
|
||||
personalPileInfoVO.setConnectionType(StringUtils.isNotBlank(personalPileInfoVO.getDeviceId()) ? "BT" : "4G");
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
@@ -64,4 +64,14 @@ public class PersonalPileInfoVO {
|
||||
* 枪口数量
|
||||
*/
|
||||
private String connectorNum;
|
||||
|
||||
private String deviceName;
|
||||
|
||||
private String deviceId;
|
||||
|
||||
/**
|
||||
* 充电桩连接类型
|
||||
* 4G/BT
|
||||
*/
|
||||
private String connectionType;
|
||||
}
|
||||
Reference in New Issue
Block a user