Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging...

Pu Zhibing

1 天以前 873b05ed68b2eabf2152954e88dc5598a8aeb8ea

 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/util/ChuanYiChongSuperviseUtil.java

@@ -163,19 +163,19 @@
      buildBody(post, info, operator);
      HttpResponse execute = post.execute();
      if(200 != execute.getStatus()){
         log.error("推送三方平台充电开始状态失败：" + execute.body());
         log.error("川易充推送三方平台充电开始状态失败：" + execute.body());
         return null;
      }
      log.info("推送三方平台设备状态响应：" + 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());
         log.error("川易充推送三方平台充电开始状态失败：" + baseResult.getMsg());
         return null;
      }
      //解密参数
      String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
      log.info("推送三方平台设备状态Data：" + decrypt);
      log.info("川易充推送三方平台设备状态Data：" + decrypt);
      NotificationStationStatusResult notificationStationStatusResult = JSON.parseObject(decrypt, NotificationStationStatusResult.class);
      return notificationStationStatusResult;
   }
@@ -197,19 +197,19 @@
      buildBody(post, info, operator);
      HttpResponse execute = post.execute();
      if(200 != execute.getStatus()){
         log.error("推送川逸充平台充电结束状态失败：" + execute.body());
         log.error("川易充推送川逸充平台充电结束状态失败：" + execute.body());
         return null;
      }
      log.info("推送川逸充平台充电结束状态响应：" + 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());
         log.error("川易充推送川逸充平台充电结束状态失败：" + baseResult.getMsg());
         return null;
      }
      //解密参数
      String decrypt = AESUtil.decrypt(baseResult.getData(), DataSecret, DataSecretIV);
      log.info("推送川逸充充电结束.状态Data：" + decrypt);
      log.info("川易充推送川逸充充电结束.状态Data：" + decrypt);
      NotificationEquipChargeStatusResult notificationEquipChargeStatusResult = JSON.parseObject(decrypt, NotificationEquipChargeStatusResult.class);
      return notificationEquipChargeStatusResult;
   }
@@ -300,9 +300,9 @@
      baseRequest.setSig(hmacMD5);
      String request_json = JacksonUtils.toJson(baseRequest);
      post.body(request_json);
      log.info("推送三方平台请求地址：" + post.getUrl());
      log.info("推送三方平台请求参数：" + request_json);
      log.info("推送三方平台请求Data：" + o.toJSONString());
      log.info("川易充推送三方平台请求地址：" + post.getUrl());
      log.info("川易充推送三方平台请求参数：" + request_json);
      log.info("川易充推送三方平台请求Data：" + o.toJSONString());
   }
   /**
    * 构建请求参数和消息头