From 60b96e9221632debb08aaf5fb7abd8361a90c0fb Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 31 Jan 2024 19:59:33 +0800
Subject: [PATCH] 社区新增面，网格员网格处理调整
---
src/main/java/org/springblade/modules/community/controller/CommunityController.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/community/controller/CommunityController.java b/src/main/java/org/springblade/modules/community/controller/CommunityController.java
index 9f248d2..b81ec3d 100644
--- a/src/main/java/org/springblade/modules/community/controller/CommunityController.java
+++ b/src/main/java/org/springblade/modules/community/controller/CommunityController.java
@@ -23,11 +23,16 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.secure.BladeUser;
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.community.excel.CommunityExcel;
+import org.springblade.modules.community.excel.CommunityImporter;
+import org.springblade.modules.grid.excel.GridExcel;
+import org.springblade.modules.grid.excel.GridImporter;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.community.entity.CommunityEntity;
@@ -35,6 +40,7 @@
import org.springblade.modules.community.wrapper.CommunityWrapper;
import org.springblade.modules.community.service.ICommunityService;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.multipart.MultipartFile;
/**
* 社区表 控制器
@@ -60,6 +66,15 @@
CommunityEntity detail = communityService.getOne(Condition.getQueryWrapper(community));
return R.data(CommunityWrapper.build().entityVO(detail));
}
+
+ /**
+ * 社区表 自定义详情
+ */
+ @GetMapping("/getDetail")
+ public R<CommunityVO> getDetail(CommunityEntity community) {
+ return R.data(communityService.getDetail(community));
+ }
+
/**
* 社区表 分页
*/
@@ -113,6 +128,14 @@
}
/**
+ * 社区表 自定义新增或修改
+ */
+ @PostMapping("/saveOrUpdate")
+ public R saveOrUpdate(@Valid @RequestBody CommunityEntity community) {
+ return R.status(communityService.saveOrUpdateCommunityEntity(community));
+ }
+
+ /**
* 社区表 删除
*/
@PostMapping("/remove")
@@ -122,5 +145,15 @@
return R.status(communityService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 导入社区数据
+ */
+ @PostMapping("/import-community")
+ public R importCommunity(MultipartFile file, Integer isCovered) {
+ CommunityImporter communityImporter = new CommunityImporter(communityService, isCovered == 1);
+ ExcelUtil.save(file, communityImporter, CommunityExcel.class);
+ return R.success("操作成功");
+ }
+
}
--
Gitblit v1.9.3