From 2ece6f6cd23d7b717881dd54a9fc74877096ecee Mon Sep 17 00:00:00 2001
From: wuxw7 <wuxw7@asiainfo.com>
Date: 星期一, 07 五月 2018 23:13:59 +0800
Subject: [PATCH] 控制服务实现登录功能 和菜单展示，以及中心服务bug修复
---
java110-common/src/main/java/com/java110/common/factory/DataTransactionFactory.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/java110-common/src/main/java/com/java110/common/factory/DataTransactionFactory.java b/java110-common/src/main/java/com/java110/common/factory/DataTransactionFactory.java
index c577773..e8dfed6 100644
--- a/java110-common/src/main/java/com/java110/common/factory/DataTransactionFactory.java
+++ b/java110-common/src/main/java/com/java110/common/factory/DataTransactionFactory.java
@@ -9,6 +9,7 @@
import com.java110.common.util.SequenceUtil;
import com.java110.common.util.StringUtil;
import com.java110.entity.center.DataFlow;
+import com.java110.entity.service.PageData;
import java.util.Date;
import java.util.Map;
@@ -243,7 +244,7 @@
JSONObject paramOut = JSONObject.parseObject("{\"meta\":{}}");
JSONObject metaObj = paramOut.getJSONObject("meta");
metaObj.put("transactionId",transactionId);
- metaObj.put("code",transactionId);
+ metaObj.put("code",code);
metaObj.put("message",message);
metaObj.put("responseTime",DateUtil.getNowDefault());
if(data != null) {
@@ -265,6 +266,18 @@
}
/**
+ * 椤甸潰杩斿洖灏佽
+ * @param code 缂栫爜
+ * @param message 淇℃伅
+ * @param data 鏁版嵁
+ * @return
+ * @throws Exception
+ */
+ public static String pageResponseJson(PageData pd,String code, String message, JSONObject data){
+ return pageResponseJson(pd == null || StringUtil.isNullOrNone(pd.getTransactionId()) ? ResponseConstant.NO_TRANSACTION_ID:pd.getTransactionId(),code,message,data);
+ }
+
+ /**
* 椤甸潰澶勭悊鎴愬姛淇℃伅灏佽
* @param transactionId
* @return
--
Gitblit v1.8.0