单站监控-电表取数逻辑修改

ems-common/src/main/java/com/xzzn/common/enums/AmmeterCategory.java

@@ -5,14 +5,18 @@ package com.xzzn.common.enums;
  * 
  * @author xzzn
  */
-public enum AmmeterCategoryStatus
+public enum AmmeterCategory
 {
-    TOTAL_CHARGE("1", "累计充电量"), TOTAL_DISCHARGE("2", "累计放电量"), DAILY_CHARGE("3", "日充电量"), DAILY_DISCHARGE("4", "日放电量");
+    CURRENT_COMB_ACTIVE("1", "当前组合有功电能"),
+    CURRENT_COMB_REACTIVE("2", "当前组合无功"),
+    A_POWER("3", "A相功率"),
+    B_POWER("4", "B相功率"),
+    C_POWER("5", "C相功率");
 
     private final String code;
     private final String info;
 
-    AmmeterCategoryStatus(String code, String info)
+    AmmeterCategory(String code, String info)
     {
         this.code = code;
         this.info = info;