From e16302f9d475c7cc4dd18c5abf1a23cb5502e362 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 28 五月 2025 14:57:56 +0800
Subject: [PATCH] 密码验证加-
---
src/main/java/com/whyc/controller/BatttestdataInfController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/controller/BatttestdataInfController.java b/src/main/java/com/whyc/controller/BatttestdataInfController.java
index ecd9ca1..d2389a6 100644
--- a/src/main/java/com/whyc/controller/BatttestdataInfController.java
+++ b/src/main/java/com/whyc/controller/BatttestdataInfController.java
@@ -4,6 +4,7 @@
import com.whyc.dto.paramter.GroupTestCapPar;
import com.whyc.pojo.Battinf;
import com.whyc.service.BatttestdataInfService;
+import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -16,7 +17,7 @@
@RequestMapping("Batttestdata_infAction")
@RestController
@Api(tags = "鍦ㄧ嚎鐩戞祴-鍘嗗彶鐩戞帶")
-public class BatttestdataInfController {
+public class BatttestdataInfController extends BaseController{
@Resource
private BatttestdataInfService service;
@@ -31,7 +32,8 @@
@PostMapping("/searchBattLastHrDataById")
@ApiOperation(value = "鏈�鍚庝竴娆℃牳瀹规斁鐢垫暟鎹�")
public Response searchBattLastHrDataById(@RequestParam int battGroupId, @RequestParam int devId) {
- return service.searchBattLastHrDataById(battGroupId, devId);
+ String lang = ActionUtil.getLang();
+ return service.searchBattLastHrDataById(battGroupId, devId, lang);
}
@PostMapping("/searchBattLife")
@@ -56,5 +58,58 @@
public Response searchGroupTestCap(@RequestBody GroupTestCapPar groupCapPar) {
return service.searchGroupTestCap(groupCapPar);
}
+ @GetMapping("getEnergyStatistics")
+ @ApiOperation(value = "鑳芥晥缁熻")
+ public Response getEnergyStatistics(@RequestParam int year) {
+ return service.getEnergyStatistics(year);
+ }
+ @GetMapping("getEnergyStatistics_nj")
+ @ApiOperation(value = "鑳芥晥缁熻--鍗椾含websocket棣栭〉")
+ public Response getEnergyStatistics_nj(@RequestParam int year,@RequestParam int userId) {
+ return service.getEnergyStatistics_nj(year,userId);
+ }
+
+ @GetMapping("getEnergyStatisticsInBaojiGroup")
+ @ApiOperation(value = "鑳芥晥缁熻鍒嗙彮缁�")
+ public Response getEnergyStatisticsInBaojiGroup(@RequestParam int year) {
+ return service.getEnergyStatisticsInBaojiGroup(year);
+ }
+
+ @GetMapping("getEnergyStatisticsInBaojiGroupWithOutYear")
+ @ApiOperation(value = "鑳芥晥缁熻鍒嗙彮缁勪笉鍒嗗勾")
+ public Response getEnergyStatisticsInBaojiGroupWithOutYear(@RequestParam int year) {
+ return service.getEnergyStatisticsInBaojiGroupWithOutYear(year);
+ }
+
+ @GetMapping("getHrYeardisBatt")
+ @ApiOperation(value = "鑾峰彇鏈勾宸叉牳瀹规斁鐢电數姹犵粍(宸插純鐢ㄦ病鏈夊姞and test_stoptype in (2, 3, 4, 6))")
+ public Response getHrYeardisBatt() {
+ return service.getHrYeardisBatt();
+ }
+
+ @GetMapping("getJcdisBatt")
+ @ApiOperation(value = "鑾峰彇瀹炴椂鍋滅數鏀剧數鏈烘埧")
+ public Response getJcdisBatt() {
+ return service.getJcdisBatt();
+ }
+
+ @GetMapping("getHrYeardisBattInfo")
+ @ApiOperation(value = "鑾峰彇鏈勾宸叉牳瀹规斁鐢电數姹犵粍鏈�鏂颁竴娆℃暟鎹鎯�")
+ public Response getHrYeardisBattInfo() {
+ return service.getHrYeardisBattInfo();
+ }
+
+ @GetMapping("getHrYeardisBattInfoZC")
+ @ApiOperation(value = "鑾峰彇鏈勾宸叉牳瀹规斁鐢电數姹犵粍鏈�鏂颁竴娆℃暟鎹鎯�(姝ｅ父鍋滄:2.3.4.6)")
+ public Response getHrYeardisBattInfoZC() {
+ return service.getHrYeardisBattInfoZC();
+ }
+
+
+ @ApiOperation("娴嬭瘯getGroupAnalysis")
+ @GetMapping("getGroupAnalysis")
+ public Response getGroupAnalysis(int uid) {
+ return service.getGroupAnalysis(uid);
+ }
}
--
Gitblit v1.9.1