From 02dc776fff0c37a7c9e992fe80f0bdd0528f5e7f Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 01 Apr 2024 14:57:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java | 12 ++
src/main/java/org/springblade/modules/task/controller/TaskPlaceSelfCheckController.java | 26 ++++
src/main/java/org/springblade/modules/place/controller/PlaceExtController.java | 14 ++
src/main/java/org/springblade/modules/house/controller/HouseController.java | 16 ++
src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java | 22 +++
src/main/java/org/springblade/modules/task/controller/TaskPlaceRectificationController.java | 32 +++++
src/main/java/org/springblade/modules/house/controller/HouseRentalController.java | 17 ++
src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java | 12 ++
src/main/java/org/springblade/modules/house/controller/HouseholdController.java | 26 ++++
src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java | 16 ++
src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java | 12 ++
src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java | 18 +++
src/main/java/org/springblade/modules/system/controller/UserController.java | 28 ++++
src/main/java/org/springblade/modules/task/controller/TaskPlaceRecordController.java | 16 ++
src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java | 12 ++
src/main/java/org/springblade/modules/task/controller/ECallEventController.java | 14 ++
src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java | 29 ++++
17 files changed, 315 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java b/src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java
index 0e3b142..2a7ce69 100644
--- a/src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java
+++ b/src/main/java/org/springblade/modules/backblast/controller/BackblastPubRecordController.java
@@ -23,10 +23,13 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.logger.BladeLogger;
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.jackson.JsonUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,6 +52,7 @@
public class BackblastPubRecordController{
private final IBackblastPubRecordService backblastPubRecordService;
+ private final BladeLogger bladeLogger;
/**
* 反炸宣传记录表 详情
@@ -76,8 +80,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("反炸宣传记录表 自定义分页")
@ApiOperation(value = "分页", notes = "传入backblastPubRecord")
public R<IPage<BackblastPubRecordVO>> page(BackblastPubRecordVO backblastPubRecord, Query query) {
+ bladeLogger.info("反炸宣传记录表 自定义分页", JsonUtil.toJson(backblastPubRecord));
IPage<BackblastPubRecordVO> pages = backblastPubRecordService.selectBackblastPubRecordPage(Condition.getPage(query), backblastPubRecord);
return R.data(pages);
}
@@ -107,8 +113,10 @@
*/
@PostMapping("/addOrUpdate")
@ApiOperationSupport(order = 8)
+ @ApiLog("反炸宣传记录表 自定义新增/修改")
@ApiOperation(value = "自定义新增/修改", notes = "传入backblastPubRecord")
public R addOrUpdate(@Valid @RequestBody BackblastPubRecordEntity backblastPubRecord) {
+ bladeLogger.info("反炸宣传记录表 自定义新增/修改", JsonUtil.toJson(backblastPubRecord));
return R.status(backblastPubRecordService.addOrUpdateBackblastPubRecordEntity(backblastPubRecord));
}
@@ -127,8 +135,10 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("反炸宣传记录表 删除")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("反炸宣传记录表 删除", JsonUtil.toJson(ids));
return R.status(backblastPubRecordService.removeByIds(Func.toLongList(ids)));
}
@@ -139,8 +149,10 @@
*/
@GetMapping("/getDetail")
@ApiOperationSupport(order = 9)
+ @ApiLog("反炸宣传记录表 自定义详情")
@ApiOperation(value = "详情", notes = "传入backblastPubRecord")
public R getDetail(BackblastPubRecordVO backblastPubRecord) {
+ bladeLogger.info("反炸宣传记录表 自定义详情", JsonUtil.toJson(backblastPubRecord));
BackblastPubRecordVO detail = backblastPubRecordService.getDetail(backblastPubRecord);
return R.data(detail);
}
diff --git a/src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java b/src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java
index 829630b..effd7c1 100644
--- a/src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java
+++ b/src/main/java/org/springblade/modules/backblast/controller/BackblastWarnHanRecController.java
@@ -23,10 +23,13 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.logger.BladeLogger;
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.jackson.JsonUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,6 +52,7 @@
public class BackblastWarnHanRecController{
private final IBackblastWarnHanRecService backblastWarnHanRecService;
+ private final BladeLogger bladeLogger;
/**
* 反炸预警处置记录表 详情
@@ -76,8 +80,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("反炸预警处置记录表 自定义分页")
@ApiOperation(value = "分页", notes = "传入backblastWarnHanRec")
public R<IPage<BackblastWarnHanRecVO>> page(BackblastWarnHanRecVO backblastWarnHanRec, Query query) {
+ bladeLogger.info("反炸预警处置记录表 自定义分页", JsonUtil.toJson(backblastWarnHanRec));
IPage<BackblastWarnHanRecVO> pages = backblastWarnHanRecService.selectBackblastWarnHanRecPage(Condition.getPage(query), backblastWarnHanRec);
return R.data(pages);
}
@@ -117,8 +123,10 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("反炸预警处置记录表 删除")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("反炸预警处置记录表 删除", JsonUtil.toJson(ids));
return R.status(backblastWarnHanRecService.removeByIds(Func.toLongList(ids)));
}
@@ -127,8 +135,10 @@
*/
@PostMapping("/saveOrUpdate")
@ApiOperationSupport(order = 8)
+ @ApiLog("反炸预警处置记录表 自定义新增或修改")
@ApiOperation(value = "自定义新增或修改", notes = "传入backblastWarnHanRec")
public R saveOrUpdate(@Valid @RequestBody BackblastWarnHanRecEntity backblastWarnHanRec) {
+ bladeLogger.info("反炸预警处置记录表 自定义新增或修改", JsonUtil.toJson(backblastWarnHanRec));
return R.status(backblastWarnHanRecService.saveOrUpdateBackblastWarnHanRecEntity(backblastWarnHanRec));
}
@@ -138,8 +148,10 @@
*/
@GetMapping("/getDetail")
@ApiOperationSupport(order = 9)
+ @ApiLog("反炸预警处置记录表 自定义详情")
@ApiOperation(value = "详情", notes = "传入backblastWarnHanRec")
public R getDetail(BackblastWarnHanRecVO backblastWarnHanRec) {
+ bladeLogger.info("反炸预警处置记录表 自定义详情", JsonUtil.toJson(backblastWarnHanRec));
BackblastWarnHanRecVO detail = backblastWarnHanRecService.getDetail(backblastWarnHanRec);
return R.data(detail);
}
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseController.java b/src/main/java/org/springblade/modules/house/controller/HouseController.java
index 1623399..49c3e7e 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseController.java
@@ -24,9 +24,12 @@
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
+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.entity.HouseEntity;
@@ -59,6 +62,7 @@
public class HouseController extends BladeController {
private final IHouseService houseService;
+ private final BladeLogger bladeLogger;
/**
* 房屋 详情
@@ -77,8 +81,10 @@
* @return
*/
@GetMapping("/getHouseDetail")
+ @ApiLog("房屋自定义详情查询")
@ApiOperation(value = "房屋自定义详情查询", notes = "传入house")
public R<HouseVO> getHouseDetail(HouseVO house) {
+ bladeLogger.info("房屋自定义详情查询", JsonUtil.toJson(house));
HouseVO detail = houseService.getHouseDetail(house);
return R.data(detail);
}
@@ -99,8 +105,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入house")
+ @ApiLog("房屋 自定义分页")
+ @ApiOperation(value = "自定义分页", notes = "传入house")
public R<IPage<HouseVO>> page(HouseVO house, Query query) {
+ bladeLogger.info("房屋 自定义分页", JsonUtil.toJson(house));
IPage<HouseVO> pages = houseService.selectHousePage(Condition.getPage(query), house);
return R.data(pages);
}
@@ -110,8 +118,10 @@
*/
@GetMapping("/labelStatistics")
@ApiOperationSupport(order = 3)
+ @ApiLog("房屋标签统计")
@ApiOperation(value = "房屋标签统计")
public R labelStatistics(HouseVO house) {
+ bladeLogger.info("房屋标签统计", JsonUtil.toJson(house));
List<Map<String, Object>> pages = houseService.labelStatistics( house);
return R.data(pages);
}
@@ -121,8 +131,10 @@
*/
@GetMapping("/labelCommunityStatistics")
@ApiOperationSupport(order = 3)
+ @ApiLog("房屋标签区域统计")
@ApiOperation(value = "房屋标签区域统计")
public R labelCommunityStatistics(HouseVO house) {
+ bladeLogger.info("房屋标签区域统计", JsonUtil.toJson(house));
List<Map<String, Object>> pages = houseService.labelCommunityStatistics( house);
return R.data(pages);
}
@@ -164,6 +176,7 @@
*/
@PostMapping("/saveOrUpdateHouse")
@ApiOperation(value = "新增或修改", notes = "传入house")
+ @ApiLog("房屋 自定义分页")
public R saveOrUpdateHouse(@RequestBody HouseEntity house) {
return R.status(houseService.saveOrUpdateHouse(house));
}
@@ -174,6 +187,7 @@
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
+ @ApiLog("房屋 自定义分页")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(houseService.removeByIds(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
index 5e9d4a4..2546aca 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseRentalController.java
@@ -26,10 +26,13 @@
import javax.validation.Valid;
import org.springblade.core.excel.util.ExcelUtil;
+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.secure.utils.AuthUtil;
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.vo.HouseRentalTenantVO;
@@ -58,14 +61,17 @@
public class HouseRentalController extends BladeController {
private final IHouseRentalService houseRentalService;
+ private final BladeLogger bladeLogger;
/**
* 出租屋 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
+ @ApiLog("出租屋 详情")
@ApiOperation(value = "详情", notes = "传入houseRental")
public R<HouseRentalVO> detail(HouseRentalEntity houseRental) {
+ bladeLogger.info("出租屋 详情", JsonUtil.toJson(houseRental));
HouseRentalEntity detail = houseRentalService.getOne(Condition.getQueryWrapper(houseRental));
return R.data(HouseRentalWrapper.build().entityVO(detail));
}
@@ -85,8 +91,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("出租屋 自定义分页")
@ApiOperation(value = "分页", notes = "传入houseRental")
public R<IPage<HouseRentalTenantVO>> page(HouseRentalTenantVO houseRental, Query query) {
+ bladeLogger.info("出租屋 自定义分页", JsonUtil.toJson(houseRental));
IPage<HouseRentalTenantVO> pages = houseRentalService.selectHouseRentalPage(Condition.getPage(query), houseRental);
return R.data(pages);
}
@@ -105,9 +113,11 @@
* 出租屋 自定义新增
*/
@PostMapping("/add")
+ @ApiLog("出租屋 自定义新增")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "自定义新增", notes = "传入houseRentalVo")
public R add(@RequestBody HouseRentalVO houseRentalVO) {
+ bladeLogger.info("出租屋 自定义新增", JsonUtil.toJson(houseRentalVO));
return R.status(houseRentalService.add(houseRentalVO));
}
@@ -127,8 +137,10 @@
* @param houseRental
* @return
*/
+ @ApiLog("出租屋 自定义修改")
@PostMapping("/updateHouseRental")
public R updateHouseRental(@RequestBody HouseRentalVO houseRental) {
+ bladeLogger.info("出租屋 自定义修改", JsonUtil.toJson(houseRental));
return R.status(houseRentalService.updateHouseRental(houseRental));
}
@@ -137,8 +149,10 @@
* @param houseRental
* @return
*/
+ @ApiLog("出租屋 确认")
@PostMapping("/confirmHouseRental")
public R confirmHouseRental(@RequestBody HouseRentalVO houseRental) {
+ bladeLogger.info("出租屋 确认", JsonUtil.toJson(houseRental));
return R.status(houseRentalService.confirmHouseRental(houseRental));
}
@@ -156,9 +170,11 @@
* 出租屋 删除
*/
@PostMapping("/remove")
+ @ApiLog("出租屋 删除")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("出租屋 删除", JsonUtil.toJson(ids));
return R.status(houseRentalService.removeByIds(Func.toLongList(ids)));
}
@@ -168,6 +184,7 @@
* @return
*/
@PostMapping("/removeHouseRental")
+ @ApiLog("出租屋 详情")
public R removeHouseRental(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
return R.status(houseRentalService.removeHouseRental(id));
}
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 6cf350f..9cf38c8 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseholdController.java
@@ -26,10 +26,13 @@
import org.springblade.common.node.TreeIntegerNode;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
+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.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.excel.HouseHoldExcel;
@@ -59,14 +62,17 @@
public class HouseholdController extends BladeController {
private final IHouseholdService householdService;
+ private final BladeLogger bladeLogger;
/**
* 住户 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
+ @ApiLog("住户 详情")
@ApiOperation(value = "详情", notes = "传入household")
public R<HouseholdVO> detail(HouseholdEntity household) {
+ bladeLogger.info("住户 详情", JsonUtil.toJson(household));
HouseholdEntity detail = householdService.getOne(Condition.getQueryWrapper(household));
return R.data(HouseholdWrapper.build().entityVO(detail));
}
@@ -78,8 +84,10 @@
* @return
*/
@GetMapping("/getDetail")
+ @ApiLog("住户 详情")
@ApiOperation(value = "详情", notes = "传入household")
public R getDetail(HouseholdEntity household) {
+ bladeLogger.info("住户 详情", JsonUtil.toJson(household));
return R.data(householdService.getDetail(household));
}
@@ -99,8 +107,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("住户 自定义分页")
@ApiOperation(value = "分页", notes = "传入household")
public R<IPage<HouseholdVO>> page(HouseholdVO household, Query query) {
+ bladeLogger.info("住户 自定义分页", JsonUtil.toJson(household));
IPage<HouseholdVO> pages = householdService.selectHouseholdPage(Condition.getPage(query), household);
return R.data(pages);
}
@@ -110,8 +120,10 @@
*/
@GetMapping("/getKeynotePersonnelPage")
@ApiOperationSupport(order = 3)
+ @ApiLog("住户 自定义分页")
@ApiOperation(value = "分页", notes = "传入household")
public R<IPage<HouseholdVO>> getKeynotePersonnelPage(HouseholdVO household, Query query) {
+ bladeLogger.info("住户 自定义分页", JsonUtil.toJson(household));
IPage<HouseholdVO> pages = householdService.getKeynotePersonnelPage(Condition.getPage(query), household);
return R.data(pages);
}
@@ -121,8 +133,10 @@
*/
@GetMapping("/getlabelStatistics")
@ApiOperationSupport(order = 3)
+ @ApiLog("住户标签统计")
@ApiOperation(value = "住户标签统计", notes = "传入household")
public R<List<TreeIntegerNode>> getlabelStatistics(HouseholdVO household) {
+ bladeLogger.info("住户标签统计", JsonUtil.toJson(household));
List<TreeIntegerNode> pages = householdService.getlabelStatistics(household);
return R.data(pages);
}
@@ -135,7 +149,9 @@
* @return
*/
@GetMapping("/selectHouseholdList")
+ @ApiLog("住户列表查询")
public R selectHouseholdList(HouseholdVO household) {
+ bladeLogger.info("住户列表查询", JsonUtil.toJson(household));
return R.data(householdService.selectHouseholdList(household));
}
@@ -176,8 +192,10 @@
* @return
*/
@PostMapping("/saveOrUpdateHousehold")
+ @ApiLog("住户 自定义新增或修改")
@ApiOperation(value = "自定义新增或修改", notes = "传入household")
public R saveOrUpdateHousehold(@Valid @RequestBody HouseholdVO household) {
+ bladeLogger.info("住户 自定义新增或修改", JsonUtil.toJson(household));
return R.status(householdService.saveOrUpdateHousehold(household));
}
@@ -186,9 +204,11 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("住户 删除")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
@Transactional(rollbackFor = Exception.class)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("住户 删除", JsonUtil.toJson(ids));
// 返回
return R.status(householdService.removeHousehold(ids));
}
@@ -199,6 +219,7 @@
*/
@PostMapping("/statistics")
@ApiOperationSupport(order = 7)
+ @ApiLog("住户审核统计")
@ApiOperation(value = "住户审核统计", notes = "网格员调用")
public R getStatistics() {
return R.data(householdService.statistics(AuthUtil.getUserId(), "",0));
@@ -236,8 +257,10 @@
*/
@GetMapping("/getHouseholdOtherInfo")
@ApiOperationSupport(order = 14)
+ @ApiLog("住户对应物业，网格，公安负责人查询")
@ApiOperation(value = "住户对应物业，网格，公安负责人查询", notes = "住户对应物业，网格，公安负责人查询")
public R getHouseholdOtherInfo(HouseholdVO household) {
+ bladeLogger.info("住户对应物业，网格，公安负责人查询", JsonUtil.toJson(household));
return R.data(householdService.getHouseholdOtherInfo(household));
}
@@ -250,6 +273,7 @@
*/
@GetMapping("/getHouseHoldStatistics")
@ApiOperationSupport(order = 14)
+ @ApiLog("e呼即办表 详情")
@ApiOperation(value = "用户信息统计", notes = " ")
public R getHouseHoldStatistics(@RequestParam("code") String code, @RequestParam("roleType") String roleType) {
return R.data(householdService.getHouseHoldStatistics(code, roleType));
@@ -282,7 +306,9 @@
*/
@GetMapping("/getUserInfoByDistrictIds")
@ApiOperation(value = "通过小区id查询用户")
+ @ApiLog("通过小区id查询用户")
public R<IPage<HouseholdVO>> getUserInfoByDistrictIds(Query query,HouseholdVO householdVO) {
+ bladeLogger.info("通过小区id查询用户", JsonUtil.toJson(householdVO));
IPage<HouseholdVO> pages = householdService.getUserInfoByDistrictIds(householdVO, Condition.getPage(query));
return R.data(pages);
}
diff --git a/src/main/java/org/springblade/modules/place/controller/PlaceExtController.java b/src/main/java/org/springblade/modules/place/controller/PlaceExtController.java
index 457a979..f4b3012 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlaceExtController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlaceExtController.java
@@ -23,10 +23,13 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.logger.BladeLogger;
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.jackson.JsonUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,6 +52,7 @@
public class PlaceExtController{
private final IPlaceExtService placeExtService;
+ private final BladeLogger bladeLogger;
/**
* 场所详情表 详情
@@ -69,7 +73,9 @@
*/
@GetMapping("/getDetail")
@ApiOperation(value = "自定义详情", notes = "传入placeExt")
+ @ApiLog("场所详情表 自定义详情")
public R<PlaceExtVO> getDetail(PlaceExtVO placeExt) {
+ bladeLogger.info("场所详情表 自定义详情", JsonUtil.toJson(placeExt));
return R.data(placeExtService.getDetail(placeExt));
}
@@ -89,8 +95,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("场所详情表 自定义分页")
@ApiOperation(value = "分页", notes = "传入placeExt")
public R<IPage<PlaceExtVO>> page(PlaceExtVO placeExt, Query query) {
+ bladeLogger.info("场所详情表 自定义分页", JsonUtil.toJson(placeExt));
IPage<PlaceExtVO> pages = placeExtService.selectPlaceExtPage(Condition.getPage(query), placeExt);
return R.data(pages);
}
@@ -121,8 +129,10 @@
* @return
*/
@PostMapping("/updatePlaceExt")
+ @ApiLog("场所详情表 自定义更新")
@ApiOperation(value = "自定义更新", notes = "传入placeExt")
public R updatePlaceExt(@RequestBody PlaceExtVO placeExt) {
+ bladeLogger.info("场所详情表 自定义更新", JsonUtil.toJson(placeExt));
return R.status(placeExtService.updatePlaceExt(placeExt));
}
@@ -132,8 +142,10 @@
* @return
*/
@PostMapping("/checkPlaceExt")
+ @ApiLog("场所详情表 审核")
@ApiOperation(value = "审核", notes = "传入placeExt")
public R checkPlaceExt(@RequestBody PlaceExtEntity placeExt) {
+ bladeLogger.info("场所详情表 审核", JsonUtil.toJson(placeExt));
return R.status(placeExtService.checkPlaceExt(placeExt));
}
@@ -152,8 +164,10 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("场所详情表 删除")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("场所详情表 删除", JsonUtil.toJson(ids));
return R.status(placeExtService.removeByIds(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java b/src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java
index cc9fc78..89b8e0e 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlacePractitionerController.java
@@ -25,10 +25,13 @@
import javax.validation.Valid;
import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.logger.BladeLogger;
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.jackson.JsonUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
@@ -54,6 +57,7 @@
public class PlacePractitionerController {
private final IPlacePractitionerService placePractitionerService;
+ private final BladeLogger bladeLogger;
/**
* 场所从业人员 详情
@@ -81,9 +85,11 @@
* 场所从业人员 自定义分页
*/
@GetMapping("/page")
+ @ApiLog("场所从业人员 自定义分页")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入placePractitioner")
public R<IPage<PlacePractitionerVO>> page(PlacePractitionerVO placePractitioner, Query query) {
+ bladeLogger.info("场所从业人员 自定义分页", JsonUtil.toJson(placePractitioner));
IPage<PlacePractitionerVO> pages = placePractitionerService.selectPlacePractitionerPage(Condition.getPage(query), placePractitioner);
return R.data(pages);
}
@@ -113,8 +119,10 @@
*/
@PostMapping("/auditing")
@ApiOperationSupport(order = 5)
+ @ApiLog("场所从业人员 修改")
@ApiOperation(value = "修改", notes = "传入placePractitioner")
public R auditing(@Valid @RequestBody PlacePractitionerEntity placePractitioner) {
+ bladeLogger.info("场所从业人员 修改", JsonUtil.toJson(placePractitioner));
return R.status(placePractitionerService.auditing(placePractitioner));
}
@@ -133,8 +141,10 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("场所从业人员 删除")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("场所从业人员 删除", JsonUtil.toJson(ids));
return R.status(placePractitionerService.removeByIds(Func.toLongList(ids)));
}
@@ -143,8 +153,10 @@
*/
@GetMapping("/countByType")
@ApiOperationSupport(order = 8)
+ @ApiLog("统计少数民族和未成年数量")
@ApiOperation(value = "统计少数民族和未成年数量", notes = "")
public R countByType(PlacePractitionerVO placePractitioner) {
+ bladeLogger.info("统计少数民族和未成年数量", JsonUtil.toJson(placePractitioner));
return R.data(placePractitionerService.countByType(placePractitioner));
}
diff --git a/src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java b/src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java
index 123cc1b..57ab702 100644
--- a/src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java
+++ b/src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java
@@ -23,9 +23,12 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+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.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -48,6 +51,7 @@
public class PoliceAlarmRecordsController extends BladeController {
private final IPoliceAlarmRecordsService policeAlarmRecordsService;
+ private final BladeLogger bladeLogger;
/**
* 报警记录 详情
@@ -74,9 +78,11 @@
* 报警记录 自定义分页
*/
@GetMapping("/page")
+ @ApiLog("报警记录 自定义分页")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入policeAlarmRecords")
public R<IPage<PoliceAlarmRecordsVO>> page(PoliceAlarmRecordsVO policeAlarmRecords, Query query) {
+ bladeLogger.info("报警记录 自定义分页", JsonUtil.toJson(policeAlarmRecords));
IPage<PoliceAlarmRecordsVO> pages = policeAlarmRecordsService.selectPoliceAlarmRecordsPage(Condition.getPage(query), policeAlarmRecords);
return R.data(pages);
}
@@ -86,8 +92,10 @@
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
+ @ApiLog("报警记录 新增")
@ApiOperation(value = "新增", notes = "传入policeAlarmRecords")
public R save(@Valid @RequestBody PoliceAlarmRecordsEntity policeAlarmRecords) {
+ bladeLogger.info("报警记录 新增", JsonUtil.toJson(policeAlarmRecords));
return R.status(policeAlarmRecordsService.savePoliceAlarmRecordsEntity(policeAlarmRecords));
}
@@ -95,9 +103,11 @@
* 报警记录 修改
*/
@PostMapping("/update")
+ @ApiLog("报警记录 修改")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入policeAlarmRecords")
public R update(@Valid @RequestBody PoliceAlarmRecordsEntity policeAlarmRecords) {
+ bladeLogger.info("报警记录 修改", JsonUtil.toJson(policeAlarmRecords));
return R.status(policeAlarmRecordsService.updateById(policeAlarmRecords));
}
@@ -116,8 +126,10 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("报警记录 删除")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("报警记录 删除", JsonUtil.toJson(ids));
return R.status(policeAlarmRecordsService.removeBatchByIds(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 030aff1..819f1d2 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -27,9 +27,12 @@
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import org.springblade.common.cache.CacheNames;
+import org.springblade.common.param.ToObject;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.launch.constant.AppConstant;
+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.redis.cache.BladeRedis;
@@ -40,6 +43,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
+import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
@@ -81,6 +85,7 @@
private final IUserService userService;
private final BladeRedis bladeRedis;
+ private final BladeLogger bladeLogger;
/**
* 查询单条
@@ -163,7 +168,9 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
// @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ @ApiLog("自定义用户列表")
public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, String deptId, BladeUser bladeUser) {
+ bladeLogger.info("自定义用户列表", JsonUtil.toJson(user));
IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -185,9 +192,11 @@
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 4)
+ @ApiLog("新增或修改")
@ApiOperation(value = "新增或修改", notes = "传入User")
@PreAuth("hasAnyRole('administrator', 'admin','wygly')")
public R submit(@Valid @RequestBody User user) {
+ bladeLogger.info("新增或修改", JsonUtil.toJson(user));
CacheUtil.clear(USER_CACHE);
return R.status(userService.submit(user));
}
@@ -197,8 +206,10 @@
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
+ @ApiLog("修改")
@ApiOperation(value = "修改", notes = "传入User")
public R update(@Valid @RequestBody User user) {
+ bladeLogger.info("修改", JsonUtil.toJson(user));
CacheUtil.clear(USER_CACHE);
CacheUtil.clear(SYS_CACHE);
return R.status(userService.updateUser(user));
@@ -211,7 +222,9 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "删除", notes = "传入id集合")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ @ApiLog("删除")
public R remove(@RequestParam String ids) {
+ bladeLogger.info("删除", JsonUtil.toJson(ids));
CacheUtil.clear(USER_CACHE);
return R.status(userService.removeUser(ids));
}
@@ -221,10 +234,12 @@
*/
@PostMapping("/grant")
@ApiOperationSupport(order = 7)
+ @ApiLog("设置菜单权限")
@ApiOperation(value = "权限设置", notes = "传入roleId集合以及menuId集合")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R grant(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds,
@ApiParam(value = "roleId集合", required = true) @RequestParam String roleIds) {
+ bladeLogger.info("设置菜单权限", JsonUtil.toJson(userIds));
boolean temp = userService.grant(userIds, roleIds);
return R.status(temp);
}
@@ -235,8 +250,10 @@
@PostMapping("/reset-password")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "初始化密码", notes = "传入userId集合")
+ @ApiLog("重置密码")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R resetPassword(@ApiParam(value = "userId集合", required = true) @RequestParam String userIds) {
+ bladeLogger.info("重置密码", JsonUtil.toJson(userIds));
boolean temp = userService.resetPassword(userIds);
return R.status(temp);
}
@@ -246,10 +263,12 @@
*/
@PostMapping("/update-password")
@ApiOperationSupport(order = 9)
+ @ApiLog("修改密码")
@ApiOperation(value = "修改密码", notes = "传入密码")
public R updatePassword(BladeUser user, @ApiParam(value = "旧密码", required = true) @RequestParam String oldPassword,
@ApiParam(value = "新密码", required = true) @RequestParam String newPassword,
@ApiParam(value = "新密码", required = true) @RequestParam String newPassword1) {
+ bladeLogger.info("修改密码", JsonUtil.toJson(ToObject.toMap("oldPassword:" + oldPassword,"newPassword:" + newPassword,"newPassword1:" + newPassword1)));
boolean temp = userService.updatePassword(user.getUserId(), oldPassword, newPassword, newPassword1);
return R.status(temp);
}
@@ -258,9 +277,11 @@
* 修改基本信息
*/
@PostMapping("/update-info")
+ @ApiLog("自定义用户列表")
@ApiOperationSupport(order = 10)
@ApiOperation(value = "修改基本信息", notes = "传入User")
public R updateInfo(@Valid @RequestBody User user) {
+ bladeLogger.info("修改基本信息", JsonUtil.toJson(user));
CacheUtil.clear(USER_CACHE);
return R.status(userService.updateUserInfo(user));
}
@@ -282,6 +303,7 @@
*/
@PostMapping("import-user")
@ApiOperationSupport(order = 12)
+ @ApiLog("导入用户")
@ApiOperation(value = "导入用户", notes = "传入excel")
public R importUser(MultipartFile file, Integer isCovered) {
UserImporter userImporter = new UserImporter(userService, isCovered == 1);
@@ -293,9 +315,11 @@
* 导出用户
*/
@GetMapping("export-user")
+ @ApiLog("导出用户")
@ApiOperationSupport(order = 13)
@ApiOperation(value = "导出用户", notes = "传入user")
public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
+ bladeLogger.info("导出用户", JsonUtil.toJson(bladeUser));
QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
if (!AuthUtil.isAdministrator()) {
queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId());
@@ -371,8 +395,10 @@
*/
@PostMapping("/unlock")
@ApiOperationSupport(order = 19)
+ @ApiLog("用户解锁")
@ApiOperation(value = "账号解锁", notes = "传入id")
public R unlock(String userIds) {
+ bladeLogger.info("用户解锁", JsonUtil.toJson(userIds));
if (StringUtil.isBlank(userIds)) {
return R.fail("请至少选择一个用户");
}
@@ -456,8 +482,10 @@
* latitude
*/
@GetMapping("/getPoliceUser")
+ @ApiLog("通过经纬度查询最近的民警人员")
@ApiOperation(value = "通过经纬度查询最近的民警人员")
public R getPoliceUser(@RequestParam("longitude") String longitude, @RequestParam(value = "latitude") String latitude, @RequestParam(value = "houseCode", required = false) String houseCode) {
+ bladeLogger.info("通过经纬度查询最近的民警人员", JsonUtil.toJson(ToObject.toMap("longitude:" + longitude,"latitude:" + latitude,"houseCode:" + houseCode)));
return R.data(userService.getPoliceUser(longitude, latitude, houseCode));
}
diff --git a/src/main/java/org/springblade/modules/task/controller/ECallEventController.java b/src/main/java/org/springblade/modules/task/controller/ECallEventController.java
index 86be4c6..6379176 100644
--- a/src/main/java/org/springblade/modules/task/controller/ECallEventController.java
+++ b/src/main/java/org/springblade/modules/task/controller/ECallEventController.java
@@ -7,9 +7,12 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+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.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -31,6 +34,7 @@
public class ECallEventController {
private final IECallEventService eCallEventService;
+ private final BladeLogger bladeLogger;
/**
* e呼即办表 详情
@@ -38,7 +42,9 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入eCallEvent")
+ @ApiLog("e呼即办表 详情")
public R<ECallEventVO> detail(ECallEventEntity eCallEvent) {
+ bladeLogger.info("e呼即办表 详情", JsonUtil.toJson(eCallEvent));
ECallEventEntity detail = eCallEventService.getOne(Condition.getQueryWrapper(eCallEvent));
return R.data(ECallEventWrapper.build().entityVO(detail));
}
@@ -58,8 +64,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("e呼即办表 自定义分页")
@ApiOperation(value = "分页", notes = "传入eCallEvent")
public R<IPage<ECallEventVO>> page(ECallEventVO eCallEvent, Query query) {
+ bladeLogger.info("e呼即办表 自定义分页", JsonUtil.toJson(eCallEvent));
IPage<ECallEventVO> pages = eCallEventService.selectECallEventPage(Condition.getPage(query), eCallEvent);
return R.data(pages);
}
@@ -69,8 +77,10 @@
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
+ @ApiLog("e呼即办表 新增")
@ApiOperation(value = "新增", notes = "传入eCallEvent")
public R save(@Valid @RequestBody ECallEventEntity eCallEvent) {
+ bladeLogger.info("e呼即办表 新增", JsonUtil.toJson(eCallEvent));
return R.status(eCallEventService.save(eCallEvent));
}
@@ -78,9 +88,11 @@
* e呼即办表 修改
*/
@PostMapping("/update")
+ @ApiLog("e呼即办表 修改")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入eCallEvent")
public R update(@Valid @RequestBody ECallEventEntity eCallEvent) {
+ bladeLogger.info("e呼即办表 修改", JsonUtil.toJson(eCallEvent));
return R.status(eCallEventService.updateById(eCallEvent));
}
@@ -98,9 +110,11 @@
* e呼即办表 删除
*/
@PostMapping("/remove")
+ @ApiLog("e呼即办表 删除")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("e呼即办表 删除", JsonUtil.toJson(ids));
return R.status(eCallEventService.removeByIds(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java b/src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java
index d633538..62df29c 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskBailReportingEventController.java
@@ -24,9 +24,12 @@
import lombok.AllArgsConstructor;
import org.apache.commons.beanutils.BeanUtils;
import org.springblade.core.boot.ctrl.BladeController;
+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.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.task.dto.TaskBailReportingEventDTO;
@@ -51,14 +54,17 @@
public class TaskBailReportingEventController extends BladeController {
private final ITaskBailReportingEventService taskBailReportingEventService;
+ private final BladeLogger bladeLogger;
/**
* 取保候审任务 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
+ @ApiLog("取保候审任务 详情")
@ApiOperation(value = "详情", notes = "传入taskBailReportingEvent")
public R<TaskBailReportingEventVO> detail(TaskBailReportingEventEntity taskBailReportingEvent) {
+ bladeLogger.info("取保候审任务 详情", JsonUtil.toJson(taskBailReportingEvent));
TaskBailReportingEventEntity detail = taskBailReportingEventService.getOne(Condition.getQueryWrapper(taskBailReportingEvent));
TaskBailReportingEventVO copy = BeanUtil.copy(detail, TaskBailReportingEventVO.class);
return R.data(copy);
@@ -79,8 +85,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("取保候审任务 自定义分页")
@ApiOperation(value = "分页", notes = "传入taskBailReportingEvent")
public R<IPage<TaskBailReportingEventVO>> page(TaskBailReportingEventVO taskBailReportingEvent, Query query) {
+ bladeLogger.info("取保候审任务 自定义分页", JsonUtil.toJson(taskBailReportingEvent));
IPage<TaskBailReportingEventVO> pages = taskBailReportingEventService.selectTaskBailReportingEventPage(Condition.getPage(query), taskBailReportingEvent);
return R.data(pages);
}
@@ -90,8 +98,10 @@
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
+ @ApiLog("取保候审任务 新增")
@ApiOperation(value = "新增", notes = "传入taskBailReportingEvent")
public R save(@Valid @RequestBody TaskBailReportingEventDTO taskBailReportingEvent) {
+ bladeLogger.info("取保候审任务 新增", JsonUtil.toJson(taskBailReportingEvent));
return R.status(taskBailReportingEventService.saveBailReporting(taskBailReportingEvent));
}
@@ -100,8 +110,10 @@
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
+ @ApiLog("取保候审任务 修改")
@ApiOperation(value = "修改", notes = "传入taskBailReportingEvent")
public R update(@Valid @RequestBody TaskBailReportingEventEntity taskBailReportingEvent) throws Exception {
+ bladeLogger.info("取保候审任务 修改", JsonUtil.toJson(taskBailReportingEvent));
return R.status(taskBailReportingEventService.updateBailReporting(taskBailReportingEvent));
}
@@ -110,8 +122,10 @@
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
+ @ApiLog("取保候审任务 新增或修改")
@ApiOperation(value = "新增或修改", notes = "传入taskBailReportingEvent")
public R submit(@Valid @RequestBody TaskBailReportingEventEntity taskBailReportingEvent) {
+ bladeLogger.info("取保候审任务 新增或修改", JsonUtil.toJson(taskBailReportingEvent));
return R.status(taskBailReportingEventService.saveOrUpdate(taskBailReportingEvent));
}
@@ -120,8 +134,10 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("取保候审任务 删除")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("取保候审任务 删除", JsonUtil.toJson(ids));
return R.status(taskBailReportingEventService.deleteLogic(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java b/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
index 7fc3e08..7302bcc 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskLabelReportingEventController.java
@@ -24,9 +24,12 @@
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
+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.place.excel.PlaceCheckExcel;
@@ -56,14 +59,17 @@
public class TaskLabelReportingEventController extends BladeController {
private final ITaskLabelReportingEventService taskLabelReportingEventService;
+ private final BladeLogger bladeLogger;
/**
- * 打金店报事 详情
+ * 二手交易报事 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
+ @ApiLog("二手交易报事 详情")
@ApiOperation(value = "详情", notes = "传入taskLabelReportingEvent")
public R detail(TaskLabelReportingEventEntity taskLabelReportingEvent) {
+ bladeLogger.info("二手交易报事 详情", JsonUtil.toJson(taskLabelReportingEvent));
TaskLabelReportingEventEntity detail = taskLabelReportingEventService.getOne(Condition.getQueryWrapper(taskLabelReportingEvent));
return R.data(detail);
}
@@ -83,8 +89,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("二手交易报事 自定义分页")
@ApiOperation(value = "分页", notes = "传入taskLabelReportingEvent")
public R<IPage<TaskLabelReportingEventVO>> page(TaskLabelReportingEventVO taskLabelReportingEvent, Query query) {
+ bladeLogger.info("二手交易报事 自定义分页", JsonUtil.toJson(taskLabelReportingEvent));
IPage<TaskLabelReportingEventVO> pages = taskLabelReportingEventService.selectTaskLabelReportingEventPage(Condition.getPage(query), taskLabelReportingEvent);
return R.data(pages);
}
@@ -94,8 +102,10 @@
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
+ @ApiLog("二手交易报事 新增")
@ApiOperation(value = "新增", notes = "传入taskLabelReportingEvent")
public R save(@Valid @RequestBody TaskLabelReportingEventDTO taskLabelReportingEvent) {
+ bladeLogger.info("二手交易报事 新增", JsonUtil.toJson(taskLabelReportingEvent));
return R.status(taskLabelReportingEventService.saveReportingEven(taskLabelReportingEvent));
}
@@ -104,8 +114,10 @@
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
+ @ApiLog("二手交易报事 修改")
@ApiOperation(value = "修改", notes = "传入taskLabelReportingEvent")
public R update(@Valid @RequestBody TaskLabelReportingEventVO taskLabelReportingEvent) throws Exception {
+ bladeLogger.info("二手交易报事 修改", JsonUtil.toJson(taskLabelReportingEvent));
return R.status(taskLabelReportingEventService.updateLabelReporting(taskLabelReportingEvent));
}
@@ -114,8 +126,10 @@
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
+ @ApiLog("二手交易报事 新增或修改")
@ApiOperation(value = "新增或修改", notes = "传入taskLabelReportingEvent")
public R submit(@Valid @RequestBody TaskLabelReportingEventEntity taskLabelReportingEvent) {
+ bladeLogger.info("二手交易报事 新增或修改", JsonUtil.toJson(taskLabelReportingEvent));
return R.status(taskLabelReportingEventService.saveOrUpdate(taskLabelReportingEvent));
}
@@ -124,8 +138,10 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("二手交易报事 删除")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("二手交易报事 删除", JsonUtil.toJson(ids));
return R.status(taskLabelReportingEventService.removeTaskByIds(Func.toLongList(ids)));
}
@@ -134,9 +150,11 @@
* @param taskLabelReportingEvent
*/
@GetMapping("export-taskLabelReportingEvent")
+ @ApiLog("导出二手交易信息")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "导出交易登记信息", notes = "传入taskLabelReportingEvent")
public void exportTaskLabelReportingEvent(TaskLabelReportingEventVO taskLabelReportingEvent, HttpServletResponse response) {
+ bladeLogger.info("导出二手交易信息", JsonUtil.toJson(taskLabelReportingEvent));
List<TaskLabelReportingEventExcel> list = taskLabelReportingEventService.exportTaskLabelReportingEvent(taskLabelReportingEvent);
ExcelUtil.export(response, "交易登记" + DateUtil.time(), "交易登记表", list, TaskLabelReportingEventExcel.class);
}
@@ -146,9 +164,11 @@
* 二手交易报事 详情
*/
@GetMapping("/getDetail")
+ @ApiLog("二手交易报事 详情")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "详情", notes = "传入taskLabelReportingEvent")
public R getDetail(TaskLabelReportingEventVO taskLabelReportingEvent) {
+ bladeLogger.info("二手交易报事 详情", JsonUtil.toJson(taskLabelReportingEvent));
TaskLabelReportingEventVO detail = taskLabelReportingEventService.getDetail(taskLabelReportingEvent);
return R.data(detail);
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskPlaceRecordController.java b/src/main/java/org/springblade/modules/task/controller/TaskPlaceRecordController.java
index ff5c415..8efd164 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskPlaceRecordController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskPlaceRecordController.java
@@ -23,9 +23,12 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+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.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -48,14 +51,17 @@
public class TaskPlaceRecordController extends BladeController {
private final ITaskPlaceRecordService taskPlaceRecordService;
+ private final BladeLogger bladeLogger;
/**
* 消防自查详情记录表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
+ @ApiLog("消防自查详情记录表 详情")
@ApiOperation(value = "详情", notes = "传入taskPlaceRecord")
public R<TaskPlaceRecordVO> detail(TaskPlaceRecordEntity taskPlaceRecord) {
+ bladeLogger.info("消防自查详情记录表 详情", JsonUtil.toJson(taskPlaceRecord));
TaskPlaceRecordEntity detail = taskPlaceRecordService.getOne(Condition.getQueryWrapper(taskPlaceRecord));
return R.data(TaskPlaceRecordWrapper.build().entityVO(detail));
}
@@ -75,8 +81,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("消防自查详情记录表 自定义分页")
@ApiOperation(value = "分页", notes = "传入taskPlaceRecord")
public R<IPage<TaskPlaceRecordVO>> page(TaskPlaceRecordVO taskPlaceRecord, Query query) {
+ bladeLogger.info("消防自查详情记录表 自定义分页", JsonUtil.toJson(taskPlaceRecord));
IPage<TaskPlaceRecordVO> pages = taskPlaceRecordService.selectTaskPlaceRecordPage(Condition.getPage(query), taskPlaceRecord);
return R.data(pages);
}
@@ -86,8 +94,10 @@
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
+ @ApiLog("消防自查详情记录表 新增")
@ApiOperation(value = "新增", notes = "传入taskPlaceRecord")
public R save(@Valid @RequestBody TaskPlaceRecordEntity taskPlaceRecord) {
+ bladeLogger.info("消防自查详情记录表 新增", JsonUtil.toJson(taskPlaceRecord));
return R.status(taskPlaceRecordService.save(taskPlaceRecord));
}
@@ -96,8 +106,10 @@
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
+ @ApiLog("消防自查详情记录表 修改")
@ApiOperation(value = "修改", notes = "传入taskPlaceRecord")
public R update(@Valid @RequestBody TaskPlaceRecordEntity taskPlaceRecord) {
+ bladeLogger.info("消防自查详情记录表 修改", JsonUtil.toJson(taskPlaceRecord));
return R.status(taskPlaceRecordService.updateById(taskPlaceRecord));
}
@@ -106,8 +118,10 @@
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
+ @ApiLog("消防自查详情记录表 新增或修改")
@ApiOperation(value = "新增或修改", notes = "传入taskPlaceRecord")
public R submit(@Valid @RequestBody TaskPlaceRecordEntity taskPlaceRecord) {
+ bladeLogger.info("消防自查详情记录表 新增或修改", JsonUtil.toJson(taskPlaceRecord));
return R.status(taskPlaceRecordService.saveOrUpdate(taskPlaceRecord));
}
@@ -116,8 +130,10 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("消防自查详情记录表 删除")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("消防自查详情记录表 删除", JsonUtil.toJson(ids));
return R.status(taskPlaceRecordService.removeBatchByIds(Func.toLongList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskPlaceRectificationController.java b/src/main/java/org/springblade/modules/task/controller/TaskPlaceRectificationController.java
index 1d43b60..930d8de 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskPlaceRectificationController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskPlaceRectificationController.java
@@ -26,9 +26,12 @@
import javax.validation.Valid;
import org.springblade.core.excel.util.ExcelUtil;
+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.task.dto.TaskPlaceRectificationDTO;
@@ -60,14 +63,17 @@
public class TaskPlaceRectificationController extends BladeController {
private final ITaskPlaceRectificationService taskPlaceRectificationService;
+ private final BladeLogger bladeLogger;
/**
* 场所整改任务表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
+ @ApiLog("场所整改任务表 详情")
@ApiOperation(value = "详情", notes = "传入taskPlaceRectification")
public R<TaskPlaceRectificationVO> detail(TaskPlaceRectificationEntity taskPlaceRectification) {
+ bladeLogger.info("场所整改任务表 详情", JsonUtil.toJson(taskPlaceRectification));
TaskPlaceRectificationEntity detail = taskPlaceRectificationService.getOne(Condition.getQueryWrapper(taskPlaceRectification));
return R.data(TaskPlaceRectificationWrapper.build().entityVO(detail));
}
@@ -87,9 +93,11 @@
* 场所整改任务表 自定义分页
*/
@GetMapping("/page")
+ @ApiLog("场所整改任务表 自定义分页")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入taskPlaceRectification")
public R<IPage<TaskPlaceRectificationVO>> page(TaskPlaceRectificationVO taskPlaceRectification, Query query) {
+ bladeLogger.info("场所整改任务表 自定义分页", JsonUtil.toJson(taskPlaceRectification));
IPage<TaskPlaceRectificationVO> pages = taskPlaceRectificationService.selectTaskPlaceRectificationPage(Condition.getPage(query), taskPlaceRectification);
return R.data(pages);
}
@@ -98,9 +106,11 @@
* 场所整改任务表 新增
*/
@PostMapping("/save")
+ @ApiLog("场所整改任务表 新增")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入taskPlaceRectification")
public R save(@Valid @RequestBody TaskPlaceRectificationEntity taskPlaceRectification) {
+ bladeLogger.info("场所整改任务表 新增", JsonUtil.toJson(taskPlaceRectification));
return R.status(taskPlaceRectificationService.save(taskPlaceRectification));
}
@@ -108,9 +118,11 @@
* 场所整改任务表 修改
*/
@PostMapping("/update")
+ @ApiLog("场所整改任务表 修改")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入taskPlaceRectification")
public R update(@Valid @RequestBody TaskPlaceRectificationEntity taskPlaceRectification) {
+ bladeLogger.info("场所整改任务表 修改", JsonUtil.toJson(taskPlaceRectification));
return R.status(taskPlaceRectificationService.updateById(taskPlaceRectification));
}
@@ -118,9 +130,11 @@
* 场所整改任务表 新增或修改
*/
@PostMapping("/submit")
+ @ApiLog("场所整改任务表 新增或修改")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入taskPlaceRectification")
public R submit(@Valid @RequestBody TaskPlaceRectificationEntity taskPlaceRectification) {
+ bladeLogger.info("场所整改任务表 新增或修改", JsonUtil.toJson(taskPlaceRectification));
return R.status(taskPlaceRectificationService.saveOrUpdate(taskPlaceRectification));
}
@@ -128,9 +142,11 @@
* 场所整改任务表 删除
*/
@PostMapping("/remove")
+ @ApiLog("场所整改任务表 详情")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("场所整改任务表 删除", JsonUtil.toJson(ids));
return R.status(taskPlaceRectificationService.removeBatchByIds(Func.toLongList(ids)));
}
@@ -138,9 +154,11 @@
* 场所整改任务表 详情
*/
@GetMapping("/detailByTaskId")
+ @ApiLog("场所整改任务表 详情")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入taskPlaceRectification")
public R<TaskPlaceRectificationVO> detailById(TaskPlaceRectificationEntity taskPlaceRectification) {
+ bladeLogger.info("场所整改任务表 详情", JsonUtil.toJson(taskPlaceRectification));
TaskPlaceRectificationEntity detail = taskPlaceRectificationService.selectTaskPlaceRectificationById(taskPlaceRectification.getTaskId());
return R.data(TaskPlaceRectificationWrapper.build().entityVO(detail));
}
@@ -150,9 +168,11 @@
* 场所整改任务表 详情
*/
@GetMapping("/getTaskPlaceRectificationList")
+ @ApiLog("场所整改任务表 详情")
@ApiOperationSupport(order = 1)
- @ApiOperation(value = "消防隐患整改情况登记表", notes = "传入taskPlaceRectification")
+ @ApiOperation(value = "场所整改任务表 详情", notes = "传入taskPlaceRectification")
public R<IPage<TaskPlaceRectificationVO>> getTaskPlaceRectificationList(TaskPlaceRectificationDTO taskPlaceRectification, Query query) {
+ bladeLogger.info("场所整改任务表 详情", JsonUtil.toJson(taskPlaceRectification));
IPage<TaskPlaceRectificationVO> taskPlaceRectificationDTOS = taskPlaceRectificationService.selectTaskPlaceRectificationList(Condition.getPage(query), taskPlaceRectification);
return R.data(taskPlaceRectificationDTOS);
}
@@ -162,9 +182,11 @@
* 场所整改任务表 修改
*/
@PostMapping("/updateRectification")
+ @ApiLog("场所整改任务表 修改")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "场所负责人整改", notes = "传入taskPlaceRectification")
public R updateRectification(@Valid @RequestBody TaskPlaceRectificationVO taskPlaceRectification) {
+ bladeLogger.info("场所整改任务表 修改", JsonUtil.toJson(taskPlaceRectification));
return R.status(taskPlaceRectificationService.updateRectification(taskPlaceRectification));
}
@@ -172,9 +194,11 @@
* 民警审核
*/
@PostMapping("/applyRectification")
+ @ApiLog("民警审核")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "民警审核", notes = "传入taskPlaceRectification")
public R applyRectification(@Valid @RequestBody TaskPlaceRectificationVO taskPlaceRectification) {
+ bladeLogger.info("民警审核", JsonUtil.toJson(taskPlaceRectification));
return R.status(taskPlaceRectificationService.applyRectification(taskPlaceRectification));
}
@@ -183,19 +207,23 @@
* 民警审核
*/
@PostMapping("/rectificationStatistics")
+ @ApiLog("民警审核")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "九小场所类型隐患数量统计", notes = "传入taskPlaceRectification")
public R rectificationStatistics(@Valid @RequestBody TaskPlaceRectificationVO taskPlaceRectification) {
+ bladeLogger.info("民警审核", JsonUtil.toJson(taskPlaceRectification));
return R.data(taskPlaceRectificationService.rectificationStatistics(taskPlaceRectification));
}
/**
- * 导出房屋
+ * 导出场所整改任务
*/
@GetMapping("exportRectificationStatistics")
+ @ApiLog("导出场所整改任务")
@ApiOperationSupport(order = 13)
@ApiOperation(value = "导出整改统计", notes = "传入user")
public void exportHouse(TaskPlaceRectificationsVO taskPlaceRectificationVO, HttpServletResponse response) {
+ bladeLogger.info("导出场所整改任务", JsonUtil.toJson(taskPlaceRectificationVO));
List<TaskPlaceRectificationExcel> list = taskPlaceRectificationService.export(taskPlaceRectificationVO);
ExcelUtil.export(response, "整改数据" + DateUtil.time(), "场所数据表", list, TaskPlaceRectificationExcel.class);
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskPlaceSelfCheckController.java b/src/main/java/org/springblade/modules/task/controller/TaskPlaceSelfCheckController.java
index 63ee3e1..0d21532 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskPlaceSelfCheckController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskPlaceSelfCheckController.java
@@ -26,9 +26,12 @@
import javax.validation.Valid;
import org.springblade.core.excel.util.ExcelUtil;
+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.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
@@ -57,14 +60,17 @@
public class TaskPlaceSelfCheckController extends BladeController {
private final ITaskPlaceSelfCheckService taskPlaceSelfCheckService;
+ private final BladeLogger bladeLogger;
/**
* 获取消防自查记任务表详细信息
*/
@ApiOperation("获取消防自查记任务表详细信息")
+ @ApiLog("获取消防自查记任务表详细信息")
@GetMapping(value = "/getInfo")
public R<TaskPlaceSelfCheckVO> getInfo(TaskPlaceSelfCheckEntity taskPlaceSelfCheck){
+ bladeLogger.info("获取消防自查记任务表详细信息", JsonUtil.toJson(taskPlaceSelfCheck));
TaskPlaceSelfCheckDTO taskPlaceSelfCheckDTO = taskPlaceSelfCheckService.selectTaskPlaceSelfCheckById(taskPlaceSelfCheck);
TaskPlaceSelfCheckVO taskPlaceSelfCheckDetailVO = BeanUtil.copy(taskPlaceSelfCheckDTO, TaskPlaceSelfCheckVO.class);
return R.data(taskPlaceSelfCheckDetailVO);
@@ -82,12 +88,14 @@
}
/**
- * 消防自查记任务表 自定义详情
+ * 获取消防自查记任务表详细信息
*/
@GetMapping("/detailByTaskId")
+ @ApiLog("获取消防自查记任务表详细信息")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "自定义详情", notes = "传入taskPlaceSelfCheck")
public R<TaskPlaceSelfCheckVO> detailByTaskId(Long taskId) {
+ bladeLogger.info("获取消防自查记任务表详细信息", JsonUtil.toJson(taskId));
TaskPlaceSelfCheckEntity detail = taskPlaceSelfCheckService.getDetailByTaskId( taskId);
return R.data(TaskPlaceSelfCheckWrapper.build().entityVO(detail));
}
@@ -106,9 +114,11 @@
* 消防自查记任务表 自定义分页
*/
@GetMapping("/page")
+ @ApiLog("消防自查记任务表 自定义分页")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入taskPlaceSelfCheck")
public R<IPage<TaskPlaceSelfCheckVO>> page(TaskPlaceSelfCheckVO taskPlaceSelfCheck, Query query) {
+ bladeLogger.info("消防自查记任务表 自定义分页", JsonUtil.toJson(taskPlaceSelfCheck));
IPage<TaskPlaceSelfCheckVO> pages = taskPlaceSelfCheckService.selectTaskPlaceSelfCheckPage(Condition.getPage(query), taskPlaceSelfCheck);
return R.data(pages);
}
@@ -117,18 +127,22 @@
* 消防自查记任务表 新增
*/
@PostMapping("/save")
+ @ApiLog("消防自查记任务表 新增")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入taskPlaceSelfCheck")
public R save(@Valid @RequestBody TaskPlaceSelfCheckEntity taskPlaceSelfCheck) {
+ bladeLogger.info("消防自查记任务表 新增", JsonUtil.toJson(taskPlaceSelfCheck));
return R.status(taskPlaceSelfCheckService.save(taskPlaceSelfCheck));
}
/**
* 消防自查记任务表 新增
*/
@PostMapping("/saveTwo")
+ @ApiLog("消防自查记任务表 新增")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入taskPlaceSelfCheck")
public R saveTwo(@Valid @RequestBody TaskPlaceSelfCheckVO taskPlaceSelfCheck) throws Exception {
+ bladeLogger.info("消防自查记任务表 新增", JsonUtil.toJson(taskPlaceSelfCheck));
return R.status(taskPlaceSelfCheckService.savePlace(taskPlaceSelfCheck));
}
@@ -136,9 +150,11 @@
* 消防自查记任务表 修改
*/
@PostMapping("/update")
+ @ApiLog("消防自查记任务表 修改")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入taskPlaceSelfCheck")
public R update(@Valid @RequestBody TaskPlaceSelfCheckEntity taskPlaceSelfCheck) {
+ bladeLogger.info("消防自查记任务表 修改", JsonUtil.toJson(taskPlaceSelfCheck));
return R.status(taskPlaceSelfCheckService.updateById(taskPlaceSelfCheck));
}
@@ -146,9 +162,11 @@
* 消防自查记任务表 新增或修改
*/
@PostMapping("/submit")
+ @ApiLog("消防自查记任务表 新增或修改")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入taskPlaceSelfCheck")
public R submit(@Valid @RequestBody TaskPlaceSelfCheckEntity taskPlaceSelfCheck) {
+ bladeLogger.info("消防自查记任务表 新增或修改", JsonUtil.toJson(taskPlaceSelfCheck));
return R.status(taskPlaceSelfCheckService.saveOrUpdate(taskPlaceSelfCheck));
}
@@ -156,9 +174,11 @@
* 消防自查记任务表 删除
*/
@PostMapping("/remove")
+ @ApiLog("消防自查记任务表 删除")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("消防自查记任务表 删除", JsonUtil.toJson(ids));
return R.status(taskPlaceSelfCheckService.removeBatchByIds(Func.toLongList(ids)));
}
@@ -166,9 +186,11 @@
* 消防自查记任务表 修改
*/
@PostMapping("/updateTaskPlaceSelfCheck")
+ @ApiLog("消防自查记任务表 修改")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "更新自查详情接口", notes = "传入taskPlaceSelfCheck")
public R updateTaskPlaceSelfCheck(@Valid @RequestBody TaskPlaceSelfCheckVO taskPlaceSelfCheck) throws Exception {
+ bladeLogger.info("消防自查记任务表 修改", JsonUtil.toJson(taskPlaceSelfCheck));
return R.status(taskPlaceSelfCheckService.updateTaskPlaceSelfCheck(taskPlaceSelfCheck));
}
@@ -178,9 +200,11 @@
* @param taskPlaceSelfCheck
*/
@GetMapping("export-taskPlaceSelfCheck")
+ @ApiLog("获取消防自查记任务表详细信息")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出消防自查", notes = "传入taskPlaceSelfCheck")
public void exportTaskPlaceSelfCheck(TaskPlaceSelfCheckVO taskPlaceSelfCheck, HttpServletResponse response) {
+ bladeLogger.info("导出消防自查信息", JsonUtil.toJson(taskPlaceSelfCheck));
List<TaskPlaceSelfCheckExcel> list = taskPlaceSelfCheckService.exportTaskPlaceSelfCheck(taskPlaceSelfCheck);
ExcelUtil.export(response, "消防自查" + DateUtil.time(), "消防自查记录表", list, TaskPlaceSelfCheckExcel.class);
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
index d07ce9a..99dd34d 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskReportForRepairsController.java
@@ -7,10 +7,13 @@
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
+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.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
@@ -35,14 +38,17 @@
public class TaskReportForRepairsController extends BladeController {
private final ITaskReportForRepairsService taskReportForRepairsService;
+ private final BladeLogger bladeLogger;
/**
* 报事报修任务表 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
+ @ApiLog("报事报修任务表 详情")
@ApiOperation(value = "详情", notes = "传入taskReportForRepairs")
public R detail(TaskReportForRepairsEntity taskReportForRepairs) {
+ bladeLogger.info("报事报修任务表 详情", JsonUtil.toJson(taskReportForRepairs));
TaskReportForRepairsEntity detail = taskReportForRepairsService.getOne(Condition.getQueryWrapper(taskReportForRepairs));
return R.data(detail);
}
@@ -61,9 +67,11 @@
* 报事报修任务表 自定义分页
*/
@GetMapping("/page")
+ @ApiLog("报事报修任务表 自定义分页")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入taskReportForRepairs")
public R<IPage<TaskReportForRepairsVO>> page(TaskReportForRepairsVO taskReportForRepairs, Query query) {
+ bladeLogger.info("报事报修任务表 自定义分页", JsonUtil.toJson(taskReportForRepairs));
IPage<TaskReportForRepairsVO> pages = taskReportForRepairsService.selectTaskReportForRepairsPage(Condition.getPage(query), taskReportForRepairs);
return R.data(pages);
}
@@ -73,8 +81,10 @@
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
+ @ApiLog("报事报修任务表 新增")
@ApiOperation(value = "新增", notes = "传入taskReportForRepairs")
public R save(@Valid @RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
+ bladeLogger.info("报事报修任务表 新增", JsonUtil.toJson(taskReportForRepairs));
return R.status(taskReportForRepairsService.saveTaskReportForRepairs(taskReportForRepairs));
}
@@ -83,8 +93,10 @@
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
+ @ApiLog("报事报修任务表 修改")
@ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
public R update(@Valid @RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
+ bladeLogger.info("报事报修任务表 修改", JsonUtil.toJson(taskReportForRepairs));
taskReportForRepairs.setConfirmTime(new Date());
return R.status(taskReportForRepairsService.updateById(taskReportForRepairs));
}
@@ -93,8 +105,10 @@
* 报事报修任务表 自定义修改
*/
@PostMapping("/updateTaskReportForRepairs")
- @ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
+ @ApiLog("报事报修任务表 自定义修改")
+ @ApiOperation(value = "自定义修改", notes = "传入taskReportForRepairs")
public R updateTaskReportForRepairs(@RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
+ bladeLogger.info("报事报修任务表 自定义修改", JsonUtil.toJson(taskReportForRepairs));
return R.status(taskReportForRepairsService.updateTaskReportForRepairs(taskReportForRepairs));
}
@@ -103,8 +117,10 @@
*/
@PostMapping("/checkReportForRepairs")
@ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入taskReportForRepairs")
+ @ApiLog("报事报修任务表 审核")
+ @ApiOperation(value = "审核", notes = "传入taskReportForRepairs")
public R checkReportForRepairs(@RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
+ bladeLogger.info("报事报修任务表 审核", JsonUtil.toJson(taskReportForRepairs));
return R.status(taskReportForRepairsService.checkReportForRepairs(taskReportForRepairs));
}
@@ -113,8 +129,10 @@
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
+ @ApiLog("报事报修任务表 新增或修改")
@ApiOperation(value = "新增或修改", notes = "传入taskReportForRepairs")
public R submit(@Valid @RequestBody TaskReportForRepairsEntity taskReportForRepairs) {
+ bladeLogger.info("报事报修任务表 新增或修改", JsonUtil.toJson(taskReportForRepairs));
return R.status(taskReportForRepairsService.saveOrUpdate(taskReportForRepairs));
}
@@ -123,8 +141,10 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("报事报修任务表 详情")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("报事报修任务表 删除", JsonUtil.toJson(ids));
return R.status(taskReportForRepairsService.deleteLogic(Func.toLongList(ids)));
}
@@ -134,7 +154,9 @@
* @return
*/
@GetMapping("/getStatisticsCount")
+ @ApiLog("报事报修任务表 详情")
public R statisticsCount(@RequestParam(value = "houseCode",required = false) String houseCode) {
+ bladeLogger.info("查询报事报修统计", JsonUtil.toJson(houseCode));
return R.data(taskReportForRepairsService.getStatisticsCount(houseCode));
}
@@ -144,6 +166,7 @@
* @return
*/
@GetMapping("/getStatistics")
+ @ApiLog("w网格员查询报事报修统计")
@ApiOperation(value = "w网格员查询报事报修统计" )
public R getStatistics() {
return R.data(taskReportForRepairsService.getStatistics(AuthUtil.getUserId(),""));
@@ -155,8 +178,10 @@
* @return
*/
@GetMapping("/getReportForStatistics")
+ @ApiLog("报事报修任务表 详情")
@ApiOperation(value = "查询报事报修统计" )
public R getReportForStatistics(@RequestParam("code") String code, @RequestParam("roleType") String roleType) {
+ bladeLogger.info("w网格员查询报事报修统计", JsonUtil.toJson(roleType));
return R.data(taskReportForRepairsService.getReportForStatistics(code, roleType));
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java b/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
index 3483522..56684aa 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskResidencePermitApplyController.java
@@ -24,10 +24,13 @@
import javax.validation.Valid;
+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.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -52,14 +55,17 @@
public class TaskResidencePermitApplyController extends BladeController {
private final ITaskResidencePermitApplyService taskResidencePermitApplyService;
+ private final BladeLogger bladeLogger;
/**
* 居住证申请 详情
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
+ @ApiLog("居住证申请 详情")
@ApiOperation(value = "详情", notes = "传入taskResidencePermitApply")
public R<TaskResidencePermitApplyVO> detail(TaskResidencePermitApplyEntity taskResidencePermitApply) {
+ bladeLogger.info("居住证申请 详情", JsonUtil.toJson(taskResidencePermitApply));
TaskResidencePermitApplyEntity detail = taskResidencePermitApplyService.getOne(Condition.getQueryWrapper(taskResidencePermitApply));
return R.data(TaskResidencePermitApplyWrapper.build().entityVO(detail));
}
@@ -82,8 +88,10 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
+ @ApiLog("居住证申请 自定义分页")
@ApiOperation(value = "分页", notes = "传入taskResidencePermitApply")
public R<IPage<TaskResidencePermitApplyVO>> page(TaskResidencePermitApplyVO taskResidencePermitApply, Query query) {
+ bladeLogger.info("居住证申请 自定义分页", JsonUtil.toJson(taskResidencePermitApply));
IPage<TaskResidencePermitApplyVO> pages = taskResidencePermitApplyService.selectTaskResidencePermitApplyPage(Condition.getPage(query), taskResidencePermitApply);
return R.data(pages);
}
@@ -93,8 +101,10 @@
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
+ @ApiLog("居住证申请 新增")
@ApiOperation(value = "新增", notes = "传入taskResidencePermitApply")
public R save(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
+ bladeLogger.info("居住证申请 新增", JsonUtil.toJson(taskResidencePermitApply));
return R.status(taskResidencePermitApplyService.saveResidencePermitApplyEntity(taskResidencePermitApply));
}
@@ -103,8 +113,10 @@
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
+ @ApiLog("居住证申请 修改")
@ApiOperation(value = "修改", notes = "传入taskResidencePermitApply")
public R update(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
+ bladeLogger.info("居住证申请 修改", JsonUtil.toJson(taskResidencePermitApply));
return R.status(taskResidencePermitApplyService.updateById(taskResidencePermitApply));
}
/**
@@ -112,8 +124,10 @@
*/
@PostMapping("/auditing")
@ApiOperationSupport(order = 5)
+ @ApiLog("居住证申请 审核")
@ApiOperation(value = "审核", notes = "传入taskResidencePermitApply")
public R updateResidencePermitApply(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
+ bladeLogger.info("居住证申请 审核", JsonUtil.toJson(taskResidencePermitApply));
return R.status(taskResidencePermitApplyService.updateResidencePermitApplyEntity(taskResidencePermitApply));
}
@@ -122,8 +136,10 @@
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
+ @ApiLog("居住证申请 新增或修改")
@ApiOperation(value = "新增或修改", notes = "传入taskResidencePermitApply")
public R submit(@Valid @RequestBody TaskResidencePermitApplyEntity taskResidencePermitApply) {
+ bladeLogger.info("居住证申请 新增或修改", JsonUtil.toJson(taskResidencePermitApply));
return R.status(taskResidencePermitApplyService.saveOrUpdate(taskResidencePermitApply));
}
@@ -132,8 +148,10 @@
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
+ @ApiLog("居住证申请 详情")
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ bladeLogger.info("居住证申请 删除", JsonUtil.toJson(ids));
return R.status(taskResidencePermitApplyService.removeTaskResidencePermitApplyBatchByIds(Func.toLongList(ids)));
}
--
Gitblit v1.9.3