From 3ca7f722f25c1908bc4588c75dbde1f56a8d9877 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 26 三月 2021 10:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   96 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 5330be7..27a30c1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -8,7 +8,6 @@
 import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
 import com.panzhihua.common.model.vos.community.*;
 import com.panzhihua.common.model.vos.user.UserPhoneVO;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -836,11 +835,11 @@
 
     /**
      * 查询城市下属所有地区列表
-     * @param cityAdcode 城市地址编码
+     * @param provinceAdcode 城市地址编码
      * @return 地区列表
      */
-    @PostMapping("listareadistrict")
-    R listAreaDistrict(@RequestParam("cityAdcode") Long cityAdcode);
+    @GetMapping("/common/data/city")
+    R listAreaDistrict(@RequestParam("provinceAdcode") Long provinceAdcode);
 
     /**
      * 首页图表数据汇总
@@ -896,21 +895,18 @@
 	R addMessageBack(@RequestBody ComActMessageBackVO comActMessageBackVO);
     /**
      * 根据id查询留言列表
-     * @param id 用户id
      * @return 发布结果
      */
     @PostMapping("pagemessagebyuser")
 	R pageMessageByUser(@RequestBody ComActMessageVO comActMessageVO);
     /**
      * 根据id删除留言
-     * @param id id
      * @return 删除结果
      */
     @PostMapping("deletemessage")
 	R deleteMessage(@RequestBody ComActMessageVO comActMessageVO);
     /**
      * 根据id集合批量设置是否公开
-     * @param ids id集合
      * @return 删除结果
      */
     @PostMapping("resetmessagepublic")
@@ -954,8 +950,29 @@
     @PostMapping("detailOpsHouse")
     R detailOpsHouse(@RequestParam("id") Long id);
 
+    /**
+     * 房屋租售-修改
+     * @param comOpsHouseVO    修改参数
+     * @return  修改结果
+     */
     @PostMapping("/putOpsHouse")
     R putOpsHouse(@RequestBody ComOpsHouseVO comOpsHouseVO);
+
+    /**
+     * 房屋租售-小程序修改
+     * @param comOpsHouseVO    修改参数
+     * @return  修改结果
+     */
+    @PostMapping("/putOpsHouseByApplets")
+    R putOpsHouseByApplets(@RequestBody ComOpsHouseVO comOpsHouseVO);
+
+    /**
+     * 房屋租售-上下架
+     * @param comOpsHouseVO    上下架参数
+     * @return  上下架结果
+     */
+    @PostMapping("/undercarriageHouse")
+    R undercarriageHouse(@RequestBody ComOpsHouseUndercarriageVO comOpsHouseVO);
 
     /**
      * 一起议-删除
@@ -1208,7 +1225,7 @@
      * @param id
      * @return
      */
-    @GetMapping("/common/data/company/save")
+    @GetMapping("/common/data/company/detail")
     R detailComMngRealCompany(@RequestParam(value = "id") Long id);
 
     /**
@@ -1272,4 +1289,67 @@
      */
     @PostMapping("/common/data/assets/export")
     R exportRealAssets(ExportRealAssetsExcelDTO exportRealAssetsExcelDTO);
+
+    /**
+     * 查询所有省份
+     * @return
+     */
+    @GetMapping("/common/data/province")
+    R getProvince();
+
+    /**
+     * 查询省份下所有的城市
+     * @param provinceAdcode
+     * @return
+     */
+    @GetMapping("/common/data/city")
+    R getCityByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode);
+
+    /**
+     * 查询城市下所有的区县
+     * @param cityAdcode
+     * @return
+     */
+    @GetMapping("/common/data/district")
+    R getDistrictByCityCode(@RequestParam(value = "cityAdcode") Integer cityAdcode);
+
+    /**
+     * 查询省下所有区域  tree结构
+     * @param provinceAdcode
+     * @return
+     */
+    @GetMapping("/common/data/area/all")
+    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode);
+
+    /**
+     * 分页查询街道
+     * @param pageComStreetDTO
+     * @return
+     */
+    @PostMapping("/liststreet")
+    R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO);
+
+    /**
+     * 新增街道
+     * @param comStreetVOO
+     * @return
+     */
+    @PostMapping("/addstreet")
+    R pageStreet(@RequestBody ComStreetVO comStreetVOO);
+
+    /**
+     * 删除街道
+     * @param Ids
+     * @return
+     */
+    @PostMapping("/deletestreet")
+    R delectStreat(@RequestBody List<Long> Ids);
+
+    /**
+     * 查询街道
+     * @param comStreetVO
+     * @return
+     */
+    @PostMapping("/liststreet")
+    R listStreet(ComStreetVO comStreetVO);
 }

--
Gitblit v1.7.1