From 7d64716cb0d406f21cde03976fd273bd07fdc06f Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 28 九月 2021 11:44:28 +0800
Subject: [PATCH] 更新用户-角色-菜单-权限

---
 src/main/java/com/whyc/controller/DeviceManageController.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/whyc/controller/DeviceManageController.java b/src/main/java/com/whyc/controller/DeviceManageController.java
index c035d99..886c788 100644
--- a/src/main/java/com/whyc/controller/DeviceManageController.java
+++ b/src/main/java/com/whyc/controller/DeviceManageController.java
@@ -10,6 +10,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 璁惧绠$悊淇℃伅琛�
  */
@@ -21,12 +23,32 @@
     @Autowired
     private DeviceManageService service;
 
-    @GetMapping("page")
-    @ApiOperation(value = "鏌ヨ鎵�鏈�-鍒嗛〉")
+    @GetMapping("list")
+    @ApiOperation(value = "鏌ヨ宸﹁竟鑿滃崟鍒楄〃")
+    public Response<List<DeviceManage>> getList(){
+        return service.getList();
+    }
+
+    /*@GetMapping("page")
+    @ApiOperation(value = "鏌ヨ鍒嗛〉")
     public Response<PageInfo<DeviceManage>> getPage(@RequestParam int pageNum, @RequestParam int pageSize){
         return service.getPage(pageNum,pageSize);
+    }*/
+
+    @PostMapping("pageByCondition")
+    @ApiOperation(value = "鏌ヨ鍒嗛〉-鏍规嵁绛涢�夋潯浠�")
+    public Response<PageInfo<DeviceManage>> getPageByCondition(@RequestParam int pageNum,@RequestParam int pageSize,@RequestBody DeviceManage deviceManage){
+        return service.getPageByCondition(pageNum,pageSize,deviceManage);
     }
 
+
+    @GetMapping("site")
+    @ApiOperation(value = "鏌ヨ鎵�鏈夊尯鍩�")
+    public Response getSite(){
+        return service.getSite();
+    }
+
+
     @PostMapping
     @ApiOperation(value="娣诲姞-鍏ュ簱")
     public Response add(@RequestBody DeviceManage deviceManage){

--
Gitblit v1.9.1