Explorar el Código

新增大部件温度传感器异常检测接口

zhouyang.xie hace 1 semana
padre
commit
80c36ea43a

+ 3 - 1
src/main/java/com/energy/manage/analyse/constant/AnomalySensorType.java

@@ -21,7 +21,9 @@ public enum AnomalySensorType {
 
     SPEED_TORQUE_LOGIC("sensor_anomaly_spd_trq", "转速-扭矩逻辑异常"),
 
-    FREEZE_SENSOR("sensor_anomaly_freeze", "偏航扭缆传感器是否异常");
+    FREEZE_SENSOR("sensor_anomaly_freeze", "偏航扭缆传感器是否异常"),
+
+    TEMPERATURE_SENSOR("sensor_anomaly_major_temp", "大部件温度传感器是否异常");
 
     private final String fieldName;
     private final String displayName;

+ 3 - 0
src/main/java/com/energy/manage/analyse/domain/vo/anomaly/AnomalySensorCountVO.java

@@ -28,6 +28,9 @@ public class AnomalySensorCountVO {
     @ApiModelProperty(" 偏航扭缆传感器是否异常风机数")
     private Integer sensorAnomalyFreezeCount;
 
+    @ApiModelProperty(" 大部件温度传感器是否异常风机数")
+    private Integer sensorAnomalyMajorTempCount;
+
 
 
 

+ 10 - 0
src/main/java/com/energy/manage/analyse/po/anomaly/AnomalyModelPO.java

@@ -106,6 +106,16 @@ public class AnomalyModelPO {
     @ApiModelProperty("转速-扭矩逻辑是否异常比例--新增")
     private BigDecimal sensorAnomalySpdTrqRatio;
 
+
+    /**
+     * 大部件温度传感器是否异常
+     */
+    @ApiModelProperty("大部件温度传感器是否异常")
+    private Integer sensorAnomalyMajorTemp;
+
+    @ApiModelProperty("大部件温度传感器是否异常比例--新增")
+    private BigDecimal sensorAnomalyMajorTempRatio;
+
     /**
      * 模块1(风速功率)是否异常(0或1)
      */

+ 9 - 1
src/main/java/com/energy/manage/analyse/service/anomaly/impl/AnomalyServiceImpl.java

@@ -720,6 +720,7 @@ public class AnomalyServiceImpl implements AnomalyService {
         List<AnomalyThermodynamicDiagramVO> pitchSensorAnomalyList = new ArrayList<>();
         List<AnomalyThermodynamicDiagramVO> rotationSpeedSensorAnomalyList = new ArrayList<>();
         List<AnomalyThermodynamicDiagramVO> torqueSensorAnomalyList = new ArrayList<>();
+        List<AnomalyThermodynamicDiagramVO> temperatureSensorAnomalyList = new ArrayList<>();
 
         // 逻辑关联异常列表
         List<AnomalyThermodynamicDiagramVO> windPowerLogicAnomalyList = new ArrayList<>();
@@ -732,6 +733,7 @@ public class AnomalyServiceImpl implements AnomalyService {
         AnomalyThermodynamicDiagramVO pitchSensorAnomaly = null;
         AnomalyThermodynamicDiagramVO rotationSpeedSensorAnomaly = null;
         AnomalyThermodynamicDiagramVO torqueSensorAnomaly = null;
+        AnomalyThermodynamicDiagramVO temperatureSensorAnomaly = null;
 
         // 逻辑关联异常列表
         AnomalyThermodynamicDiagramVO windPowerLogicAnomaly = null;
@@ -789,6 +791,12 @@ public class AnomalyServiceImpl implements AnomalyService {
             sensorAnomalyFreeze.setRatio(anomalyModelPO.getSensorAnomalyFreezeRatio());
             sensorAnomalyFreezeList.add(sensorAnomalyFreeze);
 
+            temperatureSensorAnomaly = new AnomalyThermodynamicDiagramVO();
+            temperatureSensorAnomaly.setEngineName(engineMap.get(anomalyModelPO.getEngineId())); 
+            temperatureSensorAnomaly.setIfAbnorma(anomalyModelPO.getSensorAnomalyMajorTemp());
+            temperatureSensorAnomaly.setRatio(anomalyModelPO.getSensorAnomalyMajorTempRatio());
+            temperatureSensorAnomalyList.add(temperatureSensorAnomaly);
+
         }
 
         map.put(AnomalySensorType.POWER_SENSOR.getFieldName(), powerSensorAnomalyList);
@@ -799,7 +807,7 @@ public class AnomalyServiceImpl implements AnomalyService {
         map.put(AnomalySensorType.WIND_POWER_LOGIC.getFieldName(), windPowerLogicAnomalyList);
         map.put(AnomalySensorType.SPEED_TORQUE_LOGIC.getFieldName(), speedTorqueLogicAnomalyList);
         map.put(AnomalySensorType.FREEZE_SENSOR.getFieldName(), sensorAnomalyFreezeList);
-
+        map.put(AnomalySensorType.TEMPERATURE_SENSOR.getFieldName(), temperatureSensorAnomalyList);
         return map;
     }
 

+ 2 - 2
src/main/resources/bootstrap.properties

@@ -1,6 +1,6 @@
 #============================nacos配置=========================================
-spring.cloud.nacos.config.server-addr = 192.168.50.234:8848
-# spring.cloud.nacos.config.server-addr = 10.172.12.211:8848
+# spring.cloud.nacos.config.server-addr = 192.168.50.234:8848
+spring.cloud.nacos.config.server-addr = 10.172.12.211:8848
 spring.cloud.nacos.config.namespace = 79c42a7a-2c7d-4dcf-8a2c-b334271e2191
 spring.cloud.nacos.config.name=application.properties
 spring.cloud.nacos.config.group = @profiles.active@

+ 12 - 1
src/main/resources/mybatis/anomaly/AnaomalyMapper.xml

@@ -108,6 +108,9 @@
         <result column="sensor_anomaly_wind_pwr_ratio" property="sensorAnomalyWindPwrRatio" jdbcType="DECIMAL"/>
         <result column="sensor_anomaly_spd_trq" property="sensorAnomalySpdTrq" jdbcType="INTEGER"/>
         <result column="sensor_anomaly_spd_trq_ratio" property="sensorAnomalySpdTrqRatio" jdbcType="DECIMAL"/>
+        <result column="sensor_anomaly_major_temp" property="sensorAnomalyMajorTemp" jdbcType="INTEGER"/>
+        <result column="sensor_anomaly_major_temp_ratio" property="sensorAnomalyMajorTempRatio" jdbcType="DECIMAL"/>
+
         <result column="model1_windpwr_is_anomaly" property="model1WindpwrIsAnomaly" jdbcType="INTEGER"/>
         <result column="model1_windpwr_normal_count" property="model1WindpwrNormalCount" jdbcType="INTEGER"/>
         <result column="model1_windpwr_anomaly_count" property="model1WindpwrAnomalyCount" jdbcType="INTEGER"/>
@@ -222,6 +225,9 @@
         sensor_anomaly_wind_pwr_ratio,
         sensor_anomaly_spd_trq,
         sensor_anomaly_spd_trq_ratio,
+        sensor_anomaly_major_temp,
+        sensor_anomaly_major_temp_ratio,
+
         model1_windpwr_is_anomaly,
         model1_windpwr_normal_count,
         model1_windpwr_anomaly_count,
@@ -432,7 +438,9 @@
 
         COUNT(DISTINCT CASE WHEN sensor_anomaly_spd_trq = 1 THEN engine_id END) AS 'sensorAnomalySpdTrqCount',
 
-        COUNT(DISTINCT CASE WHEN sensor_anomaly_yaw = 1 THEN engine_id END) AS 'sensorAnomalyFreezeCount'
+        COUNT(DISTINCT CASE WHEN sensor_anomaly_yaw = 1 THEN engine_id END) AS 'sensorAnomalyFreezeCount',
+
+        COUNT(DISTINCT CASE WHEN sensor_anomaly_major_temp = 1 THEN engine_id END) AS 'sensorAnomalyMajorTempCount'
 
         FROM anomaly_model_${year}
         where 1=1
@@ -463,11 +471,14 @@ SELECT
     COUNT(DISTINCT CASE WHEN
         model2_yaw_staticyaw = 1
         OR model2_yaw_cabletwist = 1
+        OR model2_yaw_yawerror=1
+        OR model2_yaw_yawcount=1
     THEN engine_id END) AS model2Count,
 
     COUNT(DISTINCT CASE WHEN
         model3_pitch_pitchregulation = 1
         OR model3_pitch_pitchcoord = 1
+        OR model3_pitch_minpitch = 1
     THEN engine_id END) AS model3Count,
 
     COUNT(DISTINCT CASE WHEN