diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index 83d788460..9659b6030 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -464,10 +464,12 @@ public class PileService { if (StringUtils.equals(Constants.ONE, type)) { List pileMemberRelations = pileMemberRelationService.selectPileMemberRelationByPileSn(dto.getPileSn()); idList = pileMemberRelations.stream().map(PileMemberRelation::getId).collect(Collectors.toList()); + + // 管理员解绑,需要删除该桩的预约信息 + pileReservationInfoService.deleteReservationByPileSn(dto.getPileSn()); }else { idList.add(pileMemberRelation.getId()); } - return pileMemberRelationService.deleteRelationByIds(idList); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileReservationInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileReservationInfoMapper.java index 3eebf865d..8a3acf398 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileReservationInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileReservationInfoMapper.java @@ -37,4 +37,11 @@ public interface PileReservationInfoMapper { PileReservationInfo selectByPileConnectorCode(String pileConnectorCode); PileReservationInfo selectByPileSn(String pileSn); + + /** + * 根据桩编号删除预约记录 + * @param pileSn + * @return + */ + int deleteByPileSn(String pileSn); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservationInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservationInfoService.java index 59ccba5db..ce3678fe8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservationInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservationInfoService.java @@ -1,14 +1,14 @@ package com.jsowell.pile.service; -import java.util.List; - import com.jsowell.common.core.page.PageResponse; +import com.jsowell.pile.domain.PileReservationInfo; import com.jsowell.pile.dto.CreateReservedDTO; import com.jsowell.pile.dto.PersonPileStopChargingDTO; import com.jsowell.pile.dto.PileReservationDTO; -import com.jsowell.pile.domain.PileReservationInfo; import com.jsowell.pile.vo.PileReservationInfoVO; +import java.util.List; + public interface PileReservationInfoService { int deleteByPrimaryKey(Integer id); @@ -77,5 +77,11 @@ public interface PileReservationInfoService { void initPersonalPileReservation(String pileConnectorCode); void initPersonalPileReservation(String pileSn, String connectorCode); + + /** + * 根据pileSn删除预约记录 + * @param pileSn + */ + void deleteReservationByPileSn(String pileSn); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java index 4ff0fa684..56d6cc2cc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java @@ -615,5 +615,10 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic String pileConnectorCode = pileSn + connectorCode; this.initPersonalPileReservation(pileConnectorCode); } + + @Override + public void deleteReservationByPileSn(String pileSn) { + pileReservationInfoMapper.deleteByPileSn(pileSn); + } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml index 61a5f03b9..cbbfacab4 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml @@ -668,4 +668,9 @@ where del_flag = '0' and pile_sn = #{pileSn,jdbcType=VARCHAR} + + + delete from pile_reservation_info + where pile_sn = #{pileSn,jdbcType=VARCHAR} + \ No newline at end of file