From ec614c02b1be04f6f0ffe35dc65f8206c2080a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=BE=E9=85=92?= Date: Wed, 1 Jan 2025 01:54:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9A=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E6=96=87=E5=90=8C=E6=AD=A5=E6=B5=81=E9=87=8F=E8=AE=A1=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E8=BF=90=E8=A1=8C=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/DeviceOtherMsgConsumer.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 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 d4a212d..ee00102 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 @@ -106,14 +106,28 @@ public class DeviceOtherMsgConsumer { if(jsonObject.getStr("type")!=null){ //上报正常数据 if(jsonObject.getStr("type").equals("waterEleData")){ - String data1 = jsonObject.getStr("data"); + JSONObject data1 = jsonObject.getJSONObject("data"); + //收到开阀定时报文 - if(JSONUtil.parseObj(data1).get("action").equals("timeMsg")){ + if(data1.get("action").equals("timeMsg")){ pumpUsageRecords.setMessageContent(JSONUtil.toJsonStr(jsonObject)); + // int i = ngWaterPumpUsageRecordsMapper.insertNgWaterPumpUsageRecords(pumpUsageRecords); // if(i<1){ // System.err.println("--------------------------保存使用记录失败!---------------------------"); // } + //同步设备运行状态 + //获取设备当前运行状态 + Integer valveState = data1.getInt("valveState"); + Integer runStatus = null; + if(valveState==0){ + runStatus=2; + } else if (valveState==1) { + runStatus=1; + } + if(runStatus!=null){ + new LambdaUpdateChainWrapper<>(deviceReportInfoMapper).set(DeviceReportInfo::getRunStatus,runStatus).eq(DeviceReportInfo::getSerialNumber,serialNumber).update(); + } } //收到关阀时定时报文 else if(JSONUtil.parseObj(data1).get("action").equals("safeMsg")){