From 566e7986291e73051d30ee252b0ebf852b1577a7 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 02 Apr 2024 14:25:51 +0800
Subject: [PATCH] 娱乐场所标签新增180200
---
src/main/java/org/springblade/modules/place/controller/PlaceController.java | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 155 insertions(+), 11 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..e2ffbf0 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlaceController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
@@ -21,20 +21,20 @@
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
+
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.logger.BladeLogger;
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.jackson.JsonUtil;
+import org.springblade.core.tool.utils.DateUtil;
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.springblade.modules.place.excel.*;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.place.entity.PlaceEntity;
@@ -43,6 +43,8 @@
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
/**
* 场所表 控制器
@@ -57,6 +59,7 @@
public class PlaceController extends BladeController{
private final IPlaceService placeService;
+ private final BladeLogger bladeLogger;
/**
* 场所表 详情
@@ -73,7 +76,7 @@
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入place")
+ @ApiOperation(value = "分页LIST", notes = "传入place")
public R<IPage<PlaceVO>> list(PlaceEntity place, Query query) {
IPage<PlaceEntity> pages = placeService.page(Condition.getPage(query), Condition.getQueryWrapper(place));
return R.data(PlaceWrapper.build().pageVO(pages));
@@ -82,11 +85,39 @@
/**
* 场所表 自定义分页
*/
+ @ApiLog("场所列表查询")
@GetMapping("/page")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入place")
+ @ApiOperation(value = "分页page", notes = "传入place")
public R<IPage<PlaceVO>> page(PlaceVO place, Query query) {
+ bladeLogger.info("blade-place_page", JsonUtil.toJson(place));
IPage<PlaceVO> pages = placeService.selectPlacePage(Condition.getPage(query), place);
+ return R.data(pages);
+ }
+
+ /**
+ * 九小场所档案
+ */
+ @ApiLog("九小场所档案列表查询")
+ @GetMapping("/ninePage")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "九小场所档案", notes = "传入place")
+ public R<IPage<PlaceVO>> ninePage(PlaceVO place, Query query) {
+ bladeLogger.info("blade-place_ninePage", JsonUtil.toJson(place));
+ IPage<PlaceVO> pages = placeService.selectNinePlacePage(Condition.getPage(query), place);
+ return R.data(pages);
+ }
+
+ /**
+ * 企业商超列表查询
+ */
+ @ApiLog("企业商超列表查询")
+ @GetMapping("/mallPage")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "企业商超列表查询", notes = "传入place")
+ public R<IPage<PlaceVO>> mallPage(PlaceVO place, Query query) {
+ bladeLogger.info("blade-place_mallPage", JsonUtil.toJson(place));
+ IPage<PlaceVO> pages = placeService.selectMallPage(Condition.getPage(query), place);
return R.data(pages);
}
@@ -100,9 +131,31 @@
return R.status(placeService.save(place));
}
+ /**
+ * 自定义新增
+ * @param placeVO
+ * @return
+ */
@PostMapping("/add")
+ @ApiLog("场所自定义新增")
+ @ApiOperation(value = "自定义新增", notes = "传入place")
public R add(@RequestBody PlaceVO placeVO){
- return R.status(placeService.addVO(placeVO));
+ bladeLogger.info("场所自定义新增", JsonUtil.toJson(placeVO));
+ return R.status(placeService.addOrUpdate(placeVO));
+ }
+
+
+ /**
+ * 自定义新增/修改
+ * @param placeVO
+ * @return
+ */
+ @PostMapping("/addOrUpdate")
+ @ApiLog("场所自定义新增/修改")
+ @ApiOperation(value = "自定义新增/修改", notes = "传入place")
+ public R addOrUpdate(@RequestBody PlaceVO placeVO){
+ bladeLogger.info("场所自定义新增/修改", JsonUtil.toJson(placeVO));
+ return R.status(placeService.addOrUpdate(placeVO));
}
/**
@@ -113,6 +166,18 @@
@ApiOperation(value = "修改", notes = "传入place")
public R update(@Valid @RequestBody PlaceEntity place) {
return R.status(placeService.updateById(place));
+ }
+
+
+ /**
+ * 自定义修改
+ * @param placeVO
+ * @return
+ */
+ @PostMapping("/updatePlace")
+ @ApiOperation(value = "自定义修改", notes = "传入place")
+ public R updatePlace(@RequestBody PlaceVO placeVO){
+ return R.status(placeService.updatePlace(placeVO));
}
/**
@@ -130,9 +195,13 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("场所数据删除")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(placeService.removeByIds(Func.toLongList(ids)));
+ bladeLogger.info("场所数据删除", JsonUtil.toJson(ids));
+ List<Long> longs = Func.toLongList(ids);
+ // 返回
+ return R.status(placeService.removePlace(longs));
}
/**
@@ -155,6 +224,16 @@
return R.data(placeService.historyPlaceLabelHandle(place));
}
+ /**
+ * 历史场所详情数据处理
+ * @param place
+ * @return
+ */
+ @GetMapping("/historyPlaceExtHandle")
+ public R historyPlaceExtHandle(PlaceVO place) {
+ return R.data(placeService.historyPlaceExtHandle(place));
+ }
+
/**
* 场所表 自定义详情查询
@@ -162,7 +241,10 @@
* @return
*/
@GetMapping("/getDetail")
+ @ApiLog("场所表 自定义详情查询")
+ @ApiOperation(value = "场所表 自定义详情查询", notes = "传入ids")
public R<PlaceVO> getDetail(PlaceVO place) {
+ bladeLogger.info("场所表 自定义详情查询", JsonUtil.toJson(place));
return R.data(placeService.getDetail(place));
}
@@ -186,4 +268,66 @@
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());
+ }
+
+ /**
+ * 导出九小统计
+ */
+ @GetMapping("exportNineType")
+ @ApiOperationSupport(order = 13)
+ @ApiLog("导出九小统计")
+ @ApiOperation(value = "导出九小统计", notes = "传入place")
+ public void exportNineType(PlaceVO place, HttpServletResponse response) {
+ List<NinePlaceExcel> list = placeService.export(place);
+ ExcelUtil.export(response, "档案管理" + DateUtil.time(), "场所数据表", list, NinePlaceExcel.class);
+ }
+
+
+ /**
+ * 场所警务网格处理
+ */
+ @GetMapping("/placeJwGridCodeHandle")
+ public R placeJwGridCodeHandle() {
+ return R.data(placeService.placeJwGridCodeHandle());
+ }
+
+ /**
+ * 场所综治网格处理
+ */
+ @GetMapping("/placeGridCodeHandle")
+ public R placeGridCodeHandle() {
+ return R.data(placeService.placeGridCodeHandle());
+ }
+
+ /**
+ * 场所二维码绑定处理
+ */
+ @GetMapping("/placeDoorBindHandle")
+ public R placeDoorBindHandle() {
+ return R.data(placeService.placeDoorBindHandle());
+ }
}
--
Gitblit v1.9.3