|
@@ -27,6 +27,7 @@ import java.util.*;
|
|
import java.io.File;
|
|
import java.io.File;
|
|
import java.io.FileOutputStream;
|
|
import java.io.FileOutputStream;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
|
+import java.util.concurrent.TimeUnit;
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
import java.util.concurrent.atomic.AtomicLong;
|
|
import java.util.concurrent.atomic.AtomicLong;
|
|
|
|
|
|
@@ -203,7 +204,7 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
|
|
}
|
|
}
|
|
list.add(CommonIcoVO.builder().name("offCount").list(offCounts).listDate(offDateS).build());
|
|
list.add(CommonIcoVO.builder().name("offCount").list(offCounts).listDate(offDateS).build());
|
|
list.add(CommonIcoVO.builder().name("runStates").list(runStatus).listDate(runDates).build());
|
|
list.add(CommonIcoVO.builder().name("runStates").list(runStatus).listDate(runDates).build());
|
|
- list.add(CommonIcoVO.builder().name("offTime").list(offTime).build());
|
|
|
|
|
|
+ list.add(CommonIcoVO.builder().name("offTime").list(TimeUnit.MILLISECONDS.toMinutes(offTime)).build());
|
|
return list;
|
|
return list;
|
|
}
|
|
}
|
|
|
|
|