jiangping
2024-07-17 718d62b2bd5df79cd130514f5aa6a77a7e26d93f
提交
已添加1个文件
已修改6个文件
86 ■■■■■ 文件已修改
server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java 22 ●●●●● 补丁 | 查看 | 原始文档 | 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/ZTAreaTreeResponse.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/web/ApiController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/web/CatalogApi.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/web/CommonApi.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/service/src/main/java/com/doumee/biz/zbom/ZbomZhongTaiService.java
@@ -33,6 +33,7 @@
    ZTBasePageResponse<ZTContentListResponse> pageLikeList(ZTContentListRequest param);
    ZTBasePageResponse<ZTBehaviorInfoResponse> pageBehavoirList(ZTContentListRequest param);
    List<ZTAreaInfoResponse> getAreaList(ZTAreaListRequest param);
    List<ZTAreaTreeResponse> getAreaTreeList(ZTAreaListRequest param);
    boolean bindCustomerFavorites(ZTBindCusFavoriteDoRequest param);
    ZSZXCatalogResponse getZSZXCatalogs();
    ZTBasePageResponse<ZTCusFavoritesInfoResponse> pageCusFavoriteList(ZTContentListRequest param);
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomZhongTaiServiceImpl.java
@@ -387,6 +387,28 @@
        }
        return  null;
    }
    /**
     * èŽ·å–èŽ·å–çœå¸‚åŒºé›†åˆ
     * @param param
     * @return
     */
    @Override
    public List<ZTAreaTreeResponse> getAreaTreeList(ZTAreaListRequest param){
       if(StringUtils.isBlank(param.getPid())){
           param.setPid(ZTConstants.DEFAULT_PID);//默认取全部省份
       }
        ZTBaseResponse<List<ZTAreaTreeResponse>> result = sendHttpRequest(
                ZTConstants.IntegerUrl.AREA_TREE_URL,
                ZTConstants.IntegerName.AREA_TREE_NAME,
                param.getToken(),
                param.getUserType(),
                JSONObject.toJSONString(param ),
                new TypeReference<ZTBaseResponse<List<ZTAreaTreeResponse>>>(){});
        if(result!=null){
            return result.getData();
        }
        return  null;
    }
    public   <T>   ZTBaseResponse<T> sendHttpRequest(String url,String name,String token,String userType,String param,TypeReference<ZTBaseResponse<T>> typeReference){
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTConstants.java
@@ -39,6 +39,8 @@
        String COLLECT_LIST_URL ="/behavior/getFavorite";
        String LIKE_LIST_URL ="/behavior/getLike";
        String AREA_LIST_URL ="/base/admin/bAreaRegion/getChildren";
        String AREA_TREE_URL ="/base/admin/bAreaRegion/getTree";
        String AREA_ALL_URL ="/base/admin/bAreaRegion/getNotTree";
        String BIND_CUSTOMER_FAVORITES_URL ="/behavior/api/bindCustomerFavorites";
        String CUSTOMER_FAVORITES_LIST_URL ="/behavior/api/customerFavorites";
        String BEHAVIOR_LIST_URL ="/behavior/api/customerBehaviors";
@@ -61,5 +63,8 @@
        String BIND_CUSTOMER_FAVORITES_NAME  ="绑定客户喜欢";
        String CUSTOMER_FAVORITES_LIST_NAME  ="获取客户喜欢";
        String BEHAVIOR_LIST_NAME  ="获取行为轨迹";
        String AREA_TREE_NAME ="全量省市区树形数据";
        String AREA_ALL_NAME ="全量省市区评级数据";
    }
}
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTAreaTreeResponse.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
package com.doumee.biz.zbom.model.zhongtai.response;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
 * çœå¸‚区详情返回
 */
@Data
public class ZTAreaTreeResponse implements Serializable {
    /**
     * ID
     */
    private String id;
    /**
     * åœ°åŒºç­‰çº§
     */
    private String level;
    /**
     * åç§°
     */
    private String name;
    /**
     * çˆ¶çº§ID
     */
    private String parentId;
    /**
     * æ‹¼éŸ³
     */
    private String pinyin;
    /**
     * ä¸‰ç»´å®¶ç¼–码
     */
    private String swjCode;
    List<ZTAreaTreeResponse>  children;
}
server/web/src/main/java/com/doumee/api/web/ApiController.java
@@ -42,7 +42,6 @@
        return request;
    }
    /**
     * èŽ·å–ç”¨æˆ·ID
     *
@@ -75,7 +74,6 @@
        Member user = memberService.findById(userId);
      return user;
    }
    protected Long getUserType() {
        Object obj = this.getRequest().getAttribute(JwtTokenUtil.UserType);
server/web/src/main/java/com/doumee/api/web/CatalogApi.java
@@ -36,7 +36,6 @@
    @Autowired
    public SmsEmailService smsEmailService;
    @ApiOperation(value = "C端小程序-获取首页志说装修四个模块类目数据", notes = "获取首页志说装修四个模块类目数据")
    @PostMapping("/getZSZXCatalogs")
    public ApiResponse<ZSZXCatalogResponse> getZSZXCatalogs() {
server/web/src/main/java/com/doumee/api/web/CommonApi.java
@@ -4,6 +4,7 @@
import com.doumee.biz.zbom.ZbomZhongTaiService;
import com.doumee.biz.zbom.model.zhongtai.ZTAreaListRequest;
import com.doumee.biz.zbom.model.zhongtai.response.ZTAreaInfoResponse;
import com.doumee.biz.zbom.model.zhongtai.response.ZTAreaTreeResponse;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
@@ -56,6 +57,17 @@
    }
    @ApiOperation(value = "获取区划全量树形信息", notes = "客户端小程序")
    @PostMapping("/getAreaTree")
    public ApiResponse<List<ZTAreaTreeResponse>> getAreaTree(@RequestBody ZTAreaListRequest ztAreaListRequest) {
        if(StringUtils.isBlank(ztAreaListRequest.getPid())){
            ztAreaListRequest.setPid("1");
        }
        List<ZTAreaTreeResponse> ztAreaInfoResponses =  zbomZhongTaiService.getAreaTreeList(ztAreaListRequest);
        return  ApiResponse.success(ztAreaInfoResponses);
    }