mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-21 19:45:09 +08:00
Merge branch 'dev' of http://192.168.2.46:8099/jsowell/jsowell-charger-web into dev
This commit is contained in:
@@ -153,16 +153,17 @@ public class PersonPileController extends BaseController {
|
||||
@GetMapping("/getPersonalPileList")
|
||||
public RestApiResponse<?> getPersonalPileList(HttpServletRequest request) {
|
||||
RestApiResponse<?> response = null;
|
||||
String memberId = null;
|
||||
try {
|
||||
String memberId = getMemberIdByAuthorization(request);
|
||||
logger.info("通过memberId查个人桩列表 params: {}", memberId);
|
||||
memberId = getMemberIdByAuthorization(request);
|
||||
// logger.info("通过memberId查个人桩列表 params: {}", memberId);
|
||||
List<PersonalPileInfoVO> list = pileBasicInfoService.getPileInfoByMemberId(memberId);
|
||||
response = new RestApiResponse<>(list);
|
||||
} catch (Exception e) {
|
||||
logger.error("通过memberId查个人桩列表异常", e);
|
||||
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_PERSONAL_PILE_BY_MEMBER_ID_ERROR);
|
||||
}
|
||||
logger.info("通过memberId查个人桩列表 result:{}", response);
|
||||
logger.info("通过memberId查个人桩列表, params: {}, result:{}", memberId, response);
|
||||
return response;
|
||||
}
|
||||
|
||||
@@ -179,8 +180,8 @@ public class PersonPileController extends BaseController {
|
||||
public RestApiResponse<?> getConnectorRealTimeInfo(HttpServletRequest request, @RequestBody QueryPersonPileDTO dto) {
|
||||
RestApiResponse<?> response = null;
|
||||
try {
|
||||
String memberId = getMemberIdByAuthorization(request);
|
||||
dto.setMemberId(memberId);
|
||||
// String memberId = getMemberIdByAuthorization(request);
|
||||
// dto.setMemberId(memberId);
|
||||
PersonPileRealTimeVO connectorRealTimeInfo = pileService.getConnectorRealTimeInfo(dto);
|
||||
response = new RestApiResponse<>(connectorRealTimeInfo);
|
||||
} catch (BusinessException e) {
|
||||
|
||||
Reference in New Issue
Block a user