From b3f85b60ba9e39572e686009d36b5e5d7e81e910 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 11 七月 2019 20:30:10 +0800
Subject: [PATCH] 合并远程信息
---
java110-core/src/main/java/com/java110/core/context/PageData.java | 212 ++++++++++++++++++++++++----------------------------
1 files changed, 98 insertions(+), 114 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 2228fa0..0fae25b 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,130 +1,73 @@
package com.java110.core.context;
import com.alibaba.fastjson.JSONObject;
+import com.java110.common.util.DateUtil;
+import org.springframework.http.ResponseEntity;
import java.io.Serializable;
import java.util.Map;
+import java.util.UUID;
/**
* 椤甸潰璇锋眰鏁版嵁灏佽
* Created by wuxw on 2018/5/2.
*/
-public class PageData implements Serializable {
+public class PageData implements IPageData,Serializable {
+
+
+
+ public PageData(){
+
+ this.setTransactionId(UUID.randomUUID().toString());
+ }
+
private String userId ;
+
+ //浼氳瘽ID
+ private String sessionId;
private String transactionId;
private String requestTime;
- private String method;
+ private String componentCode;
+
+ private String componentMethod;
private String token;
- private Object serviceSMOImpl;
-
- private JSONObject param;
-
- private JSONObject meta;
-
- private JSONObject reqJson;
-
- private JSONObject resJson;
-
- private String code;
-
- private String message;
+ private String reqData;
private String responseTime;
- private JSONObject data;
+ private String url;
- private Map<String,String> userInfo;
-
+ private ResponseEntity responseEntity;
public String getUserId() {
return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
}
public String getTransactionId() {
return transactionId;
}
- public PageData setTransactionId(String transactionId) {
- this.transactionId = transactionId;
- return this;
+
+ public String getComponentCode() {
+ return componentCode;
}
- public String getRequestTime() {
- return requestTime;
+ public String getComponentMethod() {
+ return componentMethod;
}
- public void setRequestTime(String requestTime) {
- this.requestTime = requestTime;
+ public String getToken() {
+ return token;
}
- public String getMethod() {
- return method;
- }
-
- public void setMethod(String method) {
- this.method = method;
- }
-
- public JSONObject getParam() {
- return param;
- }
-
- public void setParam(JSONObject param) {
- this.param = param;
- }
-
- public JSONObject getMeta() {
- return meta;
- }
-
- public void setMeta(JSONObject meta) {
- this.meta = meta;
- }
-
- public JSONObject getReqJson() {
- return reqJson;
- }
-
- public void setReqJson(JSONObject reqJson) {
- this.reqJson = reqJson;
- }
-
- public JSONObject getResJson() {
- return resJson;
- }
-
- public void setResJson(JSONObject resJson) {
- this.resJson = resJson;
- }
-
- public void setResJson(String resJsonString) {
- this.resJson = JSONObject.parseObject(resJsonString);
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
+ public String getReqData() {
+ return reqData;
}
public String getResponseTime() {
@@ -135,52 +78,93 @@
this.responseTime = responseTime;
}
- public JSONObject getData() {
- return data;
+ public void setUserId(String userId) {
+ this.userId = userId;
}
- public void setData(JSONObject data) {
- this.data = data;
+ public void setTransactionId(String transactionId) {
+ this.transactionId = transactionId;
}
- public String getToken() {
- return token;
+ public void setRequestTime(String requestTime) {
+ this.requestTime = requestTime;
+ }
+
+ public void setComponentCode(String componentCode) {
+ this.componentCode = componentCode;
+ }
+
+ public void setComponentMethod(String componentMethod) {
+ this.componentMethod = componentMethod;
}
public void setToken(String token) {
this.token = token;
}
-
- public Map<String, String> getUserInfo() {
- return userInfo;
+ @Override
+ public String getSessionId() {
+ return sessionId;
}
- public void setUserInfo(Map<String, String> userInfo) {
- this.userInfo = userInfo;
+ public void setSessionId(String sessionId) {
+ this.sessionId = sessionId;
}
-
- public Object getServiceSMOImpl() {
- return serviceSMOImpl;
+ public void setReqData(String reqData) {
+ this.reqData = reqData;
}
- public void setServiceSMOImpl(Object serviceSMOImpl) {
- this.serviceSMOImpl = serviceSMOImpl;
+ @Override
+ public ResponseEntity getResponseEntity() {
+ return responseEntity;
}
- public PageData builder(String requestJson) throws IllegalArgumentException{
+ public void setResponseEntity(ResponseEntity responseEntity) {
+ this.responseEntity = responseEntity;
+ }
+
+ public String getRequestTime() {
+ return requestTime;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ /**
+ * 鍒濆鍖� PageData
+ * @return
+ */
+ public static IPageData newInstance(){
+ return new PageData();
+ }
+
+ public IPageData builder(Map param) throws IllegalArgumentException{
JSONObject reqJson = null;
- try {
- reqJson = JSONObject.parseObject(requestJson);
- }catch (Exception e){
- throw new IllegalArgumentException("璇锋眰鍙傛暟閿欒",e);
- }
- this.setMeta(reqJson.getJSONObject("meta"));
- this.setMethod(this.getMeta().getString("method"));
- this.setRequestTime(this.getMeta().getString("requestTime"));
- this.setParam(reqJson.getJSONObject("param"));
- this.setReqJson(reqJson);
+
return this;
}
+
+ public IPageData builder(String userId,String token,String reqData,String componentCode,String componentMethod,String url,String sessionId)
+ throws IllegalArgumentException{
+ this.setComponentCode(componentCode);
+ this.setComponentMethod(componentMethod);
+ this.setReqData(reqData);
+ this.setRequestTime(DateUtil.getyyyyMMddhhmmssDateString());
+ this.setUserId(userId);
+ this.setToken(token);
+ this.setUrl(url);
+ this.setSessionId(sessionId);
+
+ return this;
+ }
+
+ public String toString(){
+ return JSONObject.toJSONString(this);
+ }
}
--
Gitblit v1.8.0