Merge branch 'master' of http://60.205.104.179:3000/yinyujing/zhihuishuiwuDataSyn

TimedUpload/QuartzJobs/ChangleWorkmanshipDataUploadJob.cs

@@ -67,56 +67,62 @@ namespace TimedUpload.QuartzJobs
             try
             {
                 log.Info("二供工艺图数据同步任务开始执行.................\r\n");
-                string factorySql = "select 编码 DeviceCode,1 Type,RTRIM(日期) + ' ' +  RTRIM(时间) ReadTime,* from (select row_number() over(partition by 编码 order by 日期 desc, 时间 desc) as rid,* from 二供通用泵站 where 编码 is not null) as tt  where tt.rid=1";
-                DataTable dtDevice = dbHelper.Fill(factorySql);
-                if (dtDevice == null || dtDevice.Rows.Count == 0)
-                {
-                    return;
-                }
-
-                DataColumnCollection cols = dtDevice.Columns;
-                // 处理设备列表
-                for (int i = 0; i < dtDevice.Rows.Count; i++)
+                DateTime newTime = DateTime.Now;
+                String yearStr = newTime.Year.ToString();
+                #region 获取水质
+                string ph = "0", chlorine = "0", turbidity = "0";
+                string waterQulitySql = @"SELECT TOP 2 [RecordName],[RecordValue] FROM [dbo].[历史记录] where DevId = 3 order by GetDateTime DESC";
+                DataTable waterQulityDt = dbHelper.Fill(waterQulitySql);
+                if (waterQulityDt != null && waterQulityDt.Rows.Count > 0)
                 {
-                    DataRow dr = dtDevice.Rows[i];
-                    string deviceCode = dr["DeviceCode"].ToString();
-                    string type = dr["Type"].ToString();
-                    string realData = CreateJsonParameters(cols, dr);
-
-                    Dictionary<string, object> deviceMap = new Dictionary<string, object>();
-                    deviceMap["DeviceCode"] = deviceCode;
-                    deviceMap["Type"] = type;
-                    deviceMap["RealData"] = realData;
-
-                    string message = JsonConvert.SerializeObject(deviceMap);
-
-                    foreach (KeyValuePair<string, IModel> item in channels)
+                    for (int i = 0; i < waterQulityDt.Rows.Count; i++)
                     {
-                        string key = item.Key;
-                        IModel channel = item.Value;
-                        IBasicProperties property = properties[key];
-                        channel.BasicPublish("workmanship", "", property, Encoding.UTF8.GetBytes(message)); //生产消息
+                        DataRow row = waterQulityDt.Rows[i];
+                        if (row["RecordName"].ToString().Trim() == "余氯") {
+                            chlorine = row["RecordValue"].ToString();
+                        }
+                        if (row["RecordName"].ToString().Trim() == "浊度")
+                        {
+                            turbidity = row["RecordValue"].ToString();
+                        }
                     }
                 }
-
-                log.Info("二供工艺图数据同步任务开始执行.................\r\n");
-            }
-            catch (Exception ex)
-            {
-                log.Error("二供工艺图数据同步任务错误：" + ex.Message + "===========" + ex.StackTrace + "\r\n");
-            }
-        }
-
-        /// <summary>
-        /// 水源井数据
-        /// </summary>
-        /// <param name="channel"></param>
-        private void SendWaterWellData(Dictionary<string, IModel> channels, Dictionary<string, IBasicProperties> properties)
-        {
-            try
-            {
-                log.Info("水源井工艺图数据同步任务开始执行.................\r\n");
-                string factorySql = "select 编码 DeviceCode,2 Type,RTRIM(日期) + ' ' +  RTRIM(时间) ReadTime,* from (select row_number() over(partition by 编码 order by 日期 desc, 时间 desc) as rid,* from 水源井数据 where 编码 is not null) as tt  where tt.rid=1";
+                #endregion 
+
+
+                string factorySql = @"SELECT top 1 1 rid,
+                    1 Type,CONVERT(varchar(100),采集时间,111) 日期,CONVERT(varchar(100),采集时间,108) 时间  
+                    CONVERT(varchar(100),采集时间,111) + ' ' + CONVERT(varchar(100),采集时间,108) ReadTime,CONVERT(varchar(100),采集时间,111) + ' ' + CONVERT(varchar(5),采集时间,108) 更新时间,
+                    " + ph + " PH," + chlorine + " 余氯, " + turbidity + @" 浊度,13.9 温度,'南流泉泵站' 编号,'second001' 编码,'second001' DeviceCode,0 水箱液位,0 爆管报警,'' 电源故障,
+                    '' 真空报警,瞬时流量,'' 硬件超压,'' 系统电压,0 缺水报警,0 网络状态,0 超压报警,'' 软件超压,0 进水报警, 累计流量 净累计流量,'' 正累计流量,'' 负累计流量,
+                    0 一段压力设定,0 三段压力设定,0 二段压力设定
+
+                    ,[表1A相电压] 电压AB
+                    ,[表1B相电压] 电压AC
+                    ,[表1C相电压] 电压BC
+                    ,[表1A相电流] + 表2A相电流 + 表3A相电流 电流A
+                    ,[表1B相电流] + 表2B相电流 + 表3B相电流 电流B
+                    ,[表1C相电流] + 表2C相电流 + 表3C相电流 电流C
+                    ,[表1电能] + 表2电能 + 表3电能 用电量
+                    ,[表1A相电压] 一泵电压,'' 一泵故障
+                    ,[表1A相电流] 一泵电流
+                    ,[表2A相电压] 二泵电压,'' 二泵故障
+                    ,[表2A相电流] 二泵电流
+                    ,[表3A相电压] 三泵电压,'' 二泵故障
+                    ,[表3A相电流] 三泵电流
+                    ,[泵3状态] 三泵运行状态
+                    ,[泵2状态] 二泵运行状态
+                    ,[泵1状态] 一泵运行状态
+                    ,[一号泵有功功率] 一泵功率
+                    ,[一号泵频率] 一泵频率
+                    ,[二号泵有功功率] 二泵功率
+                    ,[二号泵频率] 二泵频率
+                    ,[三号泵有功功率] 三泵功率
+                    ,[三号泵频率] 三泵频率
+                    ,[出水设定压力] 泵设定压力
+                    ,[出水端实际压力] 泵出口压力
+                    ,[进水端实际压力] 泵进口压力
+                    FROM [dbo].[历史记录_000015_" + yearStr + "]  order by id DESC";
                 DataTable dtDevice = dbHelper.Fill(factorySql);
                 if (dtDevice == null || dtDevice.Rows.Count == 0)
                 {
@@ -148,11 +154,11 @@ namespace TimedUpload.QuartzJobs
                     }
                 }
 
-                log.Info("水源井工艺图数据同步任务结束.................\r\n");
+                log.Info("二供工艺图数据同步任务开始执行.................\r\n");
             }
             catch (Exception ex)
             {
-                log.Error("水源井工艺图数据同步任务执行错误：" + ex.Message + "===========" + ex.StackTrace + "\r\n");
+                log.Error("二供工艺图数据同步任务错误：" + ex.Message + "===========" + ex.StackTrace + "\r\n");
             }
         }