From 013f480082d982b7542bfd812edb0913882ecbe4 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 04 Dec 2019 17:21:33 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 104 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 68 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/SensorServiceImpl.java b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
index e26a7f7..77dca20 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -5,17 +5,21 @@
import com.moral.entity.Sensor;
import com.moral.mapper.SensorMapper;
import com.moral.service.SensorService;
+
import org.springframework.stereotype.Service;
+
import tk.mybatis.mapper.entity.Example;
import javax.annotation.Resource;
+
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
-public class SensorServiceImpl implements SensorService{
+public class SensorServiceImpl implements SensorService {
@Resource
SensorMapper sensorMapper;
@@ -23,47 +27,52 @@
/**
* ������������������������������
+ *
* @return
*/
@Override
- public List<Sensor> queryAll(){
+ public List<Sensor> queryAll() {
return sensorMapper.selectByExample(null);
}
- public PageBean<Sensor> queryByPageBean(PageBean pageBean){
- return MyBatisBaseMapUtil.queryPage(sensorMapper,pageBean,ENTITY_CLASS);
+
+ public PageBean<Sensor> queryByPageBean(PageBean pageBean) {
+ return MyBatisBaseMapUtil.queryPage(sensorMapper, pageBean, ENTITY_CLASS);
}
+
@Override
- public PageBean queryByVersionId(Integer deviceVersionId){
+ public PageBean queryByVersionId(Integer deviceVersionId) {
List<Sensor> sensorList = sensorMapper.selectByVersionId(deviceVersionId);
- return new PageBean(sensorList);
+ return new PageBean(sensorList);
}
+
@Override
- public List<Sensor> queryListByVersionId(Integer deviceVersionId){
+ public List<Sensor> queryListByVersionId(Integer deviceVersionId) {
return sensorMapper.selectByVersionId(deviceVersionId);
}
+
@Override
- public List<Sensor> queryListByVersionNo(Integer versionNo){
+ public List<Sensor> queryListByVersionNo(Integer versionNo) {
return sensorMapper.selectByVersionNo(versionNo);
}
- public void addOrModify(Sensor sensor){
- try{
- if(sensor.getId()==null){
+
+ public void addOrModify(Sensor sensor) {
+ try {
+ if (sensor.getId() == null) {
sensorMapper.insertSelective(sensor);
- }else{
+ } else {
sensorMapper.updateByPrimaryKeySelective(sensor);
}
- }
- catch (Exception ex){
- throw ex;
+ } catch (Exception ex) {
+ throw ex;
}
}
@Override
public void deleteByIds(Integer... ids) {
- if(ids!=null&&ids.length>0){
- if(ids.length==1){
+ if (ids != null && ids.length > 0) {
+ if (ids.length == 1) {
sensorMapper.deleteByPrimaryKey(ids[0]);
- }else{
+ } else {
Example example = new Example(ENTITY_CLASS);
example.or().andIn("id", Arrays.asList(ids));
sensorMapper.deleteByExample(example);
@@ -74,6 +83,7 @@
/**
* ������������������������������������������
+ *
* @param organizationId
* @return
*/
@@ -81,25 +91,29 @@
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;
- }
+ 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) {
@@ -110,4 +124,22 @@
}
return sensorMap;
}
+
+ @Override
+ public List<Map<String, String>> getSensorsMaps(String mac) {
+ List<Sensor> sensors = sensorMapper.getSensorsInfoByMac(mac);
+ Map<String, String> sensorsDescriptionMap = new HashMap<>();
+ for (Sensor sensor : sensors) {
+ sensorsDescriptionMap.put(sensor.getSensorKey(), sensor.getDescription());
+ }
+ Map<String, String> sensorsUnitMap = new HashMap<>();
+ for (Sensor sensor : sensors) {
+ sensorsUnitMap.put(sensor.getSensorKey(), sensor.getUnit());
+ }
+ List<Map<String, String>> sensorsMapList = new ArrayList<>();
+ sensorsMapList.add(sensorsDescriptionMap);
+ sensorsMapList.add(sensorsUnitMap);
+ return sensorsMapList;
+ }
+
}
--
Gitblit v1.8.0