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

个人桩启动充电

Browse Source
This commit is contained in:
Guoqs
2024-06-20 16:36:25 +08:00
parent c6aa654052
commit 58710aedf3
16 changed files with 213 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java
View File

@@ -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;
}
}

8
jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
View File

@@ -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);

22
jsowell-admin/src/main/java/com/jsowell/service/PileService.java
View File

@@ -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;
}
}