This commit is contained in:
2023-07-17 14:30:53 +08:00
parent eb69602e21
commit 2587110cc2
8 changed files with 53 additions and 75 deletions

View File

@@ -57,22 +57,6 @@ public interface PileConnectorInfoMapper {
*/
public int updatePileConnectorInfo(PileConnectorInfo pileConnectorInfo);
/**
* 删除充电桩枪口信息
*
* @param id 充电桩枪口信息主键
* @return 结果
*/
// public int deletePileConnectorInfoById(Integer id);
/**
* 批量删除充电桩枪口信息
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
// public int deletePileConnectorInfoByIds(Integer[] ids);
/**
* 根据充电桩编号删除充电桩枪口信息
* @param pileSnList

View File

@@ -2171,27 +2171,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
orderInfo.setPayTime(new Date());
this.updateOrderBasicInfo(orderInfo);
// 如果是鉴权卡启动或者vin启动不发启动充电指令
// if (!(StringUtils.equals(dto.getStartMode(), StartModeEnum.AUTH_CARD.getValue())
// || StringUtils.equals(dto.getStartMode(), StartModeEnum.VIN_CODE.getValue()))) {
//
// if (StringUtils.equals(orderInfo.getStartType(), StartTypeEnum.NOW.getValue())) { // 立即启动充电
// String pileSn = orderInfo.getPileSn();
// // 发送启动充电指令前,再次下发计费模板
// BillingTemplateVO billingTemplateVO = pileBillingTemplateService.selectBillingTemplateDetailByPileSn(pileSn);
// if (billingTemplateVO != null) {
// pileRemoteService.publishPileBillingTemplate(pileSn, billingTemplateVO);
// }
// // 发送启动指令
// pileRemoteService.remoteStartCharging(pileSn, orderInfo.getConnectorCode(), orderInfo.getTransactionCode(), orderInfo.getPayAmount());
// } else { // 预约充电
// // 修改枪口状态为 占用预约
//
// // 下发修改充电桩设置指令
//
// }
// }
// 是否发送启动指令
boolean sendStartCharging = true;

View File

@@ -21,6 +21,11 @@ public class ConnectorInfoVO {
*/
private String stationId;
/**
* 充电桩编号
*/
private String pileSn;
/**
* 枪口号
*/

View File

@@ -140,7 +140,7 @@
t1.id as connectorId,
t1.station_id as stationId,
t1.sn as pileSn,
t2.pile_connector_code as connectorCode,
t2.pile_connector_code as pileConnectorCode,
t2.status,
t1.merchant_id as merchantId,
t3.merchant_name as merchantName
@@ -226,8 +226,8 @@
t1.pile_connector_code as pileConnectorCode,
t2.station_id as stationId,
t1.STATUS as connectorStatus,
t1.pile_sn,
t2.model_id,
t1.pile_sn as pileSn,
t2.model_id as modelId,
t3.speed_type as chargingType,
t3.rated_power as ratedPower
FROM