Browse Source

重命名文件,开始文件夹路径备份文件夹不能相同

章政 8 years ago
parent
commit
af96495743
1 changed files with 8 additions and 8 deletions
  1. 8 8
      UAS_XmlAnalysor/Form1.cs

+ 8 - 8
UAS_XmlAnalysor/Form1.cs

@@ -42,8 +42,7 @@ namespace UAS_XmlAnalysor
                 AutoStart.Checked = (Info[4] == "True" ? true : false);
             }
             catch (Exception) { }
-        
-            dt = (DataTable)dh.ExecuteSql("select ms_pwd,ma_user,ma_address from master ", "select");
+            dt = (DataTable)dh.ExecuteSql("select ms_pwd,ma_user,ma_address from master", "select");
             Master.DataSource = dt;
             Master.DisplayMember = "ma_user";
             Master.ValueMember = "ma_user";
@@ -57,7 +56,11 @@ namespace UAS_XmlAnalysor
                 OperateResult.AppendText("请选择监控文件夹和备份文件夹\n");
                 return;
             }
-
+            if (FolderPath.Text == BackUpFolderPath.Text)
+            {
+                OperateResult.AppendText("监控文件夹和备份文件夹不能相同\n");
+                return;
+            }
             for (int i = 0; i < dt.Rows.Count; i++)
             {
                 if (Master.Text == dt.Rows[i]["ma_user"].ToString())
@@ -81,10 +84,7 @@ namespace UAS_XmlAnalysor
             {
                 File.Delete(CachePath);
             }
-            catch (Exception)
-            {
-
-            }
+            catch (Exception) { }
             XmlDocument xmlDoc = new XmlDocument();
             //创建类型声明节点  
             XmlNode node = xmlDoc.CreateXmlDeclaration("1.0", "utf-8", "");
@@ -192,7 +192,7 @@ namespace UAS_XmlAnalysor
             {
                 try
                 {
-                    file.MoveTo(BackUpFolderPath.Text + @"\" + e.Name);
+                    file.MoveTo(BackUpFolderPath.Text + @"\" + DateTime.Now.ToString("yyyy-MM-dd-hh-mm-ss") + "-" + e.Name);
                 }
                 catch (Exception ex)
                 {