小程序增加租戶
This commit is contained in:
parent
a182acff73
commit
6f67ad062f
|
|
@ -534,13 +534,17 @@ public class IotCommonP2ServiceImpl {
|
|||
for (String s : datas.keySet()) {
|
||||
List<String> survData = datas.get(s);
|
||||
if(survData!=null && !survData.isEmpty()){
|
||||
List<String> yesterData = survData.subList(yesterDataCounts,survData.size());
|
||||
List<String> finalData = new ArrayList<>();
|
||||
if(survData.size() > yesterDataCounts){
|
||||
finalData = survData.subList(yesterDataCounts,survData.size());
|
||||
}
|
||||
|
||||
//拼接新旧数据
|
||||
if(curDatas!=null) {
|
||||
List<String> itemCurData = curDatas.get(s);
|
||||
yesterData.addAll(itemCurData);
|
||||
finalData.addAll(itemCurData);
|
||||
}
|
||||
newData.put(s,yesterData);
|
||||
newData.put(s,finalData);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue