Merge branch 'master' into fpg-master

jeecg-module-gather/src/main/java/org/jeecg/modules/leanEventWarn/service/impl/LeanEventWarnInfoServiceImpl.java

@@ -458,9 +458,9 @@ public class LeanEventWarnInfoServiceImpl extends ServiceImpl<LeanEventWarnInfoM
      */
     public List<FpgStatiscsModelMongodb> queryByTimeRanges(MongoTemplate mongoTemplate, List<Date[]> timeRanges, String devicePointId, String deviceInformationId, String deviceRegionId) {
         Query query = new Query();
-        String devicePointIds = Arrays.stream(devicePointId.split(",")).collect(Collectors.joining("|"));
-        // 设置devicePointId的查询条件，使用正则表达式
-        query.addCriteria(Criteria.where("devicePointId").regex(devicePointIds));
+//        String devicePointIds = Arrays.stream(devicePointId.split(",")).collect(Collectors.joining("|"));
+//        // 设置devicePointId的查询条件，使用正则表达式
+//        query.addCriteria(Criteria.where("devicePointId").regex(devicePointIds));
         query.addCriteria(Criteria.where("deviceInformationId").is(deviceInformationId));
         query.addCriteria(Criteria.where("deviceRegionId").is(deviceRegionId));
         // 使用Criteria添加多个时间范围条件