|
@@ -31,6 +31,8 @@ namespace TrainVideoDataDispose
|
|
|
private MeterWorkRailwayRecMainService meterWorkRailwayRecMainService = new MeterWorkRailwayRecMainService(); // 采集主表
|
|
private MeterWorkRailwayRecMainService meterWorkRailwayRecMainService = new MeterWorkRailwayRecMainService(); // 采集主表
|
|
|
private MeterWorkRailwayReceivedService MeterWorkRailwayReceivedService = new MeterWorkRailwayReceivedService(); // 采集从表
|
|
private MeterWorkRailwayReceivedService MeterWorkRailwayReceivedService = new MeterWorkRailwayReceivedService(); // 采集从表
|
|
|
|
|
|
|
|
|
|
+ private MeterBaseSpotInfoService meterBaseSpotInfoService = new MeterBaseSpotInfoService();
|
|
|
|
|
+
|
|
|
/// <summary>
|
|
/// <summary>
|
|
|
/// 获取轨道衡系统上传的原始数据文件保存路径
|
|
/// 获取轨道衡系统上传的原始数据文件保存路径
|
|
|
/// </summary>
|
|
/// </summary>
|
|
@@ -161,22 +163,6 @@ namespace TrainVideoDataDispose
|
|
|
// Create a reference to the current directory.
|
|
// Create a reference to the current directory.
|
|
|
foreach (string strPath in m_szOrigDataPath)
|
|
foreach (string strPath in m_szOrigDataPath)
|
|
|
{
|
|
{
|
|
|
- //读取称点配置信息并存入hashtable
|
|
|
|
|
- hashtable.Clear();
|
|
|
|
|
- //读取配置
|
|
|
|
|
- string[] list = System.Configuration.ConfigurationSettings.AppSettings["spotConfig"].ToString().Split(';');
|
|
|
|
|
- foreach (var item in list)
|
|
|
|
|
- {
|
|
|
|
|
- string path = item.Split(',')[0];
|
|
|
|
|
- string spotNo = item.Split(',')[1];
|
|
|
|
|
- string spotName = item.Split(',')[2];
|
|
|
|
|
- //判断是否为配置信息中的某个
|
|
|
|
|
- if (strPath == path)
|
|
|
|
|
- {
|
|
|
|
|
- hashtable.Add("spotNo", spotNo);
|
|
|
|
|
- hashtable.Add("spotName", spotName);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
System.IO.DirectoryInfo di = new System.IO.DirectoryInfo(strPath);
|
|
System.IO.DirectoryInfo di = new System.IO.DirectoryInfo(strPath);
|
|
|
FileInfo[] fis = null;
|
|
FileInfo[] fis = null;
|
|
|
|
|
|
|
@@ -384,6 +370,11 @@ namespace TrainVideoDataDispose
|
|
|
string strPointName = "";
|
|
string strPointName = "";
|
|
|
string strVideoFileName = "";
|
|
string strVideoFileName = "";
|
|
|
DataRow dr = null;
|
|
DataRow dr = null;
|
|
|
|
|
+ //读取称点配置信息并存入hashtable
|
|
|
|
|
+ hashtable.Clear();
|
|
|
|
|
+ //读取配置
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
|
|
|
//拆分行
|
|
//拆分行
|
|
|
Lines = strContent.Split(new string[] { "\r\n" }, StringSplitOptions.None);
|
|
Lines = strContent.Split(new string[] { "\r\n" }, StringSplitOptions.None);
|
|
@@ -428,19 +419,21 @@ namespace TrainVideoDataDispose
|
|
|
|
|
|
|
|
dr["SEQUENCENUMBER"] = strSequenceNo;
|
|
dr["SEQUENCENUMBER"] = strSequenceNo;
|
|
|
dr["INDEXNO"] = Fields[1];//车厢号
|
|
dr["INDEXNO"] = Fields[1];//车厢号
|
|
|
|
|
+ //dr["TRAINNO"] = strSequenceNo;
|
|
|
|
|
+ dr["TRAINNO"] = Fields[3];
|
|
|
dr["RAILWAYMODELNAME"] = Fields[2];//车型
|
|
dr["RAILWAYMODELNAME"] = Fields[2];//车型
|
|
|
- dr["TRAINNO"] = Fields[3];//车号
|
|
|
|
|
dr["WEIGHT"] = Fields[4];//重量
|
|
dr["WEIGHT"] = Fields[4];//重量
|
|
|
- dr["RAILWAYWORKNO"] = Fields[8];//列车作业编号
|
|
|
|
|
|
|
+ dr["RAILWAYWORKNO"] = strSequenceNo;//列车作业编号
|
|
|
if (Fields[3] == "")
|
|
if (Fields[3] == "")
|
|
|
{//lck20150109静态过磅时车速处理
|
|
{//lck20150109静态过磅时车速处理
|
|
|
Fields[3] = "3";
|
|
Fields[3] = "3";
|
|
|
}
|
|
}
|
|
|
dr["SPEED"] = Fields[5];//速度
|
|
dr["SPEED"] = Fields[5];//速度
|
|
|
- dr["POINTNO"] = hashtable["spotNo"].ToString();//称点信息
|
|
|
|
|
- dr["POINTNAME"] = hashtable["spotName"].ToString();//称点信息
|
|
|
|
|
- strPointNo = hashtable["spotNo"].ToString();//称点信息
|
|
|
|
|
- strPointName = hashtable["spotName"].ToString();//称点信息
|
|
|
|
|
|
|
+ RESTfulResult<List<MeterBaseSpotInfo>> rmX = meterBaseSpotInfoService.doQueryWf(new MeterBaseSpotInfo { baseSpotNo = Fields[8] });
|
|
|
|
|
+ strPointNo = rmX.Data[0].baseSpotNo;//称点信息
|
|
|
|
|
+ strPointName = rmX.Data[0].baseSpotName;//称点信息
|
|
|
|
|
+ dr["POINTNO"] = strPointNo;//称点信息
|
|
|
|
|
+ dr["POINTNAME"] = strPointName;//称点信息
|
|
|
string _path = strPath.Substring(2);//录像地址
|
|
string _path = strPath.Substring(2);//录像地址
|
|
|
string _strPath = "\\\\194.168.0.38" + _path;//194.168.0.38//录像地址dd
|
|
string _strPath = "\\\\194.168.0.38" + _path;//194.168.0.38//录像地址dd
|
|
|
strVideoFileName = strPath.Replace("\\txt", "\\movie").Replace(".txt",".mp4");//录像地址
|
|
strVideoFileName = strPath.Replace("\\txt", "\\movie").Replace(".txt",".mp4");//录像地址
|