添加接口调用日志

Pu Zhibing

2025-02-06 1533ed2ef41d32033a5ffc4aa08e2b0c9e7d14db

添加接口调用日志

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/AESUtil.java

@@ -101,7 +101,7 @@
    public static void main(String[] ages){
//        String encrypt = AESUtil.encrypt("{\"OperatorSecret\":\"cn51EeFQDTSMsn11R1ZNsYSEYBxDYcKK\",\"OperatorID\":\"MA25CNM38\"}", "YPFVz1OvAS4nSwLW", "5tLoP60aR9QUB5Mx");
//        System.err.println(encrypt);
        String travel = AESUtil.decrypt("VOXZLgEoOOmtrwaSLHiBVdsWW0F2FWCceJyAvasTxM3ZgADBdBikMNZX9I2JPaqfrMrjXP4sjSpDdUKNTbsNotGYfcj0vFrz8kSsT8RWoA+zgVKAxwKkeSvKEvLPEwLoz0rbDTW1BhL/lf8j7SqS9Q5f+Dqx3pdPDe5xF6/rCQ8vLFlEdi0x6O3UZjQFgiIDhPRghcTd3/BEPY6nF0wsQlyECgeSQzqAnTa7DDLsiJ1uWuaeKyAa6cGRiWZ7IovXs5GyPJ0mH7c/IczHZa7Afzt/PDDE0GOGGFuodWdOvQ2hgcbmrSQ/JEr2DO4UGXd8yhGlIFhzXueuiJIPlVrjB45gy7+JFOjMdMcjufk8RBq7bdXcDqz8Ktlv6yjv826jb0TcZeUA5Rmn4OIqZRVdm3KW/11ILOSeHLsqTLBZamNJAZjH0/4AAY+63Eh590S01ADHkkK1/hHvp5V/Orlp7w==", "eKfRG4Jx5BsxwEJM", "3KrwBfr6AhsmYFnP");
        String travel = AESUtil.decrypt("9gVnNqAh9O7IuqqbyD8G1ukK86O3g0bUBLzM1LJL060bNjPJCtW0wWRjr756abxIm+nOuKkjMy7/DYScMcnl2KSYJJJb6Xc4Aza8L24Mp/UKQyW6Fe9m+ThDVUfMwvn7U2OxHDXniBUdmpNi2Ex9uHa/R18H2ka0DCv/bKCm/F4KTfz48Et/1L64JTTmj7l4the0Wr7KGiVewPIEE03LF5lF+h9j0W8czC6Gx5UJOMU=", "YPFVz1OvAS4nSwLW", "5tLoP60aR9QUB5Mx");
        System.err.println(travel);
    }
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECController.java

@@ -143,10 +143,13 @@
     */
    @PostMapping("/query_token")
    public BaseResult queryToken(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
        log.info("三方平台获取token请求参数：" + JacksonUtils.toJson(baseRequest));
        BaseResult baseResult = requestCheck(false, baseRequest, request);
        if(0 != baseResult.getRet()){
            log.info("三方平台获取token响应Data：");
            baseResult.setData("");
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台获取token响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        QueryTokenResult queryTokenResult = new QueryTokenResult();
@@ -156,23 +159,28 @@
            queryTokenResult.setFailReason(1);
            //参数加密
            String jsonString = JacksonUtils.toJson(queryTokenResult);
            log.info("三方平台获取token响应Data：" + jsonString);
            String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
            baseResult.setData(encrypt);
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台获取token响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        
        //解密参数
        String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
        log.info("三方平台获取token请求Data：" + decrypt);
        QueryToken queryToken = JSON.parseObject(decrypt, QueryToken.class);
        if(!queryToken.getOperatorSecret().equals(operator.getOurOperatorSecret())){
            queryTokenResult.setSuccStat(1);
            queryTokenResult.setFailReason(2);
            //参数加密
            String jsonString = JacksonUtils.toJson(queryTokenResult);
            log.info("三方平台获取token响应Data：" + jsonString);
            String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
            baseResult.setData(encrypt);
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台获取token响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        
@@ -188,9 +196,11 @@
        queryTokenResult.setTokenAvailableTime(expires_in * 60);
        //参数加密
        String jsonString = JacksonUtils.toJson(queryTokenResult);
        log.info("三方平台获取token响应Data：" + jsonString);
        String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
        baseResult.setData(encrypt);
        baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
        log.info("三方平台获取token响应参数：" + JacksonUtils.toJson(baseResult));
        return baseResult;
    }
    
@@ -204,16 +214,20 @@
     */
    @PostMapping("/query_stations_info")
    public BaseResult queryStationsInfo(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
        log.info("三方平台查询充电站信息请求参数：" + JacksonUtils.toJson(baseRequest));
        //校验token和签名
        BaseResult baseResult = requestCheck(true, baseRequest, request);
        if(0 != baseResult.getRet()){
            log.info("三方平台查询充电站信息响应Data：");
            baseResult.setData("");
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台查询充电站信息响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        Operator operator = baseResult.getOperator();
        //解密参数
        String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
        log.info("三方平台查询充电站信息请求Data：" + decrypt);
        QueryStationsInfo queryStationsInfo = JSON.parseObject(decrypt, QueryStationsInfo.class);
        Integer pageNo = queryStationsInfo.getPageNo();
        Integer pageSize = queryStationsInfo.getPageSize();
@@ -232,9 +246,11 @@
        queryStationsInfoResult.setStationInfos(buildSite(parkingLots, siteListPaging.getRecords()));
        //参数加密
        String jsonString = JacksonUtils.toJson(queryStationsInfoResult);
        log.info("三方平台查询充电站信息响应Data：" + jsonString);
        String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
        baseResult.setData(encrypt);
        baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
        log.info("三方平台查询充电站信息响应参数：" + JacksonUtils.toJson(baseResult));
        return baseResult;
    }
    
@@ -476,15 +492,19 @@
     */
    @PostMapping("/query_station_status")
    public BaseResult queryStationStatus(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
        log.info("三方平台获取设备接口状态请求参数：" + JacksonUtils.toJson(baseRequest));
        BaseResult baseResult = requestCheck(true, baseRequest, request);
        if(0 != baseResult.getRet()){
            log.info("三方平台获取设备接口状态响应Data：");
            baseResult.setData("");
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台获取设备接口状态响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        Operator operator = baseResult.getOperator();
        //解密参数
        String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
        log.info("三方平台获取设备接口状态请求Data：" + decrypt);
        QueryStationStatus queryStationsInfo = JSON.parseObject(decrypt, QueryStationStatus.class);
        List<Integer> collect = queryStationsInfo.getStationIDs().stream().map(Integer::valueOf).collect(Collectors.toList());
        List<Site> data = siteClient.getSiteByIds(collect).getData();
@@ -536,9 +556,11 @@
        result.setStationStatusInfos(StationStatusInfos);
        //参数加密
        String jsonString = JacksonUtils.toJson(result);
        log.info("三方平台获取设备接口状态响应Data：" + jsonString);
        String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
        baseResult.setData(encrypt);
        baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
        log.info("三方平台获取设备接口状态响应参数：" + JacksonUtils.toJson(baseResult));
        return baseResult;
    }
    
@@ -552,16 +574,20 @@
     */
    @PostMapping("/query_station_stats")
    public BaseResult queryStationStats(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
        log.info("三方平台获取统计信息请求参数：" + JacksonUtils.toJson(baseRequest));
        //校验token和签名
        BaseResult baseResult = requestCheck(true, baseRequest, request);
        if(0 != baseResult.getRet()){
            log.info("三方平台获取统计信息响应Data：");
            baseResult.setData("");
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台获取统计信息响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        Operator operator = baseResult.getOperator();
        //解密参数
        String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
        log.info("三方平台获取统计信息请求Data：" + decrypt);
        QueryStationStats queryStationStats = JSON.parseObject(decrypt, QueryStationStats.class);
        QueryStationStatsResult result = new QueryStationStatsResult();
        ChargingPercentProvinceDto dto = new ChargingPercentProvinceDto();
@@ -606,9 +632,11 @@
        result.setStationStats(stationStats);
        //参数加密
        String jsonString = JacksonUtils.toJson(result);
        log.info("三方平台获取统计信息响应Data：" + jsonString);
        String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
        baseResult.setData(encrypt);
        baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
        log.info("三方平台获取统计信息响应参数：" + JacksonUtils.toJson(baseResult));
        return baseResult;
    }
    
@@ -619,22 +647,27 @@
     */
    @PostMapping("/query_equip_auth")
    public BaseResult queryEquipAuth(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
        log.info("三方平台设备认证请求参数：" + JacksonUtils.toJson(baseRequest));
        //校验token和签名
        BaseResult baseResult = requestCheck(true, baseRequest, request);
        if(0 != baseResult.getRet()){
            log.info("三方平台设备认证响应Data：");
            baseResult.setData("");
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台设备认证响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        Operator operator = baseResult.getOperator();
        //解密参数
        String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
        log.info("三方平台设备认证请求Data：" + decrypt);
        QueryEquipAuth queryEquipAuth = JSON.parseObject(decrypt, QueryEquipAuth.class);
        String connectorID = queryEquipAuth.getConnectorID();
        TChargingGun tChargingGun = chargingGunClient.getChargingGunById(Integer.valueOf(connectorID)).getData();
        if(null == tChargingGun){
            baseResult.setRet(4004);
            baseResult.setMsg("connectorID 参数无效");
            log.info("三方平台设备认证响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        QueryEquipAuthResult queryEquipAuthResult = new QueryEquipAuthResult();
@@ -673,9 +706,11 @@
        }
        //参数加密
        String jsonString = JacksonUtils.toJson(queryEquipAuthResult);
        log.info("三方平台设备认证响应Data：" + jsonString);
        String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
        baseResult.setData(encrypt);
        baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
        log.info("三方平台设备认证响应参数：" + JacksonUtils.toJson(baseResult));
        return baseResult;
    }
    
@@ -687,16 +722,20 @@
     */
    @PostMapping("/query_equip_business_policy")
    public BaseResult queryEquipBusinessPolicy(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
        log.info("三方平台查询业务策略信息请求参数：" + JacksonUtils.toJson(baseRequest));
        //校验token和签名
        BaseResult baseResult = requestCheck(true, baseRequest, request);
        if(0 != baseResult.getRet()){
            log.info("三方平台查询业务策略信息响应Data：");
            baseResult.setData("");
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台查询业务策略信息响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        Operator operator = baseResult.getOperator();
        //解密参数
        String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
        log.info("三方平台查询业务策略信息请求Data：" + decrypt);
        QueryEquipBusinessPolicy queryEquipBusinessPolicy = JSON.parseObject(decrypt, QueryEquipBusinessPolicy.class);
        
        //构建返回结果
@@ -712,9 +751,11 @@
            baseResult.setMsg("connectorID 参数无效");
            //参数加密
            String jsonString = JacksonUtils.toJson(queryEquipBusinessPolicyResult);
            log.info("三方平台查询业务策略信息响应Data：" + jsonString);
            String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
            baseResult.setData(encrypt);
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台查询业务策略信息响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        Integer accountingStrategyId = tChargingGun.getAccountingStrategyId();
@@ -729,9 +770,11 @@
            queryEquipBusinessPolicyResult.setSumPeriod(0);
            //参数加密
            String jsonString = JacksonUtils.toJson(queryEquipBusinessPolicyResult);
            log.info("三方平台查询业务策略信息响应Data：" + jsonString);
            String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
            baseResult.setData(encrypt);
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台查询业务策略信息响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        List<PolicyInfo> PolicyInfos = new ArrayList<>();
@@ -746,9 +789,11 @@
        queryEquipBusinessPolicyResult.setPolicyInfos(PolicyInfos);
        //参数加密
        String jsonString = JacksonUtils.toJson(queryEquipBusinessPolicyResult);
        log.info("三方平台查询业务策略信息响应Data：" + jsonString);
        String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
        baseResult.setData(encrypt);
        baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
        log.info("三方平台查询业务策略信息响应参数：" + JacksonUtils.toJson(baseResult));
        return baseResult;
    }
    
@@ -802,16 +847,20 @@
     */
    @PostMapping("/query_start_charge")
    public BaseResult queryStartCharge(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
        log.info("三方平台请求开始充电请求参数：" + JacksonUtils.toJson(baseRequest));
        //校验token和签名
        BaseResult baseResult = requestCheck(true, baseRequest, request);
        if(0 != baseResult.getRet()){
            log.info("三方平台请求开始充电响应Data：");
            baseResult.setData("");
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台请求开始充电响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        Operator operator = baseResult.getOperator();
        //解密参数
        String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
        log.info("三方平台请求开始充电请求Data：" + decrypt);
        QueryStartCharge queryStartCharge = JSON.parseObject(decrypt, QueryStartCharge.class);
        
        //构建返回结果
@@ -829,9 +878,11 @@
            result.setStartChargeSeqStat(5);
            //参数加密
            String jsonString = JacksonUtils.toJson(result);
            log.info("三方平台请求开始充电响应Data：" + jsonString);
            String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
            baseResult.setData(encrypt);
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台请求开始充电响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        //设备离线
@@ -841,9 +892,11 @@
            result.setStartChargeSeqStat(5);
            //参数加密
            String jsonString = JacksonUtils.toJson(result);
            log.info("三方平台请求开始充电响应Data：" + jsonString);
            String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
            baseResult.setData(encrypt);
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台请求开始充电响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        //调用充电接口
@@ -862,9 +915,11 @@
            result.setStartChargeSeqStat(2);
            //参数加密
            String jsonString = JacksonUtils.toJson(result);
            log.info("三方平台请求开始充电响应Data：" + jsonString);
            String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
            baseResult.setData(encrypt);
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台请求开始充电响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        result.setStartChargeSeqStat(1);
@@ -872,9 +927,11 @@
        result.setFailReason(0);
        //参数加密
        String jsonString = JacksonUtils.toJson(result);
        log.info("三方平台请求开始充电响应Data：" + jsonString);
        String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
        baseResult.setData(encrypt);
        baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
        log.info("三方平台请求开始充电响应参数：" + JacksonUtils.toJson(baseResult));
        return baseResult;
    }
    
@@ -930,24 +987,30 @@
     */
    @PostMapping("/query_equip_charge_status")
    public BaseResult queryEquipChargeStatus(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
        log.info("三方平台查询充电状态请求参数：" + JacksonUtils.toJson(baseRequest));
        //校验token和签名
        BaseResult baseResult = requestCheck(true, baseRequest, request);
        if(0 != baseResult.getRet()){
            log.info("三方平台查询充电状态响应Data：");
            baseResult.setData("");
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台查询充电状态响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        Operator operator = baseResult.getOperator();
        //解密参数
        String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
        log.info("三方平台查询充电状态请求Data：" + decrypt);
        QueryEquipChargeStatus queryEquipChargeStatus = JSON.parseObject(decrypt, QueryEquipChargeStatus.class);
        //校验token和签名
        QueryEquipChargeStatusResult queryEquipChargeStatusResult = buildQueryEquipChargeStatusResult(queryEquipChargeStatus.getStartChargeSeq());
        //参数加密
        String jsonString = JacksonUtils.toJson(queryEquipChargeStatusResult);
        log.info("三方平台查询充电状态响应Data：" + jsonString);
        String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
        baseResult.setData(encrypt);
        baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
        log.info("三方平台查询充电状态响应参数：" + JacksonUtils.toJson(baseResult));
        return baseResult;
    }
    
@@ -1105,16 +1168,20 @@
     */
    @PostMapping("/query_stop_charge")
    public BaseResult queryStopCharge(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
        log.info("三方平台请求停止充电请求参数：" + JacksonUtils.toJson(baseRequest));
        //校验token和签名
        BaseResult baseResult = requestCheck(true, baseRequest, request);
        if(0 != baseResult.getRet()){
            log.info("三方平台请求停止充电响应Data：");
            baseResult.setData("");
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台请求停止充电响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        Operator operator = baseResult.getOperator();
        //解密参数
        String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
        log.info("三方平台请求停止充电请求Data：" + decrypt);
        QueryStopCharge queryStopCharge = JSON.parseObject(decrypt, QueryStopCharge.class);
        QueryStopChargeResult queryStopChargeResult = new QueryStopChargeResult();
        queryStopChargeResult.setStartChargeSeq(queryStopCharge.getStartChargeSeq());
@@ -1129,16 +1196,20 @@
            queryStopChargeResult.setFailReason(3);
            //参数加密
            String jsonString = JacksonUtils.toJson(queryStopChargeResult);
            log.info("三方平台请求停止充电响应Data：" + jsonString);
            String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
            baseResult.setData(encrypt);
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台请求停止充电响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        //参数加密
        String jsonString = JacksonUtils.toJson(queryStopChargeResult);
        log.info("三方平台请求停止充电响应Data：" + jsonString);
        String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
        baseResult.setData(encrypt);
        baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
        log.info("三方平台请求停止充电响应参数：" + JacksonUtils.toJson(baseResult));
        return baseResult;
    }
    
@@ -1313,23 +1384,27 @@
    
    
    /**
     * 二维码查询抢号（快电）
     * 二维码查询枪号（快电）
     * @param baseRequest
     * @param request
     * @return
     */
    @PostMapping("/query_terminal_code")
    public BaseResult queryTerminalCode(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
        log.info("三方平台二维码查询枪号请求参数：" + JacksonUtils.toJson(baseRequest));
        //校验token和签名
        BaseResult baseResult = requestCheck(true, baseRequest, request);
        if(0 != baseResult.getRet()){
            log.info("三方平台二维码查询枪号响应Data：");
            baseResult.setData("");
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台二维码查询枪号响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        Operator operator = baseResult.getOperator();
        //解密参数
        String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
        log.info("三方平台二维码查询枪号请求Data：" + decrypt);
        QueryTerminalCode queryTerminalCode = JSON.parseObject(decrypt, QueryTerminalCode.class);
        String qrCode = queryTerminalCode.getQRCode();
        String substring = qrCode.substring(qrCode.indexOf("=") + 1);
@@ -1338,9 +1413,11 @@
        
        //参数加密
        String jsonString = JacksonUtils.toJson(queryTerminalCodeResult);
        log.info("三方平台二维码查询枪号响应Data：" + jsonString);
        String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
        baseResult.setData(encrypt);
        baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
        log.info("三方平台二维码查询枪号响应参数：" + JacksonUtils.toJson(baseResult));
        return baseResult;
    }
    
@@ -1394,24 +1471,30 @@
     */
    @PostMapping("/query_charge_order_info")
    public BaseResult queryChargeOrderInfo(@RequestBody BaseRequest baseRequest, HttpServletRequest request){
        log.info("三方平台账单拉取请求参数：" + JacksonUtils.toJson(baseRequest));
        //校验token和签名
        BaseResult baseResult = requestCheck(true, baseRequest, request);
        if(0 != baseResult.getRet()){
            log.info("三方平台账单拉取响应Data：");
            baseResult.setData("");
            baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
            log.info("三方平台账单拉取响应参数：" + JacksonUtils.toJson(baseResult));
            return baseResult;
        }
        Operator operator = baseResult.getOperator();
        //解密参数
        String decrypt = AESUtil.decrypt(baseRequest.getData(), operator.getOurDataSecret(), operator.getOurDataSecretIv());
        log.info("三方平台账单拉取请求Data：" + decrypt);
        QueryChargeOrderInfo queryChargeOrderInfo = JSON.parseObject(decrypt, QueryChargeOrderInfo.class);
        //构建返回结果
        QueryChargeOrderInfoResult result = buildQueryChargeOrderInfoResult(queryChargeOrderInfo);
        //参数加密
        String jsonString = JacksonUtils.toJson(result);
        log.info("三方平台账单拉取响应Data：" + jsonString);
        String encrypt = AESUtil.encrypt(jsonString, operator.getOurDataSecret(), operator.getOurDataSecretIv());
        baseResult.setData(encrypt);
        baseResult.setSig(TCECUtil.ourBuildSign(baseResult));
        log.info("三方平台账单拉取响应参数：" + JacksonUtils.toJson(baseResult));
        return baseResult;
    }
    

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/TCECUtil.java

@@ -56,7 +56,8 @@
        baseRequest.setOperator(operator);
        baseRequest.setSig(buildSign(baseRequest));
        String request_json = JacksonUtils.toJson(baseRequest);
        log.info("获取授权token请求：" + request_json);
        log.info("获取授权token请求地址：" + post.getUrl());
        log.info("获取授权token请求参数：" + request_json);
        log.info("获取授权token请求Data：" + jsonString);
        post.body(request_json);
        HttpResponse execute = post.execute();
@@ -108,10 +109,21 @@
        buildBody(post, info, operator);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("推送三方设备状态变化失败：" + execute.body());
            log.error("推送三方平台设备状态失败：" + execute.body());
            return null;
        }
        return JSON.parseObject(execute.body(), NotificationStationStatusResult.class);
        log.info("推送三方平台设备状态响应：" + execute.body());
        BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
        Integer Ret = baseResult.getRet();
        if(0 != Ret){
            log.error("推送三方平台设备状态失败：" + baseResult.getMsg());
            return null;
        }
        //解密参数
        String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
        log.info("推送三方平台设备状态Data：" + decrypt);
        NotificationStationStatusResult notificationStationStatusResult = JSON.parseObject(decrypt, NotificationStationStatusResult.class);
        return notificationStationStatusResult;
    }
    
    
@@ -129,16 +141,21 @@
        buildBody(post, info, operator);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("推送三方启动充电结果失败：" + execute.body());
            log.error("推送三方平台启动充电结果失败：" + execute.body());
            return null;
        }
        JSONObject jsonObject = JSON.parseObject(execute.body());
        Integer ret = jsonObject.getInteger("Ret");
        if(0 != ret){
            log.error("推送三方启动充电结果失败：" + execute.body());
        log.info("推送三方平台启动充电结果响应：" + execute.body());
        BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
        Integer Ret = baseResult.getRet();
        if(0 != Ret){
            log.error("推送三方平台启动充电结果失败：" + baseResult.getMsg());
            return null;
        }
        return jsonObject.getObject("Data", NotificationStartChargeResult.class);
        //解密参数
        String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
        log.info("推送三方平台启动充电结果Data：" + decrypt);
        NotificationStartChargeResult notificationStartChargeResult = JSON.parseObject(decrypt, NotificationStartChargeResult.class);
        return notificationStartChargeResult;
    }
    
    
@@ -157,16 +174,21 @@
        buildBody(post, info, operator);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("推送三方充电状态失败：" + execute.body());
            log.error("推送三方平台充电状态失败：" + execute.body());
            return null;
        }
        JSONObject jsonObject = JSON.parseObject(execute.body());
        Integer ret = jsonObject.getInteger("Ret");
        if(0 != ret){
            log.error("推送三方充电状态失败：" + execute.body());
        log.info("推送三方平台充电状态响应：" + execute.body());
        BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
        Integer Ret = baseResult.getRet();
        if(0 != Ret){
            log.error("推送三方平台充电状态失败：" + baseResult.getMsg());
            return null;
        }
        return jsonObject.getObject("Data", NotificationEquipChargeStatusResult.class);
        //解密参数
        String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
        log.info("推送三方平台充电状态Data：" + decrypt);
        NotificationEquipChargeStatusResult notificationEquipChargeStatusResult = JSON.parseObject(decrypt, NotificationEquipChargeStatusResult.class);
        return notificationEquipChargeStatusResult;
    }
    
    
@@ -180,16 +202,21 @@
        buildBody(post, info, operator);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("推送三方停止充电结果失败：" + execute.body());
            log.error("推送三方平台停止充电结果失败：" + execute.body());
            return null;
        }
        JSONObject jsonObject = JSON.parseObject(execute.body());
        Integer ret = jsonObject.getInteger("Ret");
        if(0 != ret){
            log.error("推送三方停止充电结果失败：" + execute.body());
        log.info("推送三方平台停止充电结果响应：" + execute.body());
        BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
        Integer Ret = baseResult.getRet();
        if(0 != Ret){
            log.error("推送三方平台停止充电结果失败：" + baseResult.getMsg());
            return null;
        }
        return jsonObject.getObject("Data", NotificationStopCharge.class);
        //解密参数
        String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
        log.info("推送三方平台停止充电结果Data：" + decrypt);
        NotificationStopCharge notificationStopCharge = JSON.parseObject(decrypt, NotificationStopCharge.class);
        return notificationStopCharge;
    }
    
    
@@ -205,16 +232,21 @@
        buildBody(post, info, operator);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("推送三方充电订单信息失败：" + execute.body());
            log.error("推送三方平台充电订单信息失败：" + execute.body());
            return null;
        }
        JSONObject jsonObject = JSON.parseObject(execute.body());
        Integer ret = jsonObject.getInteger("Ret");
        if(0 != ret){
            log.error("推送三方充电订单信息失败：" + execute.body());
        log.info("推送三方平台充电订单信息响应：" + execute.body());
        BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
        Integer Ret = baseResult.getRet();
        if(0 != Ret){
            log.error("推送三方平台充电订单信息失败：" + baseResult.getMsg());
            return null;
        }
        return jsonObject.getObject("Data", NotificationChargeOrderInfoResult.class);
        //解密参数
        String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
        log.info("推送三方平台充电订单信息Data：" + decrypt);
        NotificationChargeOrderInfoResult notificationChargeOrderInfoResult = JSON.parseObject(decrypt, NotificationChargeOrderInfoResult.class);
        return notificationChargeOrderInfoResult;
    }
    
    
@@ -236,7 +268,11 @@
        baseRequest.setData(encrypt);
        baseRequest.setOperator(operator);
        baseRequest.setSig(buildSign(baseRequest));
        post.body(JacksonUtils.toJson(baseRequest));
        String request_json = JacksonUtils.toJson(baseRequest);
        post.body(request_json);
        log.info("推送三方平台请求地址：" + post.getUrl());
        log.info("推送三方平台请求参数：" + request_json);
        log.info("推送三方平台请求Data：" + jsonString);
    }

    

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/kuaidian/TCECKDUtil.java

@@ -54,10 +54,21 @@
        buildBody(post, stationChange, operator);
        HttpResponse execute = post.execute();
        if(200 != execute.getStatus()){
            log.error("推送站点变更通知失败：" + execute.body());
            log.error("推送三方平台站点变更通知失败：" + execute.body());
            return null;
        }
        return JSON.parseObject(execute.body(), NotificationStationChangeResult.class);
        log.info("推送三方平台站点变更通知响应：" + execute.body());
        BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
        Integer Ret = baseResult.getRet();
        if(0 != Ret){
            log.error("推送三方平台站点变更通知失败：" + baseResult.getMsg());
            return null;
        }
        //解密参数
        String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
        log.info("推送三方平台站点变更通知Data：" + decrypt);
        NotificationStationChangeResult notificationStationChangeResult = JSON.parseObject(decrypt, NotificationStationChangeResult.class);
        return notificationStationChangeResult;
    }