From 0cd3a666af34e28eaf50ed1392b5d219a9d2b1cf Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 24 七月 2024 09:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia
---
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index 47b86ee..44ebc5b 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -9,10 +9,12 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.IamInterfaceLogMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.UsersMapper;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.web.response.ZSZXCatalogResponse;
import com.doumee.dao.web.response.ZTBaseInfoResponse;
import com.doumee.service.business.GetZhongTaiDataService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
@@ -25,6 +27,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -52,7 +55,29 @@
@Autowired
private RedisTemplate<String, Object> redisTemplate;
-
+ @Override
+ public ZSZXCatalogResponse getZSZXCatalogs(Long userId,String userType){
+ ZSZXCatalogResponse response = new ZSZXCatalogResponse();
+ ZTCatalogListRequest param = new ZTCatalogListRequest();
+ param.setUserId(userId.toString());
+ param.setUserType(userType);
+ 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;
+ }
@Override
public List<ZTCatalogInfoResponse> getCatalogList(ZTCatalogListRequest ztCatalogListRequest){
@@ -60,6 +85,10 @@
|| StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,Long.valueOf(ztCatalogListRequest.getUserId()),ztCatalogListRequest.getUserType());
+ System.out.println(JSONObject.toJSONString(ztBaseInfoResponse));
+ ztCatalogListRequest.setOpenId(ztBaseInfoResponse.getOpenId());
+ ztCatalogListRequest.setToken(ztBaseInfoResponse.getToken());
return zbomZhongTaiService.getCatalogList(ztCatalogListRequest);
}
@@ -70,6 +99,9 @@
|| StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,Long.valueOf(ztCatalogListRequest.getUserId()),ztCatalogListRequest.getUserType());
+ ztCatalogListRequest.setOpenId(ztBaseInfoResponse.getOpenId());
+ ztCatalogListRequest.setToken(ztBaseInfoResponse.getToken());
return zbomZhongTaiService.getTagList(ztCatalogListRequest);
}
@@ -83,14 +115,7 @@
param.setArticleId(articleId);
param.setToken(ztBaseInfoResponse.getToken());
param.setActionType(actionType);
- ZTBaseResponse ztBaseResponse = zbomZhongTaiService.collectDo(param);
- if(Objects.isNull(ztBaseResponse)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"涓彴鎺ュ彛鍝嶅簲澶辫触");
- }else{
- if(!ztBaseResponse.getSuccess()){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"涓彴璇锋眰淇℃伅寮傚父锛�"+ztBaseResponse.getMsg());
- }
- }
+ zbomZhongTaiService.collectDo(param);
}
@Override
@@ -116,8 +141,13 @@
String data = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_AREA_REDIS_KEY);
List<ZTAreaTreeResponse> ztAreaTreeResponses = new ArrayList<>();
if(StringUtils.isBlank(data)){
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,Long.valueOf(ztAreaListRequest.getUserId()),ztAreaListRequest.getUserType());
+ ztAreaListRequest.setOpenId(ztBaseInfoResponse.getOpenId());
+ ztAreaListRequest.setToken(ztBaseInfoResponse.getToken());
ztAreaTreeResponses = zbomZhongTaiService.getAreaTreeList(ztAreaListRequest);
- redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_AREA_REDIS_KEY,JSONArray.toJSONString(ztAreaTreeResponses));
+ if(CollectionUtils.isNotEmpty(ztAreaTreeResponses)){
+ redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_AREA_REDIS_KEY,JSONArray.toJSONString(ztAreaTreeResponses));
+ }
}else{
ztAreaTreeResponses = JSONArray.parseArray(data,ZTAreaTreeResponse.class);
}
@@ -173,7 +203,9 @@
ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
+ System.out.println("寮�濮嬫椂闂�========================銆�"+DateUtil.getLongDate(new Date()));
ZTBasePageResponse<ZTProductInfoResponse> response = zbomZhongTaiService.pageProductList(ztContentListRequest);
+ System.out.println("缁撴潫鏃堕棿========================銆�"+DateUtil.getLongDate(new Date()));
return response;
}
@@ -293,4 +325,23 @@
return response;
}
+
+
+ @Override
+ public ZTBasePageResponse<ZTCollectLikeInfoResponse> collectLikePage(ZTCollectLikeRequest ztCollectLikeRequest){
+ if(Objects.isNull(ztCollectLikeRequest)
+ || Objects.isNull(ztCollectLikeRequest.getPageNum())
+ || Objects.isNull(ztCollectLikeRequest.getPageSize())
+ || StringUtils.isBlank(ztCollectLikeRequest.getBusinessType())
+ || StringUtils.isBlank(ztCollectLikeRequest.getBusinessCategory())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ //鏌ヨ 涓彴
+ ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
+ Long.valueOf(ztCollectLikeRequest.getUserId()),ztCollectLikeRequest.getUserType());
+ ztCollectLikeRequest.setToken(ztBaseInfoResponse.getToken());
+ ZTBasePageResponse<ZTCollectLikeInfoResponse> response = zbomZhongTaiService.collectLikePage(ztCollectLikeRequest);
+ return response;
+ }
}
--
Gitblit v1.9.3