From 9cc50d2e2c3fcfff3c6b95c09806d3881a97c5ff Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 15:20:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/controller/PlaceController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 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 fe3d131..d106a53 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlaceController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
@@ -100,9 +100,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));
}
/**
@@ -113,6 +129,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));
}
/**
@@ -155,6 +182,16 @@
return R.data(placeService.historyPlaceLabelHandle(place));
}
+ /**
+ * 历史场所详情数据处理
+ * @param place
+ * @return
+ */
+ @GetMapping("/historyPlaceExtHandle")
+ public R historyPlaceExtHandle(PlaceVO place) {
+ return R.data(placeService.historyPlaceExtHandle(place));
+ }
+
/**
* 场所表 自定义详情查询
@@ -186,4 +223,20 @@
ExcelUtil.save(file, placeImporter, PlaceAndRelExcel.class);
return R.success("操作成功");
}
+
+ /**
+ * 场所数据处理-用户信息（场所负责人信息写入到场所表）
+ */
+ @GetMapping("/placeUserHandle")
+ public R placeUserHandle() {
+ return R.data(placeService.placeUserHandle());
+ }
+
+ /**
+ * 场所标签数据处理
+ */
+ @GetMapping("/placeLabelHandle")
+ public R placeLabelHandle() {
+ return R.data(placeService.placeLabelHandle());
+ }
}
--
Gitblit v1.9.3