From 23b55dc567bcf8a453e4b88df2f5f5b664f9e9f1 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 24 三月 2021 15:46:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 212 insertions(+), 1 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 85b5738..303ac03 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
@@ -7,8 +7,8 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.model.vos.partybuilding.PartyBuildingMemberExcelVO;
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.*;
@@ -939,6 +939,54 @@
R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);
/**
+ * 一起议-新增
+ * @param comOpsHouseDTO 新增参数
+ * @return 新增结果
+ */
+ @PostMapping("addOpsHouse")
+ R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO);
+
+ /**
+ * 一起议-详情
+ * @param id 主键
+ * @return ComOpsHouseVO
+ */
+ @PostMapping("detailOpsHouse")
+ R detailOpsHouse(@RequestParam("id") Long id);
+
+ /**
+ * 房屋租售-修改
+ * @param comOpsHouseVO 修改参数
+ * @return 修改结果
+ */
+ @PostMapping("/putOpsHouse")
+ R putOpsHouse(@RequestBody ComOpsHouseVO comOpsHouseVO);
+
+ /**
+ * 房屋租售-上下架
+ * @param comOpsHouseVO 上下架参数
+ * @return 上下架结果
+ */
+ @PostMapping("/undercarriageHouse")
+ R undercarriageHouse(@RequestBody ComOpsHouseUndercarriageVO comOpsHouseVO);
+
+ /**
+ * 一起议-删除
+ * @param id 主键
+ * @return 删除结果
+ */
+ @PostMapping("deleteOpsHouse")
+ R deleteOpsHouse(@RequestParam("id") Long id);
+
+ /**
+ * 一起议-分页查询
+ * @param pageComOpsHouseDTO 查询参数
+ * @return ComOpsHouseVO
+ */
+ @PostMapping("pageOpsHouse")
+ R pageOpsHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO);
+
+ /**
* 社区后台分页查询便民服务商家
* @param pageComCvtBusinessDTO 查询参数
* @return 返回结果
@@ -1097,4 +1145,167 @@
*/
@PostMapping("/convenient/serve/import")
R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 导出房屋信息
+ * @param areaId
+ * @return
+ */
+ @PostMapping("/house/export")
+ R houseExport(@RequestParam("areaId") Long areaId);
+
+ /**
+ * 小程序添加车辆信息
+ * @param comCvtBusinessDTO
+ * @return
+ */
+ @PostMapping("/common/data/car/user/register")
+ R addComMngCarApplet(@RequestBody ComMngCarAppletDTO comCvtBusinessDTO);
+
+ /**
+ * 小程序用户登记车辆列表
+ * @param userId
+ * @return
+ */
+ @GetMapping("/common/data/car/user/list")
+ R userComMngCarList(@RequestParam("userId") Long userId);
+
+ @PostMapping("/common/data/car/page")
+ R pageQueryComMngCar(@RequestBody PageComMngCarDTO pageComMngCarDTO);
+
+ @PostMapping("/common/data/car/save")
+ R saveComMngCar(@RequestBody ComMngCarSaveDTO comMngCarSaveDTO);
+
+ /**
+ * 删除车辆信息
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/common/data/car/delete")
+ R deleteComMngCar(@RequestParam(value = "id") Long id);
+
+ /**
+ * 批量导入便民服务
+ * @param list 便民服务集合
+ */
+ @PostMapping("/common/data/car/import")
+ R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list,@RequestParam("communityId") Long communityId);
+
+
+ /**
+ * 社区后台实有单位管理列表
+ * @param pageComMngRealCompanyDTO
+ * @return
+ */
+ @PostMapping("/common/data/company/page")
+ R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO);
+
+ /**
+ * 社区后台添加修改实有单位
+ * @param comMngRealCompanyVO
+ * @return
+ */
+ @PostMapping("/common/data/company/save")
+ R saveComMngRealCompany(@RequestBody ComMngRealCompanyVO comMngRealCompanyVO);
+
+ /**
+ * 社区后台删除实有单位
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/common/data/company/delete")
+ R deleteComMngRealCompany(@RequestParam(value = "id") Long id);
+
+ /**
+ * 实有单位详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/common/data/company/detail")
+ R detailComMngRealCompany(@RequestParam(value = "id") Long id);
+
+ /**
+ * 批量导入实有单位
+ * @param list 实有单位集合
+ */
+ @PostMapping("/common/data/company/import")
+ R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 实有单位导出
+ * @param exportRealCompanyExcelDTO
+ * @return
+ */
+ @PostMapping("/common/data/company/export")
+ R exportRealCompany(ExportRealCompanyExcelDTO exportRealCompanyExcelDTO);
+
+ /**
+ * 社区后台实有单位管理列表
+ * @param pageComMngRealAssetsDTO
+ * @return
+ */
+ @PostMapping("/common/data/assets/page")
+ R pageQueryComMngRealAssets(@RequestBody PageComMngRealAssetsDTO pageComMngRealAssetsDTO);
+
+ /**
+ * 社区后台添加修改实有单位
+ * @param comMngRealAssetsVO
+ * @return
+ */
+ @PostMapping("/common/data/assets/save")
+ R saveComMngRealAssets(@RequestBody ComMngRealAssetsVO comMngRealAssetsVO);
+
+ /**
+ * 社区后台删除实有单位
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/common/data/assets/delete")
+ R deleteComMngRealAssets(@RequestParam(value = "id") Long id);
+
+ /**
+ * 实有单位详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/common/data/assets/detail")
+ R detailComMngRealAssets(@RequestParam(value = "id") Long id);
+
+ /**
+ * 批量导入实有单位
+ * @param list 实有单位集合
+ */
+ @PostMapping("/common/data/assets/import")
+ R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 实有单位导出
+ * @param exportRealAssetsExcelDTO
+ * @return
+ */
+ @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);
}
--
Gitblit v1.7.1