From e294ea312fe1994c3ddfe26595ee414e6612eb0c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 04 Dec 2020 11:37:36 +0800
Subject: [PATCH] 大屏report_avg_datas接口24点无数据处理
---
src/main/java/com/moral/controller/DeviceController.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/moral/controller/DeviceController.java b/src/main/java/com/moral/controller/DeviceController.java
index 1fad118..d02ddd8 100644
--- a/src/main/java/com/moral/controller/DeviceController.java
+++ b/src/main/java/com/moral/controller/DeviceController.java
@@ -1,11 +1,5 @@
package com.moral.controller;
-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;
@@ -15,12 +9,30 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.moral.mapper.DeviceMapper;
+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;
+
@RestController
@RequestMapping("device")
@CrossOrigin(origins = "*", maxAge = 3600)
public class DeviceController {
@Resource
DeviceService deviceService;
+ @Resource
+ DeviceMapper deviceMapper;
@GetMapping("count-by-example")
public ResultBean<Integer> countByExample(PageBean pageBean){
return new ResultBean<Integer>(deviceService.countByExample(pageBean));
@@ -59,4 +71,25 @@
List<Device> devices = deviceService.getDevicesByProfessionId(parameters);
return new ResultBean<List<Device>>(devices);
}
+
+ @GetMapping("getDeviceByMonitorId")
+ public ResultBean<List<Map<String, Object>>> getDeviceByMonitorId() {
+ List<Map<String, Object>> devices = deviceMapper.getDevicesByMpId(563);
+ return new ResultBean<List<Map<String, Object>>>(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