更新获取风机状态及光伏状态的问题

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/constants/CommonConstans.java

@@ -2,9 +2,11 @@ package com.yeejoin.amos.boot.module.jxiop.biz.constants;
 
 import org.checkerframework.checker.units.qual.C;
 
+import java.util.HashMap;
+
 public class CommonConstans {
     //光伏发电量系数
-    public static final Double pvGenPoweActor = 0.0001;
+    public static final Double pvGenPoweActor = 0.000001;
     //    风电站：
 //            （日/月/年）发电量=场站所有风机（日/月/年）发电量总和
 //            装机容量=场站所有风机装机容量总和
@@ -31,4 +33,49 @@ public class CommonConstans {
     public static final Double tToWT = 0.0001;
     //万Kwh转MV
     public static final Integer wkwhToMv = 10;
+//    正常运行	发电状态=1
+//    告警运行	报警状态=1
+//    正常停机	停机状态=1
+//    故障停机	故障状态=1
+//    限功率
+//    待机状态	待机状态=1
+//    维护状态	维护状态=1
+//    通讯中断
+
+    public static final HashMap<String, String> fanStatus = new HashMap<String, String>() {
+        {
+            put("发电状态", "正常运行");
+            put("报警状态", "告警运行");
+            put("停机状态", "正常停机");
+            put("故障状态", "故障停机");
+            put("待机状态", "待机状态");
+            put("维护状态", "维护状态");
+            put("限功率", "限功率");
+            put("通讯中断", "通讯中断");
+
+        }
+    };
+//    正常运行	运行=1
+//    正常停机	停机=1
+//    限功率	限额运行=1
+//    限电停机	降额运行=1
+//    告警运行	告警运行=1
+//    故障停机	故障停机=1
+//    待机状态	待机=1
+//    通讯中断	通讯故障=1
+
+    public static final HashMap<String, String> pvStatus = new HashMap<String, String>() {
+
+        {
+            put("运行", "正常运行");
+            put("停机", "正常停机");
+            put("限额运行", "限功率");
+            put("降额运行", "限电停机");
+            put("告警运行", "告警运行");
+            put("故障停机", "故障停机");
+            put("待机", "待机状态");
+            put("通讯故障", "通讯中断");
+        }
+
+    };
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -541,7 +541,7 @@ public class MonitorFanIdxController extends BaseController {
 
         Map<String, String> map = monitorFanIndicatorMapper.getMajorBoosterStationInfoBySort(gatewayId, equipName);
         String name = map.get("text").equals("1主变高压侧") || map.get("text").equals("1主变低压侧") ?map.get("text").substring(0,3):map.get("text");
-
+        String sql = " SELECT * FROM indicators_" + gatewayId + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='故障停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='停机 or 'equipmentIndexName ='停机' or equipmentIndexName ='停机') and value = 'true'";
 
         Map<String, Object> switchUrl = monitorFanIndicatorImpl.getSwitchUrl(gatewayId, name);
         List<Map<String, Object>> statusMonitoring = monitorFanIndicator.getStatusGzp(gatewayId ,"网络",name,null);