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/OilCommController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/controller/OilCommController.java b/src/main/java/com/whyc/controller/OilCommController.java
index c25b986..88639e9 100644
--- a/src/main/java/com/whyc/controller/OilCommController.java
+++ b/src/main/java/com/whyc/controller/OilCommController.java
@@ -1,18 +1,18 @@
package com.whyc.controller;
+import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
+import com.whyc.pojo.AFERectifierState;
import com.whyc.pojo.OilComm;
import com.whyc.service.OilCommService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
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 org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
/**
* Oil閫氳
@@ -38,5 +38,27 @@
return service.getInfoByDevId(devId);
}
+ @GetMapping("field")
+ @ApiOperation(value = "鏌ヨ鍛婅闃堝�煎瓧娈�")
+ public Response<Map<String, List>> getField(){
+ return service.getField();
+ }
+
+ @PutMapping("updateStatus")
+ @ApiOperation(value = "鏇存柊鐘舵��-婕旂ず浣跨敤")
+ public Response updateStatus(@RequestParam int devId,@RequestParam int oilState){
+ return service.updateStatus(devId,oilState);
+ }
+
+ /**
+ * ======History======
+ * 鍘嗗彶鏌ヨ鏃�,鍥犱负鍘嗗彶璁板綍鏄寜鐓ф棩鏈熷垎琛ㄧ殑,濡傛灉鏌ヨ鎵�鏈夌殑鏃ユ湡琛�(union)鍚庡啀鍒嗛〉,浼氬鑷撮�熷害鏋佹參,鏁呮煡璇㈡寜鐓у崟涓棩鏈熸煡璇�
+ * TODO 寰呯‘瀹氭槸鍚﹂渶瑕佸姞涓婃棩鏈�
+ * */
+ @GetMapping("history/all")
+ @ApiOperation(value = "鏌ヨ鍘嗗彶璁板綍")
+ public Response<PageInfo<OilComm>> getHistory(@RequestParam int pageNum, int pageSize, int devId){
+ return service.getHistory(pageNum,pageSize,devId);
+ }
}
--
Gitblit v1.9.1