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;