From fae2a14914c00d4e450ef855754c3687279e398a Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 26 Jan 2018 10:54:51 +0800
Subject: [PATCH] 报表相关
---
src/main/java/com/moral/controller/DeviceController.java | 9 ++++
src/main/java/com/moral/service/DeviceService.java | 2 +
src/main/java/com/moral/service/impl/SensorServiceImpl.java | 6 +++
src/main/java/com/moral/controller/MonitorPointController.java | 9 ++++
src/main/java/com/moral/controller/SensorController.java | 7 +++
src/main/java/com/moral/service/SensorService.java | 4 ++
src/main/java/com/moral/service/MonitorPointService.java | 3 +
src/main/java/com/moral/service/impl/DeviceServiceImpl.java | 7 +++
src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java | 12 ++++++
src/main/java/com/moral/entity/Device.java | 4 +-
10 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/controller/DeviceController.java b/src/main/java/com/moral/controller/DeviceController.java
index 0cbbc34..762416c 100644
--- a/src/main/java/com/moral/controller/DeviceController.java
+++ b/src/main/java/com/moral/controller/DeviceController.java
@@ -6,6 +6,8 @@
import com.moral.service.DeviceService;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
import javax.annotation.Resource;
@RestController
@@ -30,4 +32,11 @@
ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
return resultBean;
}
+
+ @GetMapping("monitorPointId")
+ public ResultBean<List<Device>> getDevicesByMonitorPointId(@RequestParam(name="monitorPointId")Integer monitorPointId) {
+
+ List<Device> devices = deviceService.getDevicesByMonitorPointId(monitorPointId);
+ return new ResultBean<List<Device>>(devices);
+ }
}
diff --git a/src/main/java/com/moral/controller/MonitorPointController.java b/src/main/java/com/moral/controller/MonitorPointController.java
index 73d7170..9174cf5 100644
--- a/src/main/java/com/moral/controller/MonitorPointController.java
+++ b/src/main/java/com/moral/controller/MonitorPointController.java
@@ -6,6 +6,8 @@
import com.moral.service.MonitorPointService;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
import javax.annotation.Resource;
@@ -44,4 +46,11 @@
ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
return resultBean;
}
+
+ @GetMapping("list/{name}")
+ public ResultBean<List<MonitorPoint>> getMonitorPointsByName(@PathVariable("name") String name) {
+ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByName(name);
+ return new ResultBean<List<MonitorPoint>>(monitorPoints);
+ }
+
}
diff --git a/src/main/java/com/moral/controller/SensorController.java b/src/main/java/com/moral/controller/SensorController.java
index b64ee4f..67bc1d1 100644
--- a/src/main/java/com/moral/controller/SensorController.java
+++ b/src/main/java/com/moral/controller/SensorController.java
@@ -31,4 +31,11 @@
ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
return resultBean;
}
+
+ @GetMapping("all")
+ public ResultBean<List<Sensor>> getAllSensors() {
+ List<Sensor> sensors = sensorService.getAllSensors();
+ return new ResultBean<List<Sensor>>(sensors);
+ }
+
}
diff --git a/src/main/java/com/moral/entity/Device.java b/src/main/java/com/moral/entity/Device.java
index 757f78e..ec0b15f 100644
--- a/src/main/java/com/moral/entity/Device.java
+++ b/src/main/java/com/moral/entity/Device.java
@@ -32,12 +32,12 @@
* This field was generated by MyBatis Generator. This field corresponds to the database column device.longitude
* @mbggenerated Wed Nov 29 16:17:59 CST 2017
*/
- private double longitude;
+ private Double longitude;
/**
* This field was generated by MyBatis Generator. This field corresponds to the database column device.latitude
* @mbggenerated Wed Nov 29 16:17:59 CST 2017
*/
- private double latitude;
+ private Double latitude;
/**
* This field was generated by MyBatis Generator. This field corresponds to the database column device.mac
* @mbggenerated Wed Nov 29 16:17:59 CST 2017
diff --git a/src/main/java/com/moral/service/DeviceService.java b/src/main/java/com/moral/service/DeviceService.java
index db24cfc..e40048a 100644
--- a/src/main/java/com/moral/service/DeviceService.java
+++ b/src/main/java/com/moral/service/DeviceService.java
@@ -22,4 +22,6 @@
void deleteByIds(Integer[] ids);
void addOrModify(Device device);
+
+ List<Device> getDevicesByMonitorPointId(Integer monitorPointId);
}
diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index 17e08e0..b036d89 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -16,4 +16,7 @@
public void addOrModify(MonitorPoint monitorPoint);
public void deleteByIds(Integer... ids);
+
+ List<MonitorPoint> getMonitorPointsByName(String name);
+
}
diff --git a/src/main/java/com/moral/service/SensorService.java b/src/main/java/com/moral/service/SensorService.java
index d525564..9b66088 100644
--- a/src/main/java/com/moral/service/SensorService.java
+++ b/src/main/java/com/moral/service/SensorService.java
@@ -1,5 +1,7 @@
package com.moral.service;
+import java.util.List;
+
import com.moral.common.bean.PageBean;
import com.moral.entity.Sensor;
@@ -7,4 +9,6 @@
public PageBean queryByPageBean(PageBean pageBean);
public void addOrModify(Sensor sensor);
public void deleteByIds(Integer... ids);
+
+ public List<Sensor> getAllSensors();
}
diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index 152970a..78cbbd7 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -151,5 +151,12 @@
}
}
+ @Override
+ public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
+ Device device = new Device();
+ device.setMonitorPointId(monitorPointId);
+ device.setIsDelete(Constants.IS_DELETE_FALSE);
+ return deviceMapper.select(device);
+ }
}
diff --git a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
index 8e2d6ce..3f2533b 100644
--- a/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MonitorPointServiceImpl.java
@@ -18,6 +18,7 @@
import com.moral.mapper.MonitorPointMapper;
import com.moral.service.MonitorPointService;
import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
@Service
public class MonitorPointServiceImpl implements MonitorPointService {
@@ -83,4 +84,15 @@
}
}
+ @Override
+ public List<MonitorPoint> getMonitorPointsByName(String name) {
+ Example example = new Example(MonitorPoint.class);
+ Criteria criteria = example.createCriteria();
+
+ criteria.andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andLike("name", "%" + name + "%");
+ example.or().andEqualTo("isDelete", Constants.IS_DELETE_FALSE).andCondition("getPY(name) like ", "%" + name + "%");
+
+ List<MonitorPoint> monitorPoints = monitorPointMapper.selectByExample(example);
+ return monitorPoints;
+ }
}
diff --git a/src/main/java/com/moral/service/impl/SensorServiceImpl.java b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
index 92cb96f..32b2d97 100644
--- a/src/main/java/com/moral/service/impl/SensorServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/SensorServiceImpl.java
@@ -10,6 +10,7 @@
import javax.annotation.Resource;
import java.util.Arrays;
+import java.util.List;
@Service
public class SensorServiceImpl implements SensorService{
@@ -46,4 +47,9 @@
}
}
+
+ @Override
+ public List<Sensor> getAllSensors() {
+ return sensorMapper.selectAll();
+ }
}
--
Gitblit v1.8.0