From 0ce771b4a4ff5897dc91bb1b84a4561781b00ca5 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期一, 01 七月 2024 14:38:24 +0800
Subject: [PATCH] 修改
---
src/main/java/com/whyc/service/CKPowerDevBattRtDataService.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/CKPowerDevBattRtDataService.java b/src/main/java/com/whyc/service/CKPowerDevBattRtDataService.java
index 9d00f8c..9be7118 100644
--- a/src/main/java/com/whyc/service/CKPowerDevBattRtDataService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevBattRtDataService.java
@@ -3,9 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.mapper.CKPowerDevBattRtDataMapper;
-import com.whyc.mapper.CKPowerDevBattRtStateMapper;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtData;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevBattRtState;
+import com.whyc.pojo.db_ckpwrdev_inf.CKPwrDevInf;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -17,9 +18,63 @@
@Resource
private CKPowerDevBattRtDataMapper mapper;
- public List<CKPowerDevBattRtData> getList() {
+ @Autowired
+ private CKPwrDevInfService ckPwrDevInfService;
+
+ /**
+ * 棣栭〉鍙樉绀�1缁�,鐩墠鍙湁1缁�
+ * 浣嗘槸鍏朵粬鍦版柟,鍧囨寜澶氱粍澶勭悊
+ * @return
+ */
+ public List<CKPowerDevBattRtData> getList(Integer index) {
+ //鏌ヨ鏈夊崟浣撴暟閲�
+ CKPwrDevInf ckPwrDevInf = ckPwrDevInfService.get();
+
QueryWrapper<CKPowerDevBattRtData> query = Wrappers.query();
- query.eq("batt_index",0);
+ if(index!=null) {
+ if(index == -1){ //棣栭〉鏌ヨ浣跨敤,鍙煡璇㈢粍1
+ query.eq("batt_index", 0);
+ }else {
+ query.eq("batt_index", index);
+ }
+ }
+ query.le("mon_num",ckPwrDevInf.getBattMonCount());
return mapper.selectList(query);
}
+
+
+ /**鍗曚綋鍒楄〃鏌ヨ*/
+ public List<CKPowerDevBattRtData> getMonList(Integer battIndex, List<Integer> monNumList) {
+ QueryWrapper<CKPowerDevBattRtData> query = Wrappers.query();
+ if(battIndex!=null) {
+ if(battIndex == -1) { //棣栭〉涓婁娇鐢�,榛樿鍙煡缁�1
+ query.eq("batt_index", 0);
+ }else{
+ query.eq("batt_index", battIndex);
+ }
+ }
+ query.in("mon_num",monNumList);
+ return mapper.selectList(query);
+ }
+
+ /**缁勫唴鎵�鏈夊崟浣撳垪琛ㄦ煡璇�*/
+ public List<CKPowerDevBattRtData> getAllMonList(Integer battIndex) {
+ QueryWrapper<CKPowerDevBattRtData> query = Wrappers.query();
+ if(battIndex!=null) {
+ if(battIndex == -1) { //棣栭〉涓婁娇鐢�,榛樿鍙煡缁�1
+ query.eq("batt_index", 0);
+ }else{
+ query.eq("batt_index", battIndex);
+ }
+ }
+ return mapper.selectList(query);
+ }
+
+ //鑾峰彇榛樿绗竴缁勫崟浣撴暟鎹埛鏂拌嚦绗竴缁�0
+ public List<CKPowerDevBattRtData> getDataList_index0() {
+ QueryWrapper<CKPowerDevBattRtData> wrapper = Wrappers.query();
+ wrapper.eq("batt_index",0);
+ wrapper.orderByAsc("mon_num");
+ return mapper.selectList(wrapper);
+ }
}
--
Gitblit v1.9.1