From 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 18 Nov 2020 14:18:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/controller/DeviceController.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/moral/controller/DeviceController.java b/src/main/java/com/moral/controller/DeviceController.java
index 468425f..d02ddd8 100644
--- a/src/main/java/com/moral/controller/DeviceController.java
+++ b/src/main/java/com/moral/controller/DeviceController.java
@@ -1,16 +1,29 @@
 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;
 import java.util.List;
 import java.util.Map;
 
 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")
@@ -18,6 +31,8 @@
 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));
@@ -49,4 +64,32 @@
     	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);
+    }
+
+    @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