Commit bd6cf17b authored by duanruiming's avatar duanruiming

[update] 封闭开发bug修复

parent a73368ab
...@@ -167,10 +167,7 @@ public class SituationDetectionController extends BaseController { ...@@ -167,10 +167,7 @@ public class SituationDetectionController extends BaseController {
for (CrossDeviceStatusInfoOutVO item : list) { for (CrossDeviceStatusInfoOutVO item : list) {
int fualType = item.getFaultType(); int fualType = item.getFaultType();
int status = item.getStatus(); int status = item.getStatus();
if (status == 0) { if (status == 1 && fualType != 0) {
status = 2;
}
if (fualType != 0) {
status = 3; status = 3;
} }
item.setStatus(status); item.setStatus(status);
......
...@@ -663,8 +663,8 @@ public class SituationDetectionServiceImpl implements SituationDetectionService ...@@ -663,8 +663,8 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
} }
} }
List<SignalOperationModeVO> sort = signalOperationModeVOS.stream().sorted(Comparator.comparing(SignalOperationModeVO::getStartTime).reversed()).collect(Collectors.toList());
return signalOperationModeVOS; return sort;
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment