From 9f46f8471a3521c03461e04a6e82cff023e9bfdb Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 18:38:21 +0800
Subject: [PATCH] 判断优良电源性能

---
 src/main/java/com/whyc/controller/StatisticController.java |   46 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/whyc/controller/StatisticController.java b/src/main/java/com/whyc/controller/StatisticController.java
index a071479..11f662e 100644
--- a/src/main/java/com/whyc/controller/StatisticController.java
+++ b/src/main/java/com/whyc/controller/StatisticController.java
@@ -2,17 +2,16 @@
 
 import com.whyc.dto.Response;
 import com.whyc.dto.Statistic.*;
+import com.whyc.pojo.db_param.AppParam;
 import com.whyc.pojo.db_user.User;
 import com.whyc.service.*;
 import com.whyc.util.ActionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 @RestController
@@ -33,6 +32,9 @@
 
     @Autowired
     private DeviceStateService deviceStateService;
+
+    @Autowired
+    private AppParamService appParamService;
 
     @ApiOperation(value = "鐢垫簮淇℃伅缁熻(1.2.1/1.2.13)")
     @PostMapping("getPowerStatistic")
@@ -74,27 +76,41 @@
         stic.setUid(uinf.getId());
         return battTinfService.getDischr5Statistic(stic);
     }
-
     @ApiOperation(value = "鏈勾搴︽湭鏀剧數鏁伴噺缁熻(1.2.6)")
     @PostMapping("getDischr6Statistic")
     public Response getDischr6Statistic(@RequestBody DisChargeStic stic){
         User uinf= ActionUtil.getUser();
         stic.setUid(uinf.getId());
-        if(stic.getTypeList()==null||stic.getTypeList().size()==0){
+        /*if(stic.getTypeList()==null||stic.getTypeList().size()==0){
             stic.setStopReasonType(0);
         }else{
             stic.setStopReasonType(1);
-        }
+        }*/
         return battTinfService.getDischr6Statistic(stic);
     }
-
-    @ApiOperation(value = "鐢垫睜缁勭數姹犳�ц兘缁熻锛堟湭鏀剧數锛屼紭绉�锛屽姡鍖栵紝鎹熷潖锛夌粺璁�(1.2.8/9/10)")
+    @ApiOperation(value = "浼樿壇鐢垫簮鏁伴噺缁熻(1.2.7)")
+    @PostMapping("getPwr7Statistic")
+    public Response getPwr7Statistic(@RequestBody Pwr7Stic stic) throws NoSuchFieldException, IllegalAccessException {
+        User uinf= ActionUtil.getUser();
+        stic.setUid(uinf.getId());
+        return battTinfService.getPwr7Statistic(stic);
+    }
+    @ApiOperation(value = "鐢垫睜缁勭數姹犳�ц兘缁熻锛堜紭绉�锛屽姡鍖栵紝鎹熷潖<鎸夌収瀹归噺缁熻>锛夌粺璁�(1.2.8/9/10)")
     @PostMapping("getPerformanceStatistic")
     public Response getPerformanceStatistic(@RequestBody PerformanceStic stic){
         User uinf= ActionUtil.getUser();
         stic.setUid(uinf.getId());
         return battTinfService.getPerformanceStatistic(stic);
     }
+
+    @ApiOperation(value = "鐢垫睜缁勭數姹犳�ц兘缁熻锛堝姡鍖�<鎸夌収鍗曚綋鐢靛帇+鍐呴樆缁熻>锛夌粺璁�(1.2.9)")
+    @PostMapping("getPerVolAndRes9Statistic")
+    public Response getPerVolAndRes9Statistic(@RequestBody PerformanceStic stic){
+        User uinf= ActionUtil.getUser();
+        stic.setUid(uinf.getId());
+        return battTinfService.getPerVolAndRes9Statistic(stic);
+    }
+
 
 
     @ApiOperation(value = "绔欑偣淇℃伅缁熻(1.2.11)")
@@ -144,5 +160,17 @@
         return deviceStateService.getDeviceStateStatistic(stic);
     }
 
+    @ApiOperation(value = "璁剧疆鏉冮噸(1.2.16)")
+    @PostMapping("setHehavior")
+    public Response setHehavior(@RequestBody List<AppParam> List){
+        return appParamService.setHehavior(List);
+    }
+
+    @ApiOperation(value = "璇诲彇鏉冮噸(1.2.16)")
+    @GetMapping("getHehavior")
+    public Response getHehavior(){
+        return appParamService.getHehavior();
+    }
+
 
 }
\ No newline at end of file

--
Gitblit v1.9.1