From 85bc2484c98f4eb0bfb2bad003c9702bdf3cbe13 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 27 五月 2020 00:05:24 +0800
Subject: [PATCH] 优化代码

---
 java110-core/src/main/java/com/java110/core/context/PageData.java |  104 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 94 insertions(+), 10 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
index a261c57..0c19996 100644
--- a/java110-core/src/main/java/com/java110/core/context/PageData.java
+++ b/java110-core/src/main/java/com/java110/core/context/PageData.java
@@ -1,7 +1,8 @@
 package com.java110.core.context;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.common.util.DateUtil;
+import com.java110.utils.util.DateUtil;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 
 import java.io.Serializable;
@@ -12,17 +13,23 @@
  * 椤甸潰璇锋眰鏁版嵁灏佽
  * 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;
 
     private String transactionId;
 
@@ -39,6 +46,10 @@
     private String responseTime;
 
     private String url;
+
+    private String apiUrl;
+
+    private HttpMethod method;
 
     private ResponseEntity responseEntity;
 
@@ -99,6 +110,15 @@
         this.token = token;
     }
 
+    @Override
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
     public void setReqData(String reqData) {
         this.reqData = reqData;
     }
@@ -126,32 +146,96 @@
 
     /**
      * 鍒濆鍖� 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)
-            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,
+                "");
+    }
+
+    public IPageData builder(String userId,
+                             String userName,
+                             String token,
+                             String reqData,
+                             String componentCode,
+                             String componentMethod,
+                             String url,
+                             String sessionId,
+                             String appId)
+            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);
 
         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;
+    }
+
+    public void setMethod(HttpMethod method) {
+        this.method = method;
+    }
 }

--
Gitblit v1.8.0