From 4ffee6194975fdffc086daff96a1d4e19cfccb19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=BE=E9=85=92?= Date: Sun, 29 Dec 2024 00:54:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B0=B4=E7=94=B5=E5=8F=8C?= =?UTF-8?q?=E5=87=BB=E8=AE=BE=E5=A4=87=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF=E7=AD=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/redischannel/consumer/DeviceOtherMsgConsumer.java | 2 +- .../fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java | 2 +- 2 files changed, 2 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 ffed748..67cbccc 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 @@ -82,7 +82,6 @@ public class DeviceOtherMsgConsumer { String data1 = jsonObject.getStr("data"); //收到定时报文 if(JSONUtil.parseObj(data1).get("action").equals("timeMsg")){ - pumpUsageRecords.setMessageContent(JSONUtil.toJsonStr(jsonObject)); int i = ngWaterPumpUsageRecordsMapper.insertNgWaterPumpUsageRecords(pumpUsageRecords); if(i<1){ @@ -92,6 +91,7 @@ public class DeviceOtherMsgConsumer { //续费在线状态 updateDeviceOnlineStatus( productId,serialNumber); //保存数据 + pumpUsageRecords.setMessageContent(JSONUtil.toJsonStr(jsonObject)); int i = ngWaterPumpUsageRecordsMapper.insertNgWaterPumpUsageRecords(pumpUsageRecords); if(i<1){ System.err.println("--------------------------保存使用记录失败!---------------------------"); diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java index eaa8ce8..ea762d3 100644 --- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java +++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java @@ -26,7 +26,7 @@ private static final long serialVersionUID = 1L; private Long id; /** 开泵时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "开泵时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("开泵时间") private Date pumpStartTime;