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 60bb9c0c3..8c5d21bf3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -89,7 +89,7 @@ public class PileService { private PileRemoteService pileRemoteService; @Autowired - private PileReservedInfoService pileReservedInfoService; + private PileReservationInfoService pileReservationInfoService; /** * 查询设备信息 @@ -564,15 +564,15 @@ public class PileService { public void updateReservedStatus(PileReservedDTO dto) { if (StringUtils.equals(dto.getStatus(), Constants.ZERO)) { // 停用 - pileReservedInfoService.deactivateReserved(dto); + pileReservationInfoService.deactivateReserved(dto); } else if (StringUtils.equals(dto.getStatus(), Constants.ONE)) { // 启用 - pileReservedInfoService.activateReserved(dto); + pileReservationInfoService.activateReserved(dto); } } public int createReserved(CreateReservedDTO dto) { - PileReservedInfo reservedInfo = new PileReservedInfo(); + PileReservationInfo reservedInfo = new PileReservationInfo(); reservedInfo.setMemberId(dto.getMemberId()); reservedInfo.setPileSn(dto.getPileSn()); reservedInfo.setPileConnectorCode(dto.getPileConnectorCode()); @@ -589,7 +589,7 @@ public class PileService { reservedInfo.setFreq(null); } reservedInfo.setCreateBy(dto.getMemberId()); - pileReservedInfoService.insertSelective(reservedInfo); + pileReservationInfoService.insertSelective(reservedInfo); return reservedInfo.getId(); } @@ -597,8 +597,8 @@ public class PileService { int pageNo = dto.getPageNo() == null ? Constants.one : dto.getPageNo(); int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize(); PageHelper.startPage(pageNo, pageSize); - List list = pileReservedInfoService.getReservationsByMemberIdAndPileSn(dto.getMemberId(), dto.getPileSn()); - PageInfo pageInfo = new PageInfo<>(list); + List list = pileReservationInfoService.getReservationsByMemberIdAndPileSn(dto.getMemberId(), dto.getPileSn()); + PageInfo pageInfo = new PageInfo<>(list); PageResponse pageResponse = new PageResponse(); pageResponse.setPageNum(pageInfo.getPageNum()); @@ -607,7 +607,7 @@ public class PileService { pageResponse.setTotal(pageInfo.getTotal()); List resultList = Lists.newArrayList(); - for (PileReservedInfo reservedInfo : pageInfo.getList()) { + for (PileReservationInfo reservedInfo : pageInfo.getList()) { resultList.add( PileReservedVO.builder() .reservedId(reservedInfo.getId() + "") diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservedInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservationInfo.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservedInfo.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservationInfo.java index 285f48c70..e8ea0a38b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservedInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservationInfo.java @@ -16,7 +16,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -public class PileReservedInfo { +public class PileReservationInfo { /** * 主键 */ 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 new file mode 100644 index 000000000..89fecc2db --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileReservationInfoMapper.java @@ -0,0 +1,35 @@ +package com.jsowell.pile.mapper; + +import com.jsowell.pile.domain.PileReservationInfo; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +public interface PileReservationInfoMapper { + int deleteByPrimaryKey(Integer id); + + int insert(PileReservationInfo record); + + int insertOrUpdate(PileReservationInfo record); + + int insertOrUpdateSelective(PileReservationInfo record); + + int insertSelective(PileReservationInfo record); + + PileReservationInfo selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(PileReservationInfo record); + + int updateByPrimaryKey(PileReservationInfo record); + + int updateBatch(List list); + + int updateBatchSelective(List list); + + int batchInsert(@Param("list") List list); + + List findByMemberIdAndPileSnAndStatus(@Param("memberId") String memberId, @Param("pileSn") String pileSn, @Param("status") String status); + + List findByMemberIdAndPileSn(@Param("memberId") String memberId, @Param("pileSn") String pileSn); +} \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileReservedInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileReservedInfoMapper.java deleted file mode 100644 index 8de7e78d0..000000000 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileReservedInfoMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.jsowell.pile.mapper; - -import com.jsowell.pile.domain.PileReservedInfo; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; - -public interface PileReservedInfoMapper { - int deleteByPrimaryKey(Integer id); - - int insert(PileReservedInfo record); - - int insertOrUpdate(PileReservedInfo record); - - int insertOrUpdateSelective(PileReservedInfo record); - - int insertSelective(PileReservedInfo record); - - PileReservedInfo selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(PileReservedInfo record); - - int updateByPrimaryKey(PileReservedInfo record); - - int updateBatch(List list); - - int updateBatchSelective(List list); - - int batchInsert(@Param("list") List list); - - List findByMemberIdAndPileSnAndStatus(@Param("memberId") String memberId, @Param("pileSn") String pileSn, @Param("status") String status); - - List findByMemberIdAndPileSn(@Param("memberId") String memberId, @Param("pileSn") 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 new file mode 100644 index 000000000..d56dd0ef5 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservationInfoService.java @@ -0,0 +1,57 @@ +package com.jsowell.pile.service; + +import java.util.List; + +import com.jsowell.pile.dto.PileReservedDTO; +import com.jsowell.pile.domain.PileReservationInfo; + +public interface PileReservationInfoService { + int deleteByPrimaryKey(Integer id); + + int insert(PileReservationInfo record); + + int insertOrUpdate(PileReservationInfo record); + + int insertOrUpdateSelective(PileReservationInfo record); + + int insertSelective(PileReservationInfo record); + + PileReservationInfo selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(PileReservationInfo record); + + int updateByPrimaryKey(PileReservationInfo record); + + int updateBatch(List list); + + int batchInsert(List list); + + int updateBatchSelective(List list); + + List getReservationsByMemberIdAndPileSn(String memberId, String pileSn); + + /** + * 启动预约 + * @param dto + */ + void activateReserved(PileReservedDTO dto); + + /** + * 关闭预约 + * @param dto + */ + void deactivateReserved(PileReservedDTO dto); + + /** + * 根据充电枪口编号发送预约指令 + * @param pileConnectorCode + */ + void pushReservedByPileConnectorCode(String pileConnectorCode); + + /** + * 拔枪时，根据充电桩枪口编号关闭仅一次的预约 + * @param pileConnectorCode + */ + void cancelOneTimeReservation(String pileConnectorCode); +} + diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservedInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservedInfoService.java deleted file mode 100644 index f023a688c..000000000 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservedInfoService.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.jsowell.pile.service; - -import java.util.List; - -import com.jsowell.pile.dto.PileReservedDTO; -import com.jsowell.pile.domain.PileReservedInfo; - -public interface PileReservedInfoService { - - - int deleteByPrimaryKey(Integer id); - - int insert(PileReservedInfo record); - - int insertOrUpdate(PileReservedInfo record); - - int insertOrUpdateSelective(PileReservedInfo record); - - int insertSelective(PileReservedInfo record); - - PileReservedInfo selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(PileReservedInfo record); - - int updateByPrimaryKey(PileReservedInfo record); - - int updateBatch(List list); - - int batchInsert(List list); - - int updateBatchSelective(List list); - - List getReservationsByMemberIdAndPileSn(String memberId, String pileSn); - - /** - * 启动预约 - * @param dto - */ - void activateReserved(PileReservedDTO dto); - - /** - * 关闭预约 - * @param dto - */ - void deactivateReserved(PileReservedDTO dto); - - /** - * 根据充电枪口编号发送预约指令 - * @param pileConnectorCode - */ - void pushReservedByPileConnectorCode(String pileConnectorCode); - - void cancelOneTimeReservation(String pileConnectorCode); -} - diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index 3bff151d4..a5ed2fab3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -25,8 +25,6 @@ import com.jsowell.pile.dto.IndexQueryDTO; import com.jsowell.pile.dto.QueryPileDTO; import com.jsowell.pile.dto.ReplaceMerchantStationDTO; import com.jsowell.pile.mapper.PileBasicInfoMapper; -import com.jsowell.pile.mapper.PileMerchantInfoMapper; -import com.jsowell.pile.mapper.PileSimInfoMapper; import com.jsowell.pile.service.*; import com.jsowell.pile.thirdparty.ConnectorInfo; import com.jsowell.pile.thirdparty.EquipmentInfo; @@ -89,7 +87,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { private String BASE_URL_PREFIX; @Autowired - private PileReservedInfoService pileReservedInfoService; + private PileReservationInfoService pileReservationInfoService; /** * 查询设备管理 @@ -465,7 +463,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { @Override public void firstPlugInCharger(String pileConnectorCode) { // 下发预约指令 - pileReservedInfoService.pushReservedByPileConnectorCode(pileConnectorCode); + pileReservationInfoService.pushReservedByPileConnectorCode(pileConnectorCode); } /** @@ -476,7 +474,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { @Override public void firstUnplugCharger(String pileConnectorCode) { // 关闭仅执行一次的预约 - pileReservedInfoService.cancelOneTimeReservation(pileConnectorCode); + pileReservationInfoService.cancelOneTimeReservation(pileConnectorCode); } /** 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 new file mode 100644 index 000000000..fe7741416 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java @@ -0,0 +1,173 @@ +package com.jsowell.pile.service.impl; + +import com.jsowell.common.constant.Constants; +import com.jsowell.common.enums.ykc.ReturnCodeEnum; +import com.jsowell.common.exception.BusinessException; +import com.jsowell.common.util.StringUtils; +import com.jsowell.pile.dto.PileReservedDTO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.sql.Time; +import java.time.LocalTime; +import java.util.List; + +import com.jsowell.pile.mapper.PileReservationInfoMapper; +import com.jsowell.pile.domain.PileReservationInfo; +import com.jsowell.pile.service.PileReservationInfoService; + +@Service +public class PileReservationInfoServiceImpl implements PileReservationInfoService { + + @Resource + private PileReservationInfoMapper pileReservationInfoMapper; + + @Override + public int deleteByPrimaryKey(Integer id) { + return pileReservationInfoMapper.deleteByPrimaryKey(id); + } + + @Override + public int insert(PileReservationInfo record) { + return pileReservationInfoMapper.insert(record); + } + + @Override + public int insertOrUpdate(PileReservationInfo record) { + return pileReservationInfoMapper.insertOrUpdate(record); + } + + @Override + public int insertOrUpdateSelective(PileReservationInfo record) { + return pileReservationInfoMapper.insertOrUpdateSelective(record); + } + + @Override + public int insertSelective(PileReservationInfo record) { + return pileReservationInfoMapper.insertSelective(record); + } + + @Override + public PileReservationInfo selectByPrimaryKey(Integer id) { + return pileReservationInfoMapper.selectByPrimaryKey(id); + } + + @Override + public int updateByPrimaryKeySelective(PileReservationInfo record) { + return pileReservationInfoMapper.updateByPrimaryKeySelective(record); + } + + @Override + public int updateByPrimaryKey(PileReservationInfo record) { + return pileReservationInfoMapper.updateByPrimaryKey(record); + } + + @Override + public int updateBatch(List list) { + return pileReservationInfoMapper.updateBatch(list); + } + + @Override + public int batchInsert(List list) { + return pileReservationInfoMapper.batchInsert(list); + } + + @Override + public int updateBatchSelective(List list) { + return pileReservationInfoMapper.updateBatchSelective(list); + } + + @Override + public List getReservationsByMemberIdAndPileSn(String memberId, String pileSn) { + return pileReservationInfoMapper.findByMemberIdAndPileSn(memberId, pileSn); + } + + /** + * 启用预约 + */ + @Override + public void activateReserved(PileReservedDTO dto) { + PileReservationInfo pileReservationInfo = pileReservationInfoMapper.selectByPrimaryKey(Integer.parseInt(dto.getReservedId())); + if (pileReservationInfo == null) { + return; + } + if (!StringUtils.equals(dto.getMemberId(), pileReservationInfo.getMemberId())) { + return; + } + pileReservationInfo.setStatus(Constants.ONE); + // 保存之前，校验时间是否重叠 + saveReservation(pileReservationInfo); + } + + /** + * 禁用预约 + */ + @Override + public void deactivateReserved(PileReservedDTO dto) { + PileReservationInfo pileReservationInfo = pileReservationInfoMapper.selectByPrimaryKey(Integer.parseInt(dto.getReservedId())); + if (pileReservationInfo == null) { + return; + } + if (!StringUtils.equals(dto.getMemberId(), pileReservationInfo.getMemberId())) { + return; + } + // 校验通过可以修改预约 + pileReservationInfo.setStatus(Constants.ZERO); + pileReservationInfoMapper.updateByPrimaryKeySelective(pileReservationInfo); + } + + /** + * 校验时间是否重叠 + * @param memberId + * @param pileSn + * @param startTime + * @param endTime + * @param reservationId + * @return + */ + public boolean isTimeSlotAvailable(String memberId, String pileSn, Time startTime, Time endTime, Integer reservationId) { + List reservations = pileReservationInfoMapper.findByMemberIdAndPileSnAndStatus(memberId, pileSn, "1"); + LocalTime newStartTime = startTime.toLocalTime(); + LocalTime newEndTime = endTime.toLocalTime(); + + for (PileReservationInfo res : reservations) { + if (res.getId().equals(reservationId)) { + continue; // Skip the current reservation if updating + } + LocalTime existingStartTime = res.getStartTime().toLocalTime(); + LocalTime existingEndTime = res.getEndTime().toLocalTime(); + + if (newStartTime.isBefore(existingEndTime) && newEndTime.isAfter(existingStartTime)) { + return false; // Time slot overlaps + } + } + return true; + } + + public void saveReservation(PileReservationInfo reservation) { + if (isTimeSlotAvailable(reservation.getMemberId(), reservation.getPileSn(), reservation.getStartTime(), reservation.getEndTime(), reservation.getId())) { + this.updateByPrimaryKeySelective(reservation); + } else { + throw new BusinessException(ReturnCodeEnum.CODE_UPDATE_RESERVED_STATUS_REFUSED); + } + } + + /** + * 根据充电枪口编号发送指令 + * @param pileConnectorCode + */ + @Override + public void pushReservedByPileConnectorCode(String pileConnectorCode) { + // 根据充电枪口编号查询正在生效中的预约 + } + + /** + * 拔枪时，根据充电桩枪口编号关闭仅一次的预约 + * @param pileConnectorCode + */ + @Override + public void cancelOneTimeReservation(String pileConnectorCode) { + // 根据充电枪口编号查询仅一次正在生效中的预约 + } +} + diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservedInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservedInfoServiceImpl.java deleted file mode 100644 index 02731b52c..000000000 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservedInfoServiceImpl.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.jsowell.pile.service.impl; - -import com.jsowell.common.constant.Constants; -import com.jsowell.common.enums.ykc.ReturnCodeEnum; -import com.jsowell.common.exception.BusinessException; -import com.jsowell.common.util.StringUtils; -import com.jsowell.pile.dto.PileReservedDTO; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.sql.Time; -import java.time.LocalTime; -import java.util.List; - -import com.jsowell.pile.mapper.PileReservedInfoMapper; -import com.jsowell.pile.domain.PileReservedInfo; -import com.jsowell.pile.service.PileReservedInfoService; - -@Service -public class PileReservedInfoServiceImpl implements PileReservedInfoService { - - @Resource - private PileReservedInfoMapper pileReservedInfoMapper; - - @Override - public int deleteByPrimaryKey(Integer id) { - return pileReservedInfoMapper.deleteByPrimaryKey(id); - } - - @Override - public int insert(PileReservedInfo record) { - return pileReservedInfoMapper.insert(record); - } - - @Override - public int insertOrUpdate(PileReservedInfo record) { - return pileReservedInfoMapper.insertOrUpdate(record); - } - - @Override - public int insertOrUpdateSelective(PileReservedInfo record) { - return pileReservedInfoMapper.insertOrUpdateSelective(record); - } - - @Override - public int insertSelective(PileReservedInfo record) { - return pileReservedInfoMapper.insertSelective(record); - } - - @Override - public PileReservedInfo selectByPrimaryKey(Integer id) { - return pileReservedInfoMapper.selectByPrimaryKey(id); - } - - @Override - public int updateByPrimaryKeySelective(PileReservedInfo record) { - return pileReservedInfoMapper.updateByPrimaryKeySelective(record); - } - - @Override - public int updateByPrimaryKey(PileReservedInfo record) { - return pileReservedInfoMapper.updateByPrimaryKey(record); - } - - @Override - public int updateBatch(List list) { - return pileReservedInfoMapper.updateBatch(list); - } - - @Override - public int batchInsert(List list) { - return pileReservedInfoMapper.batchInsert(list); - } - - @Override - public int updateBatchSelective(List list) { - return pileReservedInfoMapper.updateBatchSelective(list); - } - - @Override - public List getReservationsByMemberIdAndPileSn(String memberId, String pileSn) { - return pileReservedInfoMapper.findByMemberIdAndPileSn(memberId, pileSn); - } - - /** - * 启用预约 - */ - @Override - public void activateReserved(PileReservedDTO dto) { - PileReservedInfo pileReservedInfo = pileReservedInfoMapper.selectByPrimaryKey(Integer.parseInt(dto.getReservedId())); - if (pileReservedInfo == null) { - return; - } - if (!StringUtils.equals(dto.getMemberId(), pileReservedInfo.getMemberId())) { - return; - } - pileReservedInfo.setStatus(Constants.ONE); - // 保存之前，校验时间是否重叠 - saveReservation(pileReservedInfo); - } - - /** - * 禁用预约 - */ - @Override - public void deactivateReserved(PileReservedDTO dto) { - PileReservedInfo pileReservedInfo = pileReservedInfoMapper.selectByPrimaryKey(Integer.parseInt(dto.getReservedId())); - if (pileReservedInfo == null) { - return; - } - if (!StringUtils.equals(dto.getMemberId(), pileReservedInfo.getMemberId())) { - return; - } - // 校验通过可以修改预约 - pileReservedInfo.setStatus(Constants.ZERO); - pileReservedInfoMapper.updateByPrimaryKeySelective(pileReservedInfo); - } - - /** - * 校验时间是否重叠 - * @param memberId - * @param pileSn - * @param startTime - * @param endTime - * @param reservationId - * @return - */ - public boolean isTimeSlotAvailable(String memberId, String pileSn, Time startTime, Time endTime, Integer reservationId) { - List reservations = pileReservedInfoMapper.findByMemberIdAndPileSnAndStatus(memberId, pileSn, "1"); - LocalTime newStartTime = startTime.toLocalTime(); - LocalTime newEndTime = endTime.toLocalTime(); - - for (PileReservedInfo res : reservations) { - if (res.getId().equals(reservationId)) { - continue; // Skip the current reservation if updating - } - LocalTime existingStartTime = res.getStartTime().toLocalTime(); - LocalTime existingEndTime = res.getEndTime().toLocalTime(); - - if (newStartTime.isBefore(existingEndTime) && newEndTime.isAfter(existingStartTime)) { - return false; // Time slot overlaps - } - } - return true; - } - - public void saveReservation(PileReservedInfo reservation) { - if (isTimeSlotAvailable(reservation.getMemberId(), reservation.getPileSn(), reservation.getStartTime(), reservation.getEndTime(), reservation.getId())) { - this.updateByPrimaryKeySelective(reservation); - } else { - throw new BusinessException(ReturnCodeEnum.CODE_UPDATE_RESERVED_STATUS_REFUSED); - } - } - - /** - * 根据充电枪口编号发送指令 - * @param pileConnectorCode - */ - @Override - public void pushReservedByPileConnectorCode(String pileConnectorCode) { - // 根据充电枪口编号查询正在生效中的预约 - } -} - diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileReservedInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml similarity index 95% rename from jsowell-pile/src/main/resources/mapper/pile/PileReservedInfoMapper.xml rename to jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml index 278267d78..df74a4dad 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileReservedInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml @@ -1,9 +1,9 @@ - - + + - + @@ -28,17 +28,17 @@ select - from pile_reserved_info + from pile_reservation_info where id = #{id,jdbcType=INTEGER} - delete from pile_reserved_info + delete from pile_reservation_info where id = #{id,jdbcType=INTEGER} - + - insert into pile_reserved_info (member_id, pile_sn, pile_connector_code, + insert into pile_reservation_info (member_id, pile_sn, pile_connector_code, `status`, reserved_type, start_time, end_time, freq, create_by, create_time, update_by, update_time, @@ -49,9 +49,9 @@ #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR}) - + - insert into pile_reserved_info + insert into pile_reservation_info member_id, @@ -135,9 +135,9 @@ - + - update pile_reserved_info + update pile_reservation_info member_id = #{memberId,jdbcType=VARCHAR}, @@ -181,9 +181,9 @@ where id = #{id,jdbcType=INTEGER} - + - update pile_reserved_info + update pile_reservation_info set member_id = #{memberId,jdbcType=VARCHAR}, pile_sn = #{pileSn,jdbcType=VARCHAR}, pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR}, @@ -201,7 +201,7 @@ - update pile_reserved_info + update pile_reservation_info @@ -276,7 +276,7 @@ - update pile_reserved_info + update pile_reservation_info @@ -377,7 +377,7 @@ - insert into pile_reserved_info + insert into pile_reservation_info (member_id, pile_sn, pile_connector_code, `status`, reserved_type, start_time, end_time, freq, create_by, create_time, update_by, update_time, del_flag) values @@ -389,9 +389,9 @@ #{item.delFlag,jdbcType=CHAR}) - + - insert into pile_reserved_info + insert into pile_reservation_info id, @@ -449,9 +449,9 @@ del_flag = #{delFlag,jdbcType=CHAR}, - + - insert into pile_reserved_info + insert into pile_reservation_info id, @@ -591,7 +591,7 @@ select - from pile_reserved_info + from pile_reservation_info where del_flag = '0' and member_id = #{memberId,jdbcType=VARCHAR} and pile_sn = #{pileSn,jdbcType=VARCHAR}