|
@@ -156,6 +156,12 @@ public class EquipmentOnoffServiceImpl extends ServiceImpl<EquipmentOnoffMapper,
|
|
|
}catch (NullPointerException e){}
|
|
|
for(Collectdata collectdata:orgDataList){
|
|
|
Map<String, Object> dataMap = new ObjectMapper().convertValue(collectdata.getProperties(), Map.class);
|
|
|
+ if(dataMap.containsKey("TIME")){
|
|
|
+ dataMap.remove("TIME");
|
|
|
+ }
|
|
|
+ if(dataMap.containsKey("time")){
|
|
|
+ dataMap.remove("time");
|
|
|
+ }
|
|
|
dataMap.put("logtime", collectdata.getLogtime());
|
|
|
historyList.add(dataMap);
|
|
|
}
|