Quellcode durchsuchen

Merge remote-tracking branch 'origin/master'

jochu_liu vor 1 Jahr
Ursprung
Commit
6e1ef74953
1 geänderte Dateien mit 10 neuen und 6 gelöschten Zeilen
  1. 10 6
      TimedUpload/QuartzJobs/ChangleSecondPumpDataJob.cs

+ 10 - 6
TimedUpload/QuartzJobs/ChangleSecondPumpDataJob.cs

@@ -177,31 +177,35 @@ namespace TimedUpload.QuartzJobs
                             string colPre = "";
                             string state = "";
                             string colPrePower = "";
+                            string colPreCurrent = "";
                             switch (j)
                             {
                                 case 1:
                                     colPre = "一号泵";
                                     state = "泵1状态";
-                                    colPrePower = "表1A相";
+                                    colPreCurrent = "表1A相";
+                                    colPrePower = "表1";
                                     break;
                                 case 2:
                                     colPre = "二号泵";
                                     state = "泵2状态";
-                                    colPrePower = "表2A相";
+                                    colPreCurrent = "表2A相";
+                                    colPrePower = "表2";
                                     break;
                                 case 3:
                                     colPre = "三号泵";
                                     state = "泵3状态";
-                                    colPrePower = "表3A相";
+                                    colPreCurrent = "表3A相";
+                                    colPrePower = "表3";
                                     break;
                             }
 
                             string meterCode = "wwkj" + j.ToString().PadLeft(3, '0');
                             string frequency = dr[colPre + "频率"].ToString();
-                            string current = dr[colPrePower + "电流"].ToString();
+                            string current = dr[colPreCurrent + "电流"].ToString();
                             string runState = dr[state].ToString();
-                            string power = dr[colPre + "有功功率"].ToString();
-                            string voltage = dr[colPrePower + "电压"].ToString();
+                            string power = dr[colPrePower + "电能"].ToString();
+                            string voltage = dr[colPreCurrent + "电压"].ToString();
                             meterMap["PumpCode"] = meterCode;
                             meterMap["ReadTime"] = readTime;
                             meterMap["Frequency"] = frequency;