From 19516e371e9b2bc3389a32111e45f0b28a43b82a Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 17 十月 2023 11:07:15 +0800
Subject: [PATCH] 16

---
 src/main/java/com/whyc/service/StandardFeatureCurveService.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/service/StandardFeatureCurveService.java b/src/main/java/com/whyc/service/StandardFeatureCurveService.java
index 7cada52..a9f25fa 100644
--- a/src/main/java/com/whyc/service/StandardFeatureCurveService.java
+++ b/src/main/java/com/whyc/service/StandardFeatureCurveService.java
@@ -187,7 +187,7 @@
         int count=subService.getCount(data);
         List list=new ArrayList();
         list.add(count);*/
-        /*10
+        /*13
         DevAlarmPar param=new DevAlarmPar();
         param.setRecordYear("tb_devalarm_data_history_2023_03");
         param.setAlmStartTime(date1);
@@ -198,8 +198,19 @@
         int count=subService.getCount(param);
         List list=new ArrayList();
         list.add(count);*/
-        /*15*/
-        List list=subService.getList(1002,"tb_pwrdev_alarm_param_115000001");
+        /*15
+        List list=subService.getList(1002,"tb_pwrdev_alarm_param_115000001");*/
+        /*16*/
+        DevAlarmPar param=new DevAlarmPar();
+        param.setRecordYear("tb_devalarm_data_history_2023_03");
+        param.setAlmStartTime(date1);
+        param.setAlmStartTime1(date2);
+        param.setStationName("");
+        param.setStationName1("");
+        param.setLimitStart(0);
+        param.setLimitEnd(10);
+        param.setUId(1002);
+        List list=subService.getList2(param);
         return  list;
     }
 }

--
Gitblit v1.9.1