mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 11:05:18 +08:00
Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev
This commit is contained in:
@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
@@ -182,26 +183,26 @@ public class LianLianController extends BaseController {
|
||||
* @param StationIDs
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/query_station_status")
|
||||
public RestApiResponse<?> query_station_status(@RequestBody ArrayList<String> StationIDs) {
|
||||
logger.info("联联平台查询充电站状态信息 params:{}", StationIDs);
|
||||
RestApiResponse<?> response;
|
||||
try {
|
||||
if (CollectionUtils.isEmpty(StationIDs)) {
|
||||
return null;
|
||||
}
|
||||
LianLianPageResponse pageResponse = lianLianService.query_station_status(StationIDs);
|
||||
response = new RestApiResponse<>(pageResponse);
|
||||
}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("/query_station_status")
|
||||
// public RestApiResponse<?> query_station_status(@RequestBody ArrayList<String> StationIDs) {
|
||||
// logger.info("联联平台查询充电站状态信息 params:{}", StationIDs);
|
||||
// RestApiResponse<?> response;
|
||||
// try {
|
||||
// if (CollectionUtils.isEmpty(StationIDs)) {
|
||||
// return null;
|
||||
// }
|
||||
// LianLianPageResponse pageResponse = lianLianService.query_station_status(StationIDs);
|
||||
// response = new RestApiResponse<>(pageResponse);
|
||||
// }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;
|
||||
// }
|
||||
|
||||
/**
|
||||
* 查询统计信息
|
||||
@@ -361,12 +362,46 @@ public class LianLianController extends BaseController {
|
||||
String dataStr = new String(plainText, "UTF-8");
|
||||
// 转换成相应对象
|
||||
QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
|
||||
Map<String, String> map = lianLianService.query_stations_info(dto.getOperatorID(), queryStationInfoDTO);
|
||||
queryStationInfoDTO.setOperatorId(dto.getOperatorID());
|
||||
Map<String, String> map = lianLianService.query_stations_info(queryStationInfoDTO);
|
||||
|
||||
return CommonResult.success(0, "查询充电站信息成功!", map.get("Data"), map.get("Sig"));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
return CommonResult.failed("查询充电站信息发生异常");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 联联平台查询充电站状态信息
|
||||
* http://localhost:8080/LianLian/query_station_status
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/query_station_status")
|
||||
public CommonResult<?> query_station_status(@RequestBody CommonParamsDTO dto) {
|
||||
try {
|
||||
// 校验签名
|
||||
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");
|
||||
// 转换成相应对象
|
||||
QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
|
||||
queryStationInfoDTO.setOperatorId(dto.getOperatorID());
|
||||
Map<String, String> map = lianLianService.query_station_status(queryStationInfoDTO);
|
||||
|
||||
return CommonResult.success(0, "查询充电站状态信息成功!", map.get("Data"), map.get("Sig"));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return CommonResult.failed("查询充电站状态信息发生异常");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user