From 14753bc669a106315717f0f4a70bf2bf5c3e8995 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 13 Apr 2020 15:52:11 +0800
Subject: [PATCH] add大屏报表接口和走航车轨迹接口
---
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 122 +++++++++++++++++++++++++++++++++++-----
1 files changed, 106 insertions(+), 16 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..77dca20 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -5,41 +5,74 @@
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;
private static Class ENTITY_CLASS = Sensor.class;
- public PageBean queryByPageBean(PageBean pageBean){
- return MyBatisBaseMapUtil.queryPage(sensorMapper,pageBean,ENTITY_CLASS);
+
+ /**
+ * ������������������������������
+ *
+ * @return
+ */
+ @Override
+ public List<Sensor> queryAll() {
+ return sensorMapper.selectByExample(null);
}
- public void addOrModify(Sensor sensor){
- try{
- if(sensor.getId()==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 {
+ 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);
@@ -48,8 +81,65 @@
}
}
+ /**
+ * ������������������������������������������
+ *
+ * @param organizationId
+ * @return
+ */
@Override
- public List<Sensor> getAllSensors() {
- return sensorMapper.selectAll();
- }
+ 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;
+ }
+
+ @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