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/activeCard/ActiveCardSv.java | 19 +------------------
1 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java
index df53049..86c9cf7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardSv.java
@@ -11,7 +11,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.Map;
@@ -39,29 +38,12 @@
public QueryResultVo<List<VoActiveCard>> getActiveCards(QueryVo queryVo) {
//瀹屽杽鏌ヨ寮�鍗¤褰曠殑璧锋鏃堕棿
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-
- //LocalDateTime activeTimeStart = queryVo.activeTimeStart;
- //LocalDateTime activeTimeStop = queryVo.activeTimeStop;
-
- //if(activeTimeStart != null) {
- // activeTimeStart = LocalDateTime.parse(df.format(activeTimeStart) + " 00:00:00", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- // queryVo.setActiveTimeStart(activeTimeStart);
- //}
-
- //if(activeTimeStop != null) {
- // activeTimeStop = LocalDateTime.parse(df.format(activeTimeStop) + " 23:59:59", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
- // queryVo.setActiveTimeStop(activeTimeStop);
- //}
-
String activeTimeStart = queryVo.activeTimeStart;
String activeTimeStop = queryVo.activeTimeStop;
-
if(activeTimeStart != null) {
activeTimeStart = activeTimeStart + " 00:00:00";
queryVo.setActiveTimeStart(activeTimeStart);
}
-
if(activeTimeStop != null) {
activeTimeStop = activeTimeStop + " 23:59:59";
queryVo.setActiveTimeStop(activeTimeStop);
@@ -74,6 +56,7 @@
QueryResultVo<List<VoActiveCard>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = queryVo.pageSize ;
rsVo.pageCurr = queryVo.pageCurr ;
+
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = seActiveCardMapper.getActiveCards(params);
return rsVo ;
--
Gitblit v1.8.0