From f53830df5296e399a6153a5a7b0f2b94315dd0c1 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 14 Aug 2018 09:40:42 +0800
Subject: [PATCH] api详细接口修正
---
src/main/java/com/moral/controller/DeviceController.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/DeviceController.java b/src/main/java/com/moral/controller/DeviceController.java
index 87e7fa1..1fad118 100644
--- a/src/main/java/com/moral/controller/DeviceController.java
+++ b/src/main/java/com/moral/controller/DeviceController.java
@@ -2,10 +2,18 @@
import com.moral.common.bean.PageBean;
import com.moral.common.bean.ResultBean;
+import com.moral.entity.Device;
import com.moral.service.DeviceService;
import org.springframework.web.bind.annotation.*;
+import static com.moral.common.util.WebUtils.getParametersStartingWith;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
@RestController
@RequestMapping("device")
@@ -13,6 +21,14 @@
public class DeviceController {
@Resource
DeviceService deviceService;
+ @GetMapping("count-by-example")
+ public ResultBean<Integer> countByExample(PageBean pageBean){
+ return new ResultBean<Integer>(deviceService.countByExample(pageBean));
+ }
+ @GetMapping("count-by-times")
+ public ResultBean<List<Map>> countByTimes(Date start, Date end){
+ return new ResultBean<List<Map>>(deviceService.countByTimes(start,end,"%Y-%m"));
+ }
@GetMapping("page-list")
public PageBean pageList(PageBean pageBean) {
return deviceService.queryByPageBean(pageBean);
@@ -23,4 +39,24 @@
ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
return resultBean;
}
+ @PostMapping("add-or-modify")
+ public ResultBean addOrModify(@RequestBody Device device){
+ deviceService.addOrModify(device);
+ 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);
+ }
+
+ @GetMapping("professionId")
+ public ResultBean<List<Device>> getDevicesByProfessionId(HttpServletRequest request) {
+ Map<String, Object> parameters = getParametersStartingWith(request, null);
+ List<Device> devices = deviceService.getDevicesByProfessionId(parameters);
+ return new ResultBean<List<Device>>(devices);
+ }
}
--
Gitblit v1.8.0