From 5d167ea6e943dd1574e0e6ed70ff25b8d4830f61 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 16 六月 2022 11:47:49 +0800
Subject: [PATCH] 优化代码
---
java110-core/src/main/java/com/java110/core/context/PageData.java | 387 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 273 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
old mode 100644
new mode 100755
index 2228fa0..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
@@ -1,130 +1,98 @@
package com.java110.core.context;
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;
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 {
- private String userId ;
+
+ public PageData() {
+
+ this.setTransactionId(UUID.randomUUID().toString());
+ }
+
+
+ private String userId;
+
+ private String userName;
+
+ private String appId;
+
+ //浼氳瘽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 String apiUrl;
+ private HttpMethod method;
+ private Map<String, Object> headers;
+
+ /**
+ * 浠樻鏂筰d
+ */
+ private String payerObjId;
+
+ /**
+ * 浠樻鏂圭被鍨�
+ */
+ private String payerObjType;
+
+ /**
+ * 缂磋垂鍒版湡鏃堕棿
+ */
+ private String endTime;
+
+ 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 +103,243 @@
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 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() {
+ 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