xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +6862 -421
103 changed files with 6862 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2c5d4ddd1b - Show all commits

6
ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java
View File

@ -146,6 +146,9 @@ public class FXXDataProcessServiceImpl implements IFXXDataProcessService {
String stackDeviceId = ""; String stackDeviceId = "";
if (up != null && up.size() >0) { if (up != null && up.size() >0) {
stackDeviceId = up.get(0).getParentId(); stackDeviceId = up.get(0).getParentId();
if (stackDeviceId != null || stackDeviceId.isEmpty()) {
stackDeviceId = "1";
}
} }
//BMS 电池簇 //BMS 电池簇
EmsBatteryCluster data = new EmsBatteryCluster(); EmsBatteryCluster data = new EmsBatteryCluster();
@ -216,6 +219,9 @@ public class FXXDataProcessServiceImpl implements IFXXDataProcessService {
String stackDeviceId = ""; String stackDeviceId = "";
if (up != null && up.size() >0) { if (up != null && up.size() >0) {
stackDeviceId = up.get(0).getParentId(); stackDeviceId = up.get(0).getParentId();
if (stackDeviceId != null || stackDeviceId.isEmpty()) {
stackDeviceId = "1";
}
} }
//单体电池 //单体电池
Map<String, Map<String, Object>> records = processData(JSON.parseObject(dataJson, new TypeReference<Map<String, Object>>() {})); Map<String, Map<String, Object>> records = processData(JSON.parseObject(dataJson, new TypeReference<Map<String, Object>>() {}));