From c09880d791eccb623be595aeb11d6ce0c4561a3f Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期五, 14 三月 2025 15:50:46 +0800 Subject: [PATCH] sdk密码授权模式修改为客户端模式,只需要用户名和客户端id、secret --- src/main/java/com/iailab/sdk/demo/HttpClientDemo.java | 30 ++++++++++-------------------- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/iailab/sdk/demo/HttpClientDemo.java b/src/main/java/com/iailab/sdk/demo/HttpClientDemo.java index 3c8580b..1f386ef 100644 --- a/src/main/java/com/iailab/sdk/demo/HttpClientDemo.java +++ b/src/main/java/com/iailab/sdk/demo/HttpClientDemo.java @@ -1,6 +1,7 @@ package com.iailab.sdk.demo; -import com.iailab.sdk.auth.client.IailabAuthClient; +import com.iailab.sdk.auth.client.IailabClient; +import com.iailab.sdk.auth.client.common.pojo.CommonResult; import com.iailab.sdk.auth.client.dto.ApiDataQueryDTO; import com.iailab.sdk.auth.client.dto.TokenDTO; import org.springframework.web.bind.annotation.RestController; @@ -20,7 +21,7 @@ * 获取平台授权token及refreshToken */ public void authenticate() { - TokenDTO authenticate = IailabAuthClient.authenticate(); + TokenDTO authenticate = IailabClient.authenticate(); System.out.println(authenticate); } @@ -29,27 +30,16 @@ * @throws Exception */ public void refreshToken() throws Exception { - IailabAuthClient.authenticate(); - TokenDTO authenticate = IailabAuthClient.refreshToken(); + IailabClient.authenticate(); + TokenDTO authenticate = IailabClient.refreshToken(); System.out.println(authenticate); } - public Map<String, Object> queryPointsRealValue() throws Exception { + public CommonResult<Map<String, Object>> queryPointsRealValue() throws Exception { List<String> pointNos = new ArrayList<>(); - pointNos.add("111"); - return IailabAuthClient.getInstance().queryPointsRealValue(pointNos); - } - - public Map<String, Object> queryPlanChart() throws Exception { - ApiDataQueryDTO apiDataQueryDTO = new ApiDataQueryDTO(); - List<String> itemNos = new ArrayList<>(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - apiDataQueryDTO.setStart(sdf.parse("2024-06-11 07:24:00")); - apiDataQueryDTO.setEnd(sdf.parse("2024-06-13 00:00:00")); - itemNos.add("P0000100010"); - apiDataQueryDTO.setItemNos(itemNos); - return IailabAuthClient.getInstance().queryPlanChart(apiDataQueryDTO); + pointNos.add("F0000120031"); + return IailabClient.getInstance().queryPointsRealValue(pointNos); } /** @@ -65,7 +55,7 @@ params.put("granularity", null); itemNos.add("P0000100010"); params.put("itemNos", itemNos); - String s = IailabAuthClient.doHttp("POST", "http://172.16.8.100/admin-api/data/api/query-plans/chart", params); + String s = IailabClient.doHttp("POST", "http://172.16.8.100/admin-api/data/api/query-plans/chart", params); System.out.println(s); } @@ -76,7 +66,7 @@ public void doHttpGet() throws Exception { Map<String, Object> params = new HashMap<>(); params.put("pointNos", "M0000101158,M0000101157,M0000101156,M0000101155,F0000120026"); - String s = IailabAuthClient.doHttp("get", "http://172.16.8.100/admin-api/data/api/device-value", params); + String s = IailabClient.doHttp("get", "http://172.16.8.100/admin-api/data/api/device-value", params); System.out.println(s); } } -- Gitblit v1.9.3