diff --git a/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java b/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java index a9efc65..2ab030b 100644 --- a/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java +++ b/fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java @@ -157,7 +157,7 @@ public class DeviceOtherMsgConsumer { * 处理设备收到指令回应 */ private void deviceCmdAckHandler(String data){ - System.err.println("mqtt回应收到设备下发命令:"+ data); + System.err.println("平台收到设备执行完指令的结果:"+ data); } } diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserConsumptionDetailsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserConsumptionDetailsController.java index caf0c2e..412bb45 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserConsumptionDetailsController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/UserConsumptionDetailsController.java @@ -41,7 +41,7 @@ public class UserConsumptionDetailsController extends BaseController /** * 查询用户充值卡账单明细记录列表 */ - @PreAuthorize("@ss.hasPermi('rechargecard:details:list')") +// @PreAuthorize("@ss.hasPermi('rechargecard:details:list')") @GetMapping("/list") @ApiOperation("查询用户充值卡账单明细记录列表") public TableDataInfo list(UserConsumptionDetails userConsumptionDetails) @@ -55,7 +55,7 @@ public class UserConsumptionDetailsController extends BaseController * 导出用户充值卡账单明细记录列表 */ @ApiOperation("导出用户充值卡账单明细记录列表") - @PreAuthorize("@ss.hasPermi('rechargecard:details:export')") +// @PreAuthorize("@ss.hasPermi('rechargecard:details:export')") @PostMapping("/export") 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}") @ApiOperation("获取用户充值卡账单明细记录详细信息列表") 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}") @ApiOperation("获取用户充值卡账单明细记录详细信息") 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 @ApiOperation("新增用户充值卡账单明细记录") 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 @ApiOperation("修改用户充值卡账单明细记录") 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}") @ApiOperation("删除用户充值卡账单明细记录") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/dto/DeviceOperationDTO.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/dto/DeviceOperationDTO.java index 4286b6d..4faf6cb 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/dto/DeviceOperationDTO.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/dto/DeviceOperationDTO.java @@ -11,5 +11,5 @@ public class DeviceOperationDTO { private String operationType; - private String operationCode; + private Integer operationCode; }