|
@@ -5,6 +5,7 @@ import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.Map.Entry;
|
|
|
import java.util.Set;
|
|
|
import java.util.UUID;
|
|
|
|
|
@@ -77,6 +78,12 @@ public class AlarmRecordServiceImpl extends BaseServiceImpl<AlarmRecord> impleme
|
|
|
endTime = DateUtil.parse(lt);
|
|
|
}
|
|
|
}
|
|
|
+ JSONObject supplementJsonObject = jsonCriteria.getCriteria().getJSONObject("supplement");
|
|
|
+ if(null!=supplementJsonObject && !supplementJsonObject.isEmpty()) {
|
|
|
+ for (Entry<String, Object> entry : supplementJsonObject.entrySet()) {
|
|
|
+ queryWrapper.eq("supplement ->'$."+entry.getKey()+"'", entry.getValue());
|
|
|
+ }
|
|
|
+ }
|
|
|
PagedResponse<AlarmRecord> resp = shardingService.selectShardingPageList(AlarmRecord.class, queryWrapper,
|
|
|
jsonCriteria.getPage(), jsonCriteria.getSize(), startTime, endTime);
|
|
|
PagedResponse<AlarmRecord> resultAlarmRecordList = new PagedResponse<>();
|