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 74dce17..4d0ac7b 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 @@ -85,7 +85,7 @@ public class TbBdDeviceRecordController extends BaseController { */ @ApiOperation(value = "编辑边带记录设备数据") @RequiresPermissions("base:info:edit") - @PutMapping + @PostMapping("/edit") public AjaxResult edit(@RequestBody @NotNull(message = "参数不能为空") @Valid TbBdDeviceRecord record) { return toAjax(tbBdDeviceRecordService.updateByPrimaryKeySelective(record)); } @@ -94,14 +94,14 @@ public class TbBdDeviceRecordController extends BaseController { /** * 删除数据 * - * @param id 主键 + * @param record * @return 删除是否成功 */ @ApiOperation(value = "删除边带记录设备数据") @RequiresPermissions("base:info:delete") - @DeleteMapping("/{id}") - public AjaxResult deleteById(@PathVariable("id") Long id) { - return tbBdDeviceRecordService.deleteByPrimaryKey(id); + @PostMapping("/deleteById") + public AjaxResult deleteById(@RequestBody TbBdDeviceRecord record) { + return tbBdDeviceRecordService.deleteByPrimaryKey(record.getId()); } /** 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 cfabef1..458b5fe 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 @@ -85,7 +85,7 @@ public class TbBdRecordController extends BaseController { */ @ApiOperation(value = "编辑边带申请数据") @RequiresPermissions("base:record:edit") - @PutMapping + @PostMapping("/edit") public AjaxResult edit(@RequestBody @NotNull(message = "参数不能为空") @Valid TbBdRecord tbBdRecord) { return tbBdRecordService.updateByPrimaryKeySelective(tbBdRecord); } @@ -94,14 +94,14 @@ public class TbBdRecordController extends BaseController { /** * 删除数据 * - * @param id 主键 + * @param tbBdRecord * @return 删除是否成功 */ @ApiOperation(value = "删除边带申请数据") @RequiresPermissions("base:record:delete") - @DeleteMapping("/{id}") - public AjaxResult deleteById(@PathVariable("id") Long id) { - return tbBdRecordService.deleteByPrimaryKey(id); + @PostMapping("/deleteById") + public AjaxResult deleteById(@RequestBody TbBdRecord tbBdRecord) { + return tbBdRecordService.deleteByPrimaryKey(tbBdRecord.getId()); } /** 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 d7a4447..49ee12e 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 @@ -71,9 +71,9 @@ public class TbDevAttributeController extends BaseController { */ @ApiOperation(value = "删除设备监测数据") @RequiresPermissions("base:attribute:delete") - @DeleteMapping("/{id}") - public AjaxResult deleteById(@PathVariable("id") Long id) { - return toAjax(tbDevAttributeService.deleteByPrimaryKey(id)); + @PostMapping("/deleteById") + public AjaxResult deleteById(@RequestBody TbDevAttribute record) { + return toAjax(tbDevAttributeService.deleteByPrimaryKey(record.getId())); } /** 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 e0c09d9..209e556 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 @@ -75,7 +75,7 @@ public class TbDeviceController extends BaseController { */ @ApiOperation(value = "编辑设备数据") @RequiresPermissions("base:device:edit") - @PutMapping + @PostMapping("/edit") public AjaxResult edit(@Valid @RequestBody TbDevice tbDevice) { return tbDeviceService.updateByPrimaryKeySelective(tbDevice); } @@ -83,14 +83,14 @@ public class TbDeviceController extends BaseController { /** * 删除数据 * - * @param id 主键 + * @param tbDevice * @return 删除是否成功 */ @ApiOperation(value = "删除设备数据") @RequiresPermissions("base:device:delete") - @DeleteMapping("/{id}") - public AjaxResult deleteById(@PathVariable("id") Long id) { - return tbDeviceService.deleteByPrimaryKey(id); + @PostMapping("/deleteById") + public AjaxResult deleteById(@RequestBody TbDevice tbDevice) { + return tbDeviceService.deleteByPrimaryKey(tbDevice.getId()); } /** 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 e50c66b..cfb69da 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 @@ -90,7 +90,7 @@ public class TbPeopleController extends BaseController { */ @ApiOperation(value = "编辑人员数据") @RequiresPermissions("base:people:edit") - @PutMapping + @PostMapping("/edit") public AjaxResult edit(@Valid @RequestBody TbPeople tbPeople) { return tbPeopleService.update(tbPeople); } @@ -98,14 +98,14 @@ public class TbPeopleController extends BaseController { /** * 删除数据 * - * @param id 主键 + * @param tbPeople * @return 删除是否成功 */ @ApiOperation(value = "删除人员数据") @RequiresPermissions("base:people:delete") - @DeleteMapping("/{id}") - public AjaxResult deleteById(@PathVariable("id") Long id) { - return tbPeopleService.deleteById(id); + @PostMapping("/deleteById") + public AjaxResult deleteById(@RequestBody TbPeople tbPeople) { + return tbPeopleService.deleteById(tbPeople.getId()); } /** 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 0230106..e02f861 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 @@ -84,7 +84,7 @@ public class TbProPowerController extends BaseController { */ @ApiOperation(value = "编辑杆塔数据") @RequiresPermissions("base:power:edit") - @PutMapping + @PostMapping("/edit") public AjaxResult edit(@Valid @RequestBody TbProPower tbProPower) { return tbProPowerService.update(tbProPower); } @@ -92,14 +92,14 @@ public class TbProPowerController extends BaseController { /** * 删除数据 * - * @param id 主键 + * @param tbProPower * @return 删除是否成功 */ @ApiOperation(value = "删除杆塔数据") @RequiresPermissions("base:power:delete") - @DeleteMapping("/{id}") - public AjaxResult deleteById(@PathVariable("id") Long id) { - return tbProPowerService.deleteById(id); + @PostMapping("/deleteById") + public AjaxResult deleteById(@RequestBody TbProPower tbProPower) { + return tbProPowerService.deleteById(tbProPower.getId()); } /** 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 6682a02..0fa30a9 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 @@ -84,7 +84,7 @@ public class TbProjectController extends BaseController { */ @ApiOperation(value = "编辑工程数据") @RequiresPermissions("base:project:edit") - @PutMapping + @PostMapping("/edit") public AjaxResult edit(@Valid @RequestBody TbProject tbProject) { return tbProjectService.update(tbProject); } @@ -92,14 +92,14 @@ public class TbProjectController extends BaseController { /** * 删除数据 * - * @param id 主键 + * @param tbProject * @return 删除是否成功 */ @ApiOperation(value = "删除工程数据") @RequiresPermissions("base:project:delete") - @DeleteMapping("/{id}") - public AjaxResult deleteById(@PathVariable("id") Long id) { - return tbProjectService.deleteById(id); + @PostMapping("/deleteById") + public AjaxResult deleteById(@RequestBody TbProject tbProject) { + return tbProjectService.deleteById(tbProject.getId()); } /** 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 4da03e0..2b33247 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 @@ -82,7 +82,7 @@ public class TbTeamController extends BaseController { */ @ApiOperation(value = "编辑班组信息") @RequiresPermissions("base:team:edit") - @PutMapping + @PostMapping("/edit") public AjaxResult edit(@Valid @RequestBody TbTeam tbTeam) { return tbTeamService.update(tbTeam); } @@ -90,14 +90,14 @@ public class TbTeamController extends BaseController { /** * 通过主键解散班组 * - * @param id 主键 + * @param tbTeam * @return 是否成功 */ @ApiOperation(value = "通过主键解散班组") @RequiresPermissions("base:team:delete") - @DeleteMapping("/{id}") - public AjaxResult deleteById(@PathVariable("id") Long id) { - return tbTeamService.deleteById(id); + @PostMapping("/deleteById") + public AjaxResult deleteById(@RequestBody TbTeam tbTeam) { + return tbTeamService.deleteById(tbTeam.getId()); } /** @@ -158,7 +158,7 @@ public class TbTeamController extends BaseController { * @return 查询结果 */ @ApiOperation(value = "查询安全帽类型设备列表") - //@RequiresPermissions("base:team:list") + @RequiresPermissions("base:team:list") @GetMapping("/devList") public AjaxResult queryByPage(TbDeviceVo tbDeviceVo) { return AjaxResult.success(tbTeamService.selectDeviceList(tbDeviceVo)); 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 ba045ef..bbbea17 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 @@ -67,7 +67,7 @@ public class TbWarnConfigController extends BaseController { } @ApiOperation(value = "查询设备预警配置数据") - //@RequiresPermissions("base:warn:list") + @RequiresPermissions("base:warn:list") @GetMapping("/getList") public AjaxResult getList(TbWarnConfig tbWarnConfig) { if (tbWarnConfig.getConfiguType().equals(Constants.TEMP_KEY)) { @@ -121,7 +121,7 @@ public class TbWarnConfigController extends BaseController { */ @ApiOperation(value = "编辑预警配置数据") @RequiresPermissions("base:warn:edit") - @PutMapping + @PostMapping("/edit") public AjaxResult edit(@RequestBody @Valid TbWarnConfig tbWarnConfig) { return tbWarnConfigService.updateByPrimaryKeySelective(tbWarnConfig); } @@ -130,14 +130,14 @@ public class TbWarnConfigController extends BaseController { /** * 删除数据 * - * @param id 主键 + * @param tbWarnConfig * @return 删除是否成功 */ @ApiOperation(value = "删除预警配置数据") @RequiresPermissions("base:warn:delete") - @DeleteMapping("/{id}") - public AjaxResult deleteById(@PathVariable("id") Long id) { - return tbWarnConfigService.deleteByPrimaryKey(id); + @PostMapping("/deleteById") + public AjaxResult deleteById(@RequestBody TbWarnConfig tbWarnConfig) { + return tbWarnConfigService.deleteByPrimaryKey(tbWarnConfig.getId()); } /**