From 8c189b243bfbbacb2ab1ce79f4e1ff22708f125a Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 26 七月 2021 16:45:09 +0800
Subject: [PATCH] 修复接口
---
src/main/java/com/whyc/controller/UPSCommController.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/controller/UPSCommController.java b/src/main/java/com/whyc/controller/UPSCommController.java
index ffa3862..9c85805 100644
--- a/src/main/java/com/whyc/controller/UPSCommController.java
+++ b/src/main/java/com/whyc/controller/UPSCommController.java
@@ -1,6 +1,8 @@
package com.whyc.controller;
+import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
+import com.whyc.pojo.OilComm;
import com.whyc.pojo.UPSComm;
import com.whyc.service.UPSCommService;
import io.swagger.annotations.Api;
@@ -10,14 +12,18 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
/**
* UPS閫氳
*/
@RequestMapping("UPSComm")
@RestController
-@Api(tags = "UPS閫氳")
+@Api(tags = "璇曢獙鍙版鼎婊戝喎鍗寸郴缁�-UPS閫氳")
@Slf4j
public class UPSCommController {
@@ -26,10 +32,25 @@
@GetMapping("status")
@ApiOperation(value = "鑾峰彇UPS鐘舵��")
- @RequiresRoles("admin")
public Response<UPSComm> getStatus(){
return service.getStauts();
}
+ @GetMapping("field")
+ @ApiOperation(value = "鏌ヨ鍛婅闃堝�煎瓧娈�")
+ public Response<Map<String, List>> getField(){
+ return service.getField();
+ }
+
+ /**
+ * ======History======
+ * 鍘嗗彶鏌ヨ鏃�,鍥犱负鍘嗗彶璁板綍鏄寜鐓ф棩鏈熷垎琛ㄧ殑,濡傛灉鏌ヨ鎵�鏈夌殑鏃ユ湡琛�(union)鍚庡啀鍒嗛〉,浼氬鑷撮�熷害鏋佹參,鏁呮煡璇㈡寜鐓у崟涓棩鏈熸煡璇�
+ * TODO 寰呯‘瀹氭槸鍚﹂渶瑕佸姞涓婃棩鏈�
+ * */
+ @GetMapping("history/all")
+ @ApiOperation(value = "鏌ヨ鍘嗗彶璁板綍")
+ public Response<PageInfo<UPSComm>> getHistory(@RequestParam int pageNum, int pageSize, int devId){
+ return service.getHistory(pageNum,pageSize,devId);
+ }
}
--
Gitblit v1.9.1