From 4288e68cced096a216bebfcd797e78791e192c67 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 04 六月 2025 10:49:34 +0800
Subject: [PATCH] 添加电池组使用时间,常量参数处理,单体统计修改,下拉条件增加

---
 src/main/java/com/whyc/controller/ConditionController.java |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whyc/controller/ConditionController.java b/src/main/java/com/whyc/controller/ConditionController.java
index 4ed1bd9..4f86974 100644
--- a/src/main/java/com/whyc/controller/ConditionController.java
+++ b/src/main/java/com/whyc/controller/ConditionController.java
@@ -2,10 +2,7 @@
 
 import com.whyc.dto.Response;
 import com.whyc.pojo.db_user.User;
-import com.whyc.service.BaojigroupService;
-import com.whyc.service.BattInfService;
-import com.whyc.service.PowerInfService;
-import com.whyc.service.StationInfService;
+import com.whyc.service.*;
 import com.whyc.util.ActionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -27,6 +24,15 @@
 
     @Autowired
     private BattInfService binfService;
+
+    @Autowired
+    private BattalarmDataService  almDataService;
+
+    @Autowired
+    private DeviceStateService  deviceStateService;
+
+    @Autowired
+    private BattRtstateService  rtstateService;
 
     @ApiOperation("鑾峰彇鎵�鏈夌殑鐪佷唤(涓嬫媺)")
     @GetMapping("getProviceByUid")
@@ -134,6 +140,23 @@
         return bjGroupService.getBaojiUserByUid(uinf.getId());
     }
 
+    @ApiOperation(value = "鑾峰彇鐢垫睜鍛婅绫诲瀷(涓嬫媺)")
+    @GetMapping("getSingalIdIdType")
+    public Response getSingalIdIdType(){
+        return almDataService.getSingalIdType();
+    }
+
+    @ApiOperation(value = "鑾峰彇璁惧宸ヤ綔绫诲瀷(涓嬫媺)")
+    @GetMapping("getDevState")
+    public Response getDevState(){
+        return deviceStateService.getDevState();
+    }
+    @ApiOperation(value = "鑾峰彇鐢垫睜缁勫伐浣滅姸鎬佺被鍨�(涓嬫媺)")
+    @GetMapping("getBattState")
+    public Response getBattState(){
+        return rtstateService.getBattState();
+    }
+
 
 
 }
\ No newline at end of file

--
Gitblit v1.9.1