From d2e8d7f7f7068710806c86d55e01a05ae7d20c99 Mon Sep 17 00:00:00 2001 From: Guoqs Date: Thu, 18 Apr 2024 18:24:19 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=AF=B9=E6=8E=A5=E5=86=85=E8=92=99?= =?UTF-8?q?=E5=8F=A4=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdparty/ThirdPartyBaseController.java | 85 +++---------------- .../thirdparty/neimenggu/NMGController.java | 71 +++++++--------- 2 files changed, 43 insertions(+), 113 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyBaseController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyBaseController.java index ba3270d61..7f348774e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyBaseController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyBaseController.java @@ -5,14 +5,12 @@ import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.annotation.Anonymous; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.exception.BusinessException; -import com.jsowell.pile.domain.ThirdPartyPlatformConfig; -import com.jsowell.pile.dto.QueryOperatorInfoDTO; -import com.jsowell.pile.dto.QueryStationInfoDTO; -import com.jsowell.pile.service.ThirdPartyPlatformConfigService; import com.jsowell.pile.thirdparty.CommonParamsDTO; +import com.jsowell.pile.vo.ThirdPartySecretInfoVO; import com.jsowell.thirdparty.lianlian.common.CommonResult; import com.jsowell.thirdparty.platform.ThirdPartyPlatformService; import com.jsowell.thirdparty.platform.util.Cryptos; +import com.jsowell.thirdparty.service.ThirdpartySecretInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.PostMapping; @@ -27,12 +25,13 @@ import java.util.Map; @Anonymous @RestController public class ThirdPartyBaseController extends BaseController { + @Autowired @Qualifier("zhongDianLianPlatformServiceImpl") private ThirdPartyPlatformService platformLogic; @Autowired - private ThirdPartyPlatformConfigService thirdPartyPlatformConfigService; + private ThirdpartySecretInfoService thirdpartySecretInfoService; /** * 获取token接口 @@ -52,86 +51,22 @@ public class ThirdPartyBaseController extends BaseController { } // 解析DTO - private T parseDto(CommonParamsDTO dto, Class targetClass) { + protected T parseDto(CommonParamsDTO dto, Class targetClass) { // 解密 String operatorId = dto.getOperatorID(); // 通过operatorId 查出 operatorSecret - ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(operatorId); - if (platformConfig == null) { + // ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(operatorId); + ThirdPartySecretInfoVO secretInfoVO = thirdpartySecretInfoService.queryByOperatorId(operatorId); + if (secretInfoVO == null) { throw new BusinessException("1", "无此对接平台"); } - String operatorSecret = platformConfig.getOperatorSecret(); - String dataSecret = platformConfig.getDataSecret(); - String dataSecretIv = platformConfig.getDataSecretIv(); - String signSecret = platformConfig.getSignSecret(); + String dataSecret = secretInfoVO.getTheirDataSecret(); + String dataSecretIv = secretInfoVO.getTheirDataSecretIv(); // 解密data 获取参数中的OperatorSecret String decrypt = Cryptos.decrypt(dto.getData(), dataSecret, dataSecretIv); return JSONObject.parseObject(decrypt, targetClass); } - /** - * 查询运营商信息 - * 接口名称：supervise_query_operator_info - * 使用方法：由数据提供方实现此接口，数据需求方调用 - * 接口频率：每天一次或多次 - * 超时时间：120秒 - */ - @PostMapping("/v1/supervise_query_operator_info") - public CommonResult queryOperatorInfo(@RequestBody CommonParamsDTO dto) { - logger.info("海南平台查询运营商信息 params:{}", JSON.toJSONString(dto)); - try { - QueryOperatorInfoDTO paramDTO = parseDto(dto, QueryOperatorInfoDTO.class); - Map map = platformLogic.queryOperatorInfo(paramDTO); - logger.info("海南平台查询运营商信息 result:{}", JSON.toJSONString(map)); - return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig")); - } catch (Exception e) { - logger.error("海南平台查询运营商信息 异常", e); - return CommonResult.failed("查询运营商信息发生异常"); - } - } - - /** - * 查询充换电站信息 - * 接口名称: supervise_query_stations_info - * 使用方法：由数据提供方实现此接口，数据需求方调用 - * 接口频率：每天一次或多次 - * 超时时间：120秒 - */ - @PostMapping("/v1/supervise_query_stations_info") - public CommonResult queryStationsInfo(@RequestBody CommonParamsDTO dto) { - logger.info("海南平台查询运营商信息 params:{}", JSON.toJSONString(dto)); - try { - QueryStationInfoDTO paramDTO = parseDto(dto, QueryStationInfoDTO.class); - Map map = platformLogic.queryStationsInfo(paramDTO); - logger.info("海南平台查询运营商信息 result:{}", JSON.toJSONString(map)); - return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig")); - } catch (Exception e) { - logger.error("海南平台查询运营商信息 异常", e); - return CommonResult.failed("查询运营商信息发生异常"); - } - } - - /** - * 查询充换电站状态信息 - * supervise_query_station_status - */ - @PostMapping("/v1/supervise_query_station_status") - public CommonResult queryStationStatus(@RequestBody CommonParamsDTO dto) { - logger.info("海南平台查询充换电站状态信息 params:{}", JSON.toJSONString(dto)); - try { - QueryStationInfoDTO paramDTO = parseDto(dto, QueryStationInfoDTO.class); - Map map = platformLogic.queryStationStatus(paramDTO); - logger.info("海南平台查询充换电站状态信息 result:{}", JSON.toJSONString(map)); - return CommonResult.success(0, "查询充换电站状态信息成功！", map.get("Data"), map.get("Sig")); - } catch (Exception e) { - logger.error("海南平台查询充换电站状态信息异常", e); - return CommonResult.failed("查询充换电站状态信息发生异常"); - } - } - - /** - * - */ } diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/neimenggu/NMGController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/neimenggu/NMGController.java index d5fe9681c..205143414 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/neimenggu/NMGController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/neimenggu/NMGController.java @@ -1,18 +1,14 @@ package com.jsowell.web.controller.thirdparty.neimenggu; 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.exception.BusinessException; -import com.jsowell.pile.domain.ThirdPartyPlatformConfig; import com.jsowell.pile.dto.QueryOperatorInfoDTO; import com.jsowell.pile.dto.QueryStationInfoDTO; -import com.jsowell.pile.service.ThirdPartyPlatformConfigService; import com.jsowell.pile.thirdparty.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.common.CommonResult; import com.jsowell.thirdparty.platform.ThirdPartyPlatformService; -import com.jsowell.thirdparty.platform.util.Cryptos; +import com.jsowell.thirdparty.service.ThirdpartySecretInfoService; +import com.jsowell.web.controller.thirdparty.ThirdPartyBaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.PostMapping; @@ -28,13 +24,13 @@ import java.util.Map; @Anonymous @RestController @RequestMapping("/evcs") -public class NMGController extends BaseController { +public class NMGController extends ThirdPartyBaseController { @Autowired @Qualifier("neiMengGuPlatformServiceImpl") private ThirdPartyPlatformService platformLogic; @Autowired - private ThirdPartyPlatformConfigService thirdPartyPlatformConfigService; + private ThirdpartySecretInfoService thirdpartySecretInfoService; /** * 获取token接口 @@ -42,36 +38,35 @@ public class NMGController extends BaseController { */ @PostMapping("/v1/query_token") public CommonResult queryToken(@RequestBody CommonParamsDTO dto) { - logger.info("海南平台请求令牌 params:{}", JSON.toJSONString(dto)); + logger.info("内蒙古平台请求令牌 params:{}", JSON.toJSONString(dto)); try { Map map = platformLogic.queryToken(dto); - logger.info("海南平台请求令牌 result:{}", JSON.toJSONString(map)); + logger.info("内蒙古平台请求令牌 result:{}", JSON.toJSONString(map)); return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.error("海南平台 请求令牌接口 异常", e); + logger.error("内蒙古平台 请求令牌接口 异常", e); return CommonResult.failed("获取token发生异常"); } } // 解析DTO - private T parseDto(CommonParamsDTO dto, Class targetClass) { - // 解密 - String operatorId = dto.getOperatorID(); - // 通过operatorId 查出 operatorSecret - ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(operatorId); - if (platformConfig == null) { - throw new BusinessException("1", "无此对接平台"); - } - - String operatorSecret = platformConfig.getOperatorSecret(); - String dataSecret = platformConfig.getDataSecret(); - String dataSecretIv = platformConfig.getDataSecretIv(); - String signSecret = platformConfig.getSignSecret(); - - // 解密data 获取参数中的OperatorSecret - String decrypt = Cryptos.decrypt(dto.getData(), dataSecret, dataSecretIv); - return JSONObject.parseObject(decrypt, targetClass); - } + // private T parseDto(CommonParamsDTO dto, Class targetClass) { + // // 解密 + // String operatorId = dto.getOperatorID(); + // // 通过operatorId 查出 operatorSecret + // ThirdPartyPlatformConfig platformConfig = thirdPartyPlatformConfigService.getInfoByOperatorId(operatorId); + // thirdpartySecretInfoService.queryByOperatorId(operatorId); + // if (platformConfig == null) { + // throw new BusinessException("1", "无此对接平台"); + // } + // + // String dataSecret = platformConfig.getDataSecret(); + // String dataSecretIv = platformConfig.getDataSecretIv(); + // + // // 解密data 获取参数中的OperatorSecret + // String decrypt = Cryptos.decrypt(dto.getData(), dataSecret, dataSecretIv); + // return JSONObject.parseObject(decrypt, targetClass); + // } /** * 查询运营商信息 @@ -82,14 +77,14 @@ public class NMGController extends BaseController { */ @PostMapping("/v1/supervise_query_operator_info") public CommonResult queryOperatorInfo(@RequestBody CommonParamsDTO dto) { - logger.info("海南平台查询运营商信息 params:{}", JSON.toJSONString(dto)); + logger.info("内蒙古平台查询运营商信息 params:{}", JSON.toJSONString(dto)); try { QueryOperatorInfoDTO paramDTO = parseDto(dto, QueryOperatorInfoDTO.class); Map map = platformLogic.queryOperatorInfo(paramDTO); - logger.info("海南平台查询运营商信息 result:{}", JSON.toJSONString(map)); + logger.info("内蒙古平台查询运营商信息 result:{}", JSON.toJSONString(map)); return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.error("海南平台查询运营商信息 异常", e); + logger.error("内蒙古平台查询运营商信息 异常", e); return CommonResult.failed("查询运营商信息发生异常"); } } @@ -103,14 +98,14 @@ public class NMGController extends BaseController { */ @PostMapping("/v1/supervise_query_stations_info") public CommonResult queryStationsInfo(@RequestBody CommonParamsDTO dto) { - logger.info("海南平台查询运营商信息 params:{}", JSON.toJSONString(dto)); + logger.info("内蒙古平台查询运营商信息 params:{}", JSON.toJSONString(dto)); try { QueryStationInfoDTO paramDTO = parseDto(dto, QueryStationInfoDTO.class); Map map = platformLogic.queryStationsInfo(paramDTO); - logger.info("海南平台查询运营商信息 result:{}", JSON.toJSONString(map)); + logger.info("内蒙古平台查询运营商信息 result:{}", JSON.toJSONString(map)); return CommonResult.success(0, "请求令牌成功！", map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.error("海南平台查询运营商信息 异常", e); + logger.error("内蒙古平台查询运营商信息 异常", e); return CommonResult.failed("查询运营商信息发生异常"); } } @@ -121,14 +116,14 @@ public class NMGController extends BaseController { */ @PostMapping("/v1/supervise_query_station_status") public CommonResult queryStationStatus(@RequestBody CommonParamsDTO dto) { - logger.info("海南平台查询充换电站状态信息 params:{}", JSON.toJSONString(dto)); + logger.info("内蒙古平台查询充换电站状态信息 params:{}", JSON.toJSONString(dto)); try { QueryStationInfoDTO paramDTO = parseDto(dto, QueryStationInfoDTO.class); Map map = platformLogic.queryStationStatus(paramDTO); - logger.info("海南平台查询充换电站状态信息 result:{}", JSON.toJSONString(map)); + logger.info("内蒙古平台查询充换电站状态信息 result:{}", JSON.toJSONString(map)); return CommonResult.success(0, "查询充换电站状态信息成功！", map.get("Data"), map.get("Sig")); } catch (Exception e) { - logger.error("海南平台查询充换电站状态信息异常", e); + logger.error("内蒙古平台查询充换电站状态信息异常", e); return CommonResult.failed("查询充换电站状态信息发生异常"); } }