From e7a7b634352f684085bb6eea34b331fc069ff44d Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 05 三月 2021 09:32:59 +0800
Subject: [PATCH] update api

---
 src/main/java/com/whyc/controller/UPSCommController.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/whyc/controller/UPSCommController.java b/src/main/java/com/whyc/controller/UPSCommController.java
index 2f530c2..0ddc17d 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,6 +12,7 @@
 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;
 
 /**
@@ -31,5 +34,15 @@
         return service.getStauts();
     }
 
+    /**
+     * ======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