diff --git a/src/main/java/com/example/zxweb/common/constant/enums/IotApiPathsEnum.java b/src/main/java/com/example/zxweb/common/constant/enums/IotApiEnum.java similarity index 91% rename from src/main/java/com/example/zxweb/common/constant/enums/IotApiPathsEnum.java rename to src/main/java/com/example/zxweb/common/constant/enums/IotApiEnum.java index 609fde4..8ebed8d 100644 --- a/src/main/java/com/example/zxweb/common/constant/enums/IotApiPathsEnum.java +++ b/src/main/java/com/example/zxweb/common/constant/enums/IotApiEnum.java @@ -6,7 +6,7 @@ package com.example.zxweb.common.constant.enums; * @author: ZhouWenTao * @date: 2023/9/8 12:05 */ -public enum IotApiPathsEnum { +public enum IotApiEnum { /** * 获取单个设备信息 GET,query @@ -84,7 +84,7 @@ public enum IotApiPathsEnum { * @param path 地址 * @param text 描述 */ - IotApiPathsEnum(String path, String text) { + IotApiEnum(String path, String text) { this.path = path; this.text = text; } @@ -97,7 +97,7 @@ public enum IotApiPathsEnum { * @return String 描述 */ public static String getTextByPath(String path){ - for (IotApiPathsEnum e : IotApiPathsEnum.values()) { + for (IotApiEnum e : IotApiEnum.values()) { if (path.startsWith(e.getPath())) { return e.getText(); } @@ -111,7 +111,7 @@ public enum IotApiPathsEnum { * @return */ public static String getPathByText(String text){ - for (IotApiPathsEnum e : IotApiPathsEnum.values()) { + for (IotApiEnum e : IotApiEnum.values()) { if (text.startsWith(e.getText())) { return e.getPath(); } diff --git a/src/main/java/com/example/zxweb/controller/IotController.java b/src/main/java/com/example/zxweb/controller/IotController.java index b640af1..a5227b1 100644 --- a/src/main/java/com/example/zxweb/controller/IotController.java +++ b/src/main/java/com/example/zxweb/controller/IotController.java @@ -1,10 +1,10 @@ package com.example.zxweb.controller; +import com.alibaba.fastjson.JSONObject; import com.example.zxweb.common.api.vo.Result; -import com.example.zxweb.common.constant.enums.IotApiPathsEnum; +import com.example.zxweb.common.constant.enums.IotApiEnum; import com.example.zxweb.utils.AssertUtils; import com.example.zxweb.utils.IotUtils; -import com.example.zxweb.utils.RestUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -31,10 +31,10 @@ public class IotController { @GetMapping(value = "/devices") public Result devices(@RequestParam(value = "serial",defaultValue = "")String serial,@RequestParam(value = "productId",defaultValue = "")String productId){ AssertUtils.notEmpty(serial,"请输入-[serial]");AssertUtils.notEmpty(productId,"请输入-[productId]"); - Map queryData=new LinkedHashMap<>(); - queryData.put("serial",serial); - queryData.put("productId",productId); + JSONObject requestBody=new JSONObject(); + requestBody.put("serial",serial); + requestBody.put("productId",productId); //请求数据 - return Result.OK(IotUtils.getApi(IotApiPathsEnum.getPathByText("获取单个设备信息"),queryData)); + return Result.OK(IotUtils.getApi(IotApiEnum.getPathByText("获取单个设备信息"),requestBody)); } } diff --git a/src/main/java/com/example/zxweb/utils/IotUtils.java b/src/main/java/com/example/zxweb/utils/IotUtils.java index 8c38241..acff88d 100644 --- a/src/main/java/com/example/zxweb/utils/IotUtils.java +++ b/src/main/java/com/example/zxweb/utils/IotUtils.java @@ -1,11 +1,8 @@ package com.example.zxweb.utils; import com.alibaba.fastjson.JSONObject; -import com.example.zxweb.common.constant.enums.IotApiPathsEnum; import org.springframework.stereotype.Component; -import java.util.Map; - /** * @Description ios 设备请求工具 * @Author ZhouWenTao @@ -16,7 +13,10 @@ public class IotUtils { //请求服务地址 private static final String API_PREFIX = "https://10.0.10.153:2443/api/iot/v1"; - public static JSONObject getApi(String apiUrl,Map queryData) { + private static final JSONObject headers=JSONObject.parseObject("{\"x-consumer-username\":\"dwVendor\",\"appCode\":\"42142fd0jkbf4515853b7fcec64748f6\"}"); + + public static JSONObject getApi(String apiUrl,JSONObject queryData) { + StringBuilder sb=new StringBuilder(); int i=0; for (String field : queryData.keySet()) { @@ -25,7 +25,7 @@ public class IotUtils { sb.append(field).append("=").append(value); i++; } - JSONObject jsonObject = RestUtil.get(API_PREFIX+apiUrl + sb); - return jsonObject; + JSONObject responseBody = RestUtil.get(API_PREFIX+apiUrl,queryData,null,headers); + return responseBody; } } diff --git a/src/main/java/com/example/zxweb/utils/RestUtil.java b/src/main/java/com/example/zxweb/utils/RestUtil.java index a23bd3e..09a2f00 100644 --- a/src/main/java/com/example/zxweb/utils/RestUtil.java +++ b/src/main/java/com/example/zxweb/utils/RestUtil.java @@ -74,28 +74,28 @@ public class RestUtil { * 发送 get 请求 */ public static JSONObject get(String url) { - return getNative(url, null, null).getBody(); + return getNative(url, null, null,null).getBody(); } /** * 发送 get 请求 */ public static JSONObject get(String url, JSONObject variables) { - return getNative(url, variables, null).getBody(); + return getNative(url, variables, null,null).getBody(); } /** * 发送 get 请求 */ - public static JSONObject get(String url, JSONObject variables, JSONObject params) { - return getNative(url, variables, params).getBody(); + public static JSONObject get(String url, JSONObject variables, JSONObject params,JSONObject header) { + return getNative(url, variables, params,header).getBody(); } /** * 发送 get 请求,返回原生 ResponseEntity 对象 */ - public static ResponseEntity getNative(String url, JSONObject variables, JSONObject params) { - return request(url, HttpMethod.GET, variables, params,null); + public static ResponseEntity getNative(String url, JSONObject variables, JSONObject params,JSONObject header) { + return request(url, HttpMethod.GET, variables, params,header); } /**