From 5437586ac6cae38b00a69132c4f89f4844ece902 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 17 May 2024 16:00:32 +0800
Subject: [PATCH] 通用日志说明修改
---
src/main/java/org/springblade/modules/house/controller/HouseholdController.java | 13 +++++++------
src/main/java/org/springblade/modules/place/controller/PlaceController.java | 13 +++++++------
src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java | 6 +++---
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
index 886f04d..4595e75 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
@@ -68,7 +68,7 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入doorplateAddress")
public R<DoorplateAddressVO> detail(DoorplateAddressEntity doorplateAddress) {
- bladeLogger.info("blade-doorplateAddress_detail", JsonUtil.toJson(doorplateAddress));
+ bladeLogger.info("门牌地址详情查询", JsonUtil.toJson(doorplateAddress));
DoorplateAddressEntity detail = doorplateAddressService.getOne(Condition.getQueryWrapper(doorplateAddress));
return R.data(DoorplateAddressWrapper.build().entityVO(detail));
}
@@ -79,7 +79,7 @@
@GetMapping("/getDetail")
@ApiLog("门牌地址表（总台账数据） 自定义详情")
public R getDetail(DoorplateAddressVO doorplateAddress) {
- bladeLogger.info("blade-doorplateAddress_getDetail", JsonUtil.toJson(doorplateAddress));
+ bladeLogger.info("门牌地址详情查询", JsonUtil.toJson(doorplateAddress));
return R.data(doorplateAddressService.getDetail(doorplateAddress));
}
@@ -155,7 +155,7 @@
@GetMapping("/getFuncList")
@ApiLog("根据角色获取功能集合数据")
public R getFuncList(Integer type,String roleName) {
- bladeLogger.info("blade-doorplateAddress_getFuncList", JsonUtil.toJson(ToObject.toMap("type:" + type,"roleName:"+ roleName)));
+ bladeLogger.info("根据角色获取功能集合数据", JsonUtil.toJson(ToObject.toMap("type:" + type,"roleName:"+ roleName)));
return R.data(doorplateAddressService.getFuncList(type,roleName));
}
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
index d8febc8..0ba9196 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
@@ -72,7 +72,7 @@
@ApiLog("住户 详情")
@ApiOperation(value = "详情", notes = "传入household")
public R<HouseholdVO> detail(HouseholdEntity household) {
- bladeLogger.info("住户 详情", JsonUtil.toJson(household));
+ bladeLogger.info("住户详情查询", JsonUtil.toJson(household));
HouseholdEntity detail = householdService.getOne(Condition.getQueryWrapper(household).last("limit 1"));
return R.data(HouseholdWrapper.build().entityVO(detail));
}
@@ -87,7 +87,7 @@
@ApiLog("住户 详情")
@ApiOperation(value = "详情", notes = "传入household")
public R getDetail(HouseholdEntity household) {
- bladeLogger.info("住户 详情", JsonUtil.toJson(household));
+ bladeLogger.info("住户详情查询", JsonUtil.toJson(household));
return R.data(householdService.getDetail(household));
}
@@ -110,7 +110,7 @@
@ApiLog("住户 自定义分页")
@ApiOperation(value = "分页", notes = "传入household")
public R<IPage<HouseholdVO>> page(HouseholdVO household, Query query) {
- bladeLogger.info("住户 自定义分页", JsonUtil.toJson(household));
+ bladeLogger.info("住户列表信息查询", JsonUtil.toJson(household));
IPage<HouseholdVO> pages = householdService.selectHouseholdPage(Condition.getPage(query), household);
return R.data(pages);
}
@@ -123,7 +123,7 @@
@ApiLog("住户 自定义分页")
@ApiOperation(value = "分页", notes = "传入household")
public R<IPage<HouseholdVO>> getKeynotePersonnelPage(HouseholdVO household, Query query) {
- bladeLogger.info("住户 自定义分页", JsonUtil.toJson(household));
+ bladeLogger.info("住户列表信息查询", JsonUtil.toJson(household));
IPage<HouseholdVO> pages = householdService.getKeynotePersonnelPage(Condition.getPage(query), household);
return R.data(pages);
}
@@ -195,7 +195,7 @@
@ApiLog("住户 自定义新增或修改")
@ApiOperation(value = "自定义新增或修改", notes = "传入household")
public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdVO household) {
- bladeLogger.info("住户 自定义新增或修改", JsonUtil.toJson(household));
+ bladeLogger.info("住户信息新增或修改", JsonUtil.toJson(household));
return R.status(householdService.saveOrUpdateHousehold(household));
}
@@ -208,7 +208,7 @@
@ApiOperation(value = "逻辑删除", notes = "传入ids")
@Transactional(rollbackFor = Exception.class)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- bladeLogger.info("住户 删除", JsonUtil.toJson(ids));
+ bladeLogger.info("住户信息删除", JsonUtil.toJson(ids));
// 返回
return R.status(householdService.removeHousehold(ids));
}
@@ -232,6 +232,7 @@
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入住户", notes = "传入excel")
public R importUser(MultipartFile file, Integer isCovered) {
+ bladeLogger.info("住户信息导入", JsonUtil.toJson(isCovered));
String data = householdService.importUserHouseHold(ExcelUtil.read(file, ImportHouseholdExcel.class),isCovered==1);
return R.data(200,data,null);
}
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