From c25427771d4766ec1c0f8fd2c74d33b75e764b37 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 6 Nov 2024 13:23:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80post?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/basic/controller/TbBdDeviceRecordController.java | 2 +- .../bonus/base/basic/controller/TbBdRecordController.java | 2 +- .../base/basic/controller/TbDevAttributeController.java | 2 +- .../bonus/base/basic/controller/TbDeviceController.java | 2 +- .../bonus/base/basic/controller/TbPeopleController.java | 6 +++--- .../bonus/base/basic/controller/TbProDepartController.java | 7 +++++-- .../bonus/base/basic/controller/TbProPowerController.java | 6 +++--- .../bonus/base/basic/controller/TbProjectController.java | 4 ++-- .../com/bonus/base/basic/controller/TbTeamController.java | 4 ++-- .../bonus/base/basic/controller/TbUserPostController.java | 2 +- .../base/basic/controller/TbWarnConfigController.java | 2 +- 11 files changed, 21 insertions(+), 18 deletions(-) diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbBdDeviceRecordController.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbBdDeviceRecordController.java index 4d0ac7b..90da2b4 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbBdDeviceRecordController.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbBdDeviceRecordController.java @@ -44,7 +44,7 @@ public class TbBdDeviceRecordController extends BaseController { @ApiOperation(value = "查询边带设备全量数据") @RequiresPermissions("base:info:list") @GetMapping("/list") - public AjaxResult queryByPage(TbBdDeviceRecord record) { + public AjaxResult list(TbBdDeviceRecord record) { List list = tbBdDeviceRecordService.getAll(record); return AjaxResult.success(list); } diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbBdRecordController.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbBdRecordController.java index 458b5fe..ad3efd1 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbBdRecordController.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbBdRecordController.java @@ -57,7 +57,7 @@ public class TbBdRecordController extends BaseController { @ApiOperation(value = "查询边带申请记录数据") @RequiresPermissions("base:record:list") @GetMapping("/list") - public AjaxResult queryByPage(TbBdRecord tbBdRecord) { + public AjaxResult list(TbBdRecord tbBdRecord) { PageResultVo data = tbBdRecordService.getAll(tbBdRecord); return AjaxResult.success(data); } diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbDevAttributeController.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbDevAttributeController.java index 49ee12e..dc1bf2e 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbDevAttributeController.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbDevAttributeController.java @@ -47,7 +47,7 @@ public class TbDevAttributeController extends BaseController { @ApiOperation(value = "查询设备监测信息管理数据") @RequiresPermissions("base:attribute:list") @GetMapping("/list") - public AjaxResult queryByPage(TbDevAttribute record) { + public AjaxResult list(TbDevAttribute record) { PageResultVo data = tbDevAttributeService.queryAll(record); return AjaxResult.success(data); } diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbDeviceController.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbDeviceController.java index 209e556..ce484e1 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbDeviceController.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbDeviceController.java @@ -46,7 +46,7 @@ public class TbDeviceController extends BaseController { @ApiOperation(value = "查询设备信息管理数据") @RequiresPermissions("base:device:list") @GetMapping("/list") - public AjaxResult queryByPage(TbDevice tbDevice) { + public AjaxResult list(TbDevice tbDevice) { startPage(); List list = tbDeviceService.getAll(tbDevice); return AjaxResult.success(getDataTable(list)); diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbPeopleController.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbPeopleController.java index cfb69da..42c78f6 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbPeopleController.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbPeopleController.java @@ -47,7 +47,7 @@ public class TbPeopleController extends BaseController { @ApiOperation(value = "分页查询人员信息") @RequiresPermissions("base:people:list") @GetMapping("/list") - public AjaxResult queryByPage(TbPeople tbPeople) { + public AjaxResult list(TbPeople tbPeople) { if (tbPeople.getIsAll() != null && tbPeople.getIsAll() == 0) { return AjaxResult.success(tbPeopleService.queryByPage(tbPeople)); } @@ -150,7 +150,7 @@ public class TbPeopleController extends BaseController { @ApiOperation(value = "人员导入模版下载") @RequiresPermissions("base:people:load") @PostMapping("/downLoad") - public void downLoadExcelFile(){ + public void downLoad(){ HttpServletResponse resp = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse(); tbPeopleService.downLoadTemplate(resp); } @@ -175,7 +175,7 @@ public class TbPeopleController extends BaseController { @ApiOperation(value = "从北京电科院数据库获取人员列表") @RequiresPermissions("base:people:list") @GetMapping("/getList") - public AjaxResult queryByPage() { + public AjaxResult getList() { List list = tbPeopleService.getList(); return AjaxResult.success(list); } diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProDepartController.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProDepartController.java index 41cd07c..56e8d72 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProDepartController.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProDepartController.java @@ -7,6 +7,8 @@ import com.bonus.base.basic.service.TbProDepartService; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.log.annotation.SysLog; +import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.RequiresPermissions; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -43,7 +45,8 @@ public class TbProDepartController extends BaseController { @ApiOperation(value = "分页查询项目部信息") @RequiresPermissions("base:depart:list") @GetMapping("/list") - public AjaxResult queryByPage(TbProDepart tbProDepart) { + @SysLog(title = "项目部管理", businessType = OperaType.QUERY, module = "基础管理->项目部管理") + public AjaxResult list(TbProDepart tbProDepart) { if (tbProDepart.getIsAll() != null && tbProDepart.getIsAll() == 0) { return AjaxResult.success(tbProDepartService.queryByPage(tbProDepart)); } @@ -148,7 +151,7 @@ public class TbProDepartController extends BaseController { @ApiOperation(value = "从北京电科院数据库获取项目部名称列表") @RequiresPermissions("base:depart:list") @GetMapping("/getList") - public AjaxResult queryByPage() { + public AjaxResult getList() { List list = tbProDepartService.getList(); return AjaxResult.success(list); } diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProPowerController.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProPowerController.java index e02f861..f3bba40 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProPowerController.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProPowerController.java @@ -44,7 +44,7 @@ public class TbProPowerController extends BaseController { @ApiOperation(value = "分页查询工程杆塔信息") @RequiresPermissions("base:power:list") @GetMapping("/list") - public TableDataInfo queryByPage(TbProPower tbProPower) { + public TableDataInfo list(TbProPower tbProPower) { startPage(); List list = tbProPowerService.queryByPage(tbProPower); return getDataTable(list); @@ -122,7 +122,7 @@ public class TbProPowerController extends BaseController { @ApiOperation(value = "杆塔导入模版下载") @RequiresPermissions("base:power:load") @PostMapping("/downLoad") - public void downLoadExcelFile(){ + public void downLoad(){ HttpServletResponse resp = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse(); tbProPowerService.downLoadTemplate(resp); } @@ -147,7 +147,7 @@ public class TbProPowerController extends BaseController { @ApiOperation(value = "从北京电科院数据库获取杆塔列表") @RequiresPermissions("base:power:list") @GetMapping("/getList") - public AjaxResult queryByPage() { + public AjaxResult getList() { List list = tbProPowerService.getList(); return AjaxResult.success(list); } diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProjectController.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProjectController.java index 0fa30a9..5053134 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProjectController.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbProjectController.java @@ -41,7 +41,7 @@ public class TbProjectController extends BaseController { @ApiOperation(value = "分页查询工程管理信息") @RequiresPermissions("base:project:list") @GetMapping("/list") - public AjaxResult queryByPage(TbProject tbProject) { + public AjaxResult list(TbProject tbProject) { if (tbProject.getIsAll() != null && tbProject.getIsAll() == 0) { return AjaxResult.success(tbProjectService.queryByPage(tbProject)); } @@ -123,7 +123,7 @@ public class TbProjectController extends BaseController { @ApiOperation(value = "从北京电科院数据库获取项目部名称列表") @RequiresPermissions("base:project:list") @GetMapping("/getList") - public AjaxResult queryByPage() { + public AjaxResult getList() { List list = tbProjectService.getList(); return AjaxResult.success(list); } diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbTeamController.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbTeamController.java index 2b33247..a651bc6 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbTeamController.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbTeamController.java @@ -42,7 +42,7 @@ public class TbTeamController extends BaseController { @ApiOperation(value = "分页查询班组信息") @RequiresPermissions("base:team:list") @GetMapping("/list") - public TableDataInfo queryByPage(TbTeam tbTeam) { + public TableDataInfo list(TbTeam tbTeam) { startPage(); List list = tbTeamService.queryByPage(tbTeam); return getDataTable(list); @@ -185,7 +185,7 @@ public class TbTeamController extends BaseController { @ApiOperation(value = "从北京电科院数据库获取班组列表") @RequiresPermissions("base:team:list") @GetMapping("/getList") - public AjaxResult queryByPage() { + public AjaxResult getList() { List list = tbTeamService.getList(); return AjaxResult.success(list); } diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbUserPostController.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbUserPostController.java index 10c34f3..9ffe5b5 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbUserPostController.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbUserPostController.java @@ -37,7 +37,7 @@ public class TbUserPostController extends BaseController { @ApiOperation(value = "分页查询人员到岗到位信息") @RequiresPermissions("base:user:list") @GetMapping("/list") - public AjaxResult queryByPage(TbUserPost tbUserPost) { + public AjaxResult list(TbUserPost tbUserPost) { if (tbUserPost.getIsAll() != null && tbUserPost.getIsAll() == 0) { List list = tbUserPostService.queryByPage(tbUserPost); return AjaxResult.success(list); diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbWarnConfigController.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbWarnConfigController.java index bbbea17..781606d 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbWarnConfigController.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/controller/TbWarnConfigController.java @@ -57,7 +57,7 @@ public class TbWarnConfigController extends BaseController { @ApiOperation(value = "分页查询预警配置数据") @RequiresPermissions("base:warn:list") @GetMapping("/list") - public AjaxResult queryByPage(TbWarnConfig tbWarnConfig) { + public AjaxResult list(TbWarnConfig tbWarnConfig) { if (tbWarnConfig.getIsAll() != null && tbWarnConfig.getIsAll() == 0) { return AjaxResult.success(tbWarnConfigService.getAll(tbWarnConfig)); }