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 | 228 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 180 insertions(+), 48 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 1a1c786..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
@@ -16,9 +16,11 @@
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.CrmInterfaceLog;
import com.doumee.dao.business.model.InterfaceLog;
+import com.doumee.dao.web.response.ZSZXCatalogResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import java.util.Date;
@@ -36,6 +38,9 @@
public class ZbomZhongTaiServiceImpl implements ZbomZhongTaiService {
@Autowired
private InterfaceLogMapper interfaceLogMapper;
+ @Autowired
+ private RedisTemplate<String, Object> redisTemplate;
+
/**
* 鑾峰彇鐢ㄦ埛鐧婚檰token
* @param param
@@ -48,11 +53,37 @@
ZTConstants.IntegerName.USER_GET_TOKEN_NAME,
param.getToken(),
param.getUserType(),
- JSONObject.toJSONString(param ));
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<ZTUserGetTokenResponse>>(){});
if(result!=null){
return result.getData();
}
return null;
+ }
+ /**
+ * 鑾峰彇鐢ㄦ埛鐧婚檰token
+ * @return
+ */
+ @Override
+ public ZSZXCatalogResponse getZSZXCatalogs(){
+ ZSZXCatalogResponse response = new ZSZXCatalogResponse();
+ ZTCatalogListRequest param = new ZTCatalogListRequest();
+ param.setCatalogCode(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU);
+ List<ZTCatalogInfoResponse> cataList = getCatalogList(param);
+ if(cataList!=null ){
+ for(ZTCatalogInfoResponse data : cataList){
+ if(StringUtils.equals(data.getCode(), ZTConstants.CatalogCode.JIADE_ID)){
+ response.setJdId(data);
+ }else if(StringUtils.equals(data.getCode(), ZTConstants.CatalogCode.CHUFANGSHEJI)){
+ response.setCfsj(data);
+ }else if(StringUtils.equals(data.getCode(), ZTConstants.CatalogCode.QW_SHEJI)){
+ response.setQwsj(data);
+ }else if(StringUtils.equals(data.getCode(), ZTConstants.CatalogCode.SHOUNASHEJI)){
+ response.setSnsj(data);
+ }
+ }
+ }
+ return response;
}
/**
* 鐢ㄦ埛淇℃伅鍚屾
@@ -60,17 +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 ));
- if(result!=null){
- return result.getData();
- }
- return null;
+ null,
+ null,
+ JSONObject.toJSONString(param),
+ new TypeReference<ZTBaseResponse<ZTUserGetTokenResponse>>(){});
+// if(result!=null){
+// return result.getData();
+// }
+ return result;
}
/**
* 娉ㄩ攢鐢ㄦ埛
@@ -84,7 +116,8 @@
ZTConstants.IntegerName.USER_LOGOUT_NAME,
param.getToken(),
param.getUserType(),
- JSONObject.toJSONString(param ));
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<Object>>(){});
if(result!=null ){
return true;
}
@@ -98,12 +131,33 @@
*/
@Override
public List<ZTCatalogInfoResponse> getCatalogList(ZTCatalogListRequest param){
- ZTBaseResponse<List<ZTCatalogInfoResponse>> result = sendHttpRequest(
+
+ ZTBaseResponse<List<ZTCatalogInfoResponse>> result = sendHttpRequest(
ZTConstants.IntegerUrl.CATALOG_LIST_URL,
ZTConstants.IntegerName.CATALOG_LIST_NAME,
param.getToken(),
param.getUserType(),
- JSONObject.toJSONString(param ));
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<List<ZTCatalogInfoResponse>>>(){});
+ if(result!=null){
+ return result.getData();
+ }
+ return null;
+ }
+ /**
+ * 鑾峰彇鍒嗙被鍜屽垎绫讳笅鐨勬爣绛�
+ * @param param
+ * @return
+ */
+ @Override
+ public List<ZTTagInfoResponse> getTagList(ZTCatalogListRequest param){
+ ZTBaseResponse<List<ZTTagInfoResponse>> result = sendHttpRequest(
+ ZTConstants.IntegerUrl.TAG_LIST_URL,
+ ZTConstants.IntegerName.TAG_LIST_NAME,
+ param.getToken(),
+ param.getUserType(),
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<List<ZTTagInfoResponse>>>(){});
if(result!=null){
return result.getData();
}
@@ -122,9 +176,13 @@
ZTConstants.IntegerName.CONTENT_LIST_NAME,
param.getToken(),
param.getUserType(),
- JSONObject.toJSONString(param ));
+ JSONObject.toJSONString(param ),
+ 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;
}
@@ -136,11 +194,12 @@
@Override
public ZTContentInfoResponse getContentInfo(ZTContentInfoRequest param){
ZTBaseResponse<ZTContentInfoResponse> result = sendHttpRequest(
- ZTConstants.IntegerUrl.CONTENT_INFO_URL+ param.getArticleId(),
+ ZTConstants.IntegerUrl.CONTENT_INFO_URL+ param.getId(),
ZTConstants.IntegerName.CONTENT_INFO_NAME,
param.getToken(),
param.getUserType(),
- JSONObject.toJSONString(param ));
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<ZTContentInfoResponse>>(){});
if(result!=null){
return result.getData();
}
@@ -152,17 +211,16 @@
* @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,
param.getToken(),
param.getUserType(),
- JSONObject.toJSONString(param ));
- if(result!=null ){
- return true;
- }
- return false;
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<Object>>(){});
+
+ return result;
}
/**
* 鍐呭鍠滄
@@ -170,17 +228,16 @@
* @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,
param.getToken(),
param.getUserType(),
- JSONObject.toJSONString(param ));
- if(result!=null ){
- return true;
- }
- return false;
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<Object>>(){});
+
+ return result;
}
/**
* 鍐呭鍒嗕韩
@@ -188,17 +245,15 @@
* @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,
param.getToken(),
param.getUserType(),
- JSONObject.toJSONString(param ));
- if(result!=null ){
- return true;
- }
- return false;
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<Object>>(){});
+ return result;
}
/**
* 鍐呭娴忚
@@ -206,13 +261,30 @@
* @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,
param.getToken(),
param.getUserType(),
- JSONObject.toJSONString(param ));
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<Object>>(){});
+ return result;
+ }
+ /**
+ * 鐢ㄦ埛缁戝畾瀹㈡埛鍠滄娓呭崟锛屽彲缁戝畾澶氫釜鍐呭
+ * @param param
+ * @return
+ */
+ @Override
+ public boolean bindCustomerFavorites(ZTBindCusFavoriteDoRequest param){
+ ZTBaseResponse result = sendHttpRequest(
+ ZTConstants.IntegerUrl.BIND_CUSTOMER_FAVORITES_URL,
+ ZTConstants.IntegerName.BIND_CUSTOMER_FAVORITES_NAME,
+ param.getToken(),
+ param.getUserType(),
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<Object>>(){});
if(result!=null ){
return true;
}
@@ -224,13 +296,52 @@
* @return
*/
@Override
- public ZTBasePageResponse<ZTContentListResponse> pageCollectList(ZTContentListRequest param){
- ZTBaseResponse< ZTBasePageResponse<ZTContentListResponse>> result = sendHttpRequest(
+ public ZTBasePageResponse<ZTCollectInfoResponse> pageCollectList(ZTContentListRequest param){
+ ZTBaseResponse< ZTBasePageResponse<ZTCollectInfoResponse>> result = sendHttpRequest(
ZTConstants.IntegerUrl.COLLECT_LIST_URL,
ZTConstants.IntegerName.COLLECT_LIST_NAME,
param.getToken(),
param.getUserType(),
- JSONObject.toJSONString(param ));
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTCollectInfoResponse>>>(){});
+ if(result!=null){
+ return result.getData();
+ }
+ return null;
+ }
+ /**
+ * 鑾峰彇鎴戠殑鏀惰棌鍒楄〃鍒嗛〉
+ * @param param
+ * @return
+ */
+ @Override
+ public ZTBasePageResponse<ZTBehaviorInfoResponse> pageBehavoirList(ZTContentListRequest param){
+ ZTBaseResponse< ZTBasePageResponse<ZTBehaviorInfoResponse>> result = sendHttpRequest(
+ ZTConstants.IntegerUrl.BEHAVIOR_LIST_URL,
+ ZTConstants.IntegerName.BEHAVIOR_LIST_NAME,
+ param.getToken(),
+ param.getUserType(),
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTBehaviorInfoResponse>>>(){});
+ if(result!=null){
+ return result.getData();
+ }
+ return null;
+ }
+ /**
+ * 鑾峰彇瀹㈡埛鍠滄
+ * @param param
+ * @return
+ */
+ @Override
+ public ZTBasePageResponse<ZTCusFavoritesInfoResponse> pageCusFavoriteList(ZTContentListRequest param){
+ ZTBaseResponse< ZTBasePageResponse<ZTCusFavoritesInfoResponse>> result = sendHttpRequest(
+ ZTConstants.IntegerUrl.CUSTOMER_FAVORITES_LIST_URL,
+ ZTConstants.IntegerName.CUSTOMER_FAVORITES_LIST_NAME,
+ param.getToken(),
+ param.getUserType(),
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTCusFavoritesInfoResponse>>>(){});
if(result!=null){
return result.getData();
}
@@ -249,7 +360,8 @@
ZTConstants.IntegerName.LIKE_LIST_NAME,
param.getToken(),
param.getUserType(),
- JSONObject.toJSONString(param ));
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTContentListResponse>>>(){});
if(result!=null){
return result.getData();
}
@@ -271,29 +383,49 @@
ZTConstants.IntegerName.AREA_LIST_NAME,
param.getToken(),
param.getUserType(),
- JSONObject.toJSONString(param ));
+ JSONObject.toJSONString(param ),
+ new TypeReference<ZTBaseResponse<List<ZTAreaInfoResponse>>>(){});
+ if(result!=null){
+ return result.getData();
+ }
+ 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){
+ 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);
- res = HttpsUtil.postJsonWithHeaders(url,param,headers);
- TypeReference typeReference =
- new TypeReference<ZTBaseResponse<T>>(){};
+ String index = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_ZHONGTAI_API_URL);
+ res = HttpsUtil.postJsonWithHeaders(index+url,param,headers);
ZTBaseResponse<T> result = JSONObject.parseObject(res, typeReference.getType());
logResult(result,name);
- if(StringUtils.equals(result.getCode(),ZTConstants.CODE_SUCCESS)){
+ if(Constants.equalsInteger(result.getCode(),ZTConstants.CODE_SUCCESS)){
return result;
}else{
success =1;
@@ -324,7 +456,7 @@
interfaceLogMapper.insert(log);
}
private static void logResult(ZTBaseResponse res,String name) {
- if(StringUtils.equals(res.getCode(), ZTConstants.CODE_SUCCESS)){
+ if(Constants.equalsInteger(res.getCode(),ZTConstants.CODE_SUCCESS)){
log.info("銆愪腑鍙版帴鍙ｏ細"+name+"銆�================鎴愬姛====\n"+res);
}else{
log.error("銆愪腑鍙版帴鍙ｏ細"+name+"銆�================澶辫触====锛歕n"+ res);
--
Gitblit v1.9.3