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/DeviceResourceApplyController.java |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/whyc/controller/DeviceResourceApplyController.java b/src/main/java/com/whyc/controller/DeviceResourceApplyController.java
index 60e7e91..e652d30 100644
--- a/src/main/java/com/whyc/controller/DeviceResourceApplyController.java
+++ b/src/main/java/com/whyc/controller/DeviceResourceApplyController.java
@@ -1,10 +1,14 @@
 package com.whyc.controller;
 
+import com.whyc.dto.DeviceConditionDTO;
 import com.whyc.dto.Response;
 import com.whyc.pojo.DeviceResourceApply;
+import com.whyc.service.DeviceResourceApplyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * 璁惧璧勬簮鐢宠
@@ -14,14 +18,19 @@
 @Api(tags = "璁惧璧勬簮")
 public class DeviceResourceApplyController {
 
-    @GetMapping("all")
+    @Autowired
+    private DeviceResourceApplyService service;
+
+    @PostMapping("all")
     @ApiOperation(value = "鏌ヨ鎵�鏈夎澶囩姸鎬佸垎椤�-绛涢��")
-    public Response getAllDeviceStatus(){
-        return null;
+    public Response getAllDeviceStatus(@RequestParam Integer pageNum,@RequestParam Integer pageSize,
+                                       @RequestBody DeviceConditionDTO deviceConditionDTO){
+        return service.getAllDeviceStatus(pageNum,pageSize,deviceConditionDTO);
     }
 
     @GetMapping
     @ApiOperation(value = "鏌ヨ璁惧鐘舵��-鏍规嵁璁惧id")
+    @ApiIgnore
     public Response getDeviceStatus(@RequestParam Integer deviceId){
         return null;
     }
@@ -30,27 +39,27 @@
     @ApiOperation(value = "鎻愪氦鐢宠")
     public Response apply(@RequestBody DeviceResourceApply resourceApply){
 
-        return null;
+        return service.apply(resourceApply);
     }
 
-    @GetMapping("applyPage")
+    @PostMapping("applyPage")
     @ApiOperation(value = "鏌ヨ鐢宠鍒楄〃鍒嗛〉-绛涢��")
-    //TODO 灏佽绛涢�夋潯浠跺埌DTO
-    public Response getApplyPage(@RequestParam Integer pageNum,@RequestParam Integer pageSize){
-        return null;
+    public Response getApplyPage(@RequestParam Integer pageNum,@RequestParam Integer pageSize,
+                                 @RequestBody DeviceConditionDTO condition){
+        return service.getApplyPage(pageNum,pageSize,condition);
     }
 
     @PutMapping("approve")
     @ApiOperation(value = "瀹℃牳")
-    public Response approve(@RequestBody DeviceResourceApply resourceApply){
+    public Response approve(@RequestParam Integer id,@RequestParam Integer status){
 
-        return null;
+        return service.approve(id,status);
     }
 
     @GetMapping("applyInfo")
-    @ApiOperation(value = "鏌ヨ鍗曚釜鐢宠鐘舵��-鏍规嵁璁惧id")
-    public Response applyInfo(@RequestBody DeviceResourceApply resourceApply){
+    @ApiOperation(value = "鏌ヨ鍗曚釜鐢宠鐘舵��-鏍规嵁鐢宠id")
+    public Response getApplyInfo(@RequestParam Integer id){
 
-        return null;
+        return service.getApplyInfo(id);
     }
 }

--
Gitblit v1.9.1