diff --git a/pom.xml b/pom.xml
index 2000fb3..7f35595 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,15 +6,15 @@
net.javase.iot
onenet-api
- 1.0.0
+ 1.0.1
1.8
UTF-8
UTF-8
4.13.1
- 1.18.26
- 5.8.20
+ 1.18.32
+ 5.8.28
2.0.23
1.7.30
@@ -31,7 +31,7 @@
org.projectlombok
lombok
${lombok.version}
- compile
+ provided
@@ -60,6 +60,23 @@
+
+
+ gitea
+ https://gitea.52it.vip/api/packages/Frank/maven
+
+
+
+
+ gitea
+ https://gitea.52it.vip/api/packages/Frank/maven
+
+
+ gitea
+ https://gitea.52it.vip/api/packages/Frank/maven
+
+
+
onenet-api
diff --git a/src/main/java/net/javase/onenet/api/DeviceApi.java b/src/main/java/net/javase/onenet/api/DeviceApi.java
index 300ceac..1499bc6 100644
--- a/src/main/java/net/javase/onenet/api/DeviceApi.java
+++ b/src/main/java/net/javase/onenet/api/DeviceApi.java
@@ -155,11 +155,22 @@ public class DeviceApi {
* @return {@link ApiResponse}
*/
public static ApiResponse deviceOperationLog(Config config, DeviceStatusHistoryModel model) {
+ return deviceOperationLog(config, model.toMap());
+ }
+
+ /**
+ * 设备操作记录查询
+ *
+ * @param config {@link Config}
+ * @param query query参数
+ * @return {@link ApiResponse}
+ */
+ public static ApiResponse deviceOperationLog(Config config, Map query) {
return ApiRequest.builder()
.api(ApiEnum.DEVICE_OPERATION_LOG.api())
.method(Method.GET)
.signMethod(SignMethod.MD5)
- .query(model.toMap())
+ .query(query)
.userid(config.getUserid())
.build()
.send(config.getAccessKey());
diff --git a/src/main/java/net/javase/onenet/exception/ApiException.java b/src/main/java/net/javase/onenet/exception/ApiException.java
index 82bdc37..459e3b2 100644
--- a/src/main/java/net/javase/onenet/exception/ApiException.java
+++ b/src/main/java/net/javase/onenet/exception/ApiException.java
@@ -6,6 +6,7 @@ package net.javase.onenet.exception;
* @author Frank
*/
public class ApiException extends RuntimeException {
+ private static final long serialVersionUID = 9095234958719589705L;
public ApiException() {
}
diff --git a/src/main/java/net/javase/onenet/model/device/DeviceMoveModel.java b/src/main/java/net/javase/onenet/model/device/DeviceMoveModel.java
index 193378d..5c92279 100644
--- a/src/main/java/net/javase/onenet/model/device/DeviceMoveModel.java
+++ b/src/main/java/net/javase/onenet/model/device/DeviceMoveModel.java
@@ -6,6 +6,8 @@ import lombok.Setter;
import net.javase.onenet.annotation.ApiParam;
import net.javase.onenet.model.base.BaseModel;
+import java.util.List;
+
/**
* DeviceMoveModel
*
@@ -33,5 +35,5 @@ public class DeviceMoveModel extends BaseModel {
* 如["name_1", "name_2"],每个元素名称最长限制64位,数组元素不超过1000个
*/
@ApiParam(name = "device_name")
- private String[] deviceName;
+ private List deviceName;
}
diff --git a/src/main/java/net/javase/onenet/utils/Kv.java b/src/main/java/net/javase/onenet/utils/Kv.java
index 11a1e7d..9f455b8 100644
--- a/src/main/java/net/javase/onenet/utils/Kv.java
+++ b/src/main/java/net/javase/onenet/utils/Kv.java
@@ -10,7 +10,7 @@ import java.util.Map;
*/
public class Kv {
- private Map map;
+ private final Map map;
public Kv() {
this.map = new HashMap<>();
diff --git a/src/main/java/net/javase/onenet/utils/RequestUtil.java b/src/main/java/net/javase/onenet/utils/RequestUtil.java
index 4e7359d..519e8b2 100644
--- a/src/main/java/net/javase/onenet/utils/RequestUtil.java
+++ b/src/main/java/net/javase/onenet/utils/RequestUtil.java
@@ -42,7 +42,7 @@ public class RequestUtil {
public static T doRequest(ApiRequest req, String accessKey, Class clazz) {
Method method = req.getMethod();
String url = req.getDomain().getDomain() + req.url();
- if (req.getQuery() != null && req.getQuery().size() > 0) {
+ if (req.getQuery() != null && !req.getQuery().isEmpty()) {
String query = URLUtil.buildQuery(req.getQuery(), StandardCharsets.UTF_8);
url += "?" + query;
}
@@ -50,7 +50,7 @@ public class RequestUtil {
if (req.getContentType() != null) {
request.contentType(req.getContentType().toString());
}
- if (req.getBody() != null && req.getBody().size() > 0) {
+ if (req.getBody() != null && !req.getBody().isEmpty()) {
request.body(JSONObject.toJSONString(req.getBody()));
}
@@ -90,7 +90,7 @@ public class RequestUtil {
public static void download(ApiRequest req, String accessKey, File target) {
Method method = req.getMethod();
String url = req.getDomain().getDomain() + req.url();
- if (req.getQuery() != null && req.getQuery().size() > 0) {
+ if (req.getQuery() != null && !req.getQuery().isEmpty()) {
String query = URLUtil.buildQuery(req.getQuery(), StandardCharsets.UTF_8);
url += "?" + query;
}
@@ -98,7 +98,7 @@ public class RequestUtil {
if (req.getContentType() != null) {
request.contentType(req.getContentType().toString());
}
- if (req.getBody() != null && req.getBody().size() > 0) {
+ if (req.getBody() != null && !req.getBody().isEmpty()) {
request.body(JSONObject.toJSONString(req.getBody()));
}