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 +31375 -1052
260 changed files with 31375 additions and 1052 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 391ed354f8 - Show all commits

7
ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java
View File

@ -513,9 +513,10 @@ public class DDSDataProcessServiceImpl extends AbstractBatteryDataProcessor impl
return stackDeviceId; return stackDeviceId;
} }
} }
stackDeviceId = list.get(0).getParentId(); for (EmsDevicesSetting emsDevicesSetting : list) {
if (stackDeviceId == null || stackDeviceId.isEmpty()) { if (deviceId.equals(emsDevicesSetting.getDeviceId())) {
return stackDeviceId; stackDeviceId = emsDevicesSetting.getParentId();
}
} }
} }
return stackDeviceId; return stackDeviceId;