From f5af2c565dbe38f22763ec17bf3868d58afafb97 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 16:30:39 +0800
Subject: [PATCH] 更改报表导出时间段 由原先的0-23 改为1-第二天零点
---
src/main/java/com/moral/service/MonitorPointService.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index 17e08e0..67c3774 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -1,19 +1,61 @@
package com.moral.service;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
+import com.alibaba.fastjson.JSONObject;
import com.moral.common.bean.PageBean;
+import com.moral.entity.Device;
import com.moral.entity.MonitorPoint;
+import org.apache.xmlbeans.impl.jam.mutable.MPackage;
public interface MonitorPointService {
List<MonitorPoint> getMonitorPointsByAreaName(Map<String, Object> parameters);
- public PageBean queryByPageBean(PageBean pageBean);
- MonitorPoint selectWithRelationById(Integer id);
+ List<MonitorPoint> queryWithStateByMap(Map<String, Object> params);
+
+ public PageBean queryByPageBean(PageBean pageBean);
+
+ MonitorPoint queryWithRelationById(Integer id);
public void addOrModify(MonitorPoint monitorPoint);
public void deleteByIds(Integer... ids);
+
+ List<MonitorPoint> getMonitorPointsByName(String name);
+ List<Map<String,String>> queryMonitroPointsState(List<Integer> idList);
+
+ Integer countOfSubOrgs(Integer orgId);
+
+ List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);
+
+ List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);
+
+ List<Integer> queryVersionsById(Integer id);
+
+ MonitorPoint queryMonitorPointById(Integer mpointId);
+
+ List<MonitorPoint> getMonitorPointsAndDevicesByRegion(Map<String, Object> parameters);
+
+ Collection<Object> getDevicesStateByRegion(Map<String, Object> parameters);
+
+ void isCompensateCalculation(Map<String, Object> parameters);
+
+ Map<String, Object> selectAllById(String id);
+
+ //������monitorPointId������������������������������������
+ List<Device> getDeviceList(int id);
+
+ //���������������������������id
+ JSONObject getMonitorPointById(int id, String Time, int i, String sensor);
+
+ JSONObject getMacList(int id);
+
+ List<MonitorPoint> getMonitorPointListByAccountId(int id);
+
+ MonitorPoint byIdGetMonitorPoint(int id);
+
+ String getOrgIdByMac(String mac);
}
--
Gitblit v1.8.0