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

Merge branch 'dev' of http://192.168.2.46:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2024-07-30 14:19:40 +08:00
parent 01fb1e7b2a 3308554a70
commit 9edd3d9933
44 changed files with 1065 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java
View File

@@ -50,7 +50,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/generateOrder")
public RestApiResponse<?> generateOrder(HttpServletRequest request, @RequestBody GenerateOrderDTO dto) {
logger.info("生成订单 param:{}", JSON.toJSONString(dto));
// logger.info("生成订单 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response;
try {
if ((StringUtils.isBlank(dto.getPileSn()) || StringUtils.isBlank(dto.getConnectorCode())) && StringUtils.isBlank(dto.getPileConnectorCode())) {
@@ -80,7 +80,7 @@ public class OrderController extends BaseController {
logger.error("生成订单 error, param:{}", JSON.toJSONString(dto), e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GENERATE_ORDER_ERROR);
}
logger.info("生成订单 result:{}", JSON.toJSONString(response));
logger.info("生成订单, param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response;
}
@@ -137,7 +137,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/getOrderList")
public RestApiResponse<?> getOrderInfo(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
logger.info("查询订单信息 param:{}", JSON.toJSONString(dto));
// logger.info("查询订单信息 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -154,7 +154,7 @@ public class OrderController extends BaseController {
logger.error("查询订单信息 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_INFO_BY_MEMBER_ID_ERROR);
}
logger.info("查询订单信息, result:{}", JSON.toJSONString(response));
logger.info("查询订单信息, param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response;
}
@@ -167,7 +167,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/getOrderDetail")
public RestApiResponse<?> getOrderDetail(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
logger.info("小程序获取订单详情 param:{}", JSON.toJSONString(dto));
// logger.info("小程序获取订单详情 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -194,27 +194,27 @@ public class OrderController extends BaseController {
* @param dto
* @return
*/
@PostMapping("/getOrderDetailV2")
public RestApiResponse<?> getOrderDetailV2(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
logger.info("小程序获取订单详情V2 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
if (StringUtils.isBlank(memberId)) {
throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
}
UniAppOrderDetailVO uniAppOrderDetail = orderService.getUniAppOrderDetailV2(dto.getOrderCode());
response = new RestApiResponse<>(uniAppOrderDetail);
} catch (BusinessException e) {
logger.warn("小程序获取订单详情V2 warn", e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("小程序获取订单详情V2 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_DETAIL_ERROR);
}
logger.info("小程序获取订单详情V2, result:{}", JSON.toJSONString(response));
return response;
}
// @PostMapping("/getOrderDetailV2")
// public RestApiResponse<?> getOrderDetailV2(HttpServletRequest request, @RequestBody UniAppQueryOrderDTO dto) {
// logger.info("小程序获取订单详情V2 param:{}", JSON.toJSONString(dto));
// RestApiResponse<?> response = null;
// try {
// String memberId = getMemberIdByAuthorization(request);
// if (StringUtils.isBlank(memberId)) {
// throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
// }
// UniAppOrderDetailVO uniAppOrderDetail = orderService.getUniAppOrderDetailV2(dto.getOrderCode());
// response = new RestApiResponse<>(uniAppOrderDetail);
// } catch (BusinessException e) {
// logger.warn("小程序获取订单详情V2 warn", e);
// response = new RestApiResponse<>(e.getCode(), e.getMessage());
// } catch (Exception e) {
// logger.error("小程序获取订单详情V2 error", e);
// response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_ORDER_DETAIL_ERROR);
// }
// logger.info("小程序获取订单详情V2, result:{}", JSON.toJSONString(response));
// return response;
// }
/**
* 根据订单号查询充电桩启动状态
@@ -268,7 +268,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/closeStartFailedOrder")
public RestApiResponse<?> closeStartFailedOrder(@RequestBody QueryOrderDTO dto) {
logger.info("关闭支付未启动的订单 param:{}", JSON.toJSONString(dto));
// logger.info("关闭支付未启动的订单 param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
orderService.closeStartFailedOrder(dto);
@@ -277,7 +277,7 @@ public class OrderController extends BaseController {
logger.error("关闭支付未启动的订单 error", e);
response = new RestApiResponse<>("00300002", "关闭支付未启动的订单异常");
}
logger.info("关闭支付未启动的订单 result:{}", response);
logger.info("关闭支付未启动的订单, param:{}, result:{}", JSON.toJSONString(dto), response);
return response;
}
@@ -305,6 +305,7 @@ public class OrderController extends BaseController {
logger.error("查询未开发票订单 error", e);
response = new RestApiResponse<>("00300003", "查询未开发票订单异常");
}
logger.info("查询未开发票订单 param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response;
}
@@ -317,7 +318,7 @@ public class OrderController extends BaseController {
*/
@PostMapping("/queryUninvoicedStationList")
public RestApiResponse<?> queryUninvoicedStationList(HttpServletRequest request, @RequestBody QueryOrderDTO dto) {
logger.info("查询未开发票的站点list param:{}", JSON.toJSONString(dto));
// logger.info("查询未开发票的站点list param:{}", JSON.toJSONString(dto));
RestApiResponse<?> response;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -334,6 +335,7 @@ public class OrderController extends BaseController {
logger.error("查询未开发票的站点list error", e);
response = new RestApiResponse<>("00300004", "查询未开发票的站点list异常");
}
logger.info("查询未开发票的站点list param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response;
}

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

@@ -13,6 +13,8 @@ import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.PileBasicInfoService;
import com.jsowell.pile.service.PileMerchantInfoService;
import com.jsowell.pile.service.PileReservationInfoService;
import com.jsowell.pile.vo.PileReservationInfoVO;
import com.jsowell.pile.vo.uniapp.customer.PersonPileConnectorSumInfoVO;
import com.jsowell.pile.vo.uniapp.customer.PersonPileRealTimeVO;
import com.jsowell.pile.vo.uniapp.customer.PersonalPileInfoVO;
@@ -43,6 +45,9 @@ public class PersonPileController extends BaseController {
@Autowired
private PileBasicInfoService pileBasicInfoService;
@Autowired
private PileReservationInfoService pileReservationInfoService;
/**
* 用户绑定个人桩
@@ -117,7 +122,7 @@ public class PersonPileController extends BaseController {
if (StringUtils.isNotBlank(appId)) {
String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByWxAppId(appId);
if (StringUtils.isNotBlank(firstLevelMerchantId)) {
dto.setMerchantId(firstLevelMerchantId);
dto.setFirstLevelMerchantId(firstLevelMerchantId);
}
}
String memberId = getMemberIdByAuthorization(request);
@@ -136,6 +141,8 @@ public class PersonPileController extends BaseController {
}
/**
* 通过memberId查个人桩列表
* <p>
@@ -162,7 +169,6 @@ public class PersonPileController extends BaseController {
/**
* 获取枪口实时数据
* <p>
* http://localhost:8080/uniapp/personalPile/getConnectorRealTimeInfo
*
* @param request
@@ -171,7 +177,6 @@ public class PersonPileController extends BaseController {
*/
@PostMapping("/getConnectorRealTimeInfo")
public RestApiResponse<?> getConnectorRealTimeInfo(HttpServletRequest request, @RequestBody QueryPersonPileDTO dto) {
logger.info("获取个人桩枪口实时数据 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
@@ -179,13 +184,13 @@ public class PersonPileController extends BaseController {
PersonPileRealTimeVO connectorRealTimeInfo = pileService.getConnectorRealTimeInfo(dto);
response = new RestApiResponse<>(connectorRealTimeInfo);
} catch (BusinessException e) {
logger.error("获取个人桩枪口实时数据 error", e);
logger.error("获取个人桩枪口实时数据 warn:{}", e.getMessage());
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("获取个人桩枪口实时数据 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_PERSONAL_PILE_CONNECTOR_INFO_ERROR);
}
logger.info("获取个人桩枪口实时数据 result:{}", response);
logger.info("获取个人桩枪口实时数据 params:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response));
return response;
}
@@ -248,7 +253,7 @@ public class PersonPileController extends BaseController {
}
/**
* 个人桩启动充电
* 个人桩启动充电/个人桩一键启动
* http://localhost:8080/uniapp/personalPile/startPersonalPileCharging
*/
@PostMapping("/startPersonalPileCharging")
@@ -268,25 +273,56 @@ public class PersonPileController extends BaseController {
logger.error("个人桩启动充电error, params:{}", dto, e);
} catch (Exception e) {
logger.error("个人桩启动充电error, params:{}", dto, e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_CREATE_RESERVED_ERROR);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_START_PERSONAL_PILE_CHARGING_ERROR);
}
logger.info("个人桩启动充电params:{}, result:{}", dto, response);
return response;
}
/**
* 个人桩停止充电
* http://localhost:8080/uniapp/personalPile/personPileStopCharging
* 管理员可以停自己启动的和别人启动的
* 其他人员只能停止自己启动的
*/
@PostMapping("/personPileStopCharging")
public RestApiResponse<?> personPileStopCharging(HttpServletRequest request, @RequestBody PersonPileStopChargingDTO dto) {
RestApiResponse<?> response = null;
try {
String appId = request.getHeader("appId");
if (StringUtils.isNotBlank(appId)) {
String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByWxAppId(appId);
if (StringUtils.isNotBlank(firstLevelMerchantId)) {
dto.setFirstLevelMerchantId(firstLevelMerchantId);
}
}
String memberId = getMemberIdByAuthorization(request);
dto.setMemberId(memberId);
pileReservationInfoService.personPileStopCharging(dto);
response = new RestApiResponse<>();
} catch (BusinessException e) {
logger.error("个人桩停止充电error", e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("个人桩停止充电error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_PERSON_PILE_STOP_CHARGING_ERROR);
}
return response;
}
/**
* 添加预约充电
* http://localhost:8080/uniapp/personalPile/createReserved
*/
@PostMapping("/createReserved")
public RestApiResponse<?> createReserved(HttpServletRequest request, @RequestBody CreateReservedDTO dto) {
// logger.info("修改预约充电状态params:{}", dto);
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
dto.setMemberId(memberId);
int reservedId = pileService.createReserved(dto);
int reservedId = pileReservationInfoService.createReservation(dto);
response = new RestApiResponse<>(ImmutableMap.of("reservedId", reservedId));
} catch (BusinessException e) {
logger.error("添加预约充电error, params:{}", dto, e);
@@ -305,12 +341,11 @@ public class PersonPileController extends BaseController {
*/
@PostMapping("/queryReservedList")
public RestApiResponse<?> queryReservedList(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
// logger.info("修改预约充电状态params:{}", dto);
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
dto.setMemberId(memberId);
PageResponse pageResponse = pileService.queryReservedList(dto);
PageResponse pageResponse = pileReservationInfoService.queryReservationList(dto);
response = new RestApiResponse<>(pageResponse);
} catch (BusinessException e) {
logger.error("查询预约列表error, params:{}", dto, e);
@@ -323,18 +358,40 @@ public class PersonPileController extends BaseController {
return response;
}
/**
* 修改预约充电
* http://localhost:8080/uniapp/personalPile/updateReservation
*/
@PostMapping("/updateReservation")
public RestApiResponse<?> updateReservation(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
dto.setMemberId(memberId);
pileReservationInfoService.updateReservation(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;
}
/**
* 修改预约充电状态
* http://localhost:8080/uniapp/personalPile/updateReservedStatus
*/
@PostMapping("/updateReservedStatus")
public RestApiResponse<?> updateReservedStatus(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
// logger.info("修改预约充电状态params:{}", dto);
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
dto.setMemberId(memberId);
pileService.updateReservedStatus(dto);
pileReservationInfoService.updateReservationStatus(dto);
response = new RestApiResponse<>();
} catch (BusinessException e) {
logger.error("修改预约充电状态error, params:{}", dto, e);
@@ -353,23 +410,43 @@ public class PersonPileController extends BaseController {
*/
@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);
pileReservationInfoService.deleteReservation(dto);
response = new RestApiResponse<>();
} catch (BusinessException e) {
logger.error("修改预约充电状态error, params:{}", dto, e);
logger.error("删除预约error, params:{}", dto, e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("修改预约充电状态error, params:{}", dto, e);
logger.error("删除预约error, params:{}", dto, e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_UPDATE_RESERVED_STATUS_ERROR);
}
logger.info("修改预约充电状态params:{}, result:{}", dto, response);
logger.info("删除预约params:{}, result:{}", dto, response);
return response;
}
/**
* 根据充电桩查询预约信息
* http://localhost:8080/uniapp/personalPile/queryReservationInfo
*/
@PostMapping("/queryReservationInfo")
public RestApiResponse<?> queryReservationInfo(HttpServletRequest request, @RequestBody PileReservationDTO dto) {
RestApiResponse<?> response = null;
try {
String memberId = getMemberIdByAuthorization(request);
dto.setMemberId(memberId);
PileReservationInfoVO vo = pileReservationInfoService.queryReservationInfo(dto);
response = new RestApiResponse<>(vo);
} 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_QUERY_RESERVATION_STATUS_ERROR);
}
logger.info("根据充电桩查询预约状态params:{}, result:{}", dto, response);
return response;
}
}