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

update 修改对接第三方平台的枪口状态

Browse Source
This commit is contained in:
Guoqs
2024-06-17 13:39:50 +08:00
parent 6daf71d813
commit 27c199617e
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.jsowell.common.UserAgentUtils;
import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.constant.Constants; import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.controller.BaseController;
@@ -67,6 +68,9 @@ public class OrderController extends BaseController {
dto.setMemberId(memberId); dto.setMemberId(memberId);
// 生成订单 // 生成订单
dto.setStartMode(Constants.ONE); // 启动方式 1-app启动 dto.setStartMode(Constants.ONE); // 启动方式 1-app启动
// 请求来源
dto.setRequestSource(UserAgentUtils.determineRequestSource(request));
String orderCode = orderService.generateOrderV2(dto); String orderCode = orderService.generateOrderV2(dto);
response = new RestApiResponse<>(ImmutableMap.of("orderCode", orderCode)); response = new RestApiResponse<>(ImmutableMap.of("orderCode", orderCode));
} catch (BusinessException e) { } catch (BusinessException e) {

12
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java
View File

@@ -143,12 +143,12 @@ public class PileController extends BaseController {
public RestApiResponse<?> selectStationConnectorList(HttpServletRequest request, @RequestBody QueryConnectorListDTO dto) { public RestApiResponse<?> selectStationConnectorList(HttpServletRequest request, @RequestBody QueryConnectorListDTO dto) {
logger.info("查询充电枪口列表 params:{}", JSON.toJSONString(dto)); logger.info("查询充电枪口列表 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null; RestApiResponse<?> response = null;
try { // try {
// 查询对接第三方平台的枪口状态 // // 查询对接第三方平台的枪口状态
selectThirdPartyConnectorStatus(dto); // selectThirdPartyConnectorStatus(dto);
} catch (Exception e) { // } catch (Exception e) {
logger.error("修改对接第三方平台的枪口状态 error"); // logger.error("修改对接第三方平台的枪口状态 error");
} // }
try { try {
PageResponse pageResponse = pileConnectorInfoService.selectStationConnectorList(dto); PageResponse pageResponse = pileConnectorInfoService.selectStationConnectorList(dto);

12
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java
View File

@@ -83,12 +83,12 @@ public class PileConnectorInfoController extends BaseController {
@PostMapping("/getConnectorInfoListByParams") @PostMapping("/getConnectorInfoListByParams")
public TableDataInfo getConnectorInfoListByParams(@RequestBody QueryConnectorListDTO dto) { public TableDataInfo getConnectorInfoListByParams(@RequestBody QueryConnectorListDTO dto) {
logger.info("查询接口列表 param:{}", JSON.toJSONString(dto)); logger.info("查询接口列表 param:{}", JSON.toJSONString(dto));
try { // try {
// 修改对接第三方平台的枪口状态 // // 修改对接第三方平台的枪口状态
selectThirdPartyConnectorStatus(dto); // selectThirdPartyConnectorStatus(dto);
} catch (Exception e) { // } catch (Exception e) {
logger.error("修改对接第三方平台的枪口状态 error"); // logger.error("修改对接第三方平台的枪口状态 error");
} // }
List<PileConnectorInfoVO> list = pileConnectorInfoService.getConnectorInfoListByParams(dto); List<PileConnectorInfoVO> list = pileConnectorInfoService.getConnectorInfoListByParams(dto);
logger.info("查询接口列表 result:{}", JSON.toJSONString(list)); logger.info("查询接口列表 result:{}", JSON.toJSONString(list));
return getDataTable(list); return getDataTable(list);

5
jsowell-common/src/main/java/com/jsowell/common/core/domain/BaseEntity.java
View File

@@ -60,6 +60,11 @@ public class BaseEntity implements Serializable {
// 有权限的站点 // 有权限的站点
private List<String> stationDeptIds; private List<String> stationDeptIds;
/**
* 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
*/
private String requestSource;
public String getSearchValue() { public String getSearchValue() {
return searchValue; return searchValue;
} }