luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复水电双击设备操作记录列表接口返回时间格式错误等。

Browse Source
This commit is contained in:
蒾酒 2024-12-29 00:54:18 +08:00
parent 250530570a
commit 4ffee61949
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fastbee-gateway/fastbee-mq/src/main/java/com/fastbee/mq/redischannel/consumer/DeviceOtherMsgConsumer.java
View File

@ -82,7 +82,6 @@ public class DeviceOtherMsgConsumer {
String data1 = jsonObject.getStr("data"); String data1 = jsonObject.getStr("data");
//收到定时报文 //收到定时报文
if(JSONUtil.parseObj(data1).get("action").equals("timeMsg")){ if(JSONUtil.parseObj(data1).get("action").equals("timeMsg")){
pumpUsageRecords.setMessageContent(JSONUtil.toJsonStr(jsonObject)); pumpUsageRecords.setMessageContent(JSONUtil.toJsonStr(jsonObject));
int i = ngWaterPumpUsageRecordsMapper.insertNgWaterPumpUsageRecords(pumpUsageRecords); int i = ngWaterPumpUsageRecordsMapper.insertNgWaterPumpUsageRecords(pumpUsageRecords);
if(i<1){ if(i<1){
@ -92,6 +91,7 @@ public class DeviceOtherMsgConsumer {
//续费在线状态 //续费在线状态
updateDeviceOnlineStatus( productId,serialNumber); updateDeviceOnlineStatus( productId,serialNumber);
//保存数据 //保存数据
pumpUsageRecords.setMessageContent(JSONUtil.toJsonStr(jsonObject));
int i = ngWaterPumpUsageRecordsMapper.insertNgWaterPumpUsageRecords(pumpUsageRecords); int i = ngWaterPumpUsageRecordsMapper.insertNgWaterPumpUsageRecords(pumpUsageRecords);
if(i<1){ if(i<1){
System.err.println("--------------------------保存使用记录失败!---------------------------"); System.err.println("--------------------------保存使用记录失败!---------------------------");

2
fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java
View File

@ -26,7 +26,7 @@ private static final long serialVersionUID = 1L;
private Long id; private Long id;
/** 开泵时间 */ /** 开泵时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开泵时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "开泵时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("开泵时间") @ApiModelProperty("开泵时间")
private Date pumpStartTime; private Date pumpStartTime;