From 53e0cba6de254a1d6f19d0287da0b212f4a5ae90 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 16 七月 2024 17:22:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 95 +++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 82 insertions(+), 13 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 b834ec6..e081da9 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 @@ -3,22 +3,22 @@ import com.alibaba.fastjson.JSONObject; import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.biz.zbom.ZbomZhongTaiService; -import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest; -import com.doumee.biz.zbom.model.zhongtai.ZTConstants; -import com.doumee.biz.zbom.model.zhongtai.ZTContentInfoRequest; -import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest; +import com.doumee.biz.zbom.model.zhongtai.*; import com.doumee.biz.zbom.model.zhongtai.response.*; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.dao.business.IamInterfaceLogMapper; import com.doumee.dao.business.MemberMapper; import com.doumee.dao.business.UsersMapper; +import com.doumee.dao.web.response.ZTBaseInfoResponse; import com.doumee.service.business.GetZhongTaiDataService; import com.github.xiaoymin.knife4j.core.util.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.xpath.operations.Bool; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -128,8 +128,9 @@ throw new BusinessException(ResponseStatus.BAD_REQUEST); } //鏌ヨ 涓彴 - String token = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,ztContentListRequest.getUserId(),ztContentListRequest.getUserType()); - ztContentListRequest.setToken(token); + ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz, + Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType()); + ztContentListRequest.setToken(ztBaseInfoResponse.getToken()); String catalogCode = ztContentListRequest.getCatalogCode(); if(catalogCode.equals(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU) ||catalogCode.equals(ZTConstants.CatalogCode.CHANPING) @@ -146,22 +147,90 @@ @Override public ZTContentInfoResponse getContentInfo(String id,String userType,Long userId){ //鏌ヨ 涓彴 TOKEN - String token = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId.toString(),userType); + ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType); ZTContentInfoRequest ztContentListRequest = new ZTContentInfoRequest(); - ztContentListRequest.setToken(token); - ztContentListRequest.setUserType(userType); + ztContentListRequest.setToken(ztBaseInfoResponse.getToken()); + ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType()); ztContentListRequest.setId(id); ZTContentInfoResponse response = zbomZhongTaiService.getContentInfo(ztContentListRequest); return response; } + @Override + public void collectContent(Long userId,String userType,String articleId){ + ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType); + ZTActionDoRequest param = new ZTActionDoRequest(); + param.setOpenId(ztBaseInfoResponse.getOpenId()); + param.setUserType(userType); + param.setArticleId(articleId); + param.setToken(ztBaseInfoResponse.getToken()); + 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()); + } + } + } + + @Override + public void likeContent(Long userId,String userType,String articleId){ + ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType); + ZTActionBatchDoRequest param = new ZTActionBatchDoRequest(); + param.setOpenId(ztBaseInfoResponse.getOpenId()); + param.setUserType(userType); + param.setToken(ztBaseInfoResponse.getToken()); + List<ZTActionDoRequest> list = new ArrayList<>(); + ZTActionDoRequest ztActionDoRequest = new ZTActionDoRequest(); + ztActionDoRequest.setArticleId(articleId); + param.setList(list); + ZTBaseResponse ztBaseResponse = zbomZhongTaiService.likeDo(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()); + } + } + } + @Override + public void shareContent(Long userId,String userType,String articleId){ + ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType); + ZTActionDoRequest param = new ZTActionDoRequest(); + param.setArticleId(articleId); + param.setOpenId(ztBaseInfoResponse.getOpenId()); + param.setUserType(userType); + param.setToken(ztBaseInfoResponse.getToken()); + ZTBaseResponse ztBaseResponse = zbomZhongTaiService.shareDo(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()); + } + } + } - - - - + @Override + public void viewContent(Long userId,String userType,String articleId){ + ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,userId,userType); + ZTActionDoRequest param = new ZTActionDoRequest(); + param.setArticleId(articleId); + param.setOpenId(ztBaseInfoResponse.getOpenId()); + param.setUserType(userType); + param.setToken(ztBaseInfoResponse.getToken()); + ZTBaseResponse ztBaseResponse = zbomZhongTaiService.viewDo(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()); + } + } + } } -- Gitblit v1.9.3