autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-14 20:30:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 电单车

Browse Source
This commit is contained in:
Guoqs
2024-09-20 15:53:35 +08:00
parent 0c1447c49e
commit e6145ae06d
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java
View File

@@ -291,7 +291,7 @@ public class PileRemoteService {
pileBillingTemplateService.updatePileBillingTemplate(pileBillingTemplate); pileBillingTemplateService.updatePileBillingTemplate(pileBillingTemplate);
// 获取到站点下所有的桩, 下发计费模板, 电单车不支持 // 获取到站点下所有的桩, 下发计费模板, 电单车不支持
if (StringUtils.equals(billingTemplateVO.getDeviceType(), "1")) { if (StringUtils.equals(billingTemplateVO.getDeviceType(), Constants.ONE)) {
List<PileDetailVO> pileList = pileBasicInfoService.selectPileListByStationIds(Lists.newArrayList(Long.valueOf(dto.getStationId()))); List<PileDetailVO> pileList = pileBasicInfoService.selectPileListByStationIds(Lists.newArrayList(Long.valueOf(dto.getStationId())));
if (CollectionUtils.isNotEmpty(pileList)) { if (CollectionUtils.isNotEmpty(pileList)) {
for (PileDetailVO pileInfoVO : pileList) { for (PileDetailVO pileInfoVO : pileList) {

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/EBikeSendCommandServiceImpl.java
View File

@@ -74,7 +74,7 @@ public class EBikeSendCommandServiceImpl implements EBikeSendCommandService {
message.setExtraFloatChargeTime(0); message.setExtraFloatChargeTime(0);
message.setSkipShortCircuitDetection(0); message.setSkipShortCircuitDetection(0);
message.setNoUserPullOutCheck(0); message.setNoUserPullOutCheck(0);
message.setForceAutoStopWhenFull(0); message.setForceAutoStopWhenFull(1);
message.setFullChargePower(0); message.setFullChargePower(0);
message.setMaxFullChargePowerCheckTime(0); message.setMaxFullChargePowerCheckTime(0);
byte[] response = this.send(message); byte[] response = this.send(message);
@@ -122,7 +122,7 @@ public class EBikeSendCommandServiceImpl implements EBikeSendCommandService {
message.setExtraFloatChargeTime(0); message.setExtraFloatChargeTime(0);
message.setSkipShortCircuitDetection(0); message.setSkipShortCircuitDetection(0);
message.setNoUserPullOutCheck(0); message.setNoUserPullOutCheck(0);
message.setForceAutoStopWhenFull(0); message.setForceAutoStopWhenFull(1);
message.setFullChargePower(0); message.setFullChargePower(0);
message.setMaxFullChargePowerCheckTime(0); message.setMaxFullChargePowerCheckTime(0);
byte[] response = this.send(message); byte[] response = this.send(message);

19
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java
View File

@@ -234,8 +234,6 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
return; return;
} }
// 查询站点信息
billingTemplate.setName(dto.getName());
billingTemplate.setType(dto.getType()); billingTemplate.setType(dto.getType());
billingTemplate.setTemplateRemark(dto.getTemplateRemark()); billingTemplate.setTemplateRemark(dto.getTemplateRemark());
billingTemplate.setUpdateBy(SecurityUtils.getUsername()); billingTemplate.setUpdateBy(SecurityUtils.getUsername());
@@ -243,15 +241,14 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
billingTemplate.setOccupyFee(dto.getOccupyFee()); billingTemplate.setOccupyFee(dto.getOccupyFee());
billingTemplate.setMaxOccupyFee(dto.getMaxOccupyFee()); billingTemplate.setMaxOccupyFee(dto.getMaxOccupyFee());
// 修改私有模板的名称 如果类型是私有，并且名称是公用，就更新为： 站点名称 + ”的计费模板“ // 查询站点信息
if (StringUtils.equals(billingTemplate.getPublicFlag(), Constants.ZERO) PileStationInfo stationInfo = pileStationInfoService.selectPileStationInfoById(billingTemplate.getStationId());
&& StringUtils.equals(billingTemplate.getName(), "公用")) { String stationName = stationInfo.getStationName();
// 查询站点信息 String memberFlagStr = StringUtils.equals(billingTemplate.getMemberFlag(), "1") ? "会员" : "普通";
PileStationInfo stationInfo = pileStationInfoService.selectPileStationInfoById(billingTemplate.getStationId()); String pileTypeStr = StringUtils.equals(dto.getType(), "1") ? "汽车" : "电单车";
if (stationInfo != null) { // 计费模板名称规则 站点名称 + ”的" + Type +"计费模板“
billingTemplate.setName(stationInfo.getStationName() + "的会员计费模板"); String name = stationName + "的" + memberFlagStr + pileTypeStr + "计费模板";
} billingTemplate.setName(name);
}
// 生成计费详情list // 生成计费详情list
List<PileBillingDetail> pileBillingDetails = generateBillingDetailList(billingTemplate.getTemplateCode(), dto); List<PileBillingDetail> pileBillingDetails = generateBillingDetailList(billingTemplate.getTemplateCode(), dto);