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 | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 60b70aa..0bac73c 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
@@ -25,6 +25,7 @@
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;
@@ -34,13 +35,19 @@
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;
@@ -67,7 +74,7 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入doorplateAddress")
public R<DoorplateAddressVO> detail(DoorplateAddressEntity doorplateAddress) {
- bladeLogger.info("blade-doorplateAddress_detail", JsonUtil.toJson(doorplateAddress));
+ bladeLogger.info("门牌地址详情查询", JsonUtil.toJson(doorplateAddress));
DoorplateAddressEntity detail = doorplateAddressService.getOne(Condition.getQueryWrapper(doorplateAddress));
return R.data(DoorplateAddressWrapper.build().entityVO(detail));
}
@@ -78,7 +85,7 @@
@GetMapping("/getDetail")
@ApiLog("门牌地址表（总台账数据） 自定义详情")
public R getDetail(DoorplateAddressVO doorplateAddress) {
- bladeLogger.info("blade-doorplateAddress_getDetail", JsonUtil.toJson(doorplateAddress));
+ bladeLogger.info("门牌地址详情查询", JsonUtil.toJson(doorplateAddress));
return R.data(doorplateAddressService.getDetail(doorplateAddress));
}
@@ -154,7 +161,7 @@
@GetMapping("/getFuncList")
@ApiLog("根据角色获取功能集合数据")
public R getFuncList(Integer type,String roleName) {
- bladeLogger.info("blade-doorplateAddress_getFuncList", JsonUtil.toJson(ToObject.toMap("type:" + type,"roleName:"+ roleName)));
+ bladeLogger.info("根据角色获取功能集合数据", JsonUtil.toJson(ToObject.toMap("type:" + type,"roleName:"+ roleName)));
return R.data(doorplateAddressService.getFuncList(type,roleName));
}
@@ -177,9 +184,9 @@
*/
@GetMapping("/getHouseRentInfo")
@ApiLog("查询房屋及出租详情信息")
- public R getHouseRentInfo(String code) {
+ public R getHouseRentInfo(String code, Long houseId) {
bladeLogger.info("获取楼盘相关集合数据", JsonUtil.toJson(code));
- return R.data(doorplateAddressService.getHouseRentInfo(code));
+ return R.data(doorplateAddressService.getHouseRentInfo(code,houseId));
}
/**
@@ -298,4 +305,16 @@
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