Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/Gyee_Frame_NX

src/main/java/com/gyee/frame/service/websocket/WpInfoPushService.java

@@ -511,6 +511,7 @@ public class WpInfoPushService {
                     zbls.add("MCHDQ.NX_GD_MCHG_DQ_P1_L1_001_AI0212");
                     zbls.add("MCHDQ.NX_GD_MCHG_DQ_P1_L1_001_AI0044");
                     zbls.add("MCHDQ.NX_GD_MCHG_DQ_P1_L1_001_AI0013");
+                    zbls.add("MCHDJL.NX_GD_XHG_DD_P1_L1_001_ZXYG037");
 
                     zblist = realApiUtil.getRealData(zbls);
 
@@ -521,6 +522,41 @@ public class WpInfoPushService {
                         double temp3 = zblist.get(2).getPointValueInDouble();
 
                         jczbmap.put("ia", MathUtil.twoBit(temp3));
+                        double temp4 = zblist.get(3).getPointValueInDouble();
+                        jczbmap.put("dnlb", MathUtil.twoBit(temp4));
+                    }
+                    break;
+                case "HZJ_GDC":
+                    zbls.add("HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0267");//电压
+                    zbls.add("HZJDQ.NX_GD_HZJG_DQ_P1_L1_001_AI0295");//电流
+                    zbls.add("HZJDJL.NX_GD_HZJG_DD_P1_L1_001_ZXYG001");
+
+                    zblist = realApiUtil.getRealData(zbls);
+
+                    if (!zblist.isEmpty() && zblist.size() == zbls.size()) {
+                        double temp1 = zblist.get(0).getPointValueInDouble();
+                        double temp2 = zblist.get(1).getPointValueInDouble();
+                        double temp3 = zblist.get(2).getPointValueInDouble();
+                        jczbmap.put("uab", MathUtil.twoBit(temp1));
+                        jczbmap.put("ia", MathUtil.twoBit(temp2));
+                        jczbmap.put("dnlb", MathUtil.twoBit(temp3));
+                    }
+                    break;
+                case "AK_GDC":
+                    zbls.add("AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0019");
+                    zbls.add("AKDQ.NX_GD_AKG_DQ_P1_L1_001_AI0004");
+                    zbls.add("AKDJL.NX_GD_AKG_DD_P1_L1_001_ZXYG009");//电能量表
+
+                    zblist = realApiUtil.getRealData(zbls);
+
+                    if (!zblist.isEmpty() && zblist.size() == zbls.size()) {
+                        double temp1 = zblist.get(0).getPointValueInDouble();
+                        double temp2 = zblist.get(1).getPointValueInDouble();
+                        jczbmap.put("uab", MathUtil.twoBit(temp1));
+                        double temp3 = zblist.get(2).getPointValueInDouble();
+
+                        jczbmap.put("ia", MathUtil.twoBit(temp2));
+                        jczbmap.put("dnlb", MathUtil.twoBit(temp3));
                     }
                     break;
                 default:

src/main/java/com/gyee/frame/service/websocket/WtInfoPushService.java

@@ -1163,13 +1163,12 @@ public class WtInfoPushService {
 						{ "AI130", "有功功率"}, 
 						{ "AI067", "功率因数"}, 
 						{ "AIG071", "机内温度"}, 
-						{ "AIG072", "逆变效率" }, 
+						{ "AIG072", "逆变效率" },
 						{ "AI130", "功率"},
-						{ "AIG104", "功率因数" }, 
 						{ "RFDL", "日发电量" }, 
 						{ "YFDL", "月发电量" }, 
 						{ "NFDL", "年发电量" }, 
-						{ "AIG064", "累计发电量" }
+						{ "AI064", "累计发电量" }
 				};
 				// 遍历定义码，获取测点Id集合
 				Map<String, String> pointUniformMap = Maps.newHashMap();
@@ -1255,18 +1254,18 @@ public class WtInfoPushService {
 				List<String> zbls = new ArrayList<>();
 				String[] codeName[] = {
 						{"AIG061", "交流电压","V"},
-						{"AIG081", "直流电压","V"},
+						{"AI0009", "直流电压","V"},//AIG081
 						{"AIG060", "交流电流","A"},
-						{"AIG078", "直流电流","A"},
-						{"AIG073", "电网频率","Hz"},
-						{"AI130", "功率","W"},
-						{"AIG104", "功率因数",""},
+						{"AI0010", "直流电流","A"},//AIG078
+						{"AI068", "电网频率","Hz"},//AIG073
+						{"AI130", "功率","kW"},
+						{"AI067", "功率因数",""},//AIG104
 						{"RFDL", "日发电量","kwh"},//TODO 疑似 各厂发电量单位不統一
 						{"YFDL", "月发电量","kwh"},
 						{"NFDL", "年发电量","kwh"},
-						{"AIG064", "累计发电量","kwh"},
+						{"AI064", "累计发电量","kwh"},//AIG064
 						{"AIG071", "逆变器温度","℃"},
-						{"AIG072", "效率",""},
+						{"AIG072", "效率","%"},
 						{"eyht", "累计二氧化碳减排量","kg"}
 				};
 				// 遍历定义码，获取测点Id集合