From 4de8e288c0512991d847866267d91d08f73760a9 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 15 May 2024 16:28:52 +0800
Subject: [PATCH] 场所导入调整
---
src/main/java/org/springblade/modules/place/controller/PlaceController.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/controller/PlaceController.java b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
index e2ffbf0..b5df254 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlaceController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
@@ -44,6 +44,7 @@
import org.springblade.core.boot.ctrl.BladeController;
import org.springframework.web.multipart.MultipartFile;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -254,9 +255,43 @@
*/
@PostMapping("/import-place")
public R importPlace(MultipartFile file, Integer isCovered) {
- PlaceImporter placeImporter = new PlaceImporter(placeService, isCovered == 1);
- ExcelUtil.save(file, placeImporter, PlaceExcel.class);
- return R.success("操作成功");
+ String data = placeService.importPlace(ExcelUtil.read(file, ImportPlaceExcel.class),isCovered==1);
+ return R.data(200,data,"");
+ }
+
+ /**
+ * 导出模板
+ */
+ @GetMapping("export-template")
+ @ApiOperationSupport(order = 13)
+ @ApiLog("导出九小统计")
+ @ApiOperation(value = "导出九小统计", notes = "传入place")
+ public void exportTemplate(HttpServletResponse response) {
+ List<ImportPlaceExcel> list = new ArrayList<>();
+ ImportPlaceExcel importPlaceExcel = new ImportPlaceExcel();
+ importPlaceExcel.setHouseCode("AdiEQ41254122****SXFDK44");
+ importPlaceExcel.setLocation("江西上饶**********");
+ importPlaceExcel.setLng("128.754451241");
+ importPlaceExcel.setLat("28.4521122441");
+ importPlaceExcel.setStreetName("西市街道");
+ importPlaceExcel.setCommunityName("万达社区");
+ importPlaceExcel.setGridName("第一网格");
+ importPlaceExcel.setPlaceName("***场所");
+ importPlaceExcel.setPrincipal("张三");
+ importPlaceExcel.setPrincipalPhone("13112341234");
+ importPlaceExcel.setPrincipalIdCard("360***********0001");
+ importPlaceExcel.setLegalPerson("张三");
+ importPlaceExcel.setLegalTel("13112341234");
+ importPlaceExcel.setLegalIdCard("360***********0001");
+ importPlaceExcel.setNineType("1");
+ importPlaceExcel.setFrontType("1");
+ importPlaceExcel.setThreeFireProtection("是");
+ importPlaceExcel.setNoExplosionCategory("2");
+ importPlaceExcel.setLabelCode("131120");
+ importPlaceExcel.setRemark("测试****");
+
+ list.add(importPlaceExcel);
+ ExcelUtil.export(response, "场所数据" + DateUtil.time(), "场所数据表", list, ImportPlaceExcel.class);
}
/**
--
Gitblit v1.9.3