From 2d2e2d34d2d0a3029f4943bbe9b762804dc13095 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 19 十月 2023 15:18:18 +0800
Subject: [PATCH] 115
---
src/main/java/com/whyc/service/StandardFeatureCurveService.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/service/StandardFeatureCurveService.java b/src/main/java/com/whyc/service/StandardFeatureCurveService.java
index de456a1..6e318e4 100644
--- a/src/main/java/com/whyc/service/StandardFeatureCurveService.java
+++ b/src/main/java/com/whyc/service/StandardFeatureCurveService.java
@@ -118,11 +118,13 @@
Date date1 = null;
Date date2 = null;
Date date3 = null;
+ Date date4 = null;
try {
date1 = ActionUtil.sdf.parse("2023-03-27 10:10:01" );
date2 = ActionUtil.sdf.parse("2023-03-31 14:36:55");
date3 = ActionUtil.sdf.parse("2022-06-25 03:47:37");
+ date4 = ActionUtil.sdf.parse("2022-06-27 03:47:37");
} catch (ParseException e) {
e.printStackTrace();
}
@@ -452,7 +454,7 @@
subService.createTable4BattAlarmDataHistoryByYear("2021_01");*/
/*97
List list=pdhmapper.getTableNameList("110000111_2021_06");*/
- /*114*/
+ /*114
List list=new ArrayList();
for (int i=0;i<4;i++){
DevalarmDataHistory bh=new DevalarmDataHistory();
@@ -471,7 +473,9 @@
bh.setAlmSeverity(1);
list.add(bh);
}
- subService.insertBatch4DevAlarmDataHistoryByYear("2023_09",list);
+ subService.insertBatch4DevAlarmDataHistoryByYear("2023_09",list);*/
+ /*115*/
+ List list= subService.getWeekOrDayData("tb_pwrdev_historydata_115000003_2022_06",date3,date4);
return new Response().setII(1,true,list,null);
}
}
--
Gitblit v1.9.1