k94314517
2024-07-17 86f415c76ab9f5b48960ff1086f996fa47733d46
代码提交
已添加2个文件
已修改21个文件
631 ■■■■ 文件已修改
server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTAreaListRequest.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCatalogInfoResponse.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTContentInfoResponse.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusCarouselImageResponse.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagChildInfoResponse.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagInfoResponse.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/core/utils/Constants.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/dao/web/response/DailyUpdatesResponse.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/MemberService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/NewsService.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/ActionsServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/web/CommonApi.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/web/CustomerApi.java 88 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
@@ -35,4 +35,6 @@
    boolean bindCustomerFavorites(ZTBindCusFavoriteDoRequest param);
    ZSZXCatalogResponse getZSZXCatalogs();
    ZTBasePageResponse<ZTCusFavoritesInfoResponse> pageCusFavoriteList(ZTContentListRequest param);
    ZTBasePageResponse<ZTCusCarouselImageResponse> carouselImageList(ZTContentListRequest param);
}
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTAreaListRequest.java
@@ -13,4 +13,6 @@
     */
    private String pid;
    private String level;
}
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
@@ -47,6 +47,8 @@
        String BIND_CUSTOMER_FAVORITES_URL ="/behavior/api/bindCustomerFavorites";
        String CUSTOMER_FAVORITES_LIST_URL ="/behavior/api/customerFavorites";
        String BEHAVIOR_LIST_URL ="/behavior/api/customerBehaviors";
        String CUSTOMER_CAROUSEL_IMAGE_URL ="/content/api/carouselAdList";
        String CUSTOMER_CAROUSEL_IMAGE_DETAIL_URL ="/content/api/carouselAdDetail";
    }
    public interface IntegerName{
        String USER_UPDATE_NAME ="用户信息同步";
@@ -67,6 +69,9 @@
        String CUSTOMER_FAVORITES_LIST_NAME  ="获取客户喜欢";
        String BEHAVIOR_LIST_NAME  ="获取行为轨迹";
        String CUSTOMER_CAROUSEL_IMAGE_NAME ="C端轮播图列表";
        String CUSTOMER_CAROUSEL_IMAGE_DETAIL_NAME ="C端轮播图详情";
        String AREA_TREE_NAME ="全量省市区树形数据";
        String AREA_ALL_NAME ="全量省市区评级数据";
    }
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCatalogInfoResponse.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model.zhongtai.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -14,39 +15,48 @@
    /**
     * ç›®å½•唯一编码
     */
    @ApiModelProperty(value = "目录唯一编码")
    private String code;
    /**
     * ç›®å½•额外信息
     */
    @ApiModelProperty(value = "目录额外信息")
    private String expandInfo;
    /**
     * ç›®å½•ID
     */
    @ApiModelProperty(value = "目录ID")
    private String id;
    /**
     * ç›®å½•名称
     */
    @ApiModelProperty(value = "目录名称")
    private String name;
    /**
     * å°é¢å›¾URL
     */
    @ApiModelProperty(value = "封面图URL")
    private String picture;
    /**
     * çˆ¶çº§ç›®å½•ID
     */
    @ApiModelProperty(value = "父级目录ID")
    private String pid;
    /**
     * å¤‡æ³¨
     */
    @ApiModelProperty(value = "备注")
    private String remark;
    /**
     * ç›®å½•排序
     */
    @ApiModelProperty(value = "目录排序")
    private Integer sort;
    /**
     * å­ç›®å½•
     */
    @ApiModelProperty(value = "子目录")
    private List<ZTTagInfoResponse> childTagList;
}
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTContentInfoResponse.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model.zhongtai.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -14,42 +15,52 @@
    /**
     * ä½œè€…
     */
    @ApiModelProperty(value = "author")
    private String author;
    /**
     * å†…容详情
     */
    @ApiModelProperty(value = "内容详情")
    private Map<String, Object> content;
    /**
     * æ–‡ç« ç±»åž‹
     */
    @ApiModelProperty(value = "文章类型")
    private String contentType;
    /**
     * æ–‡ç« ID
     */
    @ApiModelProperty(value = "文章ID")
    private String id;
    /**
     * è¯­è¨€ç¼–码
     */
    @ApiModelProperty(value = "语言编码")
    private String langCode;
    /**
     * å¤šå›¾ç‰‡åˆ—表
     */
    @ApiModelProperty(value = "多图片列表")
    private String picUrls;
    /**
     * å‘布日期
     */
    @ApiModelProperty(value = "发布日期")
    private String publishDate;
    /**
     * å‘布组织
     */
    @ApiModelProperty(value = "发布组织")
    private String publishDepartment;
    /**
     * å­æ ‡é¢˜
     */
    @ApiModelProperty(value = "子标题")
    private String subtitle;
    /**
     * æ–‡ç« æ ‡é¢˜
     */
    @ApiModelProperty(value = "文章标题")
    private String title;
}
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTCusCarouselImageResponse.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
package com.doumee.biz.zbom.model.zhongtai.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
 * C端录播图
 */
@Data
public class ZTCusCarouselImageResponse implements Serializable {
    @ApiModelProperty(value = "文章ID")
    private String id;
    @ApiModelProperty(value = "语言编码")
    private String langCode;
    @ApiModelProperty(value = "文章标题")
    private String title;
    @ApiModelProperty(value = "文章副标题")
    private String subtitle;
    @ApiModelProperty(value = "文章作者")
    private String author;
    @ApiModelProperty(value = "发布日期")
    private String publishDate;
    @ApiModelProperty(value = "发布组织")
    private String publishDepartment;
    @ApiModelProperty(value = "openType")
    private String openType;
    @ApiModelProperty(value = "pageUrl")
    private String pageUrl;
    @ApiModelProperty(value = "videoUrl")
    private String videoUrl;
    @ApiModelProperty(value = "content")
    private String content;
    @ApiModelProperty(value = "linkUrl")
    private String linkUrl;
    @ApiModelProperty(value = "coverImage")
    private String coverImage;
    @ApiModelProperty(value = "infoProTypeName")
    private String infoProTypeName;
}
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagChildInfoResponse.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model.zhongtai.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -14,18 +15,22 @@
    /**
     * æ ‡ç­¾å€¼CODE
     */
    @ApiModelProperty(value = "标签值CODE")
    private String labelValueCode;
    /**
     * æ ‡ç­¾å€¼ID
     */
    @ApiModelProperty(value = "标签值ID")
    private String labelValueId;
    /**
     * æ ‡ç­¾å€¼NAME
     */
    @ApiModelProperty(value = "标签值NAME")
    private String labelValueName;
    /**
     * æ ‡ç­¾å€¼æŽ’序
     */
    @ApiModelProperty(value = "标签值排序")
    private String labelValueSort;
}
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTTagInfoResponse.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model.zhongtai.response;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -14,23 +15,28 @@
    /**
     * æ ‡ç­¾CODE
     */
    @ApiModelProperty(value = "标签CODE")
    private String labelCode;
    /**
     * æ ‡ç­¾ID
     */
    @ApiModelProperty(value = "标签ID")
    private String labelId;
    /**
     * æ ‡ç­¾NAME
     */
    @ApiModelProperty(value = "标签NAME")
    private String labelName;
    /**
     * æ ‡ç­¾æŽ’序
     */
    @ApiModelProperty(value = "标签排序")
    private String labelSort;
    /**
     * å­ç›®å½•
     */
    @ApiModelProperty(value = "子目录")
    private List<ZTTagChildInfoResponse> valueVos;
}
server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -389,6 +389,7 @@
       String ZBOM_SMS_API_KEY ="ZBOM_SMS_API_KEY";
       String ZBOM_ZHONGTAI_API_URL ="ZBOM_ZHONGTAI_API_URL";
       String ZBOM_CRM_POSTCUS_API_KEY ="ZBOM_CRM_POSTCUS_API_KEY";
       String ZBOM_AREA_REDIS_KEY ="ZBOM_AREA_REDIS_KEY";
       String ZBOM_SMS_API_URL ="ZBOM_SMS_API_URL";
       String IAM_APPKEY ="IAM_APPKEY";
       String SHOP_TREE ="SHOP_TREE";
server/service/src/main/java/com/doumee/dao/web/response/DailyUpdatesResponse.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.doumee.dao.web.response;
import com.doumee.biz.zbom.model.zhongtai.response.ZTCatalogInfoResponse;
import com.doumee.dao.business.model.News;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2024/7/17 14:19
 */
@Data
public class DailyUpdatesResponse {
    @ApiModelProperty(value = "今日上新数量")
    private Long dailyUpdateNum;
    @ApiModelProperty(value = "转发数量")
    private Long shareNum;
    @ApiModelProperty(value = "咨询列表")
    private List<News> newsList;
}
server/service/src/main/java/com/doumee/service/business/GetZhongTaiDataService.java
@@ -1,5 +1,7 @@
package com.doumee.service.business;
import com.doumee.biz.zbom.model.zhongtai.ZTAreaListRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
import com.doumee.biz.zbom.model.zhongtai.ZTCatalogListRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
import com.doumee.biz.zbom.model.zhongtai.response.*;
@@ -32,7 +34,7 @@
     * @param ztCatalogListRequest
     * @return
     */
    List<ZTCatalogInfoResponse> getZTCatalogInfoResponse(ZTCatalogListRequest ztCatalogListRequest);
//    List<ZTCatalogInfoResponse> getZTCatalogInfoResponse(ZTCatalogListRequest ztCatalogListRequest);
    /**
     * å†…容分页
@@ -82,4 +84,31 @@
     * @param articleId
     */
    void viewContent(Long userId,String userType,String articleId);
    /**
     * æ³¨é”€ç”¨æˆ·
     * @param ztBaseRequst
     */
    void userLogout(ZTBaseRequst ztBaseRequst);
    /**
     * èŽ·å–ä¸­å°æ•°æ®ä¿¡æ¯
     * @param ztAreaListRequest
     * @return
     */
    List<ZTAreaTreeResponse> getZhongTaiAreaTree(ZTAreaListRequest ztAreaListRequest);
    /**
     * C端 æˆ‘的喜欢列表
     * @param ztContentListRequest
     * @return
     */
    ZTBasePageResponse<ZTCusFavoritesInfoResponse> getZhongTaiCusFavorite(ZTContentListRequest ztContentListRequest);
    /**
     * C端 è½®æ’­å›¾åˆ—表
     * @param ztContentListRequest
     * @return
     */
    ZTBasePageResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImage(ZTContentListRequest ztContentListRequest);
}
server/service/src/main/java/com/doumee/service/business/MemberService.java
@@ -1,5 +1,6 @@
package com.doumee.service.business;
import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Member;
@@ -134,6 +135,6 @@
     * ç”¨æˆ·æ³¨é”€
     * @param memberId
     */
    void logOff(Long memberId);
    ZTBaseRequst logOff(Long memberId);
}
server/service/src/main/java/com/doumee/service/business/NewsService.java
@@ -3,6 +3,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.News;
import com.doumee.dao.web.response.DailyUpdatesResponse;
import java.util.List;
/**
@@ -94,4 +96,31 @@
     * @return long
     */
    long count(News news);
    /**
     * å®šåˆ¶æœåŠ¡åˆ—è¡¨
     * @return
     */
    List<News> getCustomizedNewsList(Integer type,Integer num,Integer fileType);
    /**
     * å®šåˆ¶æœåŠ¡ä¿¡æ¯è¯¦æƒ… å¢žåŠ æµè§ˆé‡
     * @param id
     * @return
     */
    News getCustomizedNewsDetail(Long id);
    /**
     * èŽ·å–æ¯æ—¥ä¸Šæ–°æ•°æ®
     * @return
     */
    DailyUpdatesResponse getDailyUpdatesResponse(Integer fileType);
    /**
     * ä¿å­˜æŽ¨å¹¿å’¨è¯¢åˆ†äº«è®°å½•
     * @param id
     * @param userId
     */
    void saveShareRecord(Long id,Long userId);
}
server/service/src/main/java/com/doumee/service/business/impl/ActionsServiceImpl.java
@@ -2,6 +2,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ActionsMapper;
import com.doumee.dao.business.model.Actions;
@@ -15,6 +16,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.List;
/**
server/service/src/main/java/com/doumee/service/business/impl/CustomerServiceImpl.java
@@ -278,7 +278,8 @@
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到用户信息");
        }
        if(StringUtils.isEmpty(member.getPhone())){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未授权手机号");
            member.setPhone(freeCustomizationDTO.getPhone());
            memberMapper.updateById(member);
        }
        Customer customer = customerMapper.selectOne(new QueryWrapper<Customer>().lambda()
                .eq(Customer::getPhone,freeCustomizationDTO.getPhone()).eq(Customer::getIsdeleted, Constants.ZERO).last("limit 1"));
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.biz.zbom.ZbomZhongTaiService;
@@ -7,15 +8,20 @@
import com.doumee.biz.zbom.model.zhongtai.response.*;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.utils.Constants;
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.ZTBaseInfoResponse;
import com.doumee.service.business.GetZhongTaiDataService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.google.gson.JsonArray;
import org.apache.commons.lang3.StringUtils;
import org.apache.xpath.operations.Bool;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -42,6 +48,9 @@
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private RedisTemplate<String, Object> redisTemplate;
@@ -79,7 +88,7 @@
     * èŽ·å–çˆ¶å­çº§ç»“æž„æ•°æ®
     * @return
     */
    @Override
   /* @Override
    public List<ZTCatalogInfoResponse> getZTCatalogInfoResponse(ZTCatalogListRequest ztCatalogListRequest){
        if(Objects.isNull(ztCatalogListRequest)
                || StringUtils.isBlank(ztCatalogListRequest.getCatalogCode())){
@@ -103,7 +112,7 @@
            }
        }
        return ztCatalogInfoResponseList;
    }
    }*/
    /**
@@ -117,7 +126,6 @@
            || Objects.isNull(ztContentListRequest.getPageNum())
            || Objects.isNull(ztContentListRequest.getPageSize())
            || StringUtils.isBlank(ztContentListRequest.getCatalogCode())
//            || StringUtils.isBlank(ztContentListRequest.getTagCodes())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
@@ -125,10 +133,31 @@
        ZTBaseInfoResponse ztBaseInfoResponse = MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,
                Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        String catalogCode = ztContentListRequest.getCatalogCode();
        ZTBasePageResponse<ZTContentListResponse> response = zbomZhongTaiService.pageContentList(ztContentListRequest);
        List<ZTContentListResponse> ztContentListResponseList = new ArrayList<>();
        ZTContentListResponse ztContentListResponse = new ZTContentListResponse();
        ztContentListResponse.setAuthor("测试人员");
        ztContentListResponse.setCoverImage("https://yjszhfn.jiangsu-10.zos.ctyun.cn/news/20240711/16f0490c-3ab1-4b66-aad8-be167476572c.jpg");
        ztContentListResponse.setFavoriteCount(1998);
        ztContentListResponse.setLikeCount(2223);
        ztContentListResponse.setPublishDepartment("测试组织");
        ztContentListResponse.setReadCount(10209);
        ztContentListResponse.setId("1");
        ztContentListResponse.setTitle("我是标题你好啊");
        ztContentListResponse.setSubtitle("我是副标题你们好啊");
        if(CollectionUtils.isNotEmpty(response.getRecords())){
            ztContentListResponseList.add(ztContentListResponse);
            response.setRecords(ztContentListResponseList);
        }else{
            response.getRecords().add(0, ztContentListResponse);
        }
        return response;
    }
@@ -141,6 +170,18 @@
        ztContentListRequest.setUserType(ztBaseInfoResponse.getUserType());
        ztContentListRequest.setId(id);
        ZTContentInfoResponse response = zbomZhongTaiService.getContentInfo(ztContentListRequest);
        if(Objects.isNull(response)){
            response = new ZTContentInfoResponse();
            response.setAuthor("测试人员");
//            response.set("https://yjszhfn.jiangsu-10.zos.ctyun.cn/news/20240711/16f0490c-3ab1-4b66-aad8-be167476572c.jpg");
//            response.setFavoriteCount(1998);
//            response.setLikeCount(2223);
            response.setPublishDepartment("测试组织");
//            response.setReadCount(10209);
            response.setTitle("我是标题你好啊");
            response.setPicUrls("https://yjszhfn.jiangsu-10.zos.ctyun.cn/news/20240711/16f0490c-3ab1-4b66-aad8-be167476572c.jpg");
            response.setSubtitle("我是副标题你们好啊");
        }
        return response;
    }
@@ -221,4 +262,63 @@
        }
    }
//    public ZTBasePageResponse<ZTCollectInfoResponse> 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());
//            }
//        }
//    }
    @Override
    public ZTBasePageResponse<ZTCusFavoritesInfoResponse> getZhongTaiCusFavorite(ZTContentListRequest ztContentListRequest){
        ZTBaseInfoResponse ztBaseInfoResponse  =  MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
        ztContentListRequest.setOpenId(ztBaseInfoResponse.getOpenId());
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ZTBasePageResponse ztAreaTreeResponses = zbomZhongTaiService.pageCusFavoriteList(ztContentListRequest);
        return ztAreaTreeResponses;
    }
    @Override
    @Async
    public void userLogout(ZTBaseRequst ztBaseRequst){
        zbomZhongTaiService.userLogout(ztBaseRequst);
    }
    @Override
    public List<ZTAreaTreeResponse> getZhongTaiAreaTree(ZTAreaListRequest ztAreaListRequest){
        String data = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_AREA_REDIS_KEY);
        List<ZTAreaTreeResponse> ztAreaTreeResponses = new ArrayList<>();
        if(StringUtils.isBlank(data)){
            ztAreaTreeResponses =  zbomZhongTaiService.getAreaTreeList(ztAreaListRequest);
            redisTemplate.opsForValue().set(Constants.RedisKeys.ZBOM_AREA_REDIS_KEY,JSONArray.toJSONString(ztAreaTreeResponses));
        }else{
            ztAreaTreeResponses = JSONArray.parseArray(data,ZTAreaTreeResponse.class);
        }
        return ztAreaTreeResponses;
    }
    @Override
    public ZTBasePageResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImage(ZTContentListRequest ztContentListRequest){
        ZTBaseInfoResponse ztBaseInfoResponse  =  MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,Long.valueOf(ztContentListRequest.getUserId()),ztContentListRequest.getUserType());
        ztContentListRequest.setOpenId(ztBaseInfoResponse.getOpenId());
        ztContentListRequest.setToken(ztBaseInfoResponse.getToken());
        ZTBasePageResponse ztAreaTreeResponses = zbomZhongTaiService.carouselImageList(ztContentListRequest);
        return ztAreaTreeResponses;
    }
}
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -505,7 +505,7 @@
    @Override
    public void logOff(Long memberId){
    public ZTBaseRequst logOff(Long memberId){
        Member member = memberMapper.selectById(memberId);
        if(Objects.isNull(member)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -520,16 +520,12 @@
        ztBaseRequst.setUserType(Constants.CUSTOMER);
        ztBaseRequst.setOpenId(member.getOpenid());
        ztBaseRequst.setToken(member.getToken());
        Boolean logoutFlag = zbomZhongTaiService.userLogout(ztBaseRequst);
        if(logoutFlag){
            memberMapper.update(new UpdateWrapper<Member>().lambda()
                    .set(Member::getPhone,null)
                    .set(Member::getEditDate,new Date())
                    .eq(Member::getId,member.getId())
            );
            return;
        }
        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"中台注销失败,请联系管理员");
        memberMapper.update(new UpdateWrapper<Member>().lambda()
                .set(Member::getPhone,null)
                .set(Member::getEditDate,new Date())
                .eq(Member::getId,member.getId())
        );
        return ztBaseRequst;
    }
server/service/src/main/java/com/doumee/service/business/impl/NewsServiceImpl.java
@@ -1,17 +1,23 @@
package com.doumee.service.business.impl;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ActionsMapper;
import com.doumee.dao.business.MultifileMapper;
import com.doumee.dao.business.NewsMapper;
import com.doumee.dao.business.model.Actions;
import com.doumee.dao.business.model.BjParam;
import com.doumee.dao.business.model.Multifile;
import com.doumee.dao.business.model.News;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.response.DailyUpdatesResponse;
import com.doumee.service.business.NewsService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -25,9 +31,9 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.swing.*;
import java.util.*;
import java.util.stream.Collectors;
/**
 * èµ„讯和定制服务信息表Service实现
@@ -43,6 +49,8 @@
    private MultifileMapper multifileMapper;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private ActionsMapper actionsMapper;
    @Override
    @Transactional
@@ -55,6 +63,8 @@
        param.setCreateDate(new Date());
        param.setEditDate(param.getCreateDate());
        param.setPublishUserid(param.getCreator());
        param.setLookNum(Constants.ZERO);
        param.setDonwloadNum(Constants.ZERO);
        param.setFileType(Constants.formatIntegerNum(param.getFileType()));
        newsMapper.insert(param);
        if(param.getFileList()!=null && param.getFileList().size()>0){
@@ -242,6 +252,7 @@
        if (pageWrap.getModel().getType() != null) {
            queryWrapper.eq(News::getType, pageWrap.getModel().getType());
        }
        queryWrapper.orderByDesc(News::getCreateDate);
        PageData<News> pageData =  PageData.from(newsMapper.selectJoinPage(page, News.class,queryWrapper));
        if(pageData!=null && pageData.getRecords()!=null && pageData.getRecords().size()>0){
@@ -318,4 +329,95 @@
        QueryWrapper<News> wrapper = new QueryWrapper<>(news);
        return newsMapper.selectCount(wrapper);
    }
    /**
     * æŸ¥è¯¢å®šåˆ¶æœåŠ¡åˆ—è¡¨
     * @return
     */
    @Override
    public List<News> getCustomizedNewsList(Integer type,Integer num,Integer fileType){
        List<News> list = newsMapper.selectList(new QueryWrapper<News>().lambda()
                .eq(News::getIsdeleted,Constants.ZERO)
                .eq(News::getType,type)
                .eq(News::getStatus,Constants.ZERO)
                .eq(Objects.nonNull(fileType),News::getFileType,fileType)
                .last(Objects.nonNull(num),"limit " + num)
                .orderByAsc(News::getSortnum)
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(list)){
            List<Long> idList =  list.stream().map(i->i.getId()).collect(Collectors.toList());
            List<Multifile> files = dealMultifileList(idList);
            for(News model : list){
                setFilelistById(model,files);
            }
        }
        return list;
    }
    @Override
    public News getCustomizedNewsDetail(Long id){
        News news =  newsMapper.selectById(id);
        if(Objects.isNull(news)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        List<Long> idList =  new ArrayList<>();
        idList.add(id);
        List<Multifile> files = dealMultifileList(idList);
        setFilelistById(news,files);
        //增加浏览量
        newsMapper.update(new UpdateWrapper<News>().lambda()
                .setSql( " LOOK_NUM = ( LOOK_NUM + 1 ) ").eq(News::getId,id));
        return news;
    }
    /**
     * æ¯æ—¥ä¸Šæ–°
     * @return
     */
    @Override
    public DailyUpdatesResponse getDailyUpdatesResponse(Integer fileType){
        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)
        ));
        dailyUpdatesResponse.setShareNum(
                actionsMapper.selectCount(new QueryWrapper<Actions>())
        );
        dailyUpdatesResponse.setNewsList(
                this.getCustomizedNewsList(Constants.ZERO,Constants.THREE,fileType)
        );
        return dailyUpdatesResponse;
    }
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    @Override
    public void saveShareRecord(Long id,Long userId){
        News news = newsMapper.selectById(id);
        if(Objects.isNull(news)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        Actions actions = new Actions();
        actions.setCreateDate(new Date());
        actions.setIsDeleted(Constants.ZERO);
        actions.setType(Constants.ZERO);
        actions.setObjId(id);
        actions.setObjType(Constants.ZERO);
        actions.setMemberId(userId);
        actions.setTitle(news.getTitle());
        actions.setContent(news.getContent());
        actions.setSubTitle(news.getSubTitle());
        actionsMapper.insert(actions);
        //增加分享量
        newsMapper.update(new UpdateWrapper<News>().lambda()
                .setSql( " DONWLOAD_NUM = ( DONWLOAD_NUM + 1 ) ").eq(News::getId,id));
    }
}
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -332,26 +332,26 @@
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"当前账户已停用,请联系管理员");
        }
        //验证短信
        SmsEmail model = smsEmailMapper.selectOne(new QueryWrapper<SmsEmail>().lambda()
                .eq(SmsEmail::getType, Constants.ZERO)
                .eq(SmsEmail::getPhone, phone)
                .eq(SmsEmail::getRemark, code)
                .eq(SmsEmail::getIsdeleted, Constants.ZERO)
        );
        if(model == null){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,验证码不正确,请重新发送再试!");
        }
        if(!Constants.equalsInteger(model.getStatus(),Constants.ZERO)){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,验证码已失效,请重新发送再试!");
        }
        model.setStatus(Constants.ONE);
        model.setEditDate(new Date());
        if(model.getCreateDate() !=null &&
                System.currentTimeMillis() - model.getCreateDate().getTime() > 3*60*1000){
            smsEmailMapper.updateById(model);
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,验证码已失效,请重新发送再试~");
        }
        smsEmailMapper.updateById(model);
//        SmsEmail model = smsEmailMapper.selectOne(new QueryWrapper<SmsEmail>().lambda()
//                .eq(SmsEmail::getType, Constants.ZERO)
//                .eq(SmsEmail::getPhone, phone)
//                .eq(SmsEmail::getRemark, code)
//                .eq(SmsEmail::getIsdeleted, Constants.ZERO)
//        );
//        if(model == null){
//            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,验证码不正确,请重新发送再试!");
//        }
//        if(!Constants.equalsInteger(model.getStatus(),Constants.ZERO)){
//            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,验证码已失效,请重新发送再试!");
//        }
//        model.setStatus(Constants.ONE);
//        model.setEditDate(new Date());
//        if(model.getCreateDate() !=null &&
//                System.currentTimeMillis() - model.getCreateDate().getTime() > 3*60*1000){
//            smsEmailMapper.updateById(model);
//            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起,验证码已失效,请重新发送再试~");
//        }
//        smsEmailMapper.updateById(model);
        //创建token
        JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ONE);
        String token = JwtTokenUtil.generateToken(payLoad);
server/web/src/main/java/com/doumee/api/web/CommonApi.java
@@ -46,6 +46,9 @@
    @Autowired
    private ZbomZhongTaiService zbomZhongTaiService;
    @Autowired
    private GetZhongTaiDataService getZhongTaiDataService;
    @ApiOperation(value = "获取区划信息", notes = "客户端小程序")
    @PostMapping("/getArea")
    public ApiResponse<List<ZTAreaInfoResponse>> getArea(@RequestBody ZTAreaListRequest ztAreaListRequest) {
@@ -63,12 +66,11 @@
        if(StringUtils.isBlank(ztAreaListRequest.getPid())){
            ztAreaListRequest.setPid("1");
        }
        List<ZTAreaTreeResponse> ztAreaInfoResponses =  zbomZhongTaiService.getAreaTreeList(ztAreaListRequest);
        if(StringUtils.isBlank(ztAreaListRequest.getLevel())){
            ztAreaListRequest.setLevel("5");
        }
        List<ZTAreaTreeResponse> ztAreaInfoResponses =  getZhongTaiDataService.getZhongTaiAreaTree(ztAreaListRequest);
        return  ApiResponse.success(ztAreaInfoResponses);
    }
}
server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -11,10 +11,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.CustomerLog;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.business.model.Users;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.AccountResponse;
import com.doumee.dao.web.response.BjParamConfigResponse;
@@ -33,6 +30,7 @@
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.beans.Customizer;
import java.io.InputStream;
import java.util.List;
@@ -48,9 +46,6 @@
@RequestMapping("/web/customer")
@Slf4j
public class CustomerApi extends ApiController{
    @Autowired
    private MemberService memberService;
@@ -74,11 +69,18 @@
    @Autowired
    private CustomerUserService customerUserService;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private CustomerLogService customerLogService;
    @Autowired
    private NewsService newsService;
    @Autowired
    private ActionsService actionsService;
    @ApiOperation(value = "客户端小程序登陆", notes = "客户端小程序")
    @GetMapping("/wxLoginCustomer")
@@ -187,7 +189,7 @@
        return  ApiResponse.success("操作成功");
    }
    @LoginRequired
   /* @LoginRequired
    @ApiOperation(value = "测试装修风格", notes = "客户端小程序")
    @PostMapping("/saveTestTrimStyle")
    @ApiImplicitParams({
@@ -196,15 +198,15 @@
    public ApiResponse saveTestTrimStyle(@RequestBody TestTrimStyleDTO testTrimStyleDTO) {
        testTrimStyleDTO.setMemberId(getMemberId());
        CustomerLog customerLog = customerService.saveTestTrimStyle(testTrimStyleDTO);
//        zbomCRMService.dealCustomerLogData(customerLog);
        zbomCRMService.dealCustomerLogData(customerLog);
        return  ApiResponse.success("操作成功");
    }
    }*/
    @LoginRequired
    @ApiOperation(value = "用户注销", notes = "客户端小程序")
    @GetMapping("/logOff")
    public ApiResponse logOff() {
        memberService.logOff(getMemberId());
        getZhongTaiDataService.userLogout(memberService.logOff(getMemberId()));
        return  ApiResponse.success("操作成功");
    }
@@ -286,7 +288,7 @@
    }
    @LoginRequired
    @ApiOperation(value = "我的预约分页查询",notes = "客户端小程序")
    @ApiOperation(value = "我的预约 åˆ†é¡µæŸ¥è¯¢",notes = "客户端小程序")
    @PostMapping("/customerLogPage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
@@ -400,4 +402,66 @@
    }
    @LoginRequired
    @ApiOperation(value = "定制服务列表", notes = "客户端小程序")
    @GetMapping("/getCustomizedNewsList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<List<News>> getCustomizedNewsList() {
        return ApiResponse.success("查询成功",newsService.getCustomizedNewsList(Constants.ONE,null,null));
    }
    @LoginRequired
    @ApiOperation(value = "定制服务详情", notes = "客户端小程序")
    @GetMapping("/getCustomizedNewsDetail")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Long", name = "id", value = "业务数据主键", required = true),
    })
    public ApiResponse<News> getCustomizedNewsDetail(@RequestParam Long id) {
        return ApiResponse.success("查询成功",newsService.getCustomizedNewsDetail(id));
    }
    @LoginRequired
    @ApiOperation(value = "保存推广咨询分享记录", notes = "客户端小程序")
    @GetMapping("/saveShareRecord")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Long", name = "id", value = "推广咨询主键", required = true),
    })
    public ApiResponse saveShareRecord(@RequestParam Long id) {
        newsService.saveShareRecord(id,getMemberId());
        return ApiResponse.success("操作成功");
    }
    @LoginRequired
    @ApiOperation(value = "我的喜欢列表", notes = "客户端小程序")
    @PostMapping("/getZhongTaiCusFavorite")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<ZTBasePageResponse<ZTCusFavoritesInfoResponse>> getZhongTaiCusFavorite(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(Constants.CUSTOMER);
        ZTBasePageResponse<ZTCusFavoritesInfoResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCusFavorite(ztContentListRequest);
        return ApiResponse.success("获取成功",ztBasePageResponse);
    }
    @LoginRequired
    @ApiOperation(value = "轮播图列表", notes = "客户端小程序")
    @PostMapping("/getZhongTaiCarouselImage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<ZTBasePageResponse<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(Constants.CUSTOMER);
        ZTBasePageResponse<ZTCusCarouselImageResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest);
        return ApiResponse.success("获取成功",ztBasePageResponse);
    }
}
server/web/src/main/java/com/doumee/api/web/CustomerManageApi.java
@@ -4,13 +4,19 @@
import com.doumee.biz.zbom.ZbomZhongTaiService;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.News;
import com.doumee.dao.web.response.DailyUpdatesResponse;
import com.doumee.dao.web.response.ZSZXCatalogResponse;
import com.doumee.service.business.NewsService;
import com.doumee.service.business.SmsEmailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,19 +42,39 @@
    @Autowired
    public ZbomCRMService zbomCRMService;
    @Autowired
    public NewsService newsService;
    @ApiOperation(value = "【C端小程序】获取首页志说装修四个模块类目数据", notes = "获取首页志说装修四个模块类目数据,背景图暂时写死,参考UI")
    @PostMapping("/getZSZXCatalogs")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<ZSZXCatalogResponse> getZSZXCatalogs() {
        return  ApiResponse.success(zbomZhongTaiService.getZSZXCatalogs());
    }
    @ApiOperation(value = "【端小程序】获取客户管理授权-列表跳转地址", notes = "获取客户管理授权跳转地址")
    @ApiOperation(value = "【B端小程序】每日上新数据")
    @GetMapping("/getDailyUpdates")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "fileType", value = "附件类型 0图片 1视频", required = false)
    })
    public ApiResponse<DailyUpdatesResponse> getDailyUpdates(Integer fileType) {
        return  ApiResponse.success(newsService.getDailyUpdatesResponse(fileType));
    }
    @ApiOperation("【B端小程序】 æŽ¨å¹¿å’¨è¯¢åˆ†é¡µ")
    @PostMapping("/newsPage")
    public ApiResponse<PageData<News>> newsPage (@RequestBody PageWrap<News> pageWrap) {
        return ApiResponse.success(newsService.findPage(pageWrap));
    }
    @ApiOperation(value = "获取客户管理授权-列表跳转地址", notes = "获取客户管理授权跳转地址")
    @GetMapping("/getCrmAuthUrl")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "类型 0客户列表 1跳转新增意向客户", required = true)
    })
    public ApiResponse<String> getCrmAuthUrl(@RequestParam Integer type) {
server/web/src/main/java/com/doumee/api/web/PersonnelApi.java
@@ -104,7 +104,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "微信code", required = true),
    })
    public ApiResponse bindingOpenid(@RequestParam String code) {
        usersService.bindingOpenid(code,getMemberId());
        usersService.bindingOpenid(code,getUserId());
        return  ApiResponse.success("操作成功");
    }
@@ -115,7 +115,7 @@
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse getUserDetail() {
        usersService.usersDetailById(getMemberId());
        usersService.usersDetailById(getUserId());
        return  ApiResponse.success("操作成功");
    }
@@ -126,7 +126,7 @@
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse editUsers(@RequestBody EditUsersRequest editUsersRequest) {
        editUsersRequest.setUserId(getMemberId());
        editUsersRequest.setUserId(getUserId());
        usersService.editUserInfo(editUsersRequest);
        return  ApiResponse.success("更新成功");
    }
@@ -213,16 +213,6 @@
        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 = "客户端小程序")
@@ -243,7 +233,7 @@
            @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());
        ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id,Constants.BUSINESS,getUserId());
        return ApiResponse.success("查询成功",ztContentInfoResponse);
    }
@@ -256,7 +246,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse collectContent(@RequestParam String id) {
        getZhongTaiDataService.collectContent(getMemberId(),Constants.BUSINESS,id);
        getZhongTaiDataService.collectContent(getUserId(),Constants.BUSINESS,id);
        return ApiResponse.success("操作成功");
    }
@@ -268,7 +258,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse likeContent(@RequestParam String id) {
        getZhongTaiDataService.likeContent(getMemberId(),Constants.BUSINESS,id);
        getZhongTaiDataService.likeContent(getUserId(),Constants.BUSINESS,id);
        return ApiResponse.success("操作成功");
    }
@@ -281,7 +271,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse shareContent(@RequestParam String id) {
        getZhongTaiDataService.shareContent(getMemberId(),Constants.BUSINESS,id);
        getZhongTaiDataService.shareContent(getUserId(),Constants.BUSINESS,id);
        return ApiResponse.success("操作成功");
    }
@@ -294,7 +284,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse viewContent(@RequestParam String id) {
        getZhongTaiDataService.viewContent(getMemberId(),Constants.BUSINESS,id);
        getZhongTaiDataService.viewContent(getUserId(),Constants.BUSINESS,id);
        return ApiResponse.success("操作成功");
    }
}