From ada3e9094ecfb8b995c5580bbb59a1d64d89a801 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 26 十月 2022 09:16:32 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/controller/FileParamController.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/whyc/controller/FileParamController.java b/src/main/java/com/whyc/controller/FileParamController.java
index e873632..35752fa 100644
--- a/src/main/java/com/whyc/controller/FileParamController.java
+++ b/src/main/java/com/whyc/controller/FileParamController.java
@@ -2,12 +2,10 @@
import com.whyc.dto.ActionUtil;
import com.whyc.dto.Response;
-import com.whyc.pojo.FileParam;
import com.whyc.service.FileParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
@@ -25,12 +23,14 @@
public Response getMonVolStd(){
return service.getMonVolStd();
}
-
+
@ApiOperation("鎸夌収绛涢�夋潯浠舵煡璇㈡暟鎹簱淇℃伅")
@GetMapping("getDataByCondition")
public Response getDataByCondition(@RequestParam(required = false ,defaultValue = "1982-01-01 00:00:00") String startTime
, @RequestParam(required = false,defaultValue = "2222-01-01 00:00:00") String endTime
- , @RequestParam(required = false) int battVol) {
+ , @RequestParam(required = false) String battVol
+ ,@RequestParam(required = false ,defaultValue = "1") int pageCurr
+ ,@RequestParam(required = false ,defaultValue = "10") int pageSize) {
Date testTime1= null;
Date testTime2= null;
try {
@@ -39,20 +39,11 @@
} catch (ParseException e) {
e.printStackTrace();
}
- return service.getDataByCondition(testTime1,testTime2,battVol);
+ return service.getDataByCondition(testTime1,testTime2,battVol,pageCurr,pageSize);
}
-
- @ApiOperation("鍒嗙骇璇勪环-绯绘暟鍙婇槇鍊兼煡璇�")
- @GetMapping("factorsAndThreshold")
- public Response getFactorsAndThreshold(@RequestParam String fileId){
- FileParam param = service.getFactorsAndThreshold(fileId);
- return new Response().set(1,param);
- }
-
- @ApiOperation("鍒嗙骇璇勪环-绯绘暟鍙婇槇鍊兼洿鏂板強绂佺敤鍚敤")
- @PutMapping("factorsAndThreshold")
- public Response updateFactorsAndThreshold(@RequestBody FileParam param){
- service.updateFactorsAndThreshold(param);
- return new Response().set(1,"鏇存柊瀹屾垚");
+ @ApiOperation("鍒犻櫎鍩虹珯涓嬫暟鎹�")
+ @GetMapping("deleteDataById")
+ public Response deleteDataById(@RequestParam int stationId,@RequestParam int fileId){
+ return service.deleteDataById(stationId,fileId);
}
}
--
Gitblit v1.9.1