mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 19:15:35 +08:00
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
This commit is contained in:
@@ -364,22 +364,61 @@ public class LianLianController extends BaseController {
|
||||
* @param startChargeSeq
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/query_equip_charge_status/{startChargeSeq}")
|
||||
public RestApiResponse<?> query_equip_charge_status(@PathVariable("startChargeSeq") String startChargeSeq) {
|
||||
logger.info("联联平台查询充电状态 params :{}", startChargeSeq);
|
||||
RestApiResponse<?> response;
|
||||
// @GetMapping("/query_equip_charge_status/{startChargeSeq}")
|
||||
// public RestApiResponse<?> query_equip_charge_status(@PathVariable("startChargeSeq") String startChargeSeq) {
|
||||
// logger.info("联联平台查询充电状态 params :{}", startChargeSeq);
|
||||
// RestApiResponse<?> response;
|
||||
// try {
|
||||
// QueryChargingStatusVO vo = lianLianService.query_equip_charge_status(startChargeSeq);
|
||||
// response = new RestApiResponse<>(vo);
|
||||
// }catch (BusinessException e) {
|
||||
// logger.error("联联平台查询充电状态 error",e);
|
||||
// response = new RestApiResponse<>(e.getCode(), e.getMessage());
|
||||
// } catch (Exception e) {
|
||||
// logger.error("联联平台查询充电状态 error", e);
|
||||
// response = new RestApiResponse<>(e);
|
||||
// }
|
||||
// logger.info("联联平台查询充电状态 result :{}", response);
|
||||
// return response;
|
||||
// }
|
||||
|
||||
/**
|
||||
* 查询充电状态
|
||||
* http://localhost:8080/LianLian/query_equip_charge_status/{startChargeSeq}
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/v1/query_equip_charge_status")
|
||||
public CommonResult<?> query_equip_charge_status(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
|
||||
logger.info("联联平台查询充电状态 params :{}", JSONObject.toJSONString(dto));
|
||||
try {
|
||||
QueryChargingStatusVO vo = lianLianService.query_equip_charge_status(startChargeSeq);
|
||||
response = new RestApiResponse<>(vo);
|
||||
}catch (BusinessException e) {
|
||||
logger.error("联联平台查询充电状态 error",e);
|
||||
response = new RestApiResponse<>(e.getCode(), e.getMessage());
|
||||
// 校验令牌
|
||||
String token = request.getHeader("Authorization");
|
||||
if (!JWTUtils.checkThirdPartyToken(token)) {
|
||||
// 校验失败
|
||||
return CommonResult.failed("令牌校验错误");
|
||||
}
|
||||
// 校验签名
|
||||
Map<String, String> resultMap = lianLianService.checkoutSign(dto);
|
||||
if (resultMap == null) {
|
||||
// 签名错误
|
||||
return CommonResult.failed("签名校验错误");
|
||||
}
|
||||
String operatorSecret = resultMap.get("OperatorSecret");
|
||||
String dataString = resultMap.get("Data");
|
||||
// 解密data
|
||||
byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), operatorSecret.getBytes(), operatorSecret.getBytes());
|
||||
String dataStr = new String(plainText, "UTF-8");
|
||||
// 转换成相应对象
|
||||
QueryEquipChargeStatusDTO queryEquipChargeStatusDTO = JSONObject.parseObject(dataStr, QueryEquipChargeStatusDTO.class);
|
||||
queryEquipChargeStatusDTO.setOperatorID(dto.getOperatorID());
|
||||
Map<String, String> map = lianLianService.query_equip_charge_status(queryEquipChargeStatusDTO);
|
||||
|
||||
return CommonResult.success(0, "查询充电状态成功!", map.get("Data"), map.get("Sig"));
|
||||
} catch (Exception e) {
|
||||
logger.error("联联平台查询充电状态 error", e);
|
||||
response = new RestApiResponse<>(e);
|
||||
}
|
||||
logger.info("联联平台查询充电状态 result :{}", response);
|
||||
return response;
|
||||
return CommonResult.failed("联联平台查询充电状态发生异常");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -388,22 +427,55 @@ public class LianLianController extends BaseController {
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/query_stop_charge")
|
||||
public RestApiResponse<?> query_stop_charge(@RequestBody QueryStartChargeDTO dto) {
|
||||
// @PostMapping("/query_stop_charge")
|
||||
// public RestApiResponse<?> query_stop_charge(@RequestBody QueryStartChargeDTO dto) {
|
||||
// logger.info("联联平台请求停止充电 params :{}", JSONObject.toJSONString(dto));
|
||||
// RestApiResponse<?> response;
|
||||
// try {
|
||||
// QueryStopChargeVO queryStopChargeVO = lianLianService.query_stop_charge(dto);
|
||||
// response = new RestApiResponse<>(queryStopChargeVO);
|
||||
// }catch (BusinessException e) {
|
||||
// logger.error("联联平台请求停止充电 error",e);
|
||||
// response = new RestApiResponse<>(e.getCode(), e.getMessage());
|
||||
// } catch (Exception e) {
|
||||
// logger.error("联联平台请求停止充电 error", e);
|
||||
// response = new RestApiResponse<>(e);
|
||||
// }
|
||||
// logger.info("联联平台请求停止充电 result :{}", response);
|
||||
// return response;
|
||||
// }
|
||||
|
||||
@PostMapping("/v1/query_stop_charge")
|
||||
public CommonResult<?> query_stop_charge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) {
|
||||
logger.info("联联平台请求停止充电 params :{}", JSONObject.toJSONString(dto));
|
||||
RestApiResponse<?> response;
|
||||
try {
|
||||
QueryStopChargeVO queryStopChargeVO = lianLianService.query_stop_charge(dto);
|
||||
response = new RestApiResponse<>(queryStopChargeVO);
|
||||
}catch (BusinessException e) {
|
||||
logger.error("联联平台请求停止充电 error",e);
|
||||
response = new RestApiResponse<>(e.getCode(), e.getMessage());
|
||||
// 校验令牌
|
||||
String token = request.getHeader("Authorization");
|
||||
if (!JWTUtils.checkThirdPartyToken(token)) {
|
||||
// 校验失败
|
||||
return CommonResult.failed("令牌校验错误");
|
||||
}
|
||||
// 校验签名
|
||||
Map<String, String> resultMap = lianLianService.checkoutSign(dto);
|
||||
if (resultMap == null) {
|
||||
// 签名错误
|
||||
return CommonResult.failed("签名校验错误");
|
||||
}
|
||||
String operatorSecret = resultMap.get("OperatorSecret");
|
||||
String dataString = resultMap.get("Data");
|
||||
// 解密data
|
||||
byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), operatorSecret.getBytes(), operatorSecret.getBytes());
|
||||
String dataStr = new String(plainText, "UTF-8");
|
||||
// 转换成相应对象
|
||||
QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class);
|
||||
queryStartChargeDTO.setOperatorID(dto.getOperatorID());
|
||||
Map<String, String> map = lianLianService.query_stop_charge(queryStartChargeDTO);
|
||||
|
||||
return CommonResult.success(0, "请求停止充电成功!", map.get("Data"), map.get("Sig"));
|
||||
} catch (Exception e) {
|
||||
logger.error("联联平台请求停止充电 error", e);
|
||||
response = new RestApiResponse<>(e);
|
||||
}
|
||||
logger.info("联联平台请求停止充电 result :{}", response);
|
||||
return response;
|
||||
return CommonResult.failed("联联平台请求停止充电发生异常");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user