|
@@ -2354,6 +2354,35 @@ namespace Metis.AutoAnalysis
|
|
|
return lstResult;
|
|
|
}
|
|
|
|
|
|
+ /// <summary>
|
|
|
+ /// 检查report.ai是否存在,如果不存在检查report.ai_是否存在,如果存在改名为report.ai
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="dir"></param>
|
|
|
+ /// <returns></returns>
|
|
|
+ private bool CheckReportAIFileExist(string dir)
|
|
|
+ {
|
|
|
+ string filename = dir + "\\report.ai";
|
|
|
+ if (File.Exists(filename))
|
|
|
+ {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ string filename_ = dir + "\\report.ai_";
|
|
|
+ if (File.Exists(filename_) == false)
|
|
|
+ {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ try
|
|
|
+ {
|
|
|
+ File.Move(filename, filename_);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ catch(Exception)
|
|
|
+ {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
/// <summary>
|
|
|
/// 取文件夹下一个文件
|
|
@@ -2364,10 +2393,17 @@ namespace Metis.AutoAnalysis
|
|
|
private List<string> GetOnlyFile(string dir)
|
|
|
{
|
|
|
List<string> lstResult = new List<string>();
|
|
|
+
|
|
|
+ if (CheckReportAIFileExist(dir) == false)
|
|
|
+ {
|
|
|
+ LogHelper.log.Error("report.ai不存在 dir = " + dir);
|
|
|
+ return lstResult;
|
|
|
+ }
|
|
|
+
|
|
|
string filename = dir + "\\report.ai";
|
|
|
if (File.Exists(filename) == false)
|
|
|
{
|
|
|
- LogHelper.log.Error("report.ai不存在 " + filename);
|
|
|
+ LogHelper.log.Error("report.ai不存在 filename = " + filename);
|
|
|
return lstResult;
|
|
|
}
|
|
|
|
|
@@ -2838,8 +2874,15 @@ namespace Metis.AutoAnalysis
|
|
|
{
|
|
|
String ret = "";
|
|
|
try
|
|
|
- {
|
|
|
- String aiFile = Path.Combine(_dirCurrent, "AI") + "\\report.ai";
|
|
|
+ {
|
|
|
+ string dir = Path.Combine(_dirCurrent, "AI");
|
|
|
+ if (CheckReportAIFileExist(dir) == false)
|
|
|
+ {
|
|
|
+ LogHelper.log.Error("report.ai不存在 dir = " + dir);
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+
|
|
|
+ String aiFile = dir + "\\report.ai";
|
|
|
if (File.Exists(aiFile))
|
|
|
{
|
|
|
using (System.IO.StreamReader _file = System.IO.File.OpenText(aiFile))
|