From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java | 121 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 115 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
index 8fb5ba5..0bac73c 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
@@ -16,25 +16,38 @@
*/
package org.springblade.modules.doorplateAddress.controller;
+import cn.hutool.json.JSONUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+
+import org.springblade.common.param.ToObject;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
+import org.springblade.modules.doorplateAddress.excel.ImportDoorplateExcel;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
import org.springblade.modules.doorplateAddress.wrapper.DoorplateAddressWrapper;
+import org.springblade.modules.house.excel.HouseAndHoldExcel;
+import org.springblade.modules.house.excel.HouseAndHoldImporter;
+import org.springblade.modules.house.excel.ImportHouseholdExcel;
import org.springblade.modules.house.vo.HouseParam;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.web.multipart.MultipartFile;
+import sun.rmi.runtime.Log;
import java.util.List;
@@ -51,16 +64,29 @@
public class DoorplateAddressController{
private final IDoorplateAddressService doorplateAddressService;
+ private final BladeLogger bladeLogger;
/**
* 门牌地址表（总台账数据） 详情
*/
@GetMapping("/detail")
+ @ApiLog("门牌地址表（总台账数据） 详情")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入doorplateAddress")
public R<DoorplateAddressVO> detail(DoorplateAddressEntity doorplateAddress) {
+ bladeLogger.info("门牌地址详情查询", JsonUtil.toJson(doorplateAddress));
DoorplateAddressEntity detail = doorplateAddressService.getOne(Condition.getQueryWrapper(doorplateAddress));
return R.data(DoorplateAddressWrapper.build().entityVO(detail));
+ }
+
+ /**
+ * 门牌地址表（总台账数据） 自定义详情
+ */
+ @GetMapping("/getDetail")
+ @ApiLog("门牌地址表（总台账数据） 自定义详情")
+ public R getDetail(DoorplateAddressVO doorplateAddress) {
+ bladeLogger.info("门牌地址详情查询", JsonUtil.toJson(doorplateAddress));
+ return R.data(doorplateAddressService.getDetail(doorplateAddress));
}
/**
@@ -79,6 +105,7 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("门牌地址表（总台账数据） 自定义分页")
@ApiOperation(value = "分页", notes = "传入doorplateAddress")
public R<IPage<DoorplateAddressVO>> page(DoorplateAddressVO doorplateAddress, Query query) {
IPage<DoorplateAddressVO> pages = doorplateAddressService.selectDoorplateAddressPage(Condition.getPage(query), doorplateAddress);
@@ -132,7 +159,9 @@
* @return
*/
@GetMapping("/getFuncList")
+ @ApiLog("根据角色获取功能集合数据")
public R getFuncList(Integer type,String roleName) {
+ bladeLogger.info("根据角色获取功能集合数据", JsonUtil.toJson(ToObject.toMap("type:" + type,"roleName:"+ roleName)));
return R.data(doorplateAddressService.getFuncList(type,roleName));
}
@@ -142,7 +171,9 @@
* @return
*/
@GetMapping("/getHousesList")
+ @ApiLog("获取楼盘相关集合数据")
public R getHousesList(HouseParam houseParam) {
+ bladeLogger.info("获取楼盘相关集合数据", JsonUtil.toJson(houseParam));
return R.data(doorplateAddressService.getHousesList(houseParam));
}
@@ -152,8 +183,10 @@
* @return
*/
@GetMapping("/getHouseRentInfo")
- public R getHouseRentInfo(String code) {
- return R.data(doorplateAddressService.getHouseRentInfo(code));
+ @ApiLog("查询房屋及出租详情信息")
+ public R getHouseRentInfo(String code, Long houseId) {
+ bladeLogger.info("获取楼盘相关集合数据", JsonUtil.toJson(code));
+ return R.data(doorplateAddressService.getHouseRentInfo(code,houseId));
}
/**
@@ -173,6 +206,7 @@
* @param type
* @return
*/
+ @ApiLog("获取门牌地址树集合信息")
@GetMapping("/getDoorplateAddressList")
public R<List<DoorplateAddressVOTree>> getDoorplateAddressList(String code, String type){
List<DoorplateAddressVOTree> list = doorplateAddressService.getDoorplateAddressList(code,type);
@@ -193,6 +227,7 @@
* 根据参数获取地址详情
* @return
*/
+ @ApiLog("根据参数获取地址详情")
@GetMapping("/getDoorplateAddressDetail")
public R getDoorplateAddressDetail(DoorplateAddressVO doorplateAddressVO){
DoorplateAddressVO detail = doorplateAddressService.getDoorplateAddressDetail(doorplateAddressVO);
@@ -200,12 +235,86 @@
}
/**
- * 数据处理
+ * 房屋数据处理
* @return
*/
- @GetMapping("/dataHandle")
- public R dataHandle(){
- return R.data(doorplateAddressService.dataHandle());
+ @GetMapping("/houseDataHandle")
+ public R dataHandle(String townName){
+ return R.data(doorplateAddressService.houseDataHandle(townName));
+ }
+
+ /**
+ * 小区数据处理
+ * @return
+ */
+ @GetMapping("/aoiDataHandle")
+ public R aoiDataHandle(){
+ return R.data(doorplateAddressService.aoiDataHandle());
+ }
+
+ /**
+ * 场所数据处理
+ * @return
+ */
+ @GetMapping("/placeDataHandle")
+ public R placeDataHandle(String townName){
+ return R.data(doorplateAddressService.placeDataHandle(townName));
+ }
+
+ /**
+ * 社区数据处理
+ * @return
+ */
+ @GetMapping("/communityDataHandle")
+ public R communityDataHandle(){
+ return R.data(doorplateAddressService.communityDataHandle());
+ }
+
+
+ /**
+ * 网格范围数据处理
+ * @return
+ */
+ @GetMapping("/gridRangeDataHandle")
+ public R gridRangeDataHandle(String townName,String communityName){
+ return R.data(doorplateAddressService.gridRangeDataHandle(townName,communityName));
+ }
+
+
+ /**
+ * 查询场所标准地址数据
+ * @param doorplateAddressVO
+ * 查询场所标准地址数据
+ * @return
+ */
+ @ApiLog("查询场所标准地址数据")
+ @GetMapping("/getPlaceList")
+ public R getPlaceList(DoorplateAddressVO doorplateAddressVO,Integer size){
+ return R.data(doorplateAddressService.getPlaceList(doorplateAddressVO,size));
+ }
+
+ /**
+ * 通过小区id 查询楼栋编码
+ * @param districtId 门牌地址编号
+ * @return
+ */
+ @GetMapping("/getHouseBuildingCode")
+ @ApiLog("通过小区id 查询楼栋编码")
+ public R<List<DoorplateAddressVO>> getHouseBuildingCode(String districtId) {
+ List<DoorplateAddressVO> houseBuildingCode = doorplateAddressService.getHouseBuildingCode(districtId);
+ return R.data(houseBuildingCode);
+ }
+
+
+ /**
+ * 更新地址总表
+ */
+ @PostMapping("import-doorplate")
+ @ApiOperationSupport(order = 12)
+ @ApiOperation(value = "更新地址总表", notes = "传入excel")
+ public R importUser(MultipartFile file) {
+ String data = doorplateAddressService.importDoorplate(ExcelUtil.read(file, ImportDoorplateExcel.class));
+ return R.data(200, data, data);
}
}
--
Gitblit v1.9.3