diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java index 2ab5c55f6..129c655c5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java @@ -38,16 +38,10 @@ import java.util.Map; @RequestMapping("/LianLian") public class LianLianController extends ThirdPartyBaseController { - // @Autowired - // private LianLianService lianLianService; - @Autowired @Qualifier("lianLianPlatformServiceImpl") private ThirdPartyPlatformService lianLianService; - @Autowired - private ThirdPartyPlatformConfigService thirdPartyPlatformConfigService; - /** * 获取token接口 * http://localhost:8080/LianLian/v1/query_token @@ -56,7 +50,6 @@ public class LianLianController extends ThirdPartyBaseController { public CommonResult queryToken(@RequestBody CommonParamsDTO dto) { logger.info("联联平台请求令牌 params:{}", JSON.toJSONString(dto)); try { - // Map map = lianLianService.generateToken(dto); Map map = lianLianService.queryToken(dto); logger.info("联联平台请求令牌 result:{}", JSON.toJSONString(map)); return CommonResult.success(0, "请求令牌成功!", map.get("Data"), map.get("Sig")); @@ -77,39 +70,23 @@ public class LianLianController extends ThirdPartyBaseController { logger.info("联联平台查询充电站信息 params:{}", JSON.toJSONString(dto)); try { // 校验令牌 - String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(token)) { + boolean verifyToken = verifyToken(request.getHeader("Authorization")); + if (!verifyToken) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + // 校验签名 - // Map resultMap = lianLianService.checkoutSign(dto); - // if (resultMap == null) { - // // 签名错误 - // return CommonResult.failed("签名校验错误"); - // } - // String operatorSecret = resultMap.get("OperatorSecret"); - // String dataString = resultMap.get("Data"); - // String dataSecret = resultMap.get("DataSecret"); - // String dataSecretIV = resultMap.get("DataSecretIV"); + boolean verifySign = verifySign(dto); + if (!verifySign) { + // 签名错误 + return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR); + } - // 查询配置信息 - ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID()); - String operatorSecret = platformConfig.getOperatorSecret(); - String dataString = dto.getData(); - String dataSecret = platformConfig.getDataSecret(); - String dataSecretIV = platformConfig.getDataSecretIv(); - - // 解密data - byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes()); - String dataStr = new String(plainText, StandardCharsets.UTF_8); - // 转换成相应对象 - QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class); - queryStationInfoDTO.setOperatorId(dto.getOperatorID()); - // Map map = lianLianService.query_stations_info(queryStationInfoDTO); - - QueryOperatorInfoDTO paramDTO = parseParamsDTO(dto, QueryOperatorInfoDTO.class); + // 解析入参 + QueryStationInfoDTO queryStationInfoDTO = parseParamsDTO(dto, QueryStationInfoDTO.class); + // 执行逻辑 Map map = lianLianService.queryStationsInfo(queryStationInfoDTO); return CommonResult.success(0, "查询充电站信息成功!", map.get("Data"), map.get("Sig")); @@ -131,36 +108,23 @@ public class LianLianController extends ThirdPartyBaseController { logger.info("联联平台查询充电站状态信息 params:{}", JSON.toJSONString(dto)); try { // 校验令牌 - String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(token)) { + boolean verifyToken = verifyToken(request.getHeader("Authorization")); + if (!verifyToken) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + // 校验签名 - // Map resultMap = lianLianService.checkoutSign(dto); - // if (resultMap == null) { - // // 签名错误 - // return CommonResult.failed("签名校验错误"); - // } - // String operatorSecret = resultMap.get("OperatorSecret"); - // String dataString = resultMap.get("Data"); - // String dataSecret = resultMap.get("DataSecret"); - // String dataSecretIV = resultMap.get("DataSecretIV"); + boolean verifySign = verifySign(dto); + if (!verifySign) { + // 签名错误 + return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR); + } - // 查询配置信息 - ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID()); - String operatorSecret = platformConfig.getOperatorSecret(); - String dataString = dto.getData(); - String dataSecret = platformConfig.getDataSecret(); - String dataSecretIV = platformConfig.getDataSecretIv(); + // 解析入参 + QueryStationInfoDTO queryStationInfoDTO = parseParamsDTO(dto, QueryStationInfoDTO.class); - // 解密data - byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes()); - String dataStr = new String(plainText, StandardCharsets.UTF_8); - // 转换成相应对象 - QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class); - queryStationInfoDTO.setOperatorId(dto.getOperatorID()); - // Map map = lianLianService.query_station_status(queryStationInfoDTO); + // 执行逻辑 Map map = lianLianService.queryStationStatus(queryStationInfoDTO); return CommonResult.success(0, "查询充电站状态信息成功!", map.get("Data"), map.get("Sig")); @@ -183,36 +147,23 @@ public class LianLianController extends ThirdPartyBaseController { logger.info("联联平台查询统计信息 params:{}", JSON.toJSONString(dto)); try { // 校验令牌 - String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(token)) { + boolean verifyToken = verifyToken(request.getHeader("Authorization")); + if (!verifyToken) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + // 校验签名 - // Map resultMap = lianLianService.checkoutSign(dto); - // if (resultMap == null) { - // // 签名错误 - // return CommonResult.failed("签名校验错误"); - // } - // String operatorSecret = resultMap.get("OperatorSecret"); - // String dataString = resultMap.get("Data"); - // String dataSecret = resultMap.get("DataSecret"); - // String dataSecretIV = resultMap.get("DataSecretIV"); + boolean verifySign = verifySign(dto); + if (!verifySign) { + // 签名错误 + return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR); + } - // 查询配置信息 - ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID()); - String operatorSecret = platformConfig.getOperatorSecret(); - String dataString = dto.getData(); - String dataSecret = platformConfig.getDataSecret(); - String dataSecretIV = platformConfig.getDataSecretIv(); + // 解析入参 + QueryStationInfoDTO queryStationInfoDTO = parseParamsDTO(dto, QueryStationInfoDTO.class); - // 解密data - byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes()); - String dataStr = new String(plainText, "UTF-8"); - // 转换成相应对象 - QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class); - queryStationInfoDTO.setOperatorId(dto.getOperatorID()); - // Map map = lianLianService.query_station_stats(queryStationInfoDTO); + // 执行逻辑 Map map = lianLianService.queryStationStats(queryStationInfoDTO); return CommonResult.success(0, "查询统计信息成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { @@ -370,35 +321,23 @@ public class LianLianController extends ThirdPartyBaseController { logger.info("联联平台请求设备认证 param:{}", JSON.toJSONString(dto)); try { // 校验令牌 - // String token = request.getHeader("Authorization"); - // if (!JWTUtils.checkThirdPartyToken(token)) { - // // 校验失败 - // return CommonResult.failed("令牌校验错误"); - // } + boolean verifyToken = verifyToken(request.getHeader("Authorization")); + if (!verifyToken) { + // 校验失败 + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); + } + // 校验签名 - // Map resultMap = lianLianService.checkoutSign(dto); - // if (resultMap == null) { - // // 签名错误 - // return CommonResult.failed("签名校验错误"); - // } - // String operatorSecret = resultMap.get("OperatorSecret"); - // String dataString = resultMap.get("Data"); - // String dataSecret = resultMap.get("DataSecret"); - // String dataSecretIV = resultMap.get("DataSecretIV"); + boolean verifySign = verifySign(dto); + if (!verifySign) { + // 签名错误 + return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR); + } - // 查询配置信息 - ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID()); - String dataSecret = platformConfig.getDataSecret(); - String dataSecretIV = platformConfig.getDataSecretIv(); + // 解析入参 + QueryEquipmentDTO queryEquipmentDTO = parseParamsDTO(dto, QueryEquipmentDTO.class); - // 解密data - // byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes()); - // String dataStr = new String(plainText, StandardCharsets.UTF_8); - String dataStr = Cryptos.decrypt(dto.getData(), dataSecret, dataSecretIV); - // 转换成相应对象 - QueryEquipmentDTO queryEquipmentDTO = JSONObject.parseObject(dataStr, QueryEquipmentDTO.class); - queryEquipmentDTO.setOperatorID(dto.getOperatorID()); - // Map map = lianLianService.query_equip_auth(queryEquipmentDTO); + // 执行逻辑 Map map = lianLianService.queryEquipAuth(queryEquipmentDTO); return CommonResult.success(0, "请求设备认证成功!", map.get("Data"), map.get("Sig")); } catch (Exception e) { @@ -455,36 +394,23 @@ public class LianLianController extends ThirdPartyBaseController { logger.info("联联平台查询充电状态 params :{}", JSON.toJSONString(dto)); try { // 校验令牌 - String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(token)) { + boolean verifyToken = verifyToken(request.getHeader("Authorization")); + if (!verifyToken) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + // 校验签名 - // Map resultMap = lianLianService.checkoutSign(dto); - // if (resultMap == null) { - // // 签名错误 - // return CommonResult.failed("签名校验错误"); - // } - // String operatorSecret = resultMap.get("OperatorSecret"); - // String dataString = resultMap.get("Data"); - // String dataSecret = resultMap.get("DataSecret"); - // String dataSecretIV = resultMap.get("DataSecretIV"); + boolean verifySign = verifySign(dto); + if (!verifySign) { + // 签名错误 + return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR); + } - // 查询配置信息 - ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID()); - String operatorSecret = platformConfig.getOperatorSecret(); - String dataString = dto.getData(); - String dataSecret = platformConfig.getDataSecret(); - String dataSecretIV = platformConfig.getDataSecretIv(); + // 解析入参 + QueryEquipChargeStatusDTO queryEquipChargeStatusDTO = parseParamsDTO(dto, QueryEquipChargeStatusDTO.class); - // 解密data - byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes()); - String dataStr = new String(plainText, StandardCharsets.UTF_8); - // 转换成相应对象 - QueryEquipChargeStatusDTO queryEquipChargeStatusDTO = JSONObject.parseObject(dataStr, QueryEquipChargeStatusDTO.class); - queryEquipChargeStatusDTO.setOperatorID(dto.getOperatorID()); - // Map map = lianLianService.query_equip_charge_status(queryEquipChargeStatusDTO); + // 执行逻辑 Map map = lianLianService.queryEquipChargeStatus(queryEquipChargeStatusDTO); return CommonResult.success(0, "查询充电状态成功!", map.get("Data"), map.get("Sig")); @@ -505,36 +431,23 @@ public class LianLianController extends ThirdPartyBaseController { logger.info("联联平台请求停止充电 params :{}", JSON.toJSONString(dto)); try { // 校验令牌 - String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(token)) { + boolean verifyToken = verifyToken(request.getHeader("Authorization")); + if (!verifyToken) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + // 校验签名 - // Map resultMap = lianLianService.checkoutSign(dto); - // if (resultMap == null) { - // // 签名错误 - // return CommonResult.failed("签名校验错误"); - // } - // String operatorSecret = resultMap.get("OperatorSecret"); - // String dataString = resultMap.get("Data"); - // String dataSecret = resultMap.get("DataSecret"); - // String dataSecretIV = resultMap.get("DataSecretIV"); + boolean verifySign = verifySign(dto); + if (!verifySign) { + // 签名错误 + return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR); + } - // 查询配置信息 - ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID()); - String operatorSecret = platformConfig.getOperatorSecret(); - String dataString = dto.getData(); - String dataSecret = platformConfig.getDataSecret(); - String dataSecretIV = platformConfig.getDataSecretIv(); + // 解析入参 + QueryStartChargeDTO queryStartChargeDTO = parseParamsDTO(dto, QueryStartChargeDTO.class); - // 解密data - byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes()); - String dataStr = new String(plainText, StandardCharsets.UTF_8); - // 转换成相应对象 - QueryStartChargeDTO queryStartChargeDTO = JSONObject.parseObject(dataStr, QueryStartChargeDTO.class); - queryStartChargeDTO.setOperatorId(dto.getOperatorID()); - // Map map = lianLianService.query_stop_charge(queryStartChargeDTO); + // 执行逻辑 Map map = lianLianService.queryStopCharge(queryStartChargeDTO); return CommonResult.success(0, "请求停止充电成功!", map.get("Data"), map.get("Sig")); @@ -557,35 +470,23 @@ public class LianLianController extends ThirdPartyBaseController { logger.info("联联平台推送订单结算信息 params:{}", JSON.toJSONString(dto)); try { // 校验令牌 - String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(token)) { + boolean verifyToken = verifyToken(request.getHeader("Authorization")); + if (!verifyToken) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + // 校验签名 - // Map resultMap = lianLianService.checkoutSign(dto); - // if (resultMap == null) { - // // 签名错误 - // return CommonResult.failed("签名校验错误"); - // } - // String operatorSecret = resultMap.get("OperatorSecret"); - // String dataString = resultMap.get("Data"); - // String dataSecret = resultMap.get("DataSecret"); - // String dataSecretIV = resultMap.get("DataSecretIV"); + boolean verifySign = verifySign(dto); + if (!verifySign) { + // 签名错误 + return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR); + } - // 查询配置信息 - ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(dto.getOperatorID()); - String operatorSecret = platformConfig.getOperatorSecret(); - String dataString = dto.getData(); - String dataSecret = platformConfig.getDataSecret(); - String dataSecretIV = platformConfig.getDataSecretIv(); + // 解析入参 + PushOrderSettlementDTO pushOrderSettlementDTO = parseParamsDTO(dto, PushOrderSettlementDTO.class); - // 解密data - byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes()); - String dataStr = new String(plainText, StandardCharsets.UTF_8); - // 转换成相应对象 - PushOrderSettlementDTO pushOrderSettlementDTO = JSONObject.parseObject(dataStr, PushOrderSettlementDTO.class); - pushOrderSettlementDTO.setOperatorId(dto.getOperatorID()); + // 执行逻辑 Map map = lianLianService.notificationOrderSettlementInfo(pushOrderSettlementDTO); return CommonResult.success(0, "推送订单结算信息成功!", map.get("Data"), map.get("Sig"));