TRX 1 vuosi sitten
vanhempi
commit
049cc40921

+ 88 - 0
src/main/java/com/github/microservice/http/APIResponseModel.java

@@ -0,0 +1,88 @@
+package com.github.microservice.http;
+
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author TRX
+ * @date 2024/6/25
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class APIResponseModel {
+
+    @Schema(description = "是否错误")
+    private boolean failed;
+
+    @Schema(description = "是否成功")
+    private boolean success;
+
+    @Schema(description = "返回消息")
+    private String msg;
+
+    private String state;
+
+    private String content;
+
+    @Schema(description = "访问的URL")
+    private Object param;
+
+    @Schema(description = "请求数据")
+    private Object data;
+
+    public void setRequestData(Object data) {
+        this.data = data;
+    }
+
+    @Schema(description = "请求耗时:毫秒")
+    private Long millis;
+
+    public <T> T toBean(Class<T> tClass) {
+        if (content != null) {
+            return JSONUtil.toBean(content, tClass);
+        }
+        return null;
+    }
+
+    public JSONObject toJson() {
+        if (content != null) {
+            return JSONUtil.parseObj(content);
+        }
+        return null;
+    }
+
+    public boolean isSuccess() {
+        if (StringUtils.isNotEmpty(this.state) && "Fail".equals(state)) {
+            return false;
+        }
+        return success;
+    }
+
+    public void setIsSuccess() {
+        this.success = Boolean.TRUE;
+        this.failed = Boolean.FALSE;
+        this.state = "success";
+    }
+
+    public boolean isFailed() {
+        return !this.isSuccess();
+    }
+
+    public void setIsFailed() {
+        this.success = Boolean.FALSE;
+        this.failed = Boolean.TRUE;
+        this.state = "Fail";
+    }
+
+    public void setIsFailed(String msg) {
+        this.setIsFailed();
+        this.msg = msg;
+    }
+}

+ 24 - 0
src/main/java/com/github/microservice/http/ApiConfParam.java

@@ -0,0 +1,24 @@
+package com.github.microservice.http;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author TRX
+ * @date 2024/6/25
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ApiConfParam {
+
+    @Schema(description = "API名称")
+    private String apiName;
+
+    @Schema(description = "请求类型 Json、POST、GET")
+    private String methodType;
+}

+ 10 - 0
src/main/java/com/github/microservice/http/MethodType1.java

@@ -0,0 +1,10 @@
+package com.github.microservice.http;
+
+/**
+ * 方法类型
+ */
+public enum MethodType1 {
+    Post,
+    Get,
+    Json
+}

+ 3 - 2
src/main/java/com/github/microservice/models/devicePermiss/DevicePermiss.java → src/main/java/com/github/microservice/models/devicePermiss/DeviceAboutPermiss.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -16,7 +17,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class DevicePermiss {
+public class DeviceAboutPermiss {
 
     @Schema(description = "设备ID")
     private String deviceId;
@@ -25,6 +26,6 @@ public class DevicePermiss {
     private Boolean isOpenUse = Boolean.FALSE;
 
     @Schema(description = "包含用户权限")
-    private List<UserPermiss> userPermisses;
+    private List<UserPermiss> userPermisses = new ArrayList<>();
 
 }

+ 4 - 1
src/main/java/com/github/microservice/models/devicePermiss/GateWayPermissModel.java

@@ -26,6 +26,9 @@ public class GateWayPermissModel extends IotBaseResult {
     private String GateWayId;
 
     @Schema(description = "设备权限信息")
-    private List<DevicePermiss> devices = new ArrayList<DevicePermiss>();
+    private List<DeviceAboutPermiss> devices = new ArrayList<DeviceAboutPermiss>();
 
+    public void addDevice(DeviceAboutPermiss device) {
+        this.devices.add(device);
+    }
 }

+ 3 - 0
src/main/java/com/github/microservice/models/devicePermiss/GateWayQuery.java

@@ -16,4 +16,7 @@ public class GateWayQuery extends IotSuperModel {
     @Schema(description = "请求时间")
     private Long time;
 
+    @Schema(description = "")
+    private String projectCode;
+
 }

+ 1 - 1
src/main/java/com/github/microservice/models/devicePermiss/UserPermiss.java

@@ -24,7 +24,7 @@ public class UserPermiss {
     private String userName = "";
 
     @Schema(description = "人脸图片")
-    private List<String> faceImages = new ArrayList<>();
+    private String faceImage = "";
 
     @Schema(description = "卡号")
     private List<String> cardNos = new ArrayList<>();