diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HaiNanPlatformController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HaiNanPlatformController.java index 6d51aa757..c19b9ee75 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HaiNanPlatformController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HaiNanPlatformController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.core.controller.BaseController; +import com.jsowell.common.enums.thirdparty.ThirdPartyReturnCodeEnum; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; @@ -33,11 +34,15 @@ import java.util.Map; @Anonymous @RestController @RequestMapping("/hainan") -public class HaiNanPlatformController extends BaseController { +public class HaiNanPlatformController extends ThirdPartyBaseController { // 使用海南平台处理逻辑 // @Autowired // private AbsInterfaceWithPlatformLogic platformLogic = new HaiNanPlatformLogic(); + private final String platformName = "海南省平台"; + + private final String platformType = ThirdPlatformTypeEnum.HAI_NAN_1_PLATFORM.getTypeCode(); + @Autowired @Qualifier("haiNanPlatformServiceImpl") private ThirdPartyPlatformService platformLogic; @@ -70,44 +75,29 @@ public class HaiNanPlatformController extends BaseController { */ @PostMapping("/v1/query_stations_info") public CommonResult query_stations_info(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { - logger.info("海南平台查询充电站信息 params:{}", JSON.toJSONString(dto)); + logger.info("{}-查询充电站信息 params:{}", platformName, JSON.toJSONString(dto)); try { // 校验令牌 - // String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(request)) { + if (!verifyToken(request.getHeader("Authorization"))) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + // 校验签名 - // Map resultMap = platformLogic.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"); + if (!verifySignature(dto)) { + // 签名错误 + 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()); - queryStationInfoDTO.setThirdPlatformType(ThirdPlatformTypeEnum.HAI_NAN_1_PLATFORM.getTypeCode()); + // 执行逻辑 Map map = platformLogic.queryStationsInfo(queryStationInfoDTO); - logger.info("海南平台查询充电站信息 result:{}", JSON.toJSONString(map)); - return CommonResult.success(0, "查询充电站信息成功!", map.get("Data"), map.get("Sig")); + + return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.info("海南平台查询充电站信息 error:", e); + logger.info("{}-查询充电站信息 error:", platformName, e); } return CommonResult.failed("查询充电站信息发生异常"); } @@ -120,45 +110,32 @@ public class HaiNanPlatformController extends BaseController { */ @PostMapping("/v1/query_station_stats") public CommonResult queryStationStats(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { - logger.info("海南平台查询统计信息 params:{}", JSON.toJSONString(dto)); + logger.info("{}-查询充电站统计信息 params:{}", platformName, JSON.toJSONString(dto)); try { // 校验令牌 - if (!JWTUtils.checkThirdPartyToken(request)) { + if (!verifyToken(request.getHeader("Authorization"))) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + dto.setPlatformType(platformType); + // 校验签名 - // Map resultMap = platformLogic.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"); + if (!verifySignature(dto)) { + // 签名错误 + 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 = platformLogic.queryStationStats(queryStationInfoDTO); - logger.info("海南平台查询统计信息 result:{}", JSON.toJSONString(map)); - return CommonResult.success(0, "查询统计信息成功!", map.get("Data"), map.get("Sig")); + + return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.info("海南平台查询统计信息 error:", e); - // e.printStackTrace(); + logger.error("{}-查询充电站统计信息 error:", platformName, e); } - return CommonResult.failed("查询统计信息发生异常"); + return CommonResult.failed("查询充电站统计信息发生异常"); } /** @@ -169,45 +146,32 @@ public class HaiNanPlatformController extends BaseController { */ @PostMapping("/v1/query_station_status") public CommonResult queryStationStatus(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { - logger.info("海南平台设备接口状态查询 params:{}", JSON.toJSONString(dto)); + logger.info("{}-查询充电站状态信息 params:{}", platformName, JSON.toJSONString(dto)); try { // 校验令牌 - // String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(request)) { + if (!verifyToken(request.getHeader("Authorization"))) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + dto.setPlatformType(platformType); + // 校验签名 - // Map resultMap = platformLogic.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"); + if (!verifySignature(dto)) { + // 签名错误 + 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 = platformLogic.queryStationStatus(queryStationInfoDTO); - logger.info("海南平台设备接口状态查询 result:{}", JSON.toJSONString(map)); - return CommonResult.success(0, "设备接口状态查询成功!", map.get("Data"), map.get("Sig")); + + return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.info("海南平台设备接口状态查询 error:", e); + logger.error("{}-查询充电站状态信息 error:", platformName, e); } - return CommonResult.failed("设备接口状态查询发生异常"); + return CommonResult.failed("查询充电站状态信息发生异常"); } /** @@ -218,43 +182,30 @@ public class HaiNanPlatformController extends BaseController { */ @PostMapping("/v1/query_equip_auth") public CommonResult queryEquipAuth(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { - logger.info("请求设备认证 param:{}", JSON.toJSONString(dto)); + logger.info("{}-请求设备认证 params:{}", platformName, JSON.toJSONString(dto)); try { // 校验令牌 - // String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(request)) { + if (!verifyToken(request.getHeader("Authorization"))) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + dto.setPlatformType(platformType); + // 校验签名 - // Map resultMap = platformLogic.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"); + if (!verifySignature(dto)) { + // 签名错误 + 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(); + // 解析入参 + 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); - // 转换成相应对象 - QueryEquipmentDTO queryEquipmentDTO = JSONObject.parseObject(dataStr, QueryEquipmentDTO.class); - queryEquipmentDTO.setOperatorID(dto.getOperatorID()); + // 执行逻辑 Map map = platformLogic.queryEquipAuth(queryEquipmentDTO); - logger.info("请求设备认证 result:{}", JSON.toJSONString(map)); - return CommonResult.success(0, "请求设备认证成功!", map.get("Data"), map.get("Sig")); + + return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.info("请求设备认证 error:", e); + logger.error("{}-请求设备认证 error:", platformName, e); } return CommonResult.failed("请求设备认证发生异常"); } @@ -267,40 +218,30 @@ public class HaiNanPlatformController extends BaseController { */ @PostMapping("/v1/query_equip_business_policy") public CommonResult queryEquipBusinessPolicy(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { - logger.info("查询业务策略信息 params:{}", JSON.toJSONString(dto)); + logger.info("{}-查询业务策略信息 params:{}", platformName, JSON.toJSONString(dto)); try { // 校验令牌 - // String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(request)) { + if (!verifyToken(request.getHeader("Authorization"))) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + dto.setPlatformType(platformType); + // 校验签名 - // Map resultMap = platformLogic.checkoutSign(dto); - // if (resultMap == null) { - // // 签名错误 - // return CommonResult.failed("签名校验错误"); - // } + if (!verifySignature(dto)) { + // 签名错误 + 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 = platformLogic.queryEquipBusinessPolicy(queryStartChargeDTO); - logger.info("查询业务策略信息 result:{}", JSON.toJSONString(map)); - return CommonResult.success(0, "查询业务策略信息成功!", map.get("Data"), map.get("Sig")); + return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.info("查询业务策略信息 error:", e); + logger.error("{}-查询业务策略信息 error:", platformName, e); } return CommonResult.failed("查询业务策略信息发生异常"); } @@ -313,42 +254,30 @@ public class HaiNanPlatformController extends BaseController { */ @PostMapping("/v1/query_start_charge") public CommonResult query_start_charge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { - logger.info("海南平台请求启动充电 params :{}", JSON.toJSONString(dto)); + logger.info("{}-请求启动充电 params:{}", platformName, JSON.toJSONString(dto)); try { // 校验令牌 - if (!JWTUtils.checkThirdPartyToken(request)) { + if (!verifyToken(request.getHeader("Authorization"))) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + dto.setPlatformType(platformType); + // 校验签名 - // Map resultMap = platformLogic.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"); + if (!verifySignature(dto)) { + // 签名错误 + 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 = platformLogic.queryStartCharge(queryStartChargeDTO); - logger.info("海南平台请求启动充电 result:{}", JSON.toJSONString(map)); - return CommonResult.success(0, "请求启动充电成功!", map.get("Data"), map.get("Sig")); + + return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.error("海南平台请求启动充电 error", e); + logger.error("{}-请求启动充电 error:", platformName, e); } return CommonResult.failed("请求启动充电发生异常"); } @@ -385,45 +314,32 @@ public class HaiNanPlatformController extends BaseController { */ @PostMapping("/v1/query_equip_charge_status") public CommonResult queryEquipChargeStatus(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { - logger.info("【{}】查询充电状态 params :{}", this.getClass().getSimpleName(), JSON.toJSONString(dto)); + logger.info("{}-查询充电状态 params:{}", platformName, JSON.toJSONString(dto)); try { // 校验令牌 - // String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(request)) { + if (!verifyToken(request.getHeader("Authorization"))) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + dto.setPlatformType(platformType); + // 校验签名 - // Map resultMap = platformLogic.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"); + if (!verifySignature(dto)) { + // 签名错误 + 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 = platformLogic.queryEquipChargeStatus(queryEquipChargeStatusDTO); - logger.info("【{}】查询充电状态 result:{}", this.getClass().getSimpleName(), JSON.toJSONString(map)); - return CommonResult.success(0, "查询充电状态成功!", map.get("Data"), map.get("Sig")); + + return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.error("【{}】平台查询充电状态 error", this.getClass().getSimpleName(), e); + logger.error("{}-查询充电状态 error:", platformName, e); } - return CommonResult.failed("新电途平台查询充电状态发生异常"); + return CommonResult.failed("查询充电状态发生异常"); } /** @@ -458,43 +374,30 @@ public class HaiNanPlatformController extends BaseController { */ @PostMapping("/v1/query_stop_charge") public CommonResult queryStopCharge(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { - logger.info("请求停止充电 params :{}", JSON.toJSONString(dto)); + logger.info("{}-请求停止充电 params:{}", platformName, JSON.toJSONString(dto)); try { // 校验令牌 - // String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(request)) { + if (!verifyToken(request.getHeader("Authorization"))) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + dto.setPlatformType(platformType); + // 校验签名 - // Map resultMap = platformLogic.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"); + if (!verifySignature(dto)) { + // 签名错误 + 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 = platformLogic.queryStopCharge(queryStartChargeDTO); - logger.info("请求停止充电 result:{}", JSON.toJSONString(map)); - return CommonResult.success(0, "请求停止充电成功!", map.get("Data"), map.get("Sig")); + + return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.error("请求停止充电 error", e); + logger.error("{}-请求停止充电 error:", platformName, e); } return CommonResult.failed("请求停止充电发生异常"); } diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiController.java index 75920ca97..d17be1ed5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.core.controller.BaseController; +import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.util.JWTUtils; import com.jsowell.pile.dto.QueryEquipChargeStatusDTO; import com.jsowell.pile.dto.QueryEquipmentDTO; @@ -34,7 +35,12 @@ import java.util.Map; @Anonymous @RestController @RequestMapping("/huawei") -public class HuaWeiController extends BaseController { +@Deprecated +public class HuaWeiController extends ThirdPartyBaseController { + + private final String platformName = "华为平台"; + + private final String platformType = ThirdPlatformTypeEnum.HUA_WEI.getTypeCode(); @Autowired private HuaWeiService huaWeiService; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiControllerV2.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiControllerV2.java index f72a8e968..136d0357e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiControllerV2.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/HuaWeiControllerV2.java @@ -37,6 +37,7 @@ import java.util.Map; @Anonymous @RestController @RequestMapping("/huawei") +@Deprecated public class HuaWeiControllerV2 extends BaseController { @Autowired diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NRController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NRController.java index ff75577ee..d9bd83fdf 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NRController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/NRController.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.ykc.RealTimeMonitorData; +import com.jsowell.common.enums.thirdparty.ThirdPartyReturnCodeEnum; +import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; @@ -17,10 +19,13 @@ import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO; import com.jsowell.pile.dto.nanrui.PushAlarmInfoDTO; import com.jsowell.thirdparty.lianlian.common.CommonResult; import com.jsowell.pile.thirdparty.CommonParamsDTO; +import com.jsowell.thirdparty.platform.dto.QueryOrderDTO; +import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService; import com.jsowell.thirdparty.platform.util.Cryptos; import com.jsowell.thirdparty.platform.util.Encodes; import com.jsowell.thirdparty.nanrui.service.NRService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; @@ -37,10 +42,18 @@ import java.util.Map; @Anonymous @RestController @RequestMapping("/jiangsu") -public class NRController extends BaseController { +public class NRController extends ThirdPartyBaseController { + + private final String platformName = "江苏省平台"; + + private final String platformType = ThirdPlatformTypeEnum.JIANG_SU_PLATFORM.getTypeCode(); @Autowired - private NRService nrService; + @Qualifier("jiangSuPlatformServiceImpl") + private ThirdPartyPlatformService platformLogic; + + // @Autowired + // private NRService nrService; /** * 查询充电站信息 @@ -48,36 +61,31 @@ public class NRController extends BaseController { */ @RequestMapping("/v1/query_stations_info") public CommonResult query_stations_info(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { - logger.info("江苏平台查询充电站信息 params:{}", JSON.toJSONString(dto)); + logger.info("{}-查询充电站信息 params:{}", platformName, JSON.toJSONString(dto)); try { // 校验令牌 - String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(token)) { + if (!verifyToken(request.getHeader("Authorization"))) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + // 校验签名 - Map resultMap = nrService.checkoutSign(dto); - if (resultMap == null) { + if (!verifySignature(dto)) { // 签名错误 - return CommonResult.failed("签名校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR); } - String operatorSecret = resultMap.get("OperatorSecret"); - String dataString = resultMap.get("Data"); - String dataSecret = resultMap.get("DataSecret"); - String dataSecretIV = resultMap.get("DataSecretIV"); - // 解密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 = nrService.query_stations_info(queryStationInfoDTO); - return CommonResult.success(0, "查询充电站信息成功!", map.get("Data"), map.get("Sig")); + + // 解析入参 + QueryStationInfoDTO queryStationInfoDTO = parseParamsDTO(dto, QueryStationInfoDTO.class); + + // 执行逻辑 + Map map = platformLogic.queryStationsInfo(queryStationInfoDTO); + + return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.error("江苏平台查询充电站信息 error", e); + logger.info("{}-查询充电站信息 error:", platformName, e); } - return CommonResult.failed("查询充电站信息异常"); + return CommonResult.failed("查询充电站信息发生异常"); } @@ -87,76 +95,65 @@ public class NRController extends BaseController { */ @RequestMapping("/v1/query_station_status") public CommonResult query_station_status(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { - logger.info("江苏平台查询设备接口状态 params:{}", JSON.toJSONString(dto)); + logger.info("{}-查询设备接口状态 params:{}", platformName, JSON.toJSONString(dto)); try { // 校验令牌 - String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(token)) { + if (!verifyToken(request.getHeader("Authorization"))) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + // 校验签名 - Map resultMap = nrService.checkoutSign(dto); - if (resultMap == null) { + if (!verifySignature(dto)) { // 签名错误 - return CommonResult.failed("签名校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR); } - String operatorSecret = resultMap.get("OperatorSecret"); - String dataString = resultMap.get("Data"); - String dataSecret = resultMap.get("DataSecret"); - String dataSecretIV = resultMap.get("DataSecretIV"); - // 解密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 = nrService.query_station_status(queryStationInfoDTO); - return CommonResult.success(0, "查询设备接口状态成功!", map.get("Data"), map.get("Sig")); + + // 解析入参 + QueryStationInfoDTO queryStationInfoDTO = parseParamsDTO(dto, QueryStationInfoDTO.class); + + // 执行逻辑 + Map map = platformLogic.queryStationStatus(queryStationInfoDTO); + + return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.error("江苏平台查询设备接口状态 error", e); - e.printStackTrace(); + logger.info("{}-查询设备接口状态 error:", platformName, e); } - return CommonResult.failed("查询设备接口状态异常"); + return CommonResult.failed("查询设备接口状态发生异常"); } /** - * 查询充电电量信息 + * 查询订单信息 * @param dto */ @RequestMapping("/v1/query_order_info") public CommonResult query_order_info(HttpServletRequest request, @RequestBody CommonParamsDTO dto) { - logger.info("江苏平台查询充电电量信息 params:{}", JSON.toJSONString(dto)); + logger.info("{}-查询订单信息 params:{}", platformName, JSON.toJSONString(dto)); try { // 校验令牌 - String token = request.getHeader("Authorization"); - if (!JWTUtils.checkThirdPartyToken(token)) { + if (!verifyToken(request.getHeader("Authorization"))) { // 校验失败 - return CommonResult.failed("令牌校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR); } + // 校验签名 - Map resultMap = nrService.checkoutSign(dto); - if (resultMap == null) { + if (!verifySignature(dto)) { // 签名错误 - return CommonResult.failed("签名校验错误"); + return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR); } - String operatorSecret = resultMap.get("OperatorSecret"); - String dataString = resultMap.get("Data"); - String dataSecret = resultMap.get("DataSecret"); - String dataSecretIV = resultMap.get("DataSecretIV"); - // 解密data - byte[] plainText = Cryptos.aesDecrypt(Encodes.decodeBase64(dataString), dataSecret.getBytes(), dataSecretIV.getBytes()); - String dataStr = new String(plainText, StandardCharsets.UTF_8); - // 转换成相应对象 - NRQueryOrderDTO nrQueryOrderDTO = JSONObject.parseObject(dataStr, NRQueryOrderDTO.class); - nrQueryOrderDTO.setOperatorId(dto.getOperatorID()); - Map map = nrService.query_order_info(nrQueryOrderDTO); - return CommonResult.success(0, "查询充电电量信息成功!", map.get("Data"), map.get("Sig")); + + // 解析入参 + QueryOrderDTO queryOrderDTO = parseParamsDTO(dto, QueryOrderDTO.class); + + // 执行逻辑 + Map map = platformLogic.queryOrderInfo(queryOrderDTO); + + return CommonResult.success(Integer.parseInt(map.get("Ret")), map.get("Msg"), map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.error("江苏平台查询充电电量信息 error", e); + logger.info("{}-查询订单信息 error:", platformName, e); } - return CommonResult.failed("查询充电电量信息异常"); + return CommonResult.failed("查询订单信息发生异常"); } /** @@ -165,24 +162,24 @@ public class NRController extends BaseController { */ @PostMapping("/v1/query_token") public CommonResult queryToken(@RequestBody CommonParamsDTO dto) { - logger.info("江苏平台请求令牌 params:{}", JSON.toJSONString(dto)); + logger.info("{}- 请求令牌 params:{}",platformName, JSON.toJSONString(dto)); try { - Map map = nrService.generateToken(dto); - logger.info("江苏平台请求令牌 result:{}", JSON.toJSONString(map)); + Map map = platformLogic.queryToken(dto); + logger.info("{} - 请求令牌 result:{}", platformName, JSON.toJSONString(map)); return CommonResult.success(0, "请求令牌成功!", map.get("Data"), map.get("Sig")); - } catch (UnsupportedEncodingException e) { - logger.error("获取token接口 异常"); + } catch (Exception e) { + logger.error("请求令牌接口 异常", e); return CommonResult.failed("获取token发生异常"); } } - @RequestMapping("/v1/getToken") - public String getToken(@RequestBody GetTokenDTO dto) { - String token = nrService.getToken(dto.getUrlAddress(), dto.getOperatorId(), dto.getOperatorSecret(), - dto.getDataSecretIv(), dto.getSignSecret(), dto.getDataSecret()); - return token; - } + // @RequestMapping("/v1/getToken") + // public String getToken(@RequestBody GetTokenDTO dto) { + // String token = nrService.getToken(dto.getUrlAddress(), dto.getOperatorId(), dto.getOperatorSecret(), + // dto.getDataSecretIv(), dto.getSignSecret(), dto.getDataSecret()); + // return token; + // } /** @@ -190,27 +187,27 @@ public class NRController extends BaseController { * @param dto * @return */ - @PostMapping("/v1/pushStationInfo") - public RestApiResponse pushStationInfo(@RequestBody PushStationInfoDTO dto) { - logger.info("推送江苏平台充电站信息 params:{}", JSON.toJSONString(dto)); - RestApiResponse response = null; - try { - if (StringUtils.isBlank(String.valueOf(dto.getStationId()))) { - throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); - } - // String s = nrService.pushStationInfo(dto); - String s = nrService.pushStationInfoV2(dto); - response = new RestApiResponse<>(s); - }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/pushStationInfo") + // public RestApiResponse pushStationInfo(@RequestBody PushStationInfoDTO dto) { + // logger.info("推送江苏平台充电站信息 params:{}", JSON.toJSONString(dto)); + // RestApiResponse response = null; + // try { + // if (StringUtils.isBlank(String.valueOf(dto.getStationId()))) { + // throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); + // } + // // String s = nrService.pushStationInfo(dto); + // String s = nrService.pushStationInfoV2(dto); + // response = new RestApiResponse<>(s); + // }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; + // } /** @@ -218,49 +215,49 @@ public class NRController extends BaseController { * @param dto * @return */ - @PostMapping("/v1/pushAlarmInfo") - public RestApiResponse pushAlarmInfo(@RequestBody PushAlarmInfoDTO dto) { - logger.info("推送江苏平台告警信息 params:{}", JSON.toJSONString(dto)); - RestApiResponse response = null; - try { - if (StringUtils.isBlank(String.valueOf(dto.getStationId()))) { - throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); - } - String s = nrService.pushAlarmInfo(dto); - response = new RestApiResponse<>(s); - }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/pushAlarmInfo") + // public RestApiResponse pushAlarmInfo(@RequestBody PushAlarmInfoDTO dto) { + // logger.info("推送江苏平台告警信息 params:{}", JSON.toJSONString(dto)); + // RestApiResponse response = null; + // try { + // if (StringUtils.isBlank(String.valueOf(dto.getStationId()))) { + // throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); + // } + // String s = nrService.pushAlarmInfo(dto); + // response = new RestApiResponse<>(s); + // }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; + // } /** * 设备状态变化推送 * @param data * @return */ - @PostMapping("/v1/pushPileStatus") - public RestApiResponse pushPileStatus(@RequestBody RealTimeMonitorData data) { - logger.info("推送江苏平台设备状态变化推送 params:{}", JSON.toJSONString(data)); - RestApiResponse response = null; - try { - String s = nrService.pushPileStatus(data); - response = new RestApiResponse<>(s); - }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/pushPileStatus") + // public RestApiResponse pushPileStatus(@RequestBody RealTimeMonitorData data) { + // logger.info("推送江苏平台设备状态变化推送 params:{}", JSON.toJSONString(data)); + // RestApiResponse response = null; + // try { + // String s = nrService.pushPileStatus(data); + // response = new RestApiResponse<>(s); + // }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; + // } /** @@ -268,21 +265,21 @@ public class NRController extends BaseController { * @param orderCode * @return */ - @GetMapping("/v1/pushOrderInfo/{orderCode}") - public RestApiResponse pushOrderInfo(@PathVariable("orderCode") String orderCode) { - logger.info("江苏平台充电电量信息推送 params:{}", orderCode); - RestApiResponse response = null; - try { - String s = nrService.pushOrderInfo(orderCode); - response = new RestApiResponse<>(s); - }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; - } + // @GetMapping("/v1/pushOrderInfo/{orderCode}") + // public RestApiResponse pushOrderInfo(@PathVariable("orderCode") String orderCode) { + // logger.info("江苏平台充电电量信息推送 params:{}", orderCode); + // RestApiResponse response = null; + // try { + // String s = nrService.pushOrderInfo(orderCode); + // response = new RestApiResponse<>(s); + // }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; + // } } \ No newline at end of file