diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java index 4169fd0c4..00171816f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java @@ -9,13 +9,9 @@ import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.StringUtils; -import com.jsowell.pile.dto.CreateReservedDTO; -import com.jsowell.pile.dto.PileReservedDTO; -import com.jsowell.pile.dto.PileMemberBindingDTO; -import com.jsowell.pile.dto.QueryPersonPileDTO; +import com.jsowell.pile.dto.*; import com.jsowell.pile.service.PileBasicInfoService; import com.jsowell.pile.service.PileMerchantInfoService; -import com.jsowell.pile.vo.PileReservedVO; import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO; import com.jsowell.pile.vo.uniapp.PersonPileRealTimeVO; import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; @@ -252,7 +248,27 @@ public class PersonPileController extends BaseController { /** * 个人桩启动充电 + * http://localhost:8080/uniapp/personalPile/startPersonalPileCharging */ + @PostMapping("/startPersonalPileCharging") + public RestApiResponse startPersonalPileCharging(HttpServletRequest request, @RequestBody StartPersonPileDTO dto) { + RestApiResponse response = null; + try { + String memberId = getMemberIdByAuthorization(request); + dto.setMemberId(memberId); + String orderCode = pileService.startPersonalPileCharging(dto); + response = new RestApiResponse<>(ImmutableMap.of("orderCode", orderCode)); + } catch (BusinessException e) { + logger.error("个人桩启动充电error, params:{}", dto, e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); + } catch (Exception e) { + logger.error("个人桩启动充电error, params:{}", dto, e); + response = new RestApiResponse<>(ReturnCodeEnum.CODE_CREATE_RESERVED_ERROR); + } + logger.info("个人桩启动充电params:{}, result:{}", dto, response); + return response; + } + /** * 添加预约充电 @@ -283,7 +299,7 @@ public class PersonPileController extends BaseController { * http://localhost:8080/uniapp/personalPile/queryReservedList */ @PostMapping("/queryReservedList") - public RestApiResponse queryReservedList(HttpServletRequest request, @RequestBody PileReservedDTO dto) { + public RestApiResponse queryReservedList(HttpServletRequest request, @RequestBody PileReservationDTO dto) { // logger.info("修改预约充电状态params:{}", dto); RestApiResponse response = null; try { @@ -307,7 +323,7 @@ public class PersonPileController extends BaseController { * http://localhost:8080/uniapp/personalPile/updateReservedStatus */ @PostMapping("/updateReservedStatus") - public RestApiResponse updateReservedStatus(HttpServletRequest request, @RequestBody PileReservedDTO dto) { + public RestApiResponse updateReservedStatus(HttpServletRequest request, @RequestBody PileReservationDTO dto) { // logger.info("修改预约充电状态params:{}", dto); RestApiResponse response = null; try { @@ -326,5 +342,29 @@ public class PersonPileController extends BaseController { return response; } + /** + * 删除预约 + * http://localhost:8080/uniapp/personalPile/deleteReservation + */ + @PostMapping("/deleteReservation") + public RestApiResponse deleteReservation(HttpServletRequest request, @RequestBody PileReservationDTO dto) { + // logger.info("修改预约充电状态params:{}", dto); + RestApiResponse response = null; + try { + String memberId = getMemberIdByAuthorization(request); + dto.setMemberId(memberId); + pileService.deleteReservation(dto); + response = new RestApiResponse<>(); + } catch (BusinessException e) { + logger.error("修改预约充电状态error, params:{}", dto, e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); + } catch (Exception e) { + logger.error("修改预约充电状态error, params:{}", dto, e); + response = new RestApiResponse<>(ReturnCodeEnum.CODE_UPDATE_RESERVED_STATUS_ERROR); + } + logger.info("修改预约充电状态params:{}, result:{}", dto, response); + return response; + } + } diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index 81e435b98..194150aa4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -4,17 +4,15 @@ import com.alibaba.fastjson2.JSON; import com.jsowell.adapay.dto.BalancePaymentRequestDTO; import com.jsowell.adapay.service.AdapayService; import com.jsowell.common.annotation.Anonymous; -import com.jsowell.common.constant.Constants; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; -import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.DateUtils; import com.jsowell.pile.domain.AdapayMemberAccount; import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.domain.OrderBasicInfo; -import com.jsowell.pile.domain.ykcCommond.ReservedChargingCommand; +import com.jsowell.pile.domain.ykcCommond.ReservationChargingCommand; import com.jsowell.pile.dto.ApplyRefundDTO; import com.jsowell.pile.dto.CarVinDTO; import com.jsowell.pile.dto.QueryOrderDTO; @@ -81,12 +79,12 @@ public class TempController extends BaseController { * http://localhost:8080/temp/reservedChargingTest */ @PostMapping("reservedChargingTest") - public RestApiResponse reservedChargingTest(@RequestBody ReservedChargingCommand command) { + public RestApiResponse reservedChargingTest(@RequestBody ReservationChargingCommand command) { logger.info("发送预约充电指令, command:{}", JSON.toJSONString(command)); RestApiResponse response = null; try { // 发送预约充电指令 - pileRemoteService.reservedCharging(command); + pileRemoteService.reservationCharging(command); response = new RestApiResponse<>(ReturnCodeEnum.CODE_SUCCESS); } catch (BusinessException e) { logger.warn("预约充电测试warn", e); 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 8c5d21bf3..3de3a2a9b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -561,7 +561,7 @@ public class PileService { * 修改预约充电状态 * @param dto */ - public void updateReservedStatus(PileReservedDTO dto) { + public void updateReservedStatus(PileReservationDTO dto) { if (StringUtils.equals(dto.getStatus(), Constants.ZERO)) { // 停用 pileReservationInfoService.deactivateReserved(dto); @@ -582,10 +582,10 @@ public class PileService { // reservedInfo.setEndTime(DateUtils.parseDate(dto.getEndTime())); reservedInfo.setEndTime(Time.valueOf(dto.getEndTime())); if (StringUtils.isNotBlank(dto.getFreq())) { - reservedInfo.setReservedType("recurring"); + reservedInfo.setReservationType("recurring"); reservedInfo.setFreq(dto.getFreq()); } else { - reservedInfo.setReservedType("single"); + reservedInfo.setReservationType("single"); reservedInfo.setFreq(null); } reservedInfo.setCreateBy(dto.getMemberId()); @@ -593,7 +593,7 @@ public class PileService { return reservedInfo.getId(); } - public PageResponse queryReservedList(PileReservedDTO dto) { + public PageResponse queryReservedList(PileReservationDTO dto) { int pageNo = dto.getPageNo() == null ? Constants.one : dto.getPageNo(); int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize(); PageHelper.startPage(pageNo, pageSize); @@ -622,4 +622,18 @@ public class PileService { pageResponse.setList(resultList); return pageResponse; } + + public void deleteReservation(PileReservationDTO dto) { + pileReservationInfoService.deleteReservation(dto); + } + + /** + * 个人桩启动充电 + * @param dto + * @return + */ + public String startPersonalPileCharging(StartPersonPileDTO dto) { + String orderCode = ""; + return orderCode; + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservationInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservationInfo.java index e8ea0a38b..2cc088337 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservationInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservationInfo.java @@ -45,7 +45,7 @@ public class PileReservationInfo { /** * 预约类型,单次 (single) 或周期性 (recurring) */ - private String reservedType; + private String reservationType; /** * 预约开始时间 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservedChargingCommand.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservationChargingCommand.java similarity index 96% rename from jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservedChargingCommand.java rename to jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservationChargingCommand.java index c9483e186..b5dfb58a0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservedChargingCommand.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ykcCommond/ReservationChargingCommand.java @@ -17,7 +17,7 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor @Builder -public class ReservedChargingCommand { +public class ReservationChargingCommand { /** * 交易流水号 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileReservedDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileReservationDTO.java similarity index 96% rename from jsowell-pile/src/main/java/com/jsowell/pile/dto/PileReservedDTO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/dto/PileReservationDTO.java index 29fbe6e45..056097d81 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileReservedDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileReservationDTO.java @@ -7,7 +7,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; @Getter @Setter -public class PileReservedDTO { +public class PileReservationDTO { /** * 会员id */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryPersonPileDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryPersonPileDTO.java index 19b63696c..a69ffab64 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryPersonPileDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryPersonPileDTO.java @@ -1,6 +1,8 @@ package com.jsowell.pile.dto; import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 查询个人桩相关信息DTO @@ -34,4 +36,15 @@ public class QueryPersonPileDTO { private Integer pageNum; + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) + .append("memberId", memberId) + .append("pileConnectorCode", pileConnectorCode) + .append("startTime", startTime) + .append("endTime", endTime) + .append("pageSize", pageSize) + .append("pageNum", pageNum) + .toString(); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/StartPersonPileDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/StartPersonPileDTO.java new file mode 100644 index 000000000..8a6c4f40b --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/StartPersonPileDTO.java @@ -0,0 +1,24 @@ +package com.jsowell.pile.dto; + +import lombok.Data; + +@Data +public class StartPersonPileDTO { + + /** + * 充电桩枪口编号 + */ + private String pileConnectorCode; + + /** + * 启动类型 + * @see com.jsowell.common.enums.ykc.StartTypeEnum + */ + private String startType; + + private String memberId; + + private String startTime; + + private String endTime; +} 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 89fecc2db..da44e5ff2 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 @@ -32,4 +32,6 @@ public interface PileReservationInfoMapper { List findByMemberIdAndPileSnAndStatus(@Param("memberId") String memberId, @Param("pileSn") String pileSn, @Param("status") String status); List findByMemberIdAndPileSn(@Param("memberId") String memberId, @Param("pileSn") String pileSn); + + PileReservationInfo selectActiveReservationByPileConnectorCode(String pileConnectorCode); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java index 8537856db..1cbb1532c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileRemoteService.java @@ -2,7 +2,6 @@ package com.jsowell.pile.service; import com.google.common.collect.Lists; import com.jsowell.common.constant.CacheConstants; -import com.jsowell.common.constant.Constants; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; @@ -290,7 +289,7 @@ public class PileRemoteService { /** * 预约充电指令 */ - public void reservedCharging(ReservedChargingCommand command) { - ykcPushCommandService.pushReservedChargingCommand(command); + public void reservationCharging(ReservationChargingCommand command) { + ykcPushCommandService.pushReservationChargingCommand(command); } } 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 d56dd0ef5..516535ae4 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 @@ -2,7 +2,7 @@ package com.jsowell.pile.service; import java.util.List; -import com.jsowell.pile.dto.PileReservedDTO; +import com.jsowell.pile.dto.PileReservationDTO; import com.jsowell.pile.domain.PileReservationInfo; public interface PileReservationInfoService { @@ -34,13 +34,13 @@ public interface PileReservationInfoService { * 启动预约 * @param dto */ - void activateReserved(PileReservedDTO dto); + void activateReserved(PileReservationDTO dto); /** * 关闭预约 * @param dto */ - void deactivateReserved(PileReservedDTO dto); + void deactivateReserved(PileReservationDTO dto); /** * 根据充电枪口编号发送预约指令 @@ -53,5 +53,7 @@ public interface PileReservationInfoService { * @param pileConnectorCode */ void cancelOneTimeReservation(String pileConnectorCode); + + void deleteReservation(PileReservationDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java index d98742e90..c727f047c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/YKCPushCommandService.java @@ -82,5 +82,5 @@ public interface YKCPushCommandService { * 发送预约充电命令 * @param command */ - void pushReservedChargingCommand(ReservedChargingCommand command); + void pushReservationChargingCommand(ReservationChargingCommand command); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 6569560b0..0b81b6aa7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -37,7 +37,7 @@ import com.jsowell.common.util.bean.BeanUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.common.util.id.SnowflakeIdWorker; import com.jsowell.pile.domain.*; -import com.jsowell.pile.domain.ykcCommond.ReservedChargingCommand; +import com.jsowell.pile.domain.ykcCommond.ReservationChargingCommand; import com.jsowell.pile.dto.*; import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO; import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO; @@ -3118,7 +3118,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { * 异步发送预约充电指令 */ if (StringUtils.equals(orderInfo.getStartType(), StartTypeEnum.RESERVED.getValue())) { - ReservedChargingCommand command = ReservedChargingCommand.builder() + ReservationChargingCommand command = ReservationChargingCommand.builder() .transactionCode(orderInfo.getTransactionCode()) .pileSn(orderInfo.getPileSn()) .connectorCode(orderInfo.getConnectorCode()) @@ -3129,7 +3129,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .build(); // 发送预约充电指令 logger.info("订单:{}支付成功, 发送预约充电指令, command:{}", dto.getOrderCode(), JSON.toJSONString(command)); - pileRemoteService.reservedCharging(command); + pileRemoteService.reservationCharging(command); } if (OrderStatusEnum.STAY_RETROACTIVE_AMOUNT.getValue().equals(orderInfo.getOrderStatus())) { 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 fe7741416..3d98afd7f 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 @@ -1,27 +1,36 @@ package com.jsowell.pile.service.impl; import com.jsowell.common.constant.Constants; +import com.jsowell.common.enums.DelFlagEnum; 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 com.jsowell.pile.dto.PileReservationDTO; +import com.jsowell.pile.service.PileRemoteService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.sql.Time; import java.time.LocalTime; import java.util.List; +import java.util.Objects; import com.jsowell.pile.mapper.PileReservationInfoMapper; import com.jsowell.pile.domain.PileReservationInfo; import com.jsowell.pile.service.PileReservationInfoService; +@Slf4j @Service public class PileReservationInfoServiceImpl implements PileReservationInfoService { @Resource private PileReservationInfoMapper pileReservationInfoMapper; + @Autowired + private PileRemoteService pileRemoteService; + @Override public int deleteByPrimaryKey(Integer id) { return pileReservationInfoMapper.deleteByPrimaryKey(id); @@ -86,7 +95,7 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic * 启用预约 */ @Override - public void activateReserved(PileReservedDTO dto) { + public void activateReserved(PileReservationDTO dto) { PileReservationInfo pileReservationInfo = pileReservationInfoMapper.selectByPrimaryKey(Integer.parseInt(dto.getReservedId())); if (pileReservationInfo == null) { return; @@ -103,7 +112,7 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic * 禁用预约 */ @Override - public void deactivateReserved(PileReservedDTO dto) { + public void deactivateReserved(PileReservationDTO dto) { PileReservationInfo pileReservationInfo = pileReservationInfoMapper.selectByPrimaryKey(Integer.parseInt(dto.getReservedId())); if (pileReservationInfo == null) { return; @@ -159,6 +168,12 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic @Override public void pushReservedByPileConnectorCode(String pileConnectorCode) { // 根据充电枪口编号查询正在生效中的预约 + PileReservationInfo pileReservationInfo = pileReservationInfoMapper.selectActiveReservationByPileConnectorCode(pileConnectorCode); + if (Objects.isNull(pileReservationInfo)) { + return; + } + + // 生成个人桩订单 } /** @@ -169,5 +184,18 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic public void cancelOneTimeReservation(String pileConnectorCode) { // 根据充电枪口编号查询仅一次正在生效中的预约 } + + @Override + public void deleteReservation(PileReservationDTO dto) { + PileReservationInfo pileReservationInfo = pileReservationInfoMapper.selectByPrimaryKey(Integer.valueOf(dto.getReservedId())); + if (Objects.isNull(pileReservationInfo)) { + return; + } + if (!StringUtils.equals(pileReservationInfo.getMemberId(), dto.getMemberId())) { + return; + } + pileReservationInfo.setDelFlag(DelFlagEnum.DELETE.getValue()); + pileReservationInfoMapper.updateByPrimaryKey(pileReservationInfo); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java index 54124d4ef..49b1e02b2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java @@ -482,7 +482,7 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { * @param command */ @Override - public void pushReservedChargingCommand(ReservedChargingCommand command) { + public void pushReservationChargingCommand(ReservationChargingCommand command) { // 交易流水号 String transactionCode = command.getTransactionCode(); byte[] transactionCodeArr = BytesUtil.str2Bcd(transactionCode); diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml index df74a4dad..a29fb3c7e 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileReservationInfoMapper.xml @@ -9,7 +9,7 @@ - + @@ -21,7 +21,7 @@ - id, member_id, pile_sn, pile_connector_code, `status`, reserved_type, start_time, + id, member_id, pile_sn, pile_connector_code, `status`, reservation_type, start_time, end_time, freq, create_by, create_time, update_by, update_time, del_flag + + \ No newline at end of file