From 33e1f47419d28736b17d6947bb15ccc290b2905a Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 二月 2025 17:42:45 +0800 Subject: [PATCH] 1、代码完善; 2、江海协议解析不正确处修改,如金额是4位小数; 3、根据江海协议,新建RTU模拟器模块,可以上报心跳、开阀、关阀数据。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java index ac64d89..41344a3 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java @@ -61,7 +61,7 @@ } if(this.itemTotal == 0){ - this.pageSize = 1 ; + this.pageSize = 10 ; } if(this.pageSize == null || this.pageSize <= 0){ /** @@ -88,8 +88,10 @@ this.queryStart = (this.pageCurr - 1) * this.pageSize ; this.queryCount = this.pageSize ; - params.put("start", this.queryStart) ; - params.put("count", this.queryCount) ; + if(params != null){ + params.put("start", this.queryStart) ; + params.put("count", this.queryCount) ; + } } } -- Gitblit v1.8.0