luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
小魔仙~ 2024-12-19 20:26:41 +08:00
commit c88658fd06
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgInformationWaterUserController.java
View File

@ -35,7 +35,7 @@ public class NgInformationWaterUserController extends BaseController
/** /**
* 查询用水户信息列表 * 查询用水户信息列表
*/ */
@PreAuthorize("@ss.hasPermi('iot:user:list')") //@PreAuthorize("@ss.hasPermi('iot:user:list')")
@GetMapping("/list") @GetMapping("/list")
@ApiOperation("查询用水户信息列表") @ApiOperation("查询用水户信息列表")
public TableDataInfo list(NgInformationWaterUser ngInformationWaterUser) public TableDataInfo list(NgInformationWaterUser ngInformationWaterUser)
@ -49,7 +49,7 @@ public class NgInformationWaterUserController extends BaseController
* 导出用水户信息列表 * 导出用水户信息列表
*/ */
@ApiOperation("导出用水户信息列表") @ApiOperation("导出用水户信息列表")
@PreAuthorize("@ss.hasPermi('iot:user:export')") // @PreAuthorize("@ss.hasPermi('iot:user:export')")
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, NgInformationWaterUser ngInformationWaterUser) public void export(HttpServletResponse response, NgInformationWaterUser ngInformationWaterUser)
{ {
@ -61,7 +61,7 @@ public class NgInformationWaterUserController extends BaseController
/** /**
* 获取用水户信息详细信息 * 获取用水户信息详细信息
*/ */
@PreAuthorize("@ss.hasPermi('iot:user:query')") // @PreAuthorize("@ss.hasPermi('iot:user:query')")
@GetMapping(value = "/{waterUserId}") @GetMapping(value = "/{waterUserId}")
@ApiOperation("获取用水户信息详细信息") @ApiOperation("获取用水户信息详细信息")
public AjaxResult getInfo(@PathVariable("waterUserId") Long waterUserId) public AjaxResult getInfo(@PathVariable("waterUserId") Long waterUserId)
@ -72,7 +72,7 @@ public class NgInformationWaterUserController extends BaseController
/** /**
* 新增用水户信息 * 新增用水户信息
*/ */
@PreAuthorize("@ss.hasPermi('iot:user:add')") // @PreAuthorize("@ss.hasPermi('iot:user:add')")
@PostMapping @PostMapping
@ApiOperation("新增用水户信息") @ApiOperation("新增用水户信息")
public AjaxResult add(@RequestBody NgInformationWaterUser ngInformationWaterUser) public AjaxResult add(@RequestBody NgInformationWaterUser ngInformationWaterUser)
@ -84,7 +84,7 @@ public class NgInformationWaterUserController extends BaseController
/** /**
* 修改用水户信息 * 修改用水户信息
*/ */
@PreAuthorize("@ss.hasPermi('iot:user:edit')") // @PreAuthorize("@ss.hasPermi('iot:user:edit')")
@PutMapping @PutMapping
@ApiOperation("修改用水户信息") @ApiOperation("修改用水户信息")
public AjaxResult edit(@RequestBody NgInformationWaterUser ngInformationWaterUser) public AjaxResult edit(@RequestBody NgInformationWaterUser ngInformationWaterUser)
@ -95,7 +95,7 @@ public class NgInformationWaterUserController extends BaseController
/** /**
* 删除用水户信息 * 删除用水户信息
*/ */
@PreAuthorize("@ss.hasPermi('iot:user:remove')") // @PreAuthorize("@ss.hasPermi('iot:user:remove')")
@DeleteMapping("/{waterUserIds}") @DeleteMapping("/{waterUserIds}")
@ApiOperation("删除用水户信息") @ApiOperation("删除用水户信息")
public AjaxResult remove(@PathVariable Long[] waterUserIds) public AjaxResult remove(@PathVariable Long[] waterUserIds)

12
fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgUserRechargeRecordsController.java
View File

@ -41,7 +41,7 @@ public class NgUserRechargeRecordsController extends BaseController
/** /**
* 查询用户充值记录列表 * 查询用户充值记录列表
*/ */
@PreAuthorize("@ss.hasPermi('rechargecard:records:list')") // @PreAuthorize("@ss.hasPermi('rechargecard:records:list')")
@GetMapping("/list") @GetMapping("/list")
@ApiOperation("查询用户充值记录列表") @ApiOperation("查询用户充值记录列表")
public TableDataInfo list(NgUserRechargeRecords ngUserRechargeRecords) public TableDataInfo list(NgUserRechargeRecords ngUserRechargeRecords)
@ -55,7 +55,7 @@ public class NgUserRechargeRecordsController extends BaseController
* 导出用户充值记录列表 * 导出用户充值记录列表
*/ */
@ApiOperation("导出用户充值记录列表") @ApiOperation("导出用户充值记录列表")
@PreAuthorize("@ss.hasPermi('rechargecard:records:export')") // @PreAuthorize("@ss.hasPermi('rechargecard:records:export')")
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, NgUserRechargeRecords ngUserRechargeRecords) public void export(HttpServletResponse response, NgUserRechargeRecords ngUserRechargeRecords)
{ {
@ -67,7 +67,7 @@ public class NgUserRechargeRecordsController extends BaseController
/** /**
* 获取用户充值记录详细信息 * 获取用户充值记录详细信息
*/ */
@PreAuthorize("@ss.hasPermi('rechargecard:records:query')") // @PreAuthorize("@ss.hasPermi('rechargecard:records:query')")
@GetMapping(value = "/{userId}") @GetMapping(value = "/{userId}")
@ApiOperation("获取用户充值记录详细信息") @ApiOperation("获取用户充值记录详细信息")
public AjaxResult getInfo(@PathVariable("userId") Long userId) public AjaxResult getInfo(@PathVariable("userId") Long userId)
@ -78,7 +78,7 @@ public class NgUserRechargeRecordsController extends BaseController
/** /**
* 新增用户充值记录 * 新增用户充值记录
*/ */
@PreAuthorize("@ss.hasPermi('rechargecard:records:add')") // @PreAuthorize("@ss.hasPermi('rechargecard:records:add')")
@PostMapping @PostMapping
@ApiOperation("新增用户充值记录") @ApiOperation("新增用户充值记录")
public AjaxResult add(@RequestBody NgUserRechargeRecords ngUserRechargeRecords) public AjaxResult add(@RequestBody NgUserRechargeRecords ngUserRechargeRecords)
@ -89,7 +89,7 @@ public class NgUserRechargeRecordsController extends BaseController
/** /**
* 修改用户充值记录 * 修改用户充值记录
*/ */
@PreAuthorize("@ss.hasPermi('rechargecard:records:edit')") // @PreAuthorize("@ss.hasPermi('rechargecard:records:edit')")
@PutMapping @PutMapping
@ApiOperation("修改用户充值记录") @ApiOperation("修改用户充值记录")
public AjaxResult edit(@RequestBody NgUserRechargeRecords ngUserRechargeRecords) public AjaxResult edit(@RequestBody NgUserRechargeRecords ngUserRechargeRecords)
@ -100,7 +100,7 @@ public class NgUserRechargeRecordsController extends BaseController
/** /**
* 删除用户充值记录 * 删除用户充值记录
*/ */
@PreAuthorize("@ss.hasPermi('rechargecard:records:remove')") // @PreAuthorize("@ss.hasPermi('rechargecard:records:remove')")
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
@ApiOperation("删除用户充值记录") @ApiOperation("删除用户充值记录")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)