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

update 电单车协议

Browse Source
This commit is contained in:
Guoqs
2024-09-03 09:51:51 +08:00
parent 58096b74af
commit 95649e4c47
14 changed files with 68 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2544,8 +2544,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
// 生成订单
String orderCode = dto.getStartChargeSeq();
String pileConnectorCode = dto.getConnectorID();
String pileSn = StringUtils.substring(pileConnectorCode, 0, 14);
String connectorCode = StringUtils.substring(pileConnectorCode, 14, 16);
// String pileSn = StringUtils.substring(pileConnectorCode, 0, 14);
String pileSn = YKCUtils.getPileSn(pileConnectorCode);
// String connectorCode = StringUtils.substring(pileConnectorCode, 14, 16);
String connectorCode = YKCUtils.getConnectorCode(pileConnectorCode);
String transactionCode = IdUtils.generateTransactionCode(pileSn, connectorCode);
@@ -2986,6 +2988,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
if (StringUtils.isBlank(dto.getPileSn()) || StringUtils.isBlank(dto.getConnectorCode())) {
// 从pileConnectorCode解析
String pileConnectorCode = dto.getPileConnectorCode();
// dto.setPileSn(StringUtils.substring(pileConnectorCode, 0, pileConnectorCode.length() - 2));
// dto.setConnectorCode(StringUtils.substring(pileConnectorCode, pileConnectorCode.length() - 2, pileConnectorCode.length()));
dto.setPileSn(YKCUtils.getPileSn(pileConnectorCode));
dto.setConnectorCode(YKCUtils.getConnectorCode(pileConnectorCode));
} else {

7
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java
View File

@@ -13,6 +13,7 @@ import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.pile.domain.PileMemberRelation;
import com.jsowell.pile.domain.PileReservationInfo;
import com.jsowell.pile.domain.ykcCommond.ReservationChargingCommand;
@@ -504,8 +505,10 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic
@Override
public void personPileStopCharging(PersonPileStopChargingDTO dto) {
String pileConnectorCode = dto.getPileConnectorCode();
String pileSn = StringUtils.substring(pileConnectorCode, 0, pileConnectorCode.length() - 2);
String connectorCode = StringUtils.substring(pileConnectorCode, pileConnectorCode.length() - 2, pileConnectorCode.length());
// String pileSn = StringUtils.substring(pileConnectorCode, 0, pileConnectorCode.length() - 2);
String pileSn = YKCUtils.getPileSn(pileConnectorCode);
// String connectorCode = StringUtils.substring(pileConnectorCode, pileConnectorCode.length() - 2, pileConnectorCode.length());
String connectorCode = YKCUtils.getConnectorCode(pileConnectorCode);
// 查询个人桩信息
List<PileMemberRelation> pileMemberRelations = pileMemberRelationService.selectPileMemberRelationByPileSn(pileSn);
Map<String, List<String>> listMap = pileMemberRelations.stream()

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
View File

@@ -223,7 +223,8 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
if (StringUtils.isBlank(pileConnectorCode)) {
return null;
}
String pileSn = StringUtils.substring(pileConnectorCode, 0, 14);
// String pileSn = StringUtils.substring(pileConnectorCode, 0, 14);
String pileSn = YKCUtils.getPileSn(pileConnectorCode);
return getStationInfoByPileSn(pileSn);
}