server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
@@ -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; } server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBaseRequst.java
@@ -9,14 +9,11 @@ */ @Data public class ZTBaseRequst { /** * 父级编码 */ @ApiModelProperty(value = "C端传“CUSTOMER”, B端传'BUSINESS") @ApiModelProperty(value = "C端传“CUSTOMER”, B端传'BUSINESS",hidden = true) private String userType; @ApiModelProperty(value = "token" , hidden = true) private String token; @ApiModelProperty(value = "token" , hidden = true) private String openId; @ApiModelProperty(value = "用户主键" , hidden = true) private String userId; server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTCatalogListRequest.java
@@ -13,7 +13,8 @@ * 目录唯一编码,编码为空，则返回全部一级目录 * */ @ApiModelProperty(value = "志说装修 zb_deco 产品 product_intro 资讯product_info 全屋案例 whole_case",notes = "http://api.dev.zbom.7zcloud.com/content/api/catalog") @ApiModelProperty(value = "产品 product_intro、 资讯product_info、" + "全屋案例 whole_case、轮播carousel_ad、视频推荐video_rec、实景案例real_case",notes = "http://api.dev.zbom.7zcloud.com/content/api/catalog") private String catalogCode; } server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
@@ -23,6 +23,9 @@ String CHUFANGSHEJI ="zb_deco_cfsj"; String SHOUNASHEJI ="zb_deco_snsj"; String JIADE_ID ="zb_deco_jdid"; String CAROUSEL_AD ="carousel_ad"; String VIDEO_REC ="video_rec"; String REAL_CASE ="real_case"; } public interface IntegerUrl{ String USER_UPDATE_URL ="/customer/api/sync"; server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentListRequest.java
@@ -26,8 +26,8 @@ @ApiModelProperty(value = "内容查询条件") private String query; @ApiModelProperty(value = "标签") private String tagCodes; // @ApiModelProperty(value = "标签") // private String tagCodes; @ApiModelProperty(value = "排序方式 NORMAL - 默认；HOT - 最热；LATEST - 最新；") private String sortType; server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java
@@ -1,6 +1,7 @@ package com.doumee.biz.zbom.model.zhongtai.response; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import java.io.Serializable; @@ -11,17 +12,17 @@ /** * 记录列表 */ @JsonAlias( {"data","records","userFavoriteList","userBehaviorList","customerFavoritesList"}) @JsonAlias({"data","userFavoriteList","userBehaviorList","customerFavoritesList","records"}) private List<T> records; /** * 当前页 */ @JsonAlias( {"pageCount","pageNum"}) @JsonAlias({"pageCount","pageNum"}) private String pageNum; /** * 每页条数 */ @JsonAlias( {"pageSize",}) @JsonAlias({"pageSize"}) private String pageSize; /** * 总数 server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -51,10 +51,12 @@ || StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } if(ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU) ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CHANPING) if(!(ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CHANPING) ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZIXUN) ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.QW_CASE)){ ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.QW_CASE) ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CAROUSEL_AD) ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.VIDEO_REC) ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.REAL_CASE))){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"分类信息错误"); } return zbomZhongTaiService.getCatalogList(ztCatalogListRequest); @@ -66,12 +68,6 @@ if(Objects.isNull(ztCatalogListRequest) || StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } if(ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZHISHUO_ZHUANGXIU) ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.CHANPING) ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.ZIXUN) ||ztCatalogListRequest.getCatalogCode().equals(ZTConstants.CatalogCode.QW_CASE)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"分类信息错误"); } return zbomZhongTaiService.getTagList(ztCatalogListRequest); } @@ -121,9 +117,7 @@ || Objects.isNull(ztContentListRequest.getPageNum()) || Objects.isNull(ztContentListRequest.getPageSize()) || StringUtils.isBlank(ztContentListRequest.getCatalogCode()) || StringUtils.isBlank(ztContentListRequest.getTagCodes()) || StringUtils.isBlank(ztContentListRequest.getQuery()) || StringUtils.isBlank(ztContentListRequest.getSortType()) // || StringUtils.isBlank(ztContentListRequest.getTagCodes()) ){ throw new BusinessException(ResponseStatus.BAD_REQUEST); } @@ -132,12 +126,6 @@ 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) ||catalogCode.equals(ZTConstants.CatalogCode.ZIXUN) ||catalogCode.equals(ZTConstants.CatalogCode.QW_CASE)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"分类信息错误"); } ZTBasePageResponse<ZTContentListResponse> response = zbomZhongTaiService.pageContentList(ztContentListRequest); return response; } server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -324,23 +324,14 @@ } @LoginRequired @ApiOperation(value = "标签数据 - 中台", notes = "客户端小程序") @PostMapping("/getZTCatalogInfoResponse") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true) }) public ApiResponse<List<ZTCatalogInfoResponse>> getZTCatalogInfoResponse(@RequestBody ZTCatalogListRequest ztCatalogListRequest) { List<ZTCatalogInfoResponse> ztCatalogInfoResponse = getZhongTaiDataService.getZTCatalogInfoResponse(ztCatalogListRequest); return ApiResponse.success("查询成功",ztCatalogInfoResponse); } @LoginRequired @ApiOperation(value = "内容分页 - 中台", notes = "客户端小程序") @PostMapping("/pageContentList") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true) }) public ApiResponse<ZTBasePageResponse<ZTContentListResponse>> pageContentList(@RequestBody ZTContentListRequest ztContentListRequest) { ztContentListRequest.setUserId(getMemberId()+""); ztContentListRequest.setUserType(Constants.CUSTOMER); ZTBasePageResponse<ZTContentListResponse> ztBasePageResponse= getZhongTaiDataService.pageContentList(ztContentListRequest); return ApiResponse.success("查询成功",ztBasePageResponse); } server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -4,6 +4,9 @@ import com.doumee.biz.zbom.model.crm.CrmCustomerListRequest; import com.doumee.biz.zbom.model.crm.response.CRMBaseResponse; import com.doumee.biz.zbom.model.crm.response.CRMCustomerListResponse; import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest; import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest; import com.doumee.biz.zbom.model.zhongtai.response.*; import com.doumee.config.annotation.LoginRequired; import com.doumee.config.annotation.UserLoginRequired; import com.doumee.core.annotation.trace.Trace; @@ -55,6 +58,9 @@ @Autowired public GetCrmDataService getCrmDataService; @Autowired private GetZhongTaiDataService getZhongTaiDataService; @ApiOperation(value = "小程序登陆", notes = "员工端小程序") @GetMapping("/loginByWx") @@ -181,4 +187,114 @@ } @LoginRequired @ApiOperation(value = "分类数据 - 中台", notes = "客户端小程序") @PostMapping("/getCatalogList") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true) }) public ApiResponse<List<ZTCatalogInfoResponse>> getCatalogList (@RequestBody ZTCatalogListRequest ztCatalogListRequest ) { List<ZTCatalogInfoResponse> ztCatalogInfoResponseList = getZhongTaiDataService.getCatalogList(ztCatalogListRequest); return ApiResponse.success("查询成功",ztCatalogInfoResponseList); } @LoginRequired @ApiOperation(value = "标签数据 - 中台", notes = "客户端小程序") @PostMapping("/getCataLogTagList") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true) }) public ApiResponse<List<ZTTagInfoResponse>> getCataLogTagList(@RequestBody ZTCatalogListRequest ztCatalogListRequest ) { List<ZTTagInfoResponse> ztTagInfoResponseList = getZhongTaiDataService.getCataLogTagList(ztCatalogListRequest); return ApiResponse.success("查询成功",ztTagInfoResponseList); } @LoginRequired @ApiOperation(value = "标签数据 - 中台", notes = "客户端小程序") @PostMapping("/getZTCatalogInfoResponse") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true) }) public ApiResponse<List<ZTCatalogInfoResponse>> getZTCatalogInfoResponse(@RequestBody ZTCatalogListRequest ztCatalogListRequest) { List<ZTCatalogInfoResponse> ztCatalogInfoResponse = getZhongTaiDataService.getZTCatalogInfoResponse(ztCatalogListRequest); return ApiResponse.success("查询成功",ztCatalogInfoResponse); } @LoginRequired @ApiOperation(value = "内容分页 - 中台", notes = "客户端小程序") @PostMapping("/pageContentList") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true) }) public ApiResponse<ZTBasePageResponse<ZTContentListResponse>> pageContentList(@RequestBody ZTContentListRequest ztContentListRequest) { ZTBasePageResponse<ZTContentListResponse> ztBasePageResponse= getZhongTaiDataService.pageContentList(ztContentListRequest); return ApiResponse.success("查询成功",ztBasePageResponse); } @LoginRequired @ApiOperation(value = "内容详情 - 中台", notes = "客户端小程序") @GetMapping("/getContentInfo") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true), @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true), }) public ApiResponse<ZTContentInfoResponse> getContentInfo(@RequestParam String id) { ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id,Constants.BUSINESS,getMemberId()); return ApiResponse.success("查询成功",ztContentInfoResponse); } @LoginRequired @ApiOperation(value = "内容收藏 - 中台", notes = "客户端小程序") @GetMapping("/collectContent") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true), @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true), }) public ApiResponse collectContent(@RequestParam String id) { getZhongTaiDataService.collectContent(getMemberId(),Constants.BUSINESS,id); return ApiResponse.success("操作成功"); } @LoginRequired @ApiOperation(value = "内容喜欢 - 中台", notes = "客户端小程序") @GetMapping("/likeContent") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true), @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true), }) public ApiResponse likeContent(@RequestParam String id) { getZhongTaiDataService.likeContent(getMemberId(),Constants.BUSINESS,id); return ApiResponse.success("操作成功"); } @LoginRequired @ApiOperation(value = "内容分享 - 中台", notes = "客户端小程序") @GetMapping("/shareContent") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true), @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true), }) public ApiResponse shareContent(@RequestParam String id) { getZhongTaiDataService.shareContent(getMemberId(),Constants.BUSINESS,id); return ApiResponse.success("操作成功"); } @LoginRequired @ApiOperation(value = "内容浏览 - 中台", notes = "客户端小程序") @GetMapping("/viewContent") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true), @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true), }) public ApiResponse viewContent(@RequestParam String id) { getZhongTaiDataService.viewContent(getMemberId(),Constants.BUSINESS,id); return ApiResponse.success("操作成功"); } }
