修改bug和对接测试iotd

puzhibing

2025-02-06 fd90eaebe2d70d1f7cf7ee511f084e0b97fc16a2

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

@@ -41,24 +41,42 @@
    */
   public static String queryToken(Operator operator){
      HttpRequest post = HttpUtil.createPost(operator.getTestUrl() + InterfaceUrlEnum.QUERY_TOKEN.getUrl());
      JSONObject info = new JSONObject();
      info.put("OperatorID", operator.getOurOperatorId());
      info.put("OperatorSecret", operator.getOperatorSecret());
      Long timeStamp = Long.valueOf(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")));
      post.contentType("application/json;charset=utf-8");
      JSONObject body = new JSONObject();
      body.put("OperatorID", operator.getOurOperatorId());
      body.put("OperatorSecret", operator.getOurOperatorSecret());
      post.body(body.toJSONString());
      BaseRequest baseRequest = new BaseRequest();
      baseRequest.setOperatorID(operator.getOurOperatorId());
      baseRequest.setTimeStamp(timeStamp);
      baseRequest.setSeq("0001");
      String jsonString = JacksonUtils.toJson(info);
      String encrypt = AESUtil.encrypt(jsonString, operator.getDataSecret(), operator.getDataSecretIv());
      baseRequest.setData(encrypt);
      baseRequest.setOperator(operator);
      baseRequest.setSig(buildSign(baseRequest));
      String request_json = JacksonUtils.toJson(baseRequest);
      log.info("获取授权token请求：" + request_json);
      log.info("获取授权token请求Data：" + jsonString);
      post.body(request_json);
      HttpResponse execute = post.execute();
      if(200 != execute.getStatus()){
         log.error("获取三方token失败：" + execute.body());
         return null;
      }
      JSONObject jsonObject = JSON.parseObject(execute.body());
      Integer succStat = jsonObject.getInteger("SuccStat");
      if(0 != succStat){
         log.error("获取三方token失败：" + jsonObject.getString("FailReason"));
      log.info("获取授权token响应：" + execute.body());
      BaseResult baseResult = JSON.parseObject(execute.body(), BaseResult.class);
      Integer Ret = baseResult.getRet();
      if(0 != Ret){
         log.error("获取三方token失败：" + baseResult.getMsg());
         return null;
      }
      String token = jsonObject.getString("AccessToken");
      Long tokenAvailableTime = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC) + jsonObject.getLong("TokenAvailableTime");
      //解密参数
      String decrypt = AESUtil.decrypt(baseResult.getData(), operator.getDataSecret(), operator.getDataSecretIv());
      log.info("获取授权token请求Data：" + decrypt);
      QueryTokenResult queryTokenResult = JSON.parseObject(decrypt, QueryTokenResult.class);
      String token = queryTokenResult.getAccessToken();
      Long tokenAvailableTime = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC) + queryTokenResult.getTokenAvailableTime();
      LocalDateTime localDateTime = Instant.ofEpochSecond(tokenAvailableTime).atOffset(ZoneOffset.UTC).toLocalDateTime();
      operator.setAccessToken(token);
      operator.setTokenAvailableTime(localDateTime);
@@ -218,7 +236,7 @@
      baseRequest.setData(encrypt);
      baseRequest.setOperator(operator);
      baseRequest.setSig(buildSign(baseRequest));
      post.body(JSON.toJSONString(baseRequest));
      post.body(JacksonUtils.toJson(baseRequest));
   }

   
@@ -285,7 +303,7 @@
   public static void main(String[] args) {
      BaseModel model = new BaseModel();
      model.setOperatorID("MA25CNM38");
      model.setData("lkQUXmphG3h5Wf0UIxSfzNoCdqDLYkmDGceCbofJuWFqKBwCYulTUHSn9bJpVMVFNji/4xtSq3o1U5jSZZwIhA==");
      model.setData("AoArdDDcmHcmOMkCLHodTpY1xLtt9yhLqxvKPyfdlmEOBj1LJnQM+Z4JOZllt3Pj9rubfgxJ51zMAfzquQegJzHGAT9Y7JrKFzFe6jGtXo0=");
      model.setTimeStamp(20250205120800L);
      model.setSeq("0001");
      Operator operator = new Operator();
@@ -293,11 +311,29 @@
      operator.setSigSecret("S94xUpTpOIlLJBk8");
      model.setOperator(operator);
      String key = operator.getSigSecret();
		

      String m = new StringBuilder(model.getOperatorID()).append(model.getData()).append(model.getTimeStamp()).append(model.getSeq()).toString();
      byte[] hmacMd5 = SignUtil.getHMacMD5Bytes(key.getBytes(), m.getBytes());
      // 打印计算得到的签名Sig
      String s = SignUtil.bytesToHexString(hmacMd5);
      System.err.println(s);
		
		
//      BaseModel model = new BaseModel();
//      model.setOperatorID("MA25CNM38");
//      model.setData("xQYYEPiwoc4JENnQsF50qP6Tmnj7uU/AshWn3QbIgrMIk8zvFpy6fWLIiLzQHcLPFCihqH1uzoNhGVNcS8Wvf5gIx9+cWJvYtjwtsjAGMEwNQ6y+rF1jjKnqCNcQbHbhqJ2l76sD54QCFKyenKxymrXri19bDV8hizn3nBw+jcHBtqKHWzjdSHwPDWPIw4rXnrbWLya2PXVgYtVg93WPtliw+0xsqW0BxJamE70/Ilbg4wB5fOAOvXmbLFI+v9jRjpcA7ImhprqPMYkXYAfa2QlICrJEBK7DfpJvRMzKzeT90kOAITqIqFvbfV0ti+greRqToLP6ni4o6w3ID42UmKasIpLTnx+qtR4bVTBTRuDzXvNXDA92RqHaJO21xbSen1eHN/yGfrchBIM0gmav7EpaYAerfU4ubnmJ6xujR6okYepJwBD5DiSIrObfS+GWVPRekvnjvm7BC02NXTrGKA==");
//      model.setTimeStamp(20250205161426L);
//      model.setSeq("0001");
//      Operator operator = new Operator();
//      operator.setOurOperatorId("2921700136");
//      operator.setOurSigSecret("KBm5J2fbGzyhX023");
//      model.setOperator(operator);
//      String key = operator.getOurSigSecret();
//
//      String m = new StringBuilder(operator.getOurOperatorId()).append(model.getData()).append(model.getTimeStamp()).append(model.getSeq()).toString();
//      byte[] hmacMd5 = SignUtil.getHMacMD5Bytes(key.getBytes(), m.getBytes());
//      // 打印计算得到的签名Sig
//      String s = SignUtil.bytesToHexString(hmacMd5);
//      System.err.println(s);
   }
}