|
|
@@ -5069,7 +5069,8 @@ public class IotStaticController {
|
|
|
}
|
|
|
// 临时对象,携带 code、name、count
|
|
|
Map<String, Object> temp = new HashMap<>(3);
|
|
|
- temp.put("code", e.getKey());
|
|
|
+ temp.put("code", code);
|
|
|
+ temp.put("code_new", e.getKey());
|
|
|
temp.put("name", yfClass.get(0).getName());
|
|
|
temp.put("count", e.getValue());
|
|
|
return temp;
|
|
|
@@ -5092,8 +5093,9 @@ public class IotStaticController {
|
|
|
vo.setCount(((Long) m.get("count")).intValue());
|
|
|
// 根据 code 是否在主设备集合中设置 type
|
|
|
String code = (String) m.get("code");
|
|
|
+ String codeNew = (String) m.get("code_new");
|
|
|
vo.setType(newClassifies.contains(code) ? "top" : "");
|
|
|
- vo.setCode(code);
|
|
|
+ vo.setCode(codeNew);
|
|
|
return vo;
|
|
|
})
|
|
|
.collect(Collectors.toList());
|