From aca33b1ff34ea0f2db3290d4c0b5d898f66de108 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 16 Mar 2024 11:09:59 +0800
Subject: [PATCH] 1.房屋查询返回房屋标签颜色 2.新增预警接口处置和宣传
---
src/main/java/org/springblade/modules/category/controller/CategoryController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/category/controller/CategoryController.java b/src/main/java/org/springblade/modules/category/controller/CategoryController.java
index 8cbfccf..1755f72 100644
--- a/src/main/java/org/springblade/modules/category/controller/CategoryController.java
+++ b/src/main/java/org/springblade/modules/category/controller/CategoryController.java
@@ -24,18 +24,20 @@
import javax.validation.Valid;
import org.springblade.common.node.TreeIntegerNode;
+import org.springblade.core.excel.util.ExcelUtil;
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.utils.Func;
-import org.springblade.modules.label.vo.LabelVO;
+import org.springblade.modules.category.excel.CategoryExcel;
+import org.springblade.modules.category.excel.CategoryImporter;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.category.entity.CategoryEntity;
import org.springblade.modules.category.vo.CategoryVO;
import org.springblade.modules.category.wrapper.CategoryWrapper;
import org.springblade.modules.category.service.ICategoryService;
-
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/**
@@ -143,5 +145,15 @@
return R.data(categoryService.getCategory(category));
}
+ /**
+ * 天地图poi 导入
+ */
+ @PostMapping("/import-category")
+ public R importCategory(MultipartFile file, Integer isCovered) {
+ CategoryImporter categoryImporter = new CategoryImporter(categoryService, isCovered == 1);
+ ExcelUtil.save(file, categoryImporter, CategoryExcel.class);
+ return R.success("操作成功");
+ }
+
}
--
Gitblit v1.9.3