提交

jiangping

2024-07-17 2d9cfa55f0f839ff464b445a259839ab6490d135

提交

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

@@ -17,7 +17,18 @@
@Service
public interface ZbomZhongTaiService {
    ZTUserGetTokenResponse getUserToken(ZTUserGetTokenRequest param);
    ZTSysuserGetTokenResponse getSysuserToken(String  mobile);
    ZTBaseResponse userUpdateInfo(ZTUserInfoUpdateRequest param);
    ZTBasePageResponse<ZTProductNewsInfoResponse> pageProductNewsList(ZTContentListRequest param);
    ZTBasePageResponse<ZTProductInfoResponse> pageProductList(ZTContentListRequest param);
    ZTBasePageResponse<ZTRealcaseInfoResponse> pageRealcaseList(ZTContentListRequest param);
    ZTBasePageResponse<ZTVideoInfoResponse> pageVideoList(ZTContentListRequest param);
    ZTBasePageResponse<ZTCaseInfoResponse> pageWholecaseList(ZTContentListRequest param);
    ZTBasePageResponse<ZTZbDecoInfoResponse> pageZbDecoList(ZTContentListRequest param);
    ZTProductInfoResponse getProductInfo(ZTContentInfoRequest param);
    ZTCaseInfoResponse getWholecaseInfo(ZTContentInfoRequest param);
    ZTProductNewsInfoResponse getProductNewsInfo(ZTContentInfoRequest param);
    ZTRealcaseInfoResponse getRealcaseInfo(ZTContentInfoRequest param);
    boolean userLogout(ZTBaseRequst param);
    List<ZTCatalogInfoResponse> getCatalogList(ZTCatalogListRequest param);
    List<ZTTagInfoResponse> getTagList(ZTCatalogListRequest param);

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

@@ -61,6 +61,25 @@
       return null;
   }
    /**
     * èŽ·å–B端用户登陆token
     * @param mobile
     * @return
     */
   @Override
   public ZTSysuserGetTokenResponse getSysuserToken(String  mobile){
       ZTBaseResponse<ZTSysuserGetTokenResponse> result = sendHttpRequest(
               ZTConstants.IntegerUrl.USER_MOBILE_FASTLOGIN_URL+"?mobile="+mobile,
               ZTConstants.IntegerName.USER_MOBILE_FASTLOGIN_NAME,
               null,
               null,
               "",
               new TypeReference<ZTBaseResponse<ZTSysuserGetTokenResponse>>(){});
       if(result!=null){
           return result.getData();
       }
       return null;
   }
    /**
     * èŽ·å–用户登陆token
     * @return
     */
@@ -185,6 +204,196 @@
//            return ztBasePageResponse;
        }
        return null;
    }
    /**
     * èŽ·å–视频列表分页
     * @param param
     * @return
     */
    @Override
    public ZTBasePageResponse<ZTZbDecoInfoResponse> pageZbDecoList(ZTContentListRequest param){
        ZTBaseResponse<ZTBasePageResponse<ZTZbDecoInfoResponse>> result = sendHttpRequest(
                ZTConstants.IntegerUrl.ZBDECO_PAGE_LIST_URL,
                ZTConstants.IntegerName.ZBDECO_PAGE_LIST_NAME,
                param.getToken(),
                param.getUserType(),
                JSONObject.toJSONString(param ),
                new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTZbDecoInfoResponse>>>(){});
        if(result!=null){
            return result.getData();
        }
        return null;
    }
    /**
     * èŽ·å–视频列表分页
     * @param param
     * @return
     */
    @Override
    public ZTBasePageResponse<ZTVideoInfoResponse> pageVideoList(ZTContentListRequest param){
        ZTBaseResponse<ZTBasePageResponse<ZTVideoInfoResponse>> result = sendHttpRequest(
                ZTConstants.IntegerUrl.VIDEO_PAGE_LIST_URL,
                ZTConstants.IntegerName.VIDEO_PAGE_LIST_NAME,
                param.getToken(),
                param.getUserType(),
                JSONObject.toJSONString(param ),
                new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTVideoInfoResponse>>>(){});
        if(result!=null){
            return result.getData();
        }
        return null;
    }
    /**
     * èŽ·å–产品资讯列表分页
     * @param param
     * @return
     */
    @Override
    public ZTBasePageResponse<ZTProductNewsInfoResponse> pageProductNewsList(ZTContentListRequest param){
        ZTBaseResponse<ZTBasePageResponse<ZTProductNewsInfoResponse>> result = sendHttpRequest(
                ZTConstants.IntegerUrl.PRODUCT_NEWS_PAGE_LIST_URL,
                ZTConstants.IntegerName.PRODUCT_NEWS_PAGE_LIST_NAME,
                param.getToken(),
                param.getUserType(),
                JSONObject.toJSONString(param ),
                new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTProductNewsInfoResponse>>>(){});
        if(result!=null){
            return result.getData();
        }
        return null;
    }
    /**
     * èŽ·å–产品列表分页
     * @param param
     * @return
     */
    @Override
    public ZTBasePageResponse<ZTProductInfoResponse> pageProductList(ZTContentListRequest param){
        ZTBaseResponse<ZTBasePageResponse<ZTProductInfoResponse>> result = sendHttpRequest(
                ZTConstants.IntegerUrl.PRODUCT_PAGE_LIST_URL,
                ZTConstants.IntegerName.PRODUCT_PAGE_LIST_NAME,
                param.getToken(),
                param.getUserType(),
                JSONObject.toJSONString(param ),
                new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTProductInfoResponse>>>(){});
        if(result!=null){
            return result.getData();
        }
        return null;
    }
    /**
     * èŽ·å–全屋案例列表分页
     * @param param
     * @return
     */
    @Override
    public ZTBasePageResponse<ZTCaseInfoResponse> pageWholecaseList(ZTContentListRequest param){
        ZTBaseResponse<ZTBasePageResponse<ZTCaseInfoResponse>> result = sendHttpRequest(
                ZTConstants.IntegerUrl.WHOLECASE_PAGE_LIST_URL,
                ZTConstants.IntegerName.WHOLECASE_PAGE_LIST_NAME,
                param.getToken(),
                param.getUserType(),
                JSONObject.toJSONString(param ),
                new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTCaseInfoResponse>>>(){});
        if(result!=null){
            return result.getData();
        }
        return null;
    }
    /**
     * èŽ·å–实景案例列表分页
     * @param param
     * @return
     */
    @Override
    public ZTBasePageResponse<ZTRealcaseInfoResponse> pageRealcaseList(ZTContentListRequest param){
        ZTBaseResponse<ZTBasePageResponse<ZTRealcaseInfoResponse>> result = sendHttpRequest(
                ZTConstants.IntegerUrl.REALCASE_PAGE_LIST_URL,
                ZTConstants.IntegerName.REALCASE_PAGE_LIST_NAME,
                param.getToken(),
                param.getUserType(),
                JSONObject.toJSONString(param ),
                new TypeReference<ZTBaseResponse<ZTBasePageResponse<ZTRealcaseInfoResponse>>>(){});
        if(result!=null){
            return result.getData();
        }
        return null;
    }
    /**
     * èŽ·å–产品详情
     * @param param
     * @return
     */
    @Override
    public ZTProductInfoResponse getProductInfo(ZTContentInfoRequest param){
        ZTBaseResponse<ZTProductInfoResponse> result = sendHttpRequest(
                ZTConstants.IntegerUrl.PRODUCT_INFO_URL,
                ZTConstants.IntegerName.PRODUCT_INFO_NAME,
                param.getToken(),
                param.getUserType(),
                JSONObject.toJSONString(param ),
                new TypeReference<ZTBaseResponse<ZTProductInfoResponse>>(){});
        if(result!=null){
            return result.getData();
        }
        return  null;
    }
    /**
     * èŽ·å–产品资讯详情
     * @param param
     * @return
     */
    @Override
    public ZTProductNewsInfoResponse getProductNewsInfo(ZTContentInfoRequest param){
        ZTBaseResponse<ZTProductNewsInfoResponse> result = sendHttpRequest(
                ZTConstants.IntegerUrl.PRODUCT_NEWS_INFO_URL,
                ZTConstants.IntegerName.PRODUCT_NEWS_INFO_NAME,
                param.getToken(),
                param.getUserType(),
                JSONObject.toJSONString(param ),
                new TypeReference<ZTBaseResponse<ZTProductNewsInfoResponse>>(){});
        if(result!=null){
            return result.getData();
        }
        return  null;
    }
    /**
     * èŽ·å–实景资讯详情
     * @param param
     * @return
     */
    @Override
    public ZTRealcaseInfoResponse getRealcaseInfo(ZTContentInfoRequest param){
        ZTBaseResponse<ZTRealcaseInfoResponse> result = sendHttpRequest(
                ZTConstants.IntegerUrl.REALCASE_INFO_URL,
                ZTConstants.IntegerName.REALCASE_INFO_NAME,
                param.getToken(),
                param.getUserType(),
                JSONObject.toJSONString(param ),
                new TypeReference<ZTBaseResponse<ZTRealcaseInfoResponse>>(){});
        if(result!=null){
            return result.getData();
        }
        return  null;
    }
    /**
     * èŽ·å–全屋资讯详情
     * @param param
     * @return
     */
    @Override
    public ZTCaseInfoResponse getWholecaseInfo(ZTContentInfoRequest param){
        ZTBaseResponse<ZTCaseInfoResponse> result = sendHttpRequest(
                ZTConstants.IntegerUrl.WHOLECASE_INFO_URL,
                ZTConstants.IntegerName.WHOLECASE_INFO_NAME,
                param.getToken(),
                param.getUserType(),
                JSONObject.toJSONString(param ),
                new TypeReference<ZTBaseResponse<ZTCaseInfoResponse>>(){});
        if(result!=null){
            return result.getData();
        }
        return  null;
    }
    /**
     * èŽ·å–内容详情
@@ -458,7 +667,13 @@
        int success = 0;
        try {
            Map<String,String> headers = new HashMap<>();
            headers.put(ZTConstants.HEADER_TOKEN,token);
            if(StringUtils.equals(userType,ZTConstants.CUSTOMER)){
                //如果是C端客户
                headers.put(ZTConstants.HEADER_TOKEN,token);
            }else{
                //如果是B端用户
                headers.put(ZTConstants.HEADER_SYSUSER_TOKEN,token);
            }
            headers.put(ZTConstants.HEADER_USERTYPE,userType);
            String index = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_ZHONGTAI_API_URL);
            res = HttpsUtil.postJsonWithHeaders(index+url,param,headers);

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

@@ -7,7 +7,12 @@
    public static  Integer CODE_SUCCESS = 200;//接口成功返回码
    public static  String HEADER_USERTYPE = "userType";//userType在HEADER中的名字
    public static  String HEADER_TOKEN = "token";//token
    public static  String HEADER_SYSUSER_TOKEN = "z-access-token";//token
    public static  String DEFAULT_PID = "1";//默认省市区pid=1表示取全中国

    public static final String CUSTOMER = "CUSTOMER";
    public static final String BUSINESS = "BUSINESS";


    /**
     * åˆ†ç±»code
@@ -49,6 +54,17 @@
        String BEHAVIOR_LIST_URL ="/behavior/api/customerBehaviors";
        String CUSTOMER_CAROUSEL_IMAGE_URL ="/content/api/carouselAdList";
        String CUSTOMER_CAROUSEL_IMAGE_DETAIL_URL ="/content/api/carouselAdDetail";
        String USER_MOBILE_FASTLOGIN_URL ="/sysUser/mobileFastLogin";
        String VIDEO_PAGE_LIST_URL ="/content/api/videoRecPageList";
        String ZBDECO_PAGE_LIST_URL ="/content/api/zbDecoPageList";
        String PRODUCT_NEWS_PAGE_LIST_URL ="/content/api/productInfoPageList";
        String PRODUCT_NEWS_INFO_URL ="/content/api/productInfoDetail";
        String PRODUCT_PAGE_LIST_URL ="/content/api/productPageList";
        String PRODUCT_INFO_URL ="/content/api/productDetail";
        String WHOLECASE_PAGE_LIST_URL ="/content/api/wholeCasePageList";
        String WHOLECASE_INFO_URL ="/content/api/wholeCaseDetail";
        String REALCASE_PAGE_LIST_URL ="/content/api/realCasePageList";
        String REALCASE_INFO_URL ="/content/api/realCaseDetail";
    }
    public interface IntegerName{
        String USER_UPDATE_NAME ="用户信息同步";
@@ -74,5 +90,18 @@

        String AREA_TREE_NAME ="全量省市区树形数据";
        String AREA_ALL_NAME ="全量省市区评级数据";
        String USER_MOBILE_FASTLOGIN_NAME ="B端用户手机号快捷登录";

        String VIDEO_PAGE_LIST_NAME ="获取视频列表";
        String ZBDECO_PAGE_LIST_NAME ="获取志说装修列表";
        String PRODUCT_NEWS_PAGE_LIST_NAME ="获取产品咨询列表";
        String PRODUCT_NEWS_INFO_NAME ="获取产品咨询详情";
        String PRODUCT_PAGE_LIST_NAME ="获取产品列表";
        String PRODUCT_INFO_NAME ="获取产品详情";
        String WHOLECASE_PAGE_LIST_NAME ="获取全屋案例列表";
        String WHOLECASE_INFO_NAME ="获取全屋案例详情";
        String REALCASE_PAGE_LIST_NAME ="获取实景案例列表";
        String REALCASE_INFO_NAME ="获取实景案例详情";

    }
}

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

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

import lombok.Data;

import java.io.Serializable;


/**
 * æ¡ˆä¾‹è¯¦æƒ…返回
 */
@Data
public class ZTCaseInfoResponse implements Serializable {
    private String apiSpaceCaseVos;
    private String caseInfo;
    /**
     * æ”¶è—é‡
     */
    private String collectCount;
    /**
     * ä¸»å›¾
     */
    private String coverImage;
    /**
     * id
     */
    private String id;
    /**
     * æ˜¯å¦æ”¶è— true:收藏  false:未收藏
     */
    private boolean isCollection;
    private String layoutUlr;
    private String panorama;
    /**
     * å‘布日期
     */
    private String publishDt;
    /**
     * æ ‡é¢˜
     */
    private String title;
    /**
     * æµè§ˆé‡
     */
    private String viewCount;
}

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

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

import lombok.Data;

import java.io.Serializable;
import java.util.List;


/**
 * äº§å“è¯¦æƒ…返回
 */
@Data
public class ZTProductInfoResponse implements Serializable {
    private String author;
    /**
     * è¯¦æƒ…页轮播图列表（多视角图）
     */
    private String[] bannerImgList;
    private String collectCount;
    /**
     * è¯¦æƒ…页富文本（全屋定制遍历spaceList的富文本）
     */
    private String content;
    private String coverImage;
    private String id;
    private String isCollection;
    private String langCode;
    /**
     * äº§å“å‚数列表
     */
    private List<ZTProductParamInfoResponse> productParamList;
    private String publishDate;
    private String publishDepartment;
    /**
     * å®žæ™¯å›¾åˆ—表
     */
    private String[] realImgList;
    /**
     * ç©ºé—´åˆ—表
     */
    private List<ZTSpaceInfoResponse> spaceList;
    private String subtitle;
    private String title;
    private String viewCount;
    private String downloadCount;
    private String isTop;
    private String orgId;
    private String praiseCount;
    private String shareCount;
    private String sort;
    private String type;
}

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

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

import lombok.Data;

import java.io.Serializable;
import java.util.List;


/**
 * äº§å“å’¨è¯¢è¯¦æƒ…返回
 */
@Data
public class ZTProductNewsInfoResponse implements Serializable {
    private String author;
    /**
     * è¯¦æƒ…页轮播图列表（多视角图）
     */
    private String[] bannerImgList;
    private String collectCount;
    /**
     * è¯¦æƒ…页富文本（全屋定制遍历spaceList的富文本）
     */
    private String content;
    private String coverImage;
    private String id;
    private String isCollection;
    private String langCode;
    /**
     * äº§å“å‚数列表
     */
    private List<ZTProductParamInfoResponse> productParamList;
    private String publishDate;
    private String publishDepartment;
    /**
     * å®žæ™¯å›¾åˆ—表
     */
    private String[] realImgList;
    /**
     * ç©ºé—´åˆ—表
     */
    private List<ZTSpaceInfoResponse> spaceList;
    private String subtitle;
    private String title;
    private String viewCount;
    private String downloadCount;
    private String isTop;
    private String orgId;
    private String praiseCount;
    private String shareCount;
    private String sort;
    private String type;
}

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

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

import lombok.Data;

import java.io.Serializable;


/**
 * å®žæ™¯æ¡ˆä¾‹è¯¦æƒ…返回
 */
@Data
public class ZTProductParamInfoResponse implements Serializable {
    /**
     * å‚数名
     */
    private String paramName;
    /**
     * å‚数值
     */
    private String paramValue;

}

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

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

import lombok.Data;

import java.io.Serializable;


/**
 * å®žæ™¯æ¡ˆä¾‹è¯¦æƒ…返回
 */
@Data
public class ZTRealcaseInfoResponse implements Serializable {
    private String caseInfo;
    private String collectCount;
    /**
     * ä¸»å›¾
     */
    private String coverImage;
    private String id;
    private String[] imgList;
    /**
     * æ˜¯å¦æ”¶è— true:收藏  false:未收藏
     */
    private boolean isCollection;
    /**
     * å‘布日期
     */
    private String publishDate;
    /**
     * æ ‡é¢˜
     */
    private String title;
    private String viewCount;
}

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

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

import lombok.Data;

import java.io.Serializable;


/**
 * å®žæ™¯æ¡ˆä¾‹è¯¦æƒ…返回
 */
@Data
public class ZTSpaceInfoResponse implements Serializable {
    /**
     * ç©ºé—´å†…容富文本
     */
    private String spaceContent;
    /**
     * ç©ºé—´å›¾ç‰‡
     */
    private String spaceImg;
    /**
     * ç©ºé—´åç§°
     */
    private String spaceName;
}

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

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

import lombok.Data;

import java.io.Serializable;

@Data
public class ZTSysuserGetTokenResponse implements Serializable {
    /**
     * ç”¨æˆ·id
     */
    private String id;


    /**
     * æœ‰æ•ˆæœŸ ç§’
     */
    private Long expire;

    /**
     * å½“前用户token
     */
    private String token;
    /**
     * ç”¨æˆ·è´¦å·
     */
    private String userAccount;
    /**
     * ç”¨æˆ·å¤´åƒ
     */
    private String userImg;
    /**
     * ç”¨æˆ·æ‰‹æœºå·ç 
     */
    private String userMobile;
    /**
     * ç”¨æˆ·å§“名
     */
    private String userRealName;
    /**
     * æœåŠ¡å®¢æˆ·æ•°
     */
    private long userServedClients;
    /**
     * å¾®ä¿¡äºŒç»´ç 
     */
    private String userWechatQrCode;
    /**
     * ä»Žä¸šå¹´é™
     */
    private long userWorkingLife;
    /**
     * ä¼ä¸šå¾®ä¿¡äºŒç»´ç 
     */
    private String userWorkWechatQrCode;


}

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

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

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

import java.io.Serializable;
import java.util.Map;


/**
 * å•†å“è¯¦æƒ…返回
 */
@Data
public class ZTVideoInfoResponse implements Serializable {
    private String author;
    /**
     * æ”¶è—æ•°é‡
     */
    private long collectCount;
    /**
     * å°é¢å›¾
     */
    private String coverImage;
    /**
     * id
     */
    private String id;
    /**
     * æ˜¯å¦æ”¶è—
     */
    private boolean isCollection;
    private String langCode;
    /**
     * å–œæ¬¢æ•°é‡
     */
    private long likeCount;
    /**
     * å‘布组织
     */
    private String publishDepartment;
    /**
     * å‘布时间
     */
    private String publishDt;
    /**
     * åˆ†äº«æ•°é‡
     */
    private long shareCount;
    private String subtitle;
    /**
     * æ ‡é¢˜
     */
    private String title;
    /**
     * è§†é¢‘链接
     */
    private String videoUrl;
    /**
     * æµè§ˆæ•°é‡
     */
    private String viewCount;
}

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

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

import lombok.Data;

import java.io.Serializable;


/**
 * æ¡ˆä¾‹è¯¦æƒ…返回
 */
@Data
public class ZTZbDecoInfoResponse implements Serializable {
    private String author;
    /**
     * æ”¶è—é‡
     */
    private long collectCount;
    private String id;
    /**
     * æ˜¯å¦æ”¶è— true:收藏  false:未收藏
     */
    private boolean isCollection;
    private String langCode;
    /**
     * å–œæ¬¢æ•°
     */
    private long likeCount;
    /**
     * æ–‡ç« åœ°å€
     */
    private String linkUrl;
    private String publishDepartment;
    /**
     * å‘布日期
     */
    private String publishDt;
    private long shareCount;
    private String subtitle;
    /**
     * æ ‡é¢˜
     */
    private String title;
    /**
     * æŸ¥çœ‹é‡
     */
    private long viewCount;

}

 server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
import com.doumee.config.annotation.UserLoginRequired;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.constants.ResponseStatus;
@@ -118,7 +119,7 @@
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
            }
            request.setAttribute(JwtTokenUtil.UserId_Name, memberId);
            request.setAttribute(JwtTokenUtil.UserType, Constants.CUSTOMER);
            request.setAttribute(JwtTokenUtil.UserType, ZTConstants.CUSTOMER);
            return true;
        } catch (IllegalArgumentException | JwtException e) {
            throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"未登录");
@@ -153,7 +154,7 @@
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
            }
            request.setAttribute(JwtTokenUtil.UserId_Name, userId);
            request.setAttribute(JwtTokenUtil.UserType, Constants.BUSINESS);
            request.setAttribute(JwtTokenUtil.UserType, ZTConstants.BUSINESS);
            return true;
        } catch (IllegalArgumentException | JwtException e) {
            throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"未登录");

 server/service/src/main/java/com/doumee/core/utils/Constants.java

@@ -53,9 +53,6 @@
    public static final String HK_ROOTORG_CODE ="HK_ROOTORG_CODE" ;
    public static final String HK_ROOTORG_NAME ="HK_ROOTORG_NAME" ;
    public static final String REDIS_TOKEN_KEY = "token_";
    public static final String CUSTOMER = "CUSTOMER";
    public static final String BUSINESS = "BUSINESS";


    //被拜访人信息校验方式（0手机号单独校验 1手机号和姓名组合校验）
    public static final String ZBOM_CRM_AUTH_API_KEY = "ZBOM_CRM_AUTH_API_KEY";

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

@@ -6,9 +6,11 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.biz.zbom.ZbomZhongTaiService;
import com.doumee.biz.zbom.model.zhongtai.ZTBaseRequst;
import com.doumee.biz.zbom.model.zhongtai.ZTConstants;
import com.doumee.biz.zbom.model.zhongtai.ZTUserGetTokenRequest;
import com.doumee.biz.zbom.model.zhongtai.ZTUserInfoUpdateRequest;
import com.doumee.biz.zbom.model.zhongtai.response.ZTBaseResponse;
import com.doumee.biz.zbom.model.zhongtai.response.ZTSysuserGetTokenResponse;
import com.doumee.biz.zbom.model.zhongtai.response.ZTUserGetTokenResponse;
import com.doumee.config.Jwt.JwtPayLoad;
import com.doumee.config.Jwt.JwtTokenUtil;
@@ -438,12 +440,12 @@
    public static ZTBaseInfoResponse getZTToken(ZbomZhongTaiService zbomZhongTaiService,
                                                MemberMapper memberMapper, UsersMapper usersMapper, SystemDictDataBiz systemDictDataBiz, Long id, String userType){
        ZTBaseInfoResponse ztBaseInfoResponse = new ZTBaseInfoResponse();
        if(userType.equals(Constants.CUSTOMER)){
        if(userType.equals(ZTConstants.CUSTOMER)){
            Member member = memberMapper.selectById(id);
            if(Objects.isNull(member)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            ztBaseInfoResponse.setUserType(Constants.CUSTOMER);
            ztBaseInfoResponse.setUserType(ZTConstants.CUSTOMER);
            ztBaseInfoResponse.setOpenId(member.getOpenid());
            //如果无有效期/已过期 é‡æ–°èŽ·å–
            if(Objects.isNull(member.getTokenDate()) || member.getTokenDate().getTime()<=System.currentTimeMillis() ){
@@ -467,12 +469,12 @@
            }
            ztBaseInfoResponse.setToken(member.getToken());
            return ztBaseInfoResponse;
        }else if(userType.equals(Constants.BUSINESS)){
        }else if(userType.equals(ZTConstants.BUSINESS)){
            Users users = usersMapper.selectById(id);
            if(Objects.isNull(users)){
                throw new BusinessException(ResponseStatus.BAD_REQUEST);
            }
            ztBaseInfoResponse.setUserType(Constants.BUSINESS);
            ztBaseInfoResponse.setUserType(ZTConstants.BUSINESS);
            ztBaseInfoResponse.setOpenId(users.getOpenid());
            if(Objects.isNull(users.getTokenDate()) || users.getTokenDate().getTime()<=System.currentTimeMillis() ){
                ZTUserGetTokenRequest param = new ZTUserGetTokenRequest();
@@ -480,7 +482,7 @@
                String appId = systemDictDataBiz.queryByCode(Constants.WX_MINI_CONFIG,Constants.WX_APPID_CUSTOMER).getCode();
                param.setAppId(appId);
                param.setOpenId(users.getOpenid());
                ZTUserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getUserToken(param);
                ZTSysuserGetTokenResponse ztUserGetTokenResponse = zbomZhongTaiService.getSysuserToken(users.getPhone());
                if(Objects.nonNull(ztUserGetTokenResponse)){
                    users.setToken(ztUserGetTokenResponse.getToken());
                    Date date =new Date(System.currentTimeMillis()+(Constants.formatLongNum(ztUserGetTokenResponse.getExpire())<=0?2*60*60*1000:ztUserGetTokenResponse.getExpire()*1000));
@@ -490,7 +492,7 @@
                    ztBaseInfoResponse.setToken(ztUserGetTokenResponse.getToken());
                    return ztBaseInfoResponse;
                }else{
//                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"中台TOKEN获取失败，请联系管理员");
//                   throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"中台TOKEN获取失败，请联系管理员");
                }
            }
            ztBaseInfoResponse.setToken(users.getToken());
@@ -514,10 +516,10 @@
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已注销");
        }
        //校验用户token信息
        MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId(),Constants.CUSTOMER);
        MemberServiceImpl.getZTToken(zbomZhongTaiService,memberMapper,usersMapper,systemDictDataBiz,member.getId(),ZTConstants.CUSTOMER);
        //调起中台注销接口
        ZTBaseRequst ztBaseRequst = new ZTBaseRequst();
        ztBaseRequst.setUserType(Constants.CUSTOMER);
        ztBaseRequst.setUserType(ZTConstants.CUSTOMER);
        ztBaseRequst.setOpenId(member.getOpenid());
        ztBaseRequst.setToken(member.getToken());
        memberMapper.update(new UpdateWrapper<Member>().lambda()

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

@@ -3,6 +3,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.biz.zbom.ZbomCRMService;
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.ZTDataDetailRequest;
import com.doumee.biz.zbom.model.zhongtai.response.*;
@@ -334,7 +335,7 @@
    })
    public ApiResponse<ZTBasePageResponse<ZTContentListResponse>> pageContentList(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(Constants.CUSTOMER);
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ZTBasePageResponse<ZTContentListResponse>  ztBasePageResponse= getZhongTaiDataService.pageContentList(ztContentListRequest);
        return ApiResponse.success("查询成功",ztBasePageResponse);
    }
@@ -347,7 +348,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse<ZTContentInfoResponse> getContentInfo(@RequestParam String id) {
        ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id,Constants.CUSTOMER,getMemberId());
        ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id,ZTConstants.CUSTOMER,getMemberId());
        return ApiResponse.success("查询成功",ztContentInfoResponse);
    }

@@ -360,7 +361,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse collectContent(@RequestParam String id) {
        getZhongTaiDataService.collectContent(getMemberId(),Constants.CUSTOMER,id);
        getZhongTaiDataService.collectContent(getMemberId(),ZTConstants.CUSTOMER,id);
        return ApiResponse.success("操作成功");
    }

@@ -372,7 +373,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse likeContent(@RequestParam String id) {
        getZhongTaiDataService.likeContent(getMemberId(),Constants.CUSTOMER,id);
        getZhongTaiDataService.likeContent(getMemberId(),ZTConstants.CUSTOMER,id);
        return ApiResponse.success("操作成功");
    }

@@ -385,7 +386,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse shareContent(@RequestParam String id) {
        getZhongTaiDataService.shareContent(getMemberId(),Constants.CUSTOMER,id);
        getZhongTaiDataService.shareContent(getMemberId(),ZTConstants.CUSTOMER,id);
        return ApiResponse.success("操作成功");
    }

@@ -398,7 +399,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse viewContent(@RequestParam String id) {
        getZhongTaiDataService.viewContent(getMemberId(),Constants.CUSTOMER,id);
        getZhongTaiDataService.viewContent(getMemberId(),ZTConstants.CUSTOMER,id);
        return ApiResponse.success("操作成功");
    }

@@ -445,7 +446,7 @@
    })
    public ApiResponse<ZTBasePageResponse<ZTCusFavoritesInfoResponse>> getZhongTaiCusFavorite(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(Constants.CUSTOMER);
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        ZTBasePageResponse<ZTCusFavoritesInfoResponse> ztBasePageResponse = getZhongTaiDataService.getZhongTaiCusFavorite(ztContentListRequest);
        return ApiResponse.success("获取成功",ztBasePageResponse);
    }
@@ -460,7 +461,7 @@
    })
    public ApiResponse<List<ZTCusCarouselImageResponse>> getZhongTaiCarouselImage(@RequestBody ZTContentListRequest ztContentListRequest) {
        ztContentListRequest.setUserId(getMemberId()+"");
        ztContentListRequest.setUserType(Constants.CUSTOMER);
        ztContentListRequest.setUserType(ZTConstants.CUSTOMER);
        List<ZTCusCarouselImageResponse> ztCusCarouselImageResponseList = getZhongTaiDataService.getZhongTaiCarouselImage(ztContentListRequest);
        return ApiResponse.success("获取成功",ztCusCarouselImageResponseList);
    }
@@ -475,7 +476,7 @@
    })
    public ApiResponse<ZTCusCarouselImageResponse> getZhongTaiCarouselImageDetail(@RequestBody ZTDataDetailRequest ztDataDetailRequest) {
        ztDataDetailRequest.setUserId(getMemberId()+"");
        ztDataDetailRequest.setUserType(Constants.CUSTOMER);
        ztDataDetailRequest.setUserType(ZTConstants.CUSTOMER);
        ZTCusCarouselImageResponse ztCusCarouselImageResponse = getZhongTaiDataService.getZhongTaiCarouselImageDetail(ztDataDetailRequest);
        return ApiResponse.success("获取成功",ztCusCarouselImageResponse);
    }

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

@@ -5,6 +5,7 @@
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.ZTConstants;
import com.doumee.biz.zbom.model.zhongtai.ZTContentListRequest;
import com.doumee.biz.zbom.model.zhongtai.response.*;
import com.doumee.config.annotation.LoginRequired;
@@ -233,7 +234,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,getUserId());
        ZTContentInfoResponse ztContentInfoResponse= getZhongTaiDataService.getContentInfo(id, ZTConstants.BUSINESS,getUserId());
        return ApiResponse.success("查询成功",ztContentInfoResponse);
    }

@@ -246,7 +247,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse collectContent(@RequestParam String id) {
        getZhongTaiDataService.collectContent(getUserId(),Constants.BUSINESS,id);
        getZhongTaiDataService.collectContent(getUserId(),ZTConstants.BUSINESS,id);
        return ApiResponse.success("操作成功");
    }

@@ -258,7 +259,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse likeContent(@RequestParam String id) {
        getZhongTaiDataService.likeContent(getUserId(),Constants.BUSINESS,id);
        getZhongTaiDataService.likeContent(getUserId(),ZTConstants.BUSINESS,id);
        return ApiResponse.success("操作成功");
    }

@@ -271,7 +272,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse shareContent(@RequestParam String id) {
        getZhongTaiDataService.shareContent(getUserId(),Constants.BUSINESS,id);
        getZhongTaiDataService.shareContent(getUserId(),ZTConstants.BUSINESS,id);
        return ApiResponse.success("操作成功");
    }

@@ -284,7 +285,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "内容主键", required = true),
    })
    public ApiResponse viewContent(@RequestParam String id) {
        getZhongTaiDataService.viewContent(getUserId(),Constants.BUSINESS,id);
        getZhongTaiDataService.viewContent(getUserId(),ZTConstants.BUSINESS,id);
        return ApiResponse.success("操作成功");
    }
}