From 2cbd23d061be5076b86771750bf17615bbecb57d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 17 七月 2024 11:41:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
index 2837a38..90d7572 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
@@ -91,18 +91,18 @@
* @return
*/
@Override
- public ZTUserGetTokenResponse userUpdateInfo(ZTUserInfoUpdateRequest param){
+ public ZTBaseResponse userUpdateInfo(ZTUserInfoUpdateRequest param){
ZTBaseResponse<ZTUserGetTokenResponse> result = sendHttpRequest(
ZTConstants.IntegerUrl.USER_UPDATE_URL,
ZTConstants.IntegerName.USER_UPDATE_NAME,
- param.getToken(),
- param.getUserType(),
- JSONObject.toJSONString(param ),
+ null,
+ null,
+ JSONObject.toJSONString(param),
new TypeReference<ZTBaseResponse<ZTUserGetTokenResponse>>(){});
- if(result!=null){
- return result.getData();
- }
- return null;
+// if(result!=null){
+// return result.getData();
+// }
+ return result;
}
/**
* 娉ㄩ攢鐢ㄦ埛
@@ -150,7 +150,7 @@
* @return
*/
@Override
- public List<ZTTagInfoResponse> getTagList(ZTCatalogListRequest param){
+ public List<ZTTagInfoResponse> getTagList(ZTCatalogListRequest param){
ZTBaseResponse<List<ZTTagInfoResponse>> result = sendHttpRequest(
ZTConstants.IntegerUrl.TAG_LIST_URL,
ZTConstants.IntegerName.TAG_LIST_NAME,
@@ -180,6 +180,9 @@
new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTContentListResponse>>>(){});
if(result!=null){
return result.getData();
+// TypeReference<ZTBasePageResponse<ZTContentListResponse>> typeReference = new TypeReference<ZTBasePageResponse<ZTContentListResponse>>(){};
+// ZTBasePageResponse<ZTContentListResponse> ztBasePageResponse = JSONObject.parseObject(result.getData(), typeReference.getType());
+// return ztBasePageResponse;
}
return null;
}
@@ -208,7 +211,7 @@
* @return
*/
@Override
- public boolean collectDo(ZTActionDoRequest param){
+ public ZTBaseResponse collectDo(ZTActionDoRequest param){
ZTBaseResponse result = sendHttpRequest(
ZTConstants.IntegerUrl.COLLECT_DO_URL,
ZTConstants.IntegerName.COLLECT_DO_NAME,
@@ -216,10 +219,8 @@
param.getUserType(),
JSONObject.toJSONString(param ),
new TypeReference<ZTBaseResponse<Object>>(){});
- if(result!=null ){
- return true;
- }
- return false;
+
+ return result;
}
/**
* 鍐呭鍠滄
@@ -227,7 +228,7 @@
* @return
*/
@Override
- public boolean likeDo(ZTActionBatchDoRequest param){
+ public ZTBaseResponse likeDo(ZTActionBatchDoRequest param){
ZTBaseResponse result = sendHttpRequest(
ZTConstants.IntegerUrl.LIKE_DO_URL,
ZTConstants.IntegerName.LIKE_DO_NAME,
@@ -235,10 +236,8 @@
param.getUserType(),
JSONObject.toJSONString(param ),
new TypeReference<ZTBaseResponse<Object>>(){});
- if(result!=null ){
- return true;
- }
- return false;
+
+ return result;
}
/**
* 鍐呭鍒嗕韩
@@ -246,7 +245,7 @@
* @return
*/
@Override
- public boolean shareDo(ZTActionDoRequest param){
+ public ZTBaseResponse shareDo(ZTActionDoRequest param){
ZTBaseResponse result = sendHttpRequest(
ZTConstants.IntegerUrl.SHARE_DO_URL,
ZTConstants.IntegerName.SHARE_DO_NAME,
@@ -254,10 +253,7 @@
param.getUserType(),
JSONObject.toJSONString(param ),
new TypeReference<ZTBaseResponse<Object>>(){});
- if(result!=null ){
- return true;
- }
- return false;
+ return result;
}
/**
* 鍐呭娴忚
@@ -265,7 +261,7 @@
* @return
*/
@Override
- public boolean viewDo(ZTActionDoRequest param){
+ public ZTBaseResponse viewDo(ZTActionDoRequest param){
ZTBaseResponse result = sendHttpRequest(
ZTConstants.IntegerUrl.VIEW_DO_URL,
ZTConstants.IntegerName.VIEW_DO_NAME,
@@ -273,10 +269,7 @@
param.getUserType(),
JSONObject.toJSONString(param ),
new TypeReference<ZTBaseResponse<Object>>(){});
- if(result!=null ){
- return true;
- }
- return false;
+ return result;
}
/**
* 鐢ㄦ埛缁戝畾瀹㈡埛鍠滄娓呭崟锛屽彲缁戝畾澶氫釜鍐呭
@@ -397,14 +390,34 @@
}
return null;
}
-
+ /**
+ * 鑾峰彇鑾峰彇鐪佸競鍖洪泦鍚�
+ * @param param
+ * @return
+ */
+ @Override
+ public List<ZTAreaTreeResponse> getAreaTreeList(ZTAreaListRequest param){
+ if(StringUtils.isBlank(param.getPid())){
+ param.setPid(ZTConstants.DEFAULT_PID);//榛樿鍙栧叏閮ㄧ渷浠�
+ }
+ ZTBaseResponse<List<ZTAreaTreeResponse>> result = sendHttpRequest(
+ ZTConstants.IntegerUrl.AREA_TREE_URL,
+ ZTConstants.IntegerName.AREA_TREE_NAME,
+ param.getToken(),
+ param.getUserType(),
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<List<ZTAreaTreeResponse>>>(){});
+ if(result!=null){
+ return result.getData();
+ }
+ return null;
+ }
public <T> ZTBaseResponse<T> sendHttpRequest(String url,String name,String token,String userType,String param,TypeReference<ZTBaseResponse<T>> typeReference){
log.info("銆�"+name+"銆�================寮�濮�===="+ JSONObject.toJSONString(param));
String res = null;
int success = 0;
try {
-
Map<String,String> headers = new HashMap<>();
headers.put(ZTConstants.HEADER_TOKEN,token);
headers.put(ZTConstants.HEADER_USERTYPE,userType);
--
Gitblit v1.9.3