From e8ef361dc975aeaedeee6f28dfe679489a22f9d5 Mon Sep 17 00:00:00 2001 From: ZhuDongming <773644075@qq.com> Date: Mon, 02 Sep 2019 17:42:06 +0800 Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2 --- src/main/java/com/moral/service/impl/SensorServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/moral/service/impl/SensorServiceImpl.java b/src/main/java/com/moral/service/impl/SensorServiceImpl.java index 32b2d97..e26a7f7 100644 --- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java +++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java @@ -10,7 +10,9 @@ import javax.annotation.Resource; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class SensorServiceImpl implements SensorService{ @@ -18,8 +20,30 @@ SensorMapper sensorMapper; private static Class ENTITY_CLASS = Sensor.class; - public PageBean queryByPageBean(PageBean pageBean){ + + /** + * ������������������������������ + * @return + */ + @Override + public List<Sensor> queryAll(){ + return sensorMapper.selectByExample(null); + } + public PageBean<Sensor> queryByPageBean(PageBean pageBean){ return MyBatisBaseMapUtil.queryPage(sensorMapper,pageBean,ENTITY_CLASS); + } + @Override + public PageBean queryByVersionId(Integer deviceVersionId){ + List<Sensor> sensorList = sensorMapper.selectByVersionId(deviceVersionId); + return new PageBean(sensorList); + } + @Override + public List<Sensor> queryListByVersionId(Integer deviceVersionId){ + return sensorMapper.selectByVersionId(deviceVersionId); + } + @Override + public List<Sensor> queryListByVersionNo(Integer versionNo){ + return sensorMapper.selectByVersionNo(versionNo); } public void addOrModify(Sensor sensor){ try{ @@ -48,8 +72,42 @@ } } + /** + * ������������������������������������������ + * @param organizationId + * @return + */ + @Override + public List<Sensor> queryByOrgId(Integer organizationId) { + return sensorMapper.selectByOrgId(organizationId); + } @Override public List<Sensor> getAllSensors() { return sensorMapper.selectAll(); } + @Override + public Map<String, Object> getSensorBySensorKey(String sensorKey) { + Map<String, Object> map = sensorMapper.getSensorBySensorKey(sensorKey); + return map; + } + @Override + public List<Map<String, Object>> getSensorByDeviceId(String id) { + List<Map<String,Object>> list = sensorMapper.getSensorByDeviceId(id); + return list; + } + @Override + public List<Map<String, Object>> getSensorByMonitorPointId(String monitor_point_id) { + List<Map<String,Object>> list = sensorMapper.getSensorByMonitorPointId(monitor_point_id); + return list; + } + + @Override + public Map<String, String> getSensorsMap(Map<String, Object> parameters) { + List<Sensor> sensors = sensorMapper.getSensorsByMac(parameters); + Map<String, String> sensorMap = new HashMap<>(); + for (Sensor sensor : sensors) { + sensorMap.put(sensor.getSensorKey(), sensor.getDescription()); + } + return sensorMap; + } } -- Gitblit v1.8.0