From b46f7fa6d77852ae9e28a062da234a2ddf9405fb Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 31 三月 2025 16:09:51 +0800
Subject: [PATCH] 2025-3-22定制修改导出去掉容量和连接条

---
 src/main/java/com/whyc/controller/FileParamController.java |   38 +++++++++++++++++++++++++++++++++++---
 1 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/whyc/controller/FileParamController.java b/src/main/java/com/whyc/controller/FileParamController.java
index dee016f..e87f339 100644
--- a/src/main/java/com/whyc/controller/FileParamController.java
+++ b/src/main/java/com/whyc/controller/FileParamController.java
@@ -1,13 +1,15 @@
 package com.whyc.controller;
 
+import com.whyc.dto.ActionUtil;
 import com.whyc.dto.Response;
 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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.ParseException;
+import java.util.Date;
 
 @RestController
 @RequestMapping("fileParam")
@@ -22,4 +24,34 @@
         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) String battVol
+                                       ,@RequestParam(required = false ,defaultValue = "1") int pageCurr
+                                       ,@RequestParam(required = false ,defaultValue = "10") int pageSize
+                                       ,@RequestParam(required = false ,defaultValue = "0") int flag)  {
+        Date testTime1= null;
+        Date testTime2= null;
+        try {
+            testTime1 = ActionUtil.sdfwithALL.parse(startTime);
+            testTime2 = ActionUtil.sdfwithALL.parse(endTime);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return service.getDataByCondition(testTime1,testTime2,battVol,pageCurr,pageSize,flag);
+    }
+    @ApiOperation("鍒犻櫎鍩虹珯涓嬫暟鎹�")
+    @GetMapping("deleteDataById")
+    public Response deleteDataById(@RequestParam int stationId,@RequestParam int fileId){
+        return service.deleteDataById(stationId,fileId);
+    }
+
+    @ApiOperation("鏍规嵁fileId鑾峰彇鍙傛暟淇℃伅")
+    @GetMapping("getParamByFileId")
+    public Response getParamByFileId(@RequestParam int fileId){
+        return service.getParamByFileId(fileId);
+    }
+
 }

--
Gitblit v1.9.1