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 +28548 -1041
245 changed files with 28548 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ee53ab137b - Show all commits

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

@ -244,12 +244,8 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
for (PointQueryResponse pointInfo : response) {
String dataKey = pointInfo.getDataPoint();
Long updateTime = Long.valueOf(bmsdJson.get("timestamp").toString());
int isNeedDeviceId = pointInfo.getIsNeedDeviceId();
if (isNeedDeviceId == 1 && "PCS".equals(pointInfo.getDataDevice())) {// 需要根据deviceId拼接point
dataKey = deviceId + dataKey;
if ("PCS".equals(pointInfo.getDataDevice())) {
updateTime = Long.valueOf(pcsJson.get("timestamp").toString());
} else if (isNeedDeviceId == 1 && "BMSD".equals(pointInfo.getDataDevice())){
dataKey = bmsdDeviceId + dataKey;
}
pointInfo.setDataPoint(dataKey);
pointInfo.setPointValue(obj.get(dataKey));