From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/place/controller/PlaceController.java | 129 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 127 insertions(+), 2 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 3859b06..90d2504 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlaceController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
@@ -23,11 +23,19 @@
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.house.excel.HouseAndHoldExcel;
+import org.springblade.modules.house.excel.HouseAndHoldImporter;
+import org.springblade.modules.place.excel.PlaceAndRelExcel;
+import org.springblade.modules.place.excel.PlaceAndRelImporter;
+import org.springblade.modules.place.excel.PlaceExcel;
+import org.springblade.modules.place.excel.PlaceImporter;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.place.entity.PlaceEntity;
@@ -35,6 +43,9 @@
import org.springblade.modules.place.wrapper.PlaceWrapper;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
/**
* 场所表 控制器
@@ -92,9 +103,25 @@
return R.status(placeService.save(place));
}
+ /**
+ * 自定义新增/修改
+ * @param placeVO
+ * @return
+ */
@PostMapping("/add")
public R add(@RequestBody PlaceVO placeVO){
- return R.status(placeService.addVO(placeVO));
+ return R.status(placeService.addOrUpdate(placeVO));
+ }
+
+
+ /**
+ * 自定义新增/修改
+ * @param placeVO
+ * @return
+ */
+ @PostMapping("/addOrUpdate")
+ public R addOrUpdate(@RequestBody PlaceVO placeVO){
+ return R.status(placeService.addOrUpdate(placeVO));
}
/**
@@ -105,6 +132,17 @@
@ApiOperation(value = "修改", notes = "传入place")
public R update(@Valid @RequestBody PlaceEntity place) {
return R.status(placeService.updateById(place));
+ }
+
+
+ /**
+ * 自定义修改
+ * @param placeVO
+ * @return
+ */
+ @PostMapping("/updatePlace")
+ public R updatePlace(@RequestBody PlaceVO placeVO){
+ return R.status(placeService.updatePlace(placeVO));
}
/**
@@ -124,8 +162,95 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(placeService.removeByIds(Func.toLongList(ids)));
+ List<Long> longs = Func.toLongList(ids);
+ // 返回
+ return R.status(placeService.removePlace(longs));
+ }
+
+ /**
+ * 历史场所挂接处理-临时
+ * @param place
+ * @return
+ */
+ @GetMapping("/historyPlaceHandle")
+ public R historyPlaceHandle(PlaceVO place) {
+ return R.data(placeService.historyPlaceHandle(place));
+ }
+
+ /**
+ * 历史场所标签挂接处理-场所标签-临时
+ * @param place
+ * @return
+ */
+ @GetMapping("/historyPlaceLabelHandle")
+ public R historyPlaceLabelHandle(PlaceVO place) {
+ return R.data(placeService.historyPlaceLabelHandle(place));
+ }
+
+ /**
+ * 历史场所详情数据处理
+ * @param place
+ * @return
+ */
+ @GetMapping("/historyPlaceExtHandle")
+ public R historyPlaceExtHandle(PlaceVO place) {
+ return R.data(placeService.historyPlaceExtHandle(place));
}
+ /**
+ * 场所表 自定义详情查询
+ * @param place
+ * @return
+ */
+ @GetMapping("/getDetail")
+ public R<PlaceVO> getDetail(PlaceVO place) {
+ return R.data(placeService.getDetail(place));
+ }
+
+
+ /**
+ * 导入场所数据
+ */
+ @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("操作成功");
+ }
+
+ /**
+ * 导入场所（商超）数据
+ */
+ @PostMapping("/import-placeAndRel")
+ public R importPlaceAndRel(MultipartFile file, Integer isCovered) {
+ PlaceAndRelImporter placeImporter = new PlaceAndRelImporter(placeService, isCovered == 1);
+ ExcelUtil.save(file, placeImporter, PlaceAndRelExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 商超数据处理
+ * @return
+ */
+ @GetMapping("/placeAndRelHandle")
+ public R placeAndRelHandle() {
+ return R.data(placeService.placeAndRelHandle());
+ }
+
+ /**
+ * 场所数据处理-用户信息（场所负责人信息写入到场所表）
+ */
+ @GetMapping("/placeUserHandle")
+ public R placeUserHandle() {
+ return R.data(placeService.placeUserHandle());
+ }
+
+ /**
+ * 场所标签数据处理
+ */
+ @GetMapping("/placeLabelHandle")
+ public R placeLabelHandle() {
+ return R.data(placeService.placeLabelHandle());
+ }
}
--
Gitblit v1.9.3