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 +55901 -1134
375 changed files with 55901 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4b58838d5d - Show all commits

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

@ -407,7 +407,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
String status = dataStack.getWorkStatus();
int result = 5;
if (status != null && !status.trim().isEmpty() && status.contains("null")) {
if (status != null && !status.trim().isEmpty()) {
// 1.0 -> 1, 2.0 -> 2
result = (int) Double.parseDouble(status.trim());
}
@ -863,7 +863,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
//TODO 临时解决上送数据为浮点的问题 start
String status = pcsData.getWorkStatus();
int result = 0;
if (status != null && !status.trim().isEmpty() && status.contains("null")) {
if (status != null && !status.trim().isEmpty()) {
// 1.0 -> 1, 2.0 -> 2
result = (int) Double.parseDouble(status.trim());
}
@ -1003,7 +1003,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
log.info("临时解决上送数据为浮点的问题");
String status = data.getWorkStatus();
int result = 5;
if (status != null && !status.trim().isEmpty() && status.contains("null")) {
if (status != null && !status.trim().isEmpty()) {
// 1.0 -> 1, 2.0 -> 2
result = (int) Double.parseDouble(status.trim());
}