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

下发控制指令接口修改

Browse Source
This commit is contained in:
mi9688 2024-12-19 21:55:56 +08:00
parent c88658fd06
commit 794a7efa3e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java
View File

@ -157,7 +157,7 @@ public class DeviceOtherMsgConsumer {
* 处理设备收到指令回应 * 处理设备收到指令回应
*/ */
private void deviceCmdAckHandler(String data){ private void deviceCmdAckHandler(String data){
System.err.println("mqtt回应收到设备下发命令："+ data); System.err.println("平台收到设备执行完指令的结果："+ data);
} }
} }

14
fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserConsumptionDetailsController.java
View File

@ -41,7 +41,7 @@ public class UserConsumptionDetailsController extends BaseController
/** /**
* 查询用户充值卡账单明细记录列表 * 查询用户充值卡账单明细记录列表
*/ */
@PreAuthorize("@ss.hasPermi('rechargecard:details:list')") // @PreAuthorize("@ss.hasPermi('rechargecard:details:list')")
@GetMapping("/list") @GetMapping("/list")
@ApiOperation("查询用户充值卡账单明细记录列表") @ApiOperation("查询用户充值卡账单明细记录列表")
public TableDataInfo list(UserConsumptionDetails userConsumptionDetails) public TableDataInfo list(UserConsumptionDetails userConsumptionDetails)
@ -55,7 +55,7 @@ public class UserConsumptionDetailsController extends BaseController
* 导出用户充值卡账单明细记录列表 * 导出用户充值卡账单明细记录列表
*/ */
@ApiOperation("导出用户充值卡账单明细记录列表") @ApiOperation("导出用户充值卡账单明细记录列表")
@PreAuthorize("@ss.hasPermi('rechargecard:details:export')") // @PreAuthorize("@ss.hasPermi('rechargecard:details:export')")
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, UserConsumptionDetails userConsumptionDetails) public void export(HttpServletResponse response, UserConsumptionDetails userConsumptionDetails)
{ {
@ -67,7 +67,7 @@ public class UserConsumptionDetailsController extends BaseController
/** /**
* 获取用户充值卡账单明细记录详细信息列表 * 获取用户充值卡账单明细记录详细信息列表
*/ */
@PreAuthorize("@ss.hasPermi('rechargecard:details:query')") // @PreAuthorize("@ss.hasPermi('rechargecard:details:query')")
@GetMapping(value = "/list/{cardNumber}") @GetMapping(value = "/list/{cardNumber}")
@ApiOperation("获取用户充值卡账单明细记录详细信息列表") @ApiOperation("获取用户充值卡账单明细记录详细信息列表")
public AjaxResult getInfo(@PathVariable("cardNumber") String cardNumber) public AjaxResult getInfo(@PathVariable("cardNumber") String cardNumber)
@ -79,7 +79,7 @@ public class UserConsumptionDetailsController extends BaseController
/** /**
* 获取用户充值卡账单明细记录详细信息 * 获取用户充值卡账单明细记录详细信息
*/ */
@PreAuthorize("@ss.hasPermi('rechargecard:details:query')") // @PreAuthorize("@ss.hasPermi('rechargecard:details:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
@ApiOperation("获取用户充值卡账单明细记录详细信息") @ApiOperation("获取用户充值卡账单明细记录详细信息")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
@ -91,7 +91,7 @@ public class UserConsumptionDetailsController extends BaseController
/** /**
* 新增用户充值卡账单明细记录 * 新增用户充值卡账单明细记录
*/ */
@PreAuthorize("@ss.hasPermi('rechargecard:details:add')") // @PreAuthorize("@ss.hasPermi('rechargecard:details:add')")
@PostMapping @PostMapping
@ApiOperation("新增用户充值卡账单明细记录") @ApiOperation("新增用户充值卡账单明细记录")
public AjaxResult add(@RequestBody UserConsumptionDetails userConsumptionDetails) public AjaxResult add(@RequestBody UserConsumptionDetails userConsumptionDetails)
@ -102,7 +102,7 @@ public class UserConsumptionDetailsController extends BaseController
/** /**
* 修改用户充值卡账单明细记录 * 修改用户充值卡账单明细记录
*/ */
@PreAuthorize("@ss.hasPermi('rechargecard:details:edit')") // @PreAuthorize("@ss.hasPermi('rechargecard:details:edit')")
@PutMapping @PutMapping
@ApiOperation("修改用户充值卡账单明细记录") @ApiOperation("修改用户充值卡账单明细记录")
public AjaxResult edit(@RequestBody UserConsumptionDetails userConsumptionDetails) public AjaxResult edit(@RequestBody UserConsumptionDetails userConsumptionDetails)
@ -113,7 +113,7 @@ public class UserConsumptionDetailsController extends BaseController
/** /**
* 删除用户充值卡账单明细记录 * 删除用户充值卡账单明细记录
*/ */
@PreAuthorize("@ss.hasPermi('rechargecard:details:remove')") // @PreAuthorize("@ss.hasPermi('rechargecard:details:remove')")
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
@ApiOperation("删除用户充值卡账单明细记录") @ApiOperation("删除用户充值卡账单明细记录")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)

2
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/dto/DeviceOperationDTO.java
View File

@ -11,5 +11,5 @@ public class DeviceOperationDTO {
private String operationType; private String operationType;
private String operationCode; private Integer operationCode;
} }