代码提交

k94314517

2024-07-24 a40f7610261817f7d984e02a7636b5325c29c532

代码提交

 server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java

@@ -49,4 +49,5 @@
    List<ZTCusCarouselImageResponse> carouselImageList(ZTContentListRequest param);
    ZTCusCarouselImageResponse carouselImageDetail(ZTDataDetailRequest param);
    ZTBasePageResponse<ZTCollectLikeInfoResponse> collectLikePage(ZTCollectLikeRequest param);
    ZTBaseResponse batchAddLike(ZTBatchAddListRequest param);
}

 server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java

@@ -751,4 +751,25 @@
        }
        return null;
    }

    /**
     * èŽ·å–分类和分类下的标签
     * @param param
     * @return
     */
    @Override
    public ZTBaseResponse batchAddLike(ZTBatchAddListRequest param){
        ZTBaseResponse result = sendHttpRequest(
                ZTConstants.IntegerUrl.BATCH_ADD_LIKE_URL,
                ZTConstants.IntegerName.BATCH_ADD_LIKE_NAME,
                param.getToken(),
                param.getUserType(),
                JSONObject.toJSONString(param ),
                new TypeReference<ZTBaseResponse<Object>>(){});
        if(result!=null){
            return result;
        }
        return null;
    }

}

 server/service/src/main/java/com/doumee/biz/zbom/model/crm/response/CRMCustomerListResponse.java

@@ -20,5 +20,9 @@
    private String customerPhone;//    å®¢æˆ·å§“名
    private String customerName;//    å®¢æˆ·æ‰‹æœºå·
    private String  address    ;//地址详情
    private String  creationDate ;//创建时间
    private String  customerId ;//客户 id
    private String  platSourceId ;//传递平台 id
    private String  platSource ;//平台类型 1 pad ç«¯ 2 å°ç¨‹åºç«¯

}

 server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTBatchAddListRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
package com.doumee.biz.zbom.model.zhongtai;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;


@Data
public class ZTBatchAddListRequest extends  ZTBaseRequst{

    @ApiModelProperty(value = "内容IDS，英文逗号隔开")
    private String articleIds;

    @ApiModelProperty(value = "客户 id")
    private String  customerId ;

    @ApiModelProperty(value = "传递平台 id")
    private String  platSourceId ;

    @ApiModelProperty(value = "平台类型 1 pad ç«¯ 2 å°ç¨‹åºç«¯")
    private String  platSource ;


}

 server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java

@@ -78,6 +78,7 @@
        String REALCASE_PAGE_LIST_URL ="/content/api/realCasePageList";
        String REALCASE_INFO_URL ="/content/api/realCaseDetail";
        String FAVORITES_PAGE_URL ="/behavior/api/favoritesPageList";
        String BATCH_ADD_LIKE_URL ="/content/api/batchAddLike";


    }
@@ -119,5 +120,7 @@
        String REALCASE_INFO_NAME ="获取实景案例详情";

        String FAVORITES_NAME ="获取我的喜欢/收藏列表";

        String BATCH_ADD_LIKE_NAME ="批量绑定喜欢给客户";
    }
}

 server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java

@@ -157,4 +157,11 @@
     * @return
     */
    ZTBasePageResponse<ZTCollectLikeInfoResponse> collectLikePage(ZTCollectLikeRequest ztCollectLikeRequest);

    /**
     * ä¸­å° - æ‰¹é‡æ·»åŠ å–œæ¬¢ç»™å®¢æˆ·
     * @param param
     * @return
     */
    void batchAddLike(ZTBatchAddListRequest param);
}

 server/service/src/main/java/com/doumee/service/business/NewsService.java

@@ -115,7 +115,7 @@
     * èŽ·å–每日上新数据
     * @return
     */
    DailyUpdatesResponse getDailyUpdatesResponse(Integer fileType);
    DailyUpdatesResponse getDailyUpdatesResponse();

    /**
     * ä¿å­˜æŽ¨å¹¿å’¨è¯¢åˆ†äº«è®°å½•

 server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java

@@ -341,4 +341,24 @@
        ZTBasePageResponse<ZTCollectLikeInfoResponse> response = zbomZhongTaiService.collectLikePage(ztCollectLikeRequest);
        return response;
    }

    @Override
    public void batchAddLike(ZTBatchAddListRequest ztBatchAddListRequest){
        if(Objects.isNull(ztBatchAddListRequest)
                || StringUtils.isBlank(ztBatchAddListRequest.getArticleIds())
                || StringUtils.isBlank(ztBatchAddListRequest.getCustomerId())
                || StringUtils.isBlank(ztBatchAddListRequest.getPlatSourceId())
                || StringUtils.isBlank(ztBatchAddListRequest.getPlatSource())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //查询 ä¸­å°
        ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
                Long.valueOf(ztBatchAddListRequest.getUserId()),ztBatchAddListRequest.getUserType());
        ztBatchAddListRequest.setToken(ztBaseInfoResponse.getToken());
        zbomZhongTaiService.batchAddLike(ztBatchAddListRequest);
    }



}

 server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java

@@ -380,19 +380,19 @@
     * @return
     */
    @Override
    public DailyUpdatesResponse getDailyUpdatesResponse(Integer fileType){
    public DailyUpdatesResponse getDailyUpdatesResponse(){
        DailyUpdatesResponse dailyUpdatesResponse = new DailyUpdatesResponse();
        dailyUpdatesResponse.setDailyUpdateNum(
                newsMapper.selectCount(new QueryWrapper<News>().lambda()
                .eq(News::getIsdeleted,Constants.ZERO)
                .like(News::getCreateDate, DateUtil.getDateLong(new Date()))
                .eq(News::getType,Constants.ONE)
                .eq(News::getType,Constants.ZERO)
        ));
        dailyUpdatesResponse.setShareNum(
                actionsMapper.selectCount(new QueryWrapper<Actions>())
        );
        dailyUpdatesResponse.setNewsList(
                this.getCustomizedNewsList(Constants.ZERO,Constants.THREE,fileType)
                this.getCustomizedNewsList(Constants.ZERO,Constants.THREE,Constants.ZERO)
        );
        return dailyUpdatesResponse;
    }

 server/web/src/main/java/com/doumee/api/web/CustomerApi.java

@@ -296,6 +296,7 @@



    @UserLoginRequired
    @LoginRequired
    @ApiOperation(value = "分类数据 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getCatalogList")
@@ -304,13 +305,14 @@
    })
    public ApiResponse<List<ZTCatalogInfoResponse>> getCatalogList (@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
        ztCatalogListRequest.setUserId(getMemberId()+"");
        ztCatalogListRequest.setUserType(ZTConstants.CUSTOMER);
        ztCatalogListRequest.setUserType(getUserType());
        List<ZTCatalogInfoResponse> ztCatalogInfoResponseList = getZhongTaiDataService.getCatalogList(ztCatalogListRequest);
        return ApiResponse.success("查询成功",ztCatalogInfoResponseList);
    }



    @UserLoginRequired
    @LoginRequired
    @ApiOperation(value = "标签数据 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getCataLogTagList")
@@ -319,7 +321,7 @@
    })
    public ApiResponse<List<ZTTagInfoResponse>> getCataLogTagList(@RequestBody ZTCatalogListRequest ztCatalogListRequest ) {
        ztCatalogListRequest.setUserId(getMemberId()+"");
        ztCatalogListRequest.setUserType(ZTConstants.CUSTOMER);
        ztCatalogListRequest.setUserType(getUserType());
        List<ZTTagInfoResponse> ztTagInfoResponseList = getZhongTaiDataService.getCataLogTagList(ztCatalogListRequest);
        return ApiResponse.success("查询成功",ztTagInfoResponseList);
    }
@@ -335,7 +337,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "actionType", value = "行为类型：收藏：collect;取消收藏：collect_cancel;喜欢：like;取消喜欢：like_cancel；浏览：view;分享：share;下载：download", required = true),
    })
    public ApiResponse actionDo(@RequestParam String id,@RequestParam String actionType) {
        getZhongTaiDataService.actionDo(getMemberId(),ZTConstants.CUSTOMER,id,actionType);
        getZhongTaiDataService.actionDo(getMemberId(),getUserType(),id,actionType);
        return ApiResponse.success("操作成功");
    }

@@ -381,7 +383,7 @@
    })
    public ApiResponse<ZTBasePageResponse<ZTCusFavoritesInfoResponse>> getZhongTaiCusFavorite(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ztContentListRequest.setUserType(getUserType());
        ZTBasePageResponse<ZTCusFavoritesInfoResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCusFavorite(ztContentListRequest);
        return ApiResponse.success("获取成功",ztBasePageResponse);
    }
@@ -396,13 +398,14 @@
    })
    public ApiResponse<List<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ztContentListRequest.setUserType(getUserType());
        List<ZTCusCarouselImageResponse> ztCusCarouselImageResponseList = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest);
        return ApiResponse.success("获取成功",ztCusCarouselImageResponseList);
    }



    @UserLoginRequired
    @LoginRequired
    @ApiOperation(value = "轮播图详情", notes = "客户端小程序")
    @PostMapping("/getZhongTaiCarouselImageDetail")
@@ -411,12 +414,13 @@
    })
    public ApiResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImageDetail(@RequestBody ZTDataDetailRequest ztDataDetailRequest) {
        ztDataDetailRequest.setUserId(getMemberId()+"");
        ztDataDetailRequest.setUserType(ZTConstants.CUSTOMER);
        ztDataDetailRequest.setUserType(getUserType());
        ZTCusCarouselImageResponse ztCusCarouselImageResponse = getZhongTaiDataService.getZhongTaiCarouselImageDetail(ztDataDetailRequest);
        return ApiResponse.success("获取成功",ztCusCarouselImageResponse);
    }


    @UserLoginRequired
    @LoginRequired
    @ApiOperation(value = "咨询分页列表 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getZhongTaiProductNewsPage")
@@ -425,12 +429,13 @@
    })
    public ApiResponse<ZTBasePageResponse<ZTProductNewsInfoResponse>> getZhongTaiProductNewsPage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ztContentListRequest.setUserType(getUserType());
        ZTBasePageResponse<ZTProductNewsInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductNewsPage(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }


    @UserLoginRequired
    @LoginRequired
    @ApiOperation(value = "产品分页列表 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getZhongTaiProductPage")
@@ -439,11 +444,13 @@
    })
    public ApiResponse<ZTBasePageResponse<ZTProductInfoResponse>> getZhongTaiProductPage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ztContentListRequest.setUserType(getUserType());
        ZTBasePageResponse<ZTProductInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiProductPage(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }


    @UserLoginRequired
    @LoginRequired
    @ApiOperation(value = "实景分页列表 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getZhongTaiRealcasePage")
@@ -452,11 +459,13 @@
    })
    public ApiResponse<ZTBasePageResponse<ZTRealcaseInfoResponse>> getZhongTaiRealcasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ztContentListRequest.setUserType(getUserType());
        ZTBasePageResponse<ZTRealcaseInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiRealcasePage(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }


    @UserLoginRequired
    @LoginRequired
    @ApiOperation(value = "视频分页列表 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getZhongTaiVideoPage")
@@ -465,11 +474,13 @@
    })
    public ApiResponse<ZTBasePageResponse<ZTVideoInfoResponse>> getZhongTaiVideoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ztContentListRequest.setUserType(getUserType());
        ZTBasePageResponse<ZTVideoInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiVideoPage(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }


    @UserLoginRequired
    @LoginRequired
    @ApiOperation(value = "全屋案例分页列表 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getZhongTaiWholecasePage")
@@ -478,11 +489,13 @@
    })
    public ApiResponse<ZTBasePageResponse<ZTCaseInfoResponse>> getZhongTaiWholecasePage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ztContentListRequest.setUserType(getUserType());
        ZTBasePageResponse<ZTCaseInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiWholecasePage(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }


    @UserLoginRequired
    @LoginRequired
    @ApiOperation(value = "志说装修分页列表 - ä¸­å°", notes = "客户端小程序")
    @PostMapping("/getZhongTaiZbDecoPage")
@@ -491,12 +504,14 @@
    })
    public ApiResponse<ZTBasePageResponse<ZTZbDecoInfoResponse>> getZhongTaiZbDecoPage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ztContentListRequest.setUserType(getUserType());
        ZTBasePageResponse<ZTZbDecoInfoResponse>  ztBasePageResponse= getZhongTaiDataService.getZhongTaiZbDecoPage(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }



    @UserLoginRequired
    @LoginRequired
    @ApiOperation(value = "全屋案例详情 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/getWholecaseInfo")
@@ -505,11 +520,13 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse<ZTCaseInfoResponse> getWholecaseInfo(@RequestParam String id) {
        ZTCaseInfoResponse ztCaseInfoResponse= getZhongTaiDataService.getWholecaseInfo(id,ZTConstants.CUSTOMER,getMemberId());
        ZTCaseInfoResponse ztCaseInfoResponse= getZhongTaiDataService.getWholecaseInfo(id,getUserType(),getMemberId());
        return ApiResponse.success("查询成功",ztCaseInfoResponse);
    }



    @UserLoginRequired
    @LoginRequired
    @GetMapping("/getProductNewsInfo")
    @ApiOperation(value = "产品资讯详情 - ä¸­å°", notes = "客户端小程序")
@@ -518,12 +535,14 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse<ZTProductNewsInfoResponse> getProductNewsInfo(@RequestParam String id) {
        ZTProductNewsInfoResponse ztProductNewsInfoResponse= getZhongTaiDataService.getProductNewsInfo(id,ZTConstants.CUSTOMER,getMemberId());
        ZTProductNewsInfoResponse ztProductNewsInfoResponse= getZhongTaiDataService.getProductNewsInfo(id,getUserType(),getMemberId());
        return ApiResponse.success("查询成功",ztProductNewsInfoResponse);
    }




    @UserLoginRequired
    @LoginRequired
    @ApiOperation(value = "实景案例 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/getRealcaseInfo")
@@ -532,12 +551,14 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse<ZTRealcaseInfoResponse> getRealcaseInfo(@RequestParam String id) {
        ZTRealcaseInfoResponse ztRealcaseInfoResponse= getZhongTaiDataService.getRealcaseInfo(id,ZTConstants.CUSTOMER,getMemberId());
        ZTRealcaseInfoResponse ztRealcaseInfoResponse= getZhongTaiDataService.getRealcaseInfo(id,getUserType(),getMemberId());
        return ApiResponse.success("查询成功",ztRealcaseInfoResponse);
    }




    @UserLoginRequired
    @LoginRequired
    @ApiOperation(value = "产品详情 - ä¸­å°", notes = "客户端小程序")
    @GetMapping("/getProductInfo")

 server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java

@@ -69,11 +69,10 @@
    @ApiOperation(value = "【B端小程序】每日上新数据")
    @GetMapping("/getDailyUpdates")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "fileType", value = "附件类型 0图片 1视频", required = false)
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<DailyUpdatesResponse> getDailyUpdates(Integer fileType) {
        return  ApiResponse.success(newsService.getDailyUpdatesResponse(fileType));
    public ApiResponse<DailyUpdatesResponse> getDailyUpdates() {
        return  ApiResponse.success(newsService.getDailyUpdatesResponse());
    }



 server/web/src/main/java/com/doumee/api/web/PersonnelApi.java

@@ -4,10 +4,7 @@
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.ZTBaseRequst;
import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
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.config.annotation.LoginRequired;
import com.doumee.config.annotation.UserLoginRequired;
@@ -200,6 +197,23 @@
        return  ApiResponse.success(getCrmDataService.getCrmCustomerList(crmCustomerListRequest));
    }


    @UserLoginRequired
    @LoginRequired
    @ApiOperation(value = "批量添加喜欢给客户", notes = "员工端小程序")
    @PostMapping("/batchAddLike")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse batchAddLike(@RequestBody ZTBatchAddListRequest ztBatchAddListRequest) {
        ztBatchAddListRequest.setUserType(getUserType());
        ztBatchAddListRequest.setUserId(getUserId().toString());
        getZhongTaiDataService.batchAddLike(ztBatchAddListRequest);
        return ApiResponse.success("操作成功");
    }



    @UserLoginRequired
    @ApiOperation(value = "用户注销", notes = "员工端小程序")
    @PostMapping("/logOff")