|
|
@@ -130,6 +130,7 @@ public class ApiServiceImpl implements IApiService {
|
|
|
futureList.add(asyncService.currData(twinDevice));
|
|
|
}
|
|
|
int onlineNum = 0;
|
|
|
+ int otherStop = 0;
|
|
|
//停机明细
|
|
|
List<StopDetailVO> stopList = new ArrayList<>();
|
|
|
try {
|
|
|
@@ -201,6 +202,8 @@ public class ApiServiceImpl implements IApiService {
|
|
|
indexAlarm.setName(device.getDeviceName());
|
|
|
int alarmType = 0;
|
|
|
switch (stopStatus) {
|
|
|
+ case 0:
|
|
|
+ break;
|
|
|
case 1:
|
|
|
stop1++;
|
|
|
alarmType = 10001;
|
|
|
@@ -218,6 +221,9 @@ public class ApiServiceImpl implements IApiService {
|
|
|
stop8++;
|
|
|
alarmType = 10008;
|
|
|
default:
|
|
|
+ if (cd1 == 0f) {
|
|
|
+ otherStop++;
|
|
|
+ }
|
|
|
}
|
|
|
if (alarmType != 0) {
|
|
|
indexAlarm.setType(alarmType);
|
|
|
@@ -262,7 +268,9 @@ public class ApiServiceImpl implements IApiService {
|
|
|
device.setStop2(stop2);
|
|
|
device.setStop6(stop6);
|
|
|
device.setStop8(stop8);
|
|
|
- device.setAlarm(alarmList.size());
|
|
|
+// 2024-11-18 告警数改为其他停机数
|
|
|
+// device.setAlarm(alarmList.size());
|
|
|
+ device.setAlarm(otherStop);
|
|
|
indexData.setDevice(device);
|
|
|
CacheUtils.put(Constants.IOT_TOKEN, Constants.INDEX_ALARM, indexData);
|
|
|
|
