From 010101ffb466753b6f5ae36f6f55f4f2572dd20f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=BE=E9=85=92?= Date: Wed, 1 Jan 2025 13:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/redischannel/consumer/DeviceOtherMsgConsumer.java | 5 ++++- .../controller/userRecharge/NgMerchantsController.java | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) 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 ee00102..8ae3793 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 @@ -81,7 +81,7 @@ public class DeviceOtherMsgConsumer { try { //处理emq订阅的非 property/post 属性上报的消息 ，因为其他消息量小，放在一起处理 Long productId;//产品id,设备所属产品 - Long packetId;//包号 + Long pacSn;//包号 byte[] data = bo.getData();//数据 String topic=bo.getTopicName();//主题 //从主题中解析出产品id @@ -128,6 +128,9 @@ public class DeviceOtherMsgConsumer { if(runStatus!=null){ new LambdaUpdateChainWrapper<>(deviceReportInfoMapper).set(DeviceReportInfo::getRunStatus,runStatus).eq(DeviceReportInfo::getSerialNumber,serialNumber).update(); } + //获取流量计累计用水量/瞬时流量 + Float meterSum = data1.getFloat("meterSum"); + Float meterIns = data1.getFloat("meterIns"); } //收到关阀时定时报文 else if(JSONUtil.parseObj(data1).get("action").equals("safeMsg")){ diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgMerchantsController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgMerchantsController.java index 1cfc84a..473ec86 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgMerchantsController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/userRecharge/NgMerchantsController.java @@ -42,7 +42,7 @@ public class NgMerchantsController extends BaseController /** * 查询商户信息列表 */ -@PreAuthorize("@ss.hasPermi('iot:merchants:list')") +// @PreAuthorize("@ss.hasPermi('iot:merchants:list')") @GetMapping("/list") @ApiOperation("查询商户信息列表") public TableDataInfo list(NgMerchants ngMerchants) @@ -56,7 +56,7 @@ public class NgMerchantsController extends BaseController * 导出商户信息列表 */ @ApiOperation("导出商户信息列表") - @PreAuthorize("@ss.hasPermi('iot:merchants:export')") + // @PreAuthorize("@ss.hasPermi('iot:merchants:export')") @PostMapping("/export") public void export(HttpServletResponse response, NgMerchants ngMerchants) { @@ -69,7 +69,7 @@ public class NgMerchantsController extends BaseController /** * 获取商户信息详细信息 */ - @PreAuthorize("@ss.hasPermi('iot:merchants:query')") + // @PreAuthorize("@ss.hasPermi('iot:merchants:query')") @GetMapping(value = "/{id}") @ApiOperation("获取商户信息详细信息") public AjaxResult getInfo(@PathVariable("id") Long id) @@ -80,7 +80,7 @@ public class NgMerchantsController extends BaseController /** * 新增商户信息 */ - @PreAuthorize("@ss.hasPermi('iot:merchants:add')") + // @PreAuthorize("@ss.hasPermi('iot:merchants:add')") @PostMapping @ApiOperation("新增商户信息") public AjaxResult add(@RequestBody NgMerchants ngMerchants)