1.智能分析光伏、风电 按时刻、按小时、按天生成预警规则由原来的写死调整为动态获取。

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanWarningRuleSetMapper.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizFanWarningRuleSet;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -17,4 +18,11 @@ public interface IdxBizFanWarningRuleSetMapper extends BaseMapper<IdxBizFanWarni
    List<Map<String,Object>> queryList(int current,int size);
 
    int queryListCount();
+
+   @Select("SELECT MAX(WARNING_CYCLE) FROM idx_biz_fan_warning_rule_set WHERE ANALYSIS_TYPE = '按时刻'")
+   Integer getMaxWaringCycleOfMinutes();
+   @Select("SELECT MAX(WARNING_CYCLE) FROM idx_biz_fan_warning_rule_set WHERE ANALYSIS_TYPE = '按小时'")
+   Integer getMaxWaringCycleOfHour();
+   @Select("SELECT MAX(WARNING_CYCLE) FROM idx_biz_fan_warning_rule_set WHERE ANALYSIS_TYPE = '按天'")
+   Integer getMaxWaringCycleOfDay();
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizPvWarningRuleSetMapper.java

@@ -2,6 +2,9 @@ package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRuleSet;
+import io.swagger.models.auth.In;
+import javafx.beans.binding.DoubleExpression;
+import org.apache.ibatis.annotations.Select;
 
 /**
  *  Mapper 接口
@@ -11,4 +14,10 @@ import com.yeejoin.amos.boot.module.jxiop.biz.entity.IdxBizPvWarningRuleSet;
  */
 public interface IdxBizPvWarningRuleSetMapper extends BaseMapper<IdxBizPvWarningRuleSet> {
 
+    @Select("SELECT MAX(WARNING_CYCLE) FROM idx_biz_pv_warning_rule_set WHERE ANALYSIS_TYPE = '按时刻'")
+    Integer getMaxWaringCycleOfMinutes();
+    @Select("SELECT MAX(WARNING_CYCLE) FROM idx_biz_pv_warning_rule_set WHERE ANALYSIS_TYPE = '按小时'")
+    Integer getMaxWaringCycleOfHour();
+    @Select("SELECT MAX(WARNING_CYCLE) FROM idx_biz_pv_warning_rule_set WHERE ANALYSIS_TYPE = '按天'")
+    Integer getMaxWaringCycleOfDay();
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -1475,7 +1475,7 @@ public class CommonServiceImpl {
         String format = DateUtil.format(time, "yyyy-MM-dd HH:mm:00");
         time = DateUtil.parse(format, "yyyy-MM-dd HH:mm:00");
         logger.info("风机---------------------健康指数时间----" + time);
-        Calendar calendar = Calendar.getInstance();
+//        Calendar calendar = Calendar.getInstance();
         List<IdxBizFanPointProcessVariableClassificationDto> data = idxBizFanPointProcessVariableClassificationMapper.getInfluxDBData();
         Map<String, List<IdxBizFanPointProcessVariableClassificationDto>> maps = data.stream().collect(Collectors.groupingBy(IdxBizFanPointProcessVariableClassificationDto::getGatewayId));
 //        BoolQueryBuilder boolMustAll = QueryBuilders.boolQuery();
@@ -1730,7 +1730,8 @@ public class CommonServiceImpl {
             logger.info("------------------------------------------调用健康指数计算算法结束----------------------------------------");
             logger.info("------------------------------------------开始计算预警----------------------------------------");
 
-            healthStatusIndicatorService.healthWarningMinute(calendar, time);
+//            healthStatusIndicatorService.healthWarningMinute(calendar, time);
+            healthStatusIndicatorService.healthWarningMinute(time);
 
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -1774,7 +1775,7 @@ public class CommonServiceImpl {
         if (!openHealth) {
             return;
         }
-        Calendar calendar = Calendar.getInstance();
+//        Calendar calendar = Calendar.getInstance();
         Date time = new Date();
         time = DateUtil.offsetMinute(time,-DateUtil.minute(time)%10);
         String format = DateUtil.format(time, "yyyy-MM-dd HH:mm:00");
@@ -2005,7 +2006,8 @@ public class CommonServiceImpl {
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        healthStatusIndicatorService.healthWarningMinuteGF(calendar, time);
+//        healthStatusIndicatorService.healthWarningMinuteGF(calendar, time);
+        healthStatusIndicatorService.healthWarningMinuteGF(time);
     }