From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-core/src/main/java/com/java110/core/context/PageData.java | 193 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 184 insertions(+), 9 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/context/PageData.java b/java110-core/src/main/java/com/java110/core/context/PageData.java
old mode 100644
new mode 100755
index 6caa96e..9cab454
--- a/java110-core/src/main/java/com/java110/core/context/PageData.java
+++ b/java110-core/src/main/java/com/java110/core/context/PageData.java
@@ -2,6 +2,8 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.utils.util.DateUtil;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import java.io.Serializable;
@@ -12,17 +14,20 @@
* 椤甸潰璇锋眰鏁版嵁灏佽
* Created by wuxw on 2018/5/2.
*/
-public class PageData implements IPageData,Serializable {
+public class PageData implements IPageData, Serializable {
-
- public PageData(){
+ public PageData() {
this.setTransactionId(UUID.randomUUID().toString());
}
- private String userId ;
+ private String userId;
+
+ private String userName;
+
+ private String appId;
//浼氳瘽ID
private String sessionId;
@@ -42,6 +47,26 @@
private String responseTime;
private String url;
+
+ private String apiUrl;
+
+ private HttpMethod method;
+ private Map<String, Object> headers;
+
+ /**
+ * 浠樻鏂筰d
+ */
+ private String payerObjId;
+
+ /**
+ * 浠樻鏂圭被鍨�
+ */
+ private String payerObjType;
+
+ /**
+ * 缂磋垂鍒版湡鏃堕棿
+ */
+ private String endTime;
private ResponseEntity responseEntity;
@@ -138,33 +163,183 @@
/**
* 鍒濆鍖� PageData
+ *
* @return
*/
- public static IPageData newInstance(){
+ public static IPageData newInstance() {
return new PageData();
}
- public IPageData builder(Map param) throws IllegalArgumentException{
+ public IPageData builder(Map param) throws IllegalArgumentException {
JSONObject reqJson = null;
return this;
}
- public IPageData builder(String userId,String token,String reqData,String componentCode,String componentMethod,String url,String sessionId)
- throws IllegalArgumentException{
+ public IPageData builder(String userId,
+ String userName,
+ String token,
+ String reqData,
+ String componentCode,
+ String componentMethod,
+ String url,
+ String sessionId) {
+ return builder(userId,
+ userName,
+ token,
+ reqData,
+ componentCode,
+ componentMethod,
+ url,
+ sessionId,
+ "",
+ null);
+ }
+
+ @Override
+ public IPageData builder(String userId,
+ String userName,
+ String token,
+ String reqData,
+ String componentCode,
+ String componentMethod,
+ String url,
+ String sessionId,
+ String appId,
+ String payerObjId,
+ String payerObjType,
+ String endTime) throws IllegalArgumentException {
this.setComponentCode(componentCode);
this.setComponentMethod(componentMethod);
this.setReqData(reqData);
this.setRequestTime(DateUtil.getyyyyMMddhhmmssDateString());
this.setUserId(userId);
+ this.setUserName(userName);
this.setToken(token);
this.setUrl(url);
this.setSessionId(sessionId);
+ this.setAppId(appId);
+ this.setPayerObjId(payerObjId);
+ this.setPayerObjType(payerObjType);
+ this.setEndTime(endTime);
+ return this;
+ }
+ public IPageData builder(String userId,
+ String userName,
+ String token,
+ String reqData,
+ String componentCode,
+ String componentMethod,
+ String url,
+ String sessionId,
+ String appId)
+ throws IllegalArgumentException {
+ return builder(userId,
+ userName,
+ token,
+ reqData,
+ componentCode,
+ componentMethod,
+ url,
+ sessionId,
+ appId,
+ null);
+ }
+
+
+ public IPageData builder(String userId,
+ String userName,
+ String token,
+ String reqData,
+ String componentCode,
+ String componentMethod,
+ String url,
+ String sessionId,
+ String appId,
+ Map<String, Object> headers)
+ throws IllegalArgumentException {
+ this.setComponentCode(componentCode);
+ this.setComponentMethod(componentMethod);
+ this.setReqData(reqData);
+ this.setRequestTime(DateUtil.getyyyyMMddhhmmssDateString());
+ this.setUserId(userId);
+ this.setUserName(userName);
+ this.setToken(token);
+ this.setUrl(url);
+ this.setSessionId(sessionId);
+ this.setAppId(appId);
+ this.setHeaders(headers);
return this;
}
- public String toString(){
+ public String toString() {
return JSONObject.toJSONString(this);
}
+
+ @Override
+ public String getAppId() {
+ return appId;
+ }
+
+ public void setAppId(String appId) {
+ this.appId = appId;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getApiUrl() {
+ return apiUrl;
+ }
+
+ public void setApiUrl(String apiUrl) {
+ this.apiUrl = apiUrl;
+ }
+
+ public HttpMethod getMethod() {
+ return method;
+ }
+
+ @Override
+ public Map<String, Object> getHeaders() {
+ return this.headers;
+ }
+
+ public void setHeaders(Map<String, Object> headers) {
+ this.headers = headers;
+ }
+
+ public void setMethod(HttpMethod method) {
+ this.method = method;
+ }
+
+ public String getPayerObjId() {
+ return payerObjId;
+ }
+
+ public void setPayerObjId(String payerObjId) {
+ this.payerObjId = payerObjId;
+ }
+
+ public String getPayerObjType() {
+ return payerObjType;
+ }
+
+ public void setPayerObjType(String payerObjType) {
+ this.payerObjType = payerObjType;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
}
--
Gitblit v1.8.0