From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java
index 4d0f386..edd844a 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossSv.java
@@ -9,8 +9,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -28,18 +26,15 @@
private SeLossMapper seLossMapper;
public QueryResultVo<List<VoLoss>> getLosses(QueryVo queryVo) {
- //瀹屽杽鏌ヨ鎸傚け璁板綍鐨勮捣姝㈡椂闂�
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
- LocalDateTime lossTimeStart = queryVo.lossTimeStart;
- LocalDateTime lossTimeStop = queryVo.lossTimeStop;
+ String lossTimeStart = queryVo.lossTimeStart;
+ String lossTimeStop = queryVo.lossTimeStop;
if(lossTimeStart != null) {
- lossTimeStart = LocalDateTime.parse(df.format(lossTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ lossTimeStart = lossTimeStart + " 00:00:00";
queryVo.setLossTimeStart(lossTimeStart);
}
if(lossTimeStop != null) {
- lossTimeStop = LocalDateTime.parse(df.format(lossTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ lossTimeStop = lossTimeStop + " 23:59:59";
queryVo.setLossTimeStop(lossTimeStop);
}
@@ -50,6 +45,7 @@
QueryResultVo<List<VoLoss>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = queryVo.pageSize ;
rsVo.pageCurr = queryVo.pageCurr ;
+
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seLossMapper.getLosses(params);
return rsVo ;
--
Gitblit v1.8.0