|
@@ -188,9 +188,13 @@ public class MachineManageAction implements IMINAction {
|
|
List<Map<String, String>> list = Service.lookup(IMINDataBaseService.class)
|
|
List<Map<String, String>> list = Service.lookup(IMINDataBaseService.class)
|
|
.getMybatisMapper(MachineManageMapper.class)
|
|
.getMybatisMapper(MachineManageMapper.class)
|
|
.machineInf(map, rows);
|
|
.machineInf(map, rows);
|
|
|
|
+ List<Map<String, String>> listb = Service.lookup(IMINDataBaseService.class)
|
|
|
|
+ .getMybatisMapper(MachineManageMapper.class)
|
|
|
|
+ .machineInf(map);
|
|
|
|
+
|
|
//在线数
|
|
//在线数
|
|
- int online = list.stream().filter(item -> item.get("state").equals("00")).collect(Collectors.toList()).size();
|
|
|
|
- int unOnline = list.stream().filter(item -> item.get("state").equals("01")).collect(Collectors.toList()).size();
|
|
|
|
|
|
+ int online = listb.stream().filter(item -> item.get("state").equals("00")).collect(Collectors.toList()).size();
|
|
|
|
+ int unOnline = listb.stream().filter(item -> item.get("state").equals("01")).collect(Collectors.toList()).size();
|
|
//格式化时间和状态
|
|
//格式化时间和状态
|
|
list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime", "modifyTime");
|
|
list = Service.lookup(IFormatService.class).formatDateTime(list, "createTime", "modifyTime");
|
|
list = new MINCopyFormat("{state:'stateDesc',equType :'equTypeDesc'}").format(list);
|
|
list = new MINCopyFormat("{state:'stateDesc',equType :'equTypeDesc'}").format(list);
|