From e407fcf19e50ed0972e7262d99da4b3a83d08706 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 11 十月 2024 17:08:23 +0800
Subject: [PATCH] 1、修改协议驱动RTU上行数据解析出错时，RTU上下行数据日志中的RTU地址不正确的bug; 2、83功能码上行数据测试main方法实现。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
index 3938bb6..283c37e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/CardOperateSv.java
@@ -539,10 +539,10 @@
* @return
*/
public Map getReceipts(QoReceipt queryVo) {
- if (queryVo.getTimeStart() != null || queryVo.getTimeStart() != ""){
+ if (queryVo.getTimeStart() != null && queryVo.getTimeStart() != ""){
queryVo.setTimeStart(queryVo.getTimeStart() + " 00:00:00");
}
- if (queryVo.getTimeStop() != null || queryVo.getTimeStop() != ""){
+ if (queryVo.getTimeStop() != null && queryVo.getTimeStop() != ""){
queryVo.setTimeStop(queryVo.getTimeStop() + " 23:59:59");
}
--
Gitblit v1.8.0