处理报警故障空值,曲线拟合单位增加

runeconomy-xk/src/main/java/com/gyee/runeconomy/model/PowerFittingData.java

@@ -34,16 +34,16 @@ public class PowerFittingData {
 
 
     //风速
-    @Desc(des = "风速", remark = "1")
+    @Desc(des = "风速(m/s)", remark = "1")
     private Double speed;
     //拟合功率
-    @Desc(des = "拟合功率", remark = "1")
+    @Desc(des = "拟合功率(kW)", remark = "1")
     private Double nhdata;
     //修正数据
     @Desc(des = "修正功率", remark = "0")
     private Double xzdata;
     //cp值
-    @Desc(des = "Cp值", remark = "1")
+    @Desc(des = "Cp值(%)", remark = "1")
     private Double cpdata;
 
 }

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/EarlyWarning/EarlyWarninggetService.java

@@ -104,7 +104,7 @@ public class EarlyWarninggetService {
 
             /*******************************************************添加检修建议*************************************************/
             if (collect.size() > 0) {
-                if (collect.get(0).getMainShaftType() != null){
+                if (collect.get(0).getMainShaftType() != null && !collect.get(0).getMainShaftType().equals("无")){
                     kkxBuilder.append(collect.get(0).getMainShaftType()).append(",");
                     String mainShaftType = collect.get(0).getMainShaftType();
                     List<ProEconAlarmRule> ruleList = ruleService.getProEconAlarmRuleList(mainShaftType,modelId);
@@ -121,7 +121,7 @@ public class EarlyWarninggetService {
                     }
 
                 }
-                if (collect.get(0).getGeneratorType() != null){
+                if (collect.get(0).getGeneratorType() != null && !collect.get(0).getGeneratorType().equals("无")){
                     kkxBuilder.append(collect.get(0).getGeneratorType()).append(",");
                     String generatorType = collect.get(0).getGeneratorType();
                     List<ProEconAlarmRule> ruleList = ruleService.getProEconAlarmRuleList(generatorType,modelId);
@@ -138,7 +138,7 @@ public class EarlyWarninggetService {
                     }
 
                 }
-                if (collect.get(0).getGearboxType() !=null){
+                if (collect.get(0).getGearboxType() !=null && !collect.get(0).getGearboxType().equals("无")){
                     kkxBuilder.append(collect.get(0).getGearboxType()).append(",");
                     String gearboxType = collect.get(0).getGearboxType();
                     List<ProEconAlarmRule> ruleList = ruleService.getProEconAlarmRuleList(gearboxType,modelId);
@@ -154,7 +154,7 @@ public class EarlyWarninggetService {
                         }
                     }
                 }
-                if (collect.get(0).getPitchSystemType() !=null){
+                if (collect.get(0).getPitchSystemType() !=null && !collect.get(0).getPitchSystemType().equals("无")){
                     kkxBuilder.append(collect.get(0).getPitchSystemType()).append(",");
                     String pitchSystemType = collect.get(0).getPitchSystemType();
                     List<ProEconAlarmRule> ruleList = ruleService.getProEconAlarmRuleList(pitchSystemType,modelId);
@@ -170,7 +170,7 @@ public class EarlyWarninggetService {
                         }
                     }
                 }
-                if (collect.get(0).getTemperatureOtherIssues() !=null) {
+                if (collect.get(0).getTemperatureOtherIssues() !=null && !collect.get(0).getTemperatureOtherIssues().equals("无")) {
                     kkxBuilder.append(collect.get(0).getTemperatureOtherIssues()).append(",");
 
                     String temperatureOtherIssues = collect.get(0).getTemperatureOtherIssues();
@@ -187,7 +187,7 @@ public class EarlyWarninggetService {
                         }
                     }
                 }
-                if (collect.get(0).getVibrationType() !=null){
+                if (collect.get(0).getVibrationType() !=null && !collect.get(0).getVibrationType().equals("无")){
                     kkxBuilder.append(collect.get(0).getVibrationType()).append(",");
                     String vibrationType = collect.get(0).getVibrationType();
 
@@ -204,7 +204,7 @@ public class EarlyWarninggetService {
                         }
                     }
                 }
-                if (collect.get(0).getMechanicalType() !=null){
+                if (collect.get(0).getMechanicalType() !=null && !collect.get(0).getMechanicalType().equals("无")){
                     kkxBuilder.append(collect.get(0).getMechanicalType()).append(",");
                     String mechanicalType = collect.get(0).getMechanicalType();
                     List<ProEconAlarmRule> ruleList = ruleService.getProEconAlarmRuleList(mechanicalType,modelId);
@@ -220,7 +220,7 @@ public class EarlyWarninggetService {
                         }
                     }
                 }
-                if (collect.get(0).getElectricalType() !=null){
+                if (collect.get(0).getElectricalType() !=null  && !collect.get(0).getElectricalType().equals("无")){
                     kkxBuilder.append(collect.get(0).getElectricalType()).append(",");
                     String electricalType = collect.get(0).getElectricalType();
                     List<ProEconAlarmRule> ruleList = ruleService.getProEconAlarmRuleList(electricalType,modelId);
@@ -236,7 +236,7 @@ public class EarlyWarninggetService {
                         }
                     }
                 }
-                if (collect.get(0).getHydraulicType() !=null){
+                if (collect.get(0).getHydraulicType() !=null && !collect.get(0).getHydraulicType().equals("无")){
                     kkxBuilder.append(collect.get(0).getHydraulicType()).append(",");
                     String hydraulicType = collect.get(0).getHydraulicType();
                     List<ProEconAlarmRule> ruleList = ruleService.getProEconAlarmRuleList(hydraulicType,modelId);
@@ -252,7 +252,7 @@ public class EarlyWarninggetService {
                         }
                     }
                 }
-                if (collect.get(0).getWindMeasurementType() !=null){
+                if (collect.get(0).getWindMeasurementType() !=null && !collect.get(0).getWindMeasurementType().equals("无")){
                     kkxBuilder.append(collect.get(0).getWindMeasurementType()).append(",");
                     String windMeasurementType = collect.get(0).getWindMeasurementType();
                     List<ProEconAlarmRule> ruleList = ruleService.getProEconAlarmRuleList(windMeasurementType,modelId);
@@ -268,7 +268,7 @@ public class EarlyWarninggetService {
                         }
                     }
                 }
-                if (collect.get(0).getOtherIssues() !=null){
+                if (collect.get(0).getOtherIssues() !=null && !collect.get(0).getOtherIssues().equals("无")){
                     kkxBuilder.append(collect.get(0).getOtherIssues()).append(",");
                     String otherIssues = collect.get(0).getOtherIssues();
                     List<ProEconAlarmRule> ruleList = ruleService.getProEconAlarmRuleList(otherIssues,modelId);