From 474d1b06554165386af398075d04a7b54d09f9ad Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 02 四月 2021 13:42:23 +0800
Subject: [PATCH] 更新 设备资源申请接口
---
src/main/java/com/whyc/controller/DeviceResourceApplyController.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/controller/DeviceResourceApplyController.java b/src/main/java/com/whyc/controller/DeviceResourceApplyController.java
index 60e7e91..9279094 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,14 +39,14 @@
@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")
--
Gitblit v1.9.1