From 0814274c6ef53f39d9460e4d029717c9eff999e0 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 20 May 2024 09:04:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/controller/PlaceController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 952870c..f0c2ccd 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlaceController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
@@ -91,7 +91,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页page", notes = "传入place")
public R<IPage<PlaceVO>> page(PlaceVO place, Query query) {
- bladeLogger.info("blade-place_page", JsonUtil.toJson(place));
+ bladeLogger.info("场所列表查询", JsonUtil.toJson(place));
IPage<PlaceVO> pages = placeService.selectPlacePage(Condition.getPage(query), place);
return R.data(pages);
}
@@ -104,7 +104,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "九小场所档案", notes = "传入place")
public R<IPage<PlaceVO>> ninePage(PlaceVO place, Query query) {
- bladeLogger.info("blade-place_ninePage", JsonUtil.toJson(place));
+ bladeLogger.info("九小场所档案列表查询", JsonUtil.toJson(place));
IPage<PlaceVO> pages = placeService.selectNinePlacePage(Condition.getPage(query), place);
return R.data(pages);
}
@@ -117,7 +117,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "企业商超列表查询", notes = "传入place")
public R<IPage<PlaceVO>> mallPage(PlaceVO place, Query query) {
- bladeLogger.info("blade-place_mallPage", JsonUtil.toJson(place));
+ bladeLogger.info("企业商超列表查询", JsonUtil.toJson(place));
IPage<PlaceVO> pages = placeService.selectMallPage(Condition.getPage(query), place);
return R.data(pages);
}
@@ -141,7 +141,7 @@
@ApiLog("场所自定义新增")
@ApiOperation(value = "自定义新增", notes = "传入place")
public R add(@RequestBody PlaceVO placeVO){
- bladeLogger.info("场所自定义新增", JsonUtil.toJson(placeVO));
+ bladeLogger.info("场所信息采集/修改", JsonUtil.toJson(placeVO));
return R.status(placeService.addOrUpdate(placeVO));
}
@@ -155,7 +155,7 @@
@ApiLog("场所自定义新增/修改")
@ApiOperation(value = "自定义新增/修改", notes = "传入place")
public R addOrUpdate(@RequestBody PlaceVO placeVO){
- bladeLogger.info("场所自定义新增/修改", JsonUtil.toJson(placeVO));
+ bladeLogger.info("场所信息采集/修改", JsonUtil.toJson(placeVO));
return R.status(placeService.addOrUpdate(placeVO));
}
@@ -245,7 +245,7 @@
@ApiLog("场所表 自定义详情查询")
@ApiOperation(value = "场所表 自定义详情查询", notes = "传入ids")
public R<PlaceVO> getDetail(PlaceVO place) {
- bladeLogger.info("场所表 自定义详情查询", JsonUtil.toJson(place));
+ bladeLogger.info("场所表详情查询", JsonUtil.toJson(place));
return R.data(placeService.getDetail(place));
}
@@ -255,6 +255,7 @@
*/
@PostMapping("/import-place")
public R importPlace(MultipartFile file, Integer isCovered) {
+ bladeLogger.info("场所信息批量导入", JsonUtil.toJson(isCovered));
String data = placeService.importPlace(ExcelUtil.read(file, ImportPlaceExcel.class),isCovered==1);
return R.data(200,data,"");
}
--
Gitblit v1.9.3