From 00e38ff225eb948f5234934afc01aa54c94e0de6 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Sat, 10 Oct 2020 11:29:36 +0800
Subject: [PATCH] update
---
src/main/java/com/moral/controller/DeviceController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/DeviceController.java b/src/main/java/com/moral/controller/DeviceController.java
index 0cbbc34..5febfa5 100644
--- a/src/main/java/com/moral/controller/DeviceController.java
+++ b/src/main/java/com/moral/controller/DeviceController.java
@@ -1,12 +1,28 @@
package com.moral.controller;
+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;
+
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSONObject;
import com.moral.common.bean.PageBean;
import com.moral.common.bean.ResultBean;
import com.moral.entity.Device;
+import com.moral.entity.DeviceProperty;
import com.moral.service.DeviceService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
@RestController
@RequestMapping("device")
@@ -14,6 +30,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);
@@ -30,4 +54,33 @@
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);
+ }
+
+ @PostMapping("save-or-update")
+ public ResultBean saveOrUpdate(@RequestBody String jsonString){
+ Device device = JSONObject.parseObject(jsonString, Device.class);
+ DeviceProperty deviceProperty = JSONObject.parseObject(jsonString, DeviceProperty.class);
+ deviceService.saveOrUpdate(device,deviceProperty);
+ ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
+ return resultBean;
+ }
+
+ @GetMapping("device-list")
+ public PageBean getDeviceList(PageBean pageBean) {
+ return deviceService.getDeviceList(pageBean);
+ }
+
}
--
Gitblit v1.8.0