From dbba9c3fc5187432c34329a2a18e07feca729de5 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期二, 24 六月 2025 11:25:11 +0800
Subject: [PATCH] 2.5.1蓄电池对比分析同一时间同一品牌
---
src/main/java/com/whyc/controller/StatisticController.java | 123 +++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/whyc/controller/StatisticController.java b/src/main/java/com/whyc/controller/StatisticController.java
index 96807a8..4d22234 100644
--- a/src/main/java/com/whyc/controller/StatisticController.java
+++ b/src/main/java/com/whyc/controller/StatisticController.java
@@ -1,19 +1,18 @@
package com.whyc.controller;
import com.whyc.dto.Response;
-import com.whyc.dto.Statistic.BattTinfStic;
-import com.whyc.dto.Statistic.DeviceStateStic;
-import com.whyc.dto.Statistic.StationStic;
+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
@Api(tags = "缁熻绠＄悊")
@@ -24,6 +23,7 @@
@Autowired
private BatttestdataInfService battTinfService;
+
@Autowired
private BattInfService battService;
@@ -33,7 +33,10 @@
@Autowired
private DeviceStateService deviceStateService;
- @ApiOperation(value = "鐢垫簮淇℃伅缁熻")
+ @Autowired
+ private AppParamService appParamService;
+
+ @ApiOperation(value = "鐢垫簮淇℃伅缁熻(1.2.1/1.2.13)")
@PostMapping("getPowerStatistic")
public Response getPowerStatistic(@RequestBody StationStic stic){
User uinf= ActionUtil.getUser();
@@ -41,7 +44,7 @@
return powerInfService.getPowerStatistic(stic);
}
- @ApiOperation(value = "璁惧淇℃伅缁熻")
+ @ApiOperation(value = "璁惧淇℃伅缁熻(1.2.2)")
@PostMapping("getDevStatistic")
public Response getDevStatistic(@RequestBody StationStic stic){
User uinf= ActionUtil.getUser();
@@ -49,9 +52,68 @@
return battService.getDevStatistic(stic);
}
+ @ApiOperation(value = "钃勭數姹犵粍淇℃伅缁熻(1.2.3/1.2.12)")
+ @PostMapping("getBattStatistic")
+ public Response getBattStatistic(@RequestBody StationStic stic){
+ User uinf= ActionUtil.getUser();
+ stic.setUid(uinf.getId());
+ return battService.getBattStatistic(stic);
+ }
+
+ @ApiOperation(value = "鍗曡妭鏁伴噺缁熻(1.2.4)")
+ @PostMapping("getMonStatistic")
+ public Response getMonStatistic(@RequestBody MonStic stic){
+ User uinf= ActionUtil.getUser();
+ stic.setUid(uinf.getId());
+ Map<String,Object> map= battTinfService.getMonStatistic(stic);
+ return new Response().setII(1,true,map,"鍗曡妭鏁伴噺缁熻");
+ }
+
+ @ApiOperation(value = "鏈勾搴﹀凡鏀剧數鏁伴噺缁熻(1.2.5)")
+ @PostMapping("getDischr5Statistic")
+ public Response getDischr5Statistic(@RequestBody DisChargeStic stic){
+ User uinf= ActionUtil.getUser();
+ 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){
+ stic.setStopReasonType(0);
+ }else{
+ stic.setStopReasonType(1);
+ }*/
+ return battTinfService.getDischr6Statistic(stic);
+ }
+ @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 = "绔欑偣淇℃伅缁熻")
+
+ @ApiOperation(value = "绔欑偣淇℃伅缁熻(1.2.11)")
@PostMapping("getStationStatistic")
public Response getStationStatistic(@RequestBody StationStic stic){
User uinf= ActionUtil.getUser();
@@ -59,19 +121,56 @@
return stationInfService.getStationStatistic(stic);
}
- @ApiOperation(value = "钃勭數姹犳牳瀹逛俊鎭粺璁�")
+ @ApiOperation(value = "钃勭數姹犳牳瀹逛俊鎭粺璁�(1.2.14)")
@PostMapping("getBattTinfStatistic")
public Response getBattTinfStatistic(@RequestBody BattTinfStic stic){
User uinf= ActionUtil.getUser();
stic.setUid(uinf.getId());
return battTinfService.getBattTinfStatistic(stic);
}
+ /* @ApiOperation(value = "钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堝悓涓�鍝佺墝鍚屼竴鏃堕棿锛�(1.2.15)")
+ @PostMapping("getBattCompare15Statistic")
+ public Response getBattCompare15Statistic(@RequestBody BattCompareStic stic){
+ User uinf= ActionUtil.getUser();
+ stic.setUid(uinf.getId());
+ return battTinfService.getBattCompare15Statistic(stic);
+ }
- @ApiOperation(value = "璁惧宸ヤ綔鐘舵�佺粺璁�")
+ @ApiOperation(value = "钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堜笉鍚屽搧鐗屽悓涓�鏃堕棿锛�(1.2.16)")
+ @PostMapping("getBattCompare16Statistic")
+ public Response getBattCompare16Statistic(@RequestBody BattCompareStic stic){
+ User uinf= ActionUtil.getUser();
+ stic.setUid(uinf.getId());
+ return battTinfService.getBattCompare16Statistic(stic);
+ }
+
+ @ApiOperation(value = "钃勭數姹犵粍瀵规瘮鍒嗘瀽鐣岄潰锛堝悓涓�鍝佺墝涓嶅悓鏃堕棿锛�(1.2.17)")
+ @PostMapping("getBattCompare17Statistic")
+ public Response getBattCompare17Statistic(@RequestBody BattCompareStic stic){
+ User uinf= ActionUtil.getUser();
+ stic.setUid(uinf.getId());
+ return battTinfService.getBattCompare17Statistic(stic);
+ }*/
+
+ @ApiOperation(value = "璁惧宸ヤ綔鐘舵�佺粺璁�(1.2.21)")
@PostMapping("getDeviceStateStatistic")
public Response getDeviceStateStatistic(@RequestBody DeviceStateStic stic){
User uinf= ActionUtil.getUser();
stic.setUid(uinf.getId());
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