From 12b68cf5f346c73a4e270f37054642714e29e117 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 22 八月 2023 10:48:55 +0800
Subject: [PATCH] 修改数据入库的界面1
---
/dev/null | 63 ----------
DataLoader/MainWindow.xaml.cs | 17 ++
DataLoader/MainWindow.xaml | 161 +++++++++++++++++++++++---
DataLoader/Model/MetaType.cs | 24 ++++
DataLoader/DataLoader.csproj | 3
DataLoader/CS/DBHelper.cs | 78 +++++++++++++
DataLoader/Model/CommonProp.cs | 10 +
7 files changed, 273 insertions(+), 83 deletions(-)
diff --git a/DataLoader/CS/DBHelper.cs b/DataLoader/CS/DBHelper.cs
new file mode 100644
index 0000000..bacebbf
--- /dev/null
+++ b/DataLoader/CS/DBHelper.cs
@@ -0,0 +1,78 @@
+锘縰sing DataLoader.Model;
+using Npgsql;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Common;
+using System.Linq;
+
+namespace DataLoader.CS
+{
+ /// <summary>
+ /// 鏁版嵁搴撳府鍔╃被
+ /// </summary>
+ public class DBHelper
+ {
+ // id, eventid, metaid, verid, name, type, guid, path, sizes, tab, rows, create_user, create_time, update_user, update_time, bak, geom, layer, depcode, dircode, ismeta, sensortype, acq_time, resolution, gridsize, coor_sys, epsg, h_datum, mata_type, bands, band_type, ct
+ public static string insertMeta = "insert into lf.sys_meta (eventid, metaid, verid, name, type, guid, path, sizes, tab, rows, create_user, create_time, bak, geom, layer, depcode, dircode, ismeta, sensortype, acq_time, resolution, gridsize, coor_sys, epsg, h_datum, mata_type, bands, band_type, ct) values (@eventid, @metaid, @verid, @name, @type, @guid, @path, @sizes, @tab, @rows, @create_user, now(), @bak, @geom, @layer, @depcode, @dircode, @ismeta, @sensortype, @acq_time, @resolution, @gridsize, @coor_sys, @epsg, @h_datum, @mata_type, @bands, @band_type, @ct) returning id";
+
+ /// <summary>
+ /// 鎻掑叆鍏冩暟鎹�
+ /// </summary>
+ public int InsertMeta(List<SysMeta> list)
+ {
+ PostgreHelper db = Tools.DBHelper;
+
+ int count = 0;
+ foreach (SysMeta meta in list)
+ {
+ List<DbParameter> args = Tools.GetParams<SysMeta>(insertMeta, meta)
+ ;
+ int id = db.GetIntScalar(insertMeta, args.ToArray());
+ if (id > 0) count++;
+ }
+
+ return count;
+ }
+
+ /// <summary>
+ /// 鏍规嵁GUID鏌ヨ璺緞
+ /// </summary>
+ public static string GetFilePathByGuid(string guid)
+ {
+ string sql = "select path from lf.sys_meta where guid = @guid limit 1";
+
+ DbParameter dp = new NpgsqlParameter("@guid", guid);
+ object obj = Tools.DBHelper.GetScalar(sql, dp);
+
+ return obj == null ? null : obj.ToString();
+ }
+
+ /// <summary>
+ /// 鏂囦欢鏄�/鍚﹀瓨鍦�
+ /// </summary>
+ public static bool IsFileExists(string guid)
+ {
+ string sql = "select count(*) from lf.sys_meta where guid = @guid";
+
+ DbParameter dp = new NpgsqlParameter("@guid", guid);
+ object obj = Tools.DBHelper.GetScalar(sql, dp);
+
+ return obj != null && Convert.ToInt32(obj) > 0;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐩綍鍒楄〃
+ /// </summary>
+ public static List<SysDir> GetDirList()
+ {
+ string sql = "select * from lf.sys_dir";
+ DataTable dt = Tools.DBHelper.GetDataTable(sql);
+ if (null == dt || dt.Rows.Count == 0) return null;
+
+ List<SysDir> list = ModelHandler.FillModel<SysDir>(dt);
+
+ return list;
+ }
+ }
+}
diff --git a/DataLoader/CS/MetaHelper.cs b/DataLoader/CS/MetaHelper.cs
deleted file mode 100644
index 71edbf5..0000000
--- a/DataLoader/CS/MetaHelper.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-锘縰sing DataLoader.Model;
-using Npgsql;
-using System;
-using System.Collections.Generic;
-using System.Data.Common;
-using System.Linq;
-
-namespace DataLoader.CS
-{
- /// <summary>
- /// 鍏冩暟鎹府鍔╃被
- /// </summary>
- public class MetaHelper
- {
- // id, eventid, metaid, verid, name, type, guid, path, sizes, tab, rows, create_user, create_time, update_user, update_time, bak, geom, layer, depcode, dircode, ismeta, sensortype, acq_time, resolution, gridsize, coor_sys, epsg, h_datum, mata_type, bands, band_type, ct
- public static string insertSql = "insert into lf.sys_meta (eventid, metaid, verid, name, type, guid, path, sizes, tab, rows, create_user, create_time, bak, geom, layer, depcode, dircode, ismeta, sensortype, acq_time, resolution, gridsize, coor_sys, epsg, h_datum, mata_type, bands, band_type, ct) values (@eventid, @metaid, @verid, @name, @type, @guid, @path, @sizes, @tab, @rows, @create_user, now(), @bak, @geom, @layer, @depcode, @dircode, @ismeta, @sensortype, @acq_time, @resolution, @gridsize, @coor_sys, @epsg, @h_datum, @mata_type, @bands, @band_type, @ct) returning id";
-
- /// <summary>
- /// 鎻掑叆鏁版嵁
- /// </summary>
- public int Insert(List<SysMeta> list)
- {
- PostgreHelper db = Tools.DBHelper;
-
- int count = 0;
- foreach (SysMeta meta in list)
- {
- List<DbParameter> args = Tools.GetParams<SysMeta>(insertSql, meta)
- ;
- int id = db.GetIntScalar(insertSql, args.ToArray());
- if (id > 0) count++;
- }
-
- return count;
- }
-
- /// <summary>
- /// 鏍规嵁GUID鏌ヨ璺緞
- /// </summary>
- public static string GetFilePathByGuid(string guid)
- {
- string sql = "select path from lf.sys_meta where guid = @guid limit 1";
-
- DbParameter dp = new NpgsqlParameter("@guid", guid);
- object obj = Tools.DBHelper.GetScalar(sql, dp);
-
- return obj == null ? null : obj.ToString();
- }
-
- /// <summary>
- /// 鏂囦欢鏄�/鍚﹀瓨鍦�
- /// </summary>
- public static bool IsFileExists(string guid)
- {
- string sql = "select count(*) from lf.sys_meta where guid = @guid";
-
- DbParameter dp = new NpgsqlParameter("@guid", guid);
- object obj = Tools.DBHelper.GetScalar(sql, dp);
-
- return obj != null && Convert.ToInt32(obj) > 0;
- }
- }
-}
diff --git a/DataLoader/DataLoader.csproj b/DataLoader/DataLoader.csproj
index cfd6f6f..e2e09cf 100644
--- a/DataLoader/DataLoader.csproj
+++ b/DataLoader/DataLoader.csproj
@@ -135,13 +135,14 @@
<Compile Include="CS\Importor.cs" />
<Compile Include="CS\LogOut.cs" />
<Compile Include="CS\MD5Helper.cs" />
- <Compile Include="CS\MetaHelper.cs" />
+ <Compile Include="CS\DBHelper.cs" />
<Compile Include="CS\StaticData.cs" />
<Compile Include="CS\Tools.cs" />
<Compile Include="Model\CommonProp.cs" />
<Compile Include="CS\ModelHandler.cs" />
<Compile Include="CS\NtstWeb.cs" />
<Compile Include="CS\PostgreHelper.cs" />
+ <Compile Include="Model\MetaType.cs" />
<Compile Include="Model\SysDir.cs" />
<Compile Include="Model\ViewData.cs" />
<Compile Include="LoginWin.xaml.cs">
diff --git a/DataLoader/MainWindow.xaml b/DataLoader/MainWindow.xaml
index 3db6420..3a35f2a 100644
--- a/DataLoader/MainWindow.xaml
+++ b/DataLoader/MainWindow.xaml
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Height="700" Width="900"
Loaded="Window_Loaded"
- Title="褰卞儚鏁版嵁鍏ュ簱 v1.5" WindowStartupLocation="CenterScreen">
+ Title="鏁版嵁鍏ュ簱 v1.5" WindowStartupLocation="CenterScreen">
<Window.Resources>
<Style x:Key="btn" TargetType="Button">
<Setter Property="Background" Value="#005699"/>
@@ -26,9 +26,111 @@
<Setter Property="Height" Value="30"/>
<Setter Property="FontSize" Value="20"/>
</Style>
+
+ <!--Combox-->
+ <Style TargetType="ToggleButton" x:Key="ComboxStyleBtn">
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate>
+ <!--涓嬫媺鎸夐挳鍐呴儴鑳屾櫙鑹�-->
+ <Border x:Name="Back" BorderThickness="1" BorderBrush="Transparent">
+ <!--涓嬫媺鎸夐挳鍐呰竟妗�-->
+ <Path Name="PathFill" Fill="#136BAF" Width="10" Height="6" StrokeThickness="0" Data="M5,0 L10,10 L0,10 z" RenderTransformOrigin="0.5,0.5" Stretch="Fill">
+ <Path.RenderTransform>
+ <TransformGroup>
+ <ScaleTransform/>
+ <SkewTransform/>
+ <RotateTransform Angle="180"/>
+ <TranslateTransform/>
+ </TransformGroup>
+ </Path.RenderTransform>
+ </Path>
+ </Border>
+ <ControlTemplate.Triggers>
+ <Trigger Property="IsMouseOver" Value="True">
+ <Setter TargetName="PathFill" Property="Fill" Value="White"></Setter>
+ <Setter TargetName="Back" Property="Background" Value="#136BAF"></Setter>
+ <Setter TargetName="Back" Property="BorderBrush" Value="#136BAF"></Setter>
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+ <Style TargetType="ComboBox" x:Key="ComboBoxStyle">
+ <Setter Property="ItemContainerStyle">
+ <Setter.Value>
+ <!--ComBoxItem-->
+ <Style TargetType="ComboBoxItem">
+ <Setter Property="MinHeight" Value="30"></Setter>
+ <Setter Property="MinWidth" Value="60"></Setter>
+ <Setter Property="Foreground" Value="White"></Setter>
+ <Setter Property="FontWeight" Value="Bold"></Setter>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="ComboBoxItem">
+ <Border Name="Back" Background="Transparent" BorderThickness="0,0,0,0" BorderBrush="#136BAF" >
+ <ContentPresenter ContentSource="{Binding Source}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 0 30 0"></ContentPresenter>
+ </Border>
+ <ControlTemplate.Triggers>
+ <Trigger Property="IsMouseOver" Value="True">
+ <Setter TargetName="Back" Property="Background" Value="LightGray"></Setter>
+ </Trigger>
+ <!--涓嬫媺妗嗚儗鏅壊-->
+ <Trigger Property="IsHighlighted" Value="True">
+ <Setter TargetName="Back" Property="Background" Value="Transparent"></Setter>
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+ </Setter.Value>
+ </Setter>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="ComboBox">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="0.7*"/>
+ <ColumnDefinition Width="0.3*" MaxWidth="30"/>
+ </Grid.ColumnDefinitions>
+ <!--鏂囧瓧鍖哄煙鑳屾櫙鍜岃竟绾挎牱寮�-->
+ <TextBox Background="Transparent" HorizontalContentAlignment="Center" VerticalAlignment="Center" Grid.Column="0" Foreground="White" BorderBrush="#136BAF" BorderThickness="0,0,0,0" IsReadOnly="{TemplateBinding IsReadOnly}" Text="{TemplateBinding Text}"></TextBox>
+ <Border Grid.Column="0" BorderThickness="1,1,0,1" BorderBrush="#136BAF" CornerRadius="0,0,0,0">
+ </Border>
+ <!--鍙充晶涓嬫媺button璁剧疆-->
+ <Border Grid.Column="1" BorderThickness="0,1,1,1" BorderBrush="#136BAF" CornerRadius="0,0,0,0">
+ <ToggleButton BorderThickness="3" BorderBrush="#136BAF" Style="{StaticResource ComboxStyleBtn}" IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" ClickMode="Press"></ToggleButton>
+ </Border>
+ <!--寮瑰嚭popup鏁翠綋璁剧疆-->
+ <Popup IsOpen="{TemplateBinding IsDropDownOpen}" Placement="Bottom" x:Name="Popup" Focusable="False" AllowsTransparency="True" PopupAnimation="Slide" >
+ <!--寮瑰嚭popup杈规-->
+ <Border CornerRadius="1" BorderBrush="#136BAF" BorderThickness="1,0,1,1" MaxHeight="{TemplateBinding MaxDropDownHeight}" MinWidth="{TemplateBinding ActualWidth}" x:Name="DropDown" SnapsToDevicePixels="True">
+ <Border.Effect>
+ <DropShadowEffect Color="Black" BlurRadius="2" ShadowDepth="0" Opacity="1"/>
+ </Border.Effect>
+ <!--涓嬫媺骞曞竷杈圭晫鑳屾櫙璁剧疆 MaxHeight="{TemplateBinding MaxDropDownHeight}"-->
+ <ScrollViewer Margin="0,0,0,0" SnapsToDevicePixels="True" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" BorderBrush="#136BAF" BorderThickness="2" >
+ <!-- StackPanel 鐢ㄤ簬鏄剧ず瀛愮骇锛屾柟娉曟槸灏� IsItemsHost 璁剧疆涓� True -->
+ <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" Background="#001f55" />
+ </ScrollViewer>
+ </Border>
+ </Popup>
+ </Grid>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+ <Style TargetType="ListBoxItem">
+ <Setter Property="Height" Value="35"/>
+ <Setter Property="BorderThickness" Value="0"/>
+ </Style>
</Window.Resources>
<Grid x:Name="gMain">
<Grid.RowDefinitions>
+ <RowDefinition Height="40"/>
+ <RowDefinition Height="40"/>
<RowDefinition Height="40"/>
<RowDefinition Height="40"/>
<RowDefinition Height="40"/>
@@ -38,32 +140,53 @@
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
- <ColumnDefinition Width="4*" />
+ <ColumnDefinition Width="5*" />
<ColumnDefinition Width="20*" />
- <ColumnDefinition Width="4*" />
+ <ColumnDefinition Width="5*" />
<ColumnDefinition Width="20*" />
<ColumnDefinition Width="5*" />
</Grid.ColumnDefinitions>
- <Label Grid.Row="0" Grid.Column="0" Content="鐢ㄦ埛鍚嶏細" VerticalAlignment="Center" HorizontalAlignment="Right" />
- <TextBox Grid.Row="0" Grid.Column="1" Style="{StaticResource tb}" IsReadOnly="True" x:Name="tbUname"/>
- <Label Grid.Row="0" Grid.Column="2" Content="浠ょ墝锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
- <TextBox Grid.Row="0" Grid.Column="3" Style="{StaticResource tb}" IsReadOnly="True" x:Name="tbToken"/>
+ <Label Grid.Row="0" Grid.Column="0" Content="鐢ㄦ埛ID锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
+ <TextBox Grid.Row="0" Grid.Column="1" Style="{StaticResource tb}" IsReadOnly="True" x:Name="tbUid"/>
+ <Label Grid.Row="0" Grid.Column="2" Content="鐢ㄦ埛鍚嶏細" VerticalAlignment="Center" HorizontalAlignment="Right" />
+ <TextBox Grid.Row="0" Grid.Column="3" Style="{StaticResource tb}" IsReadOnly="True" x:Name="tbUname"/>
<Button Grid.Row="0" Grid.Column="4" Content="鐧� 褰�" Style="{StaticResource btn}" Click="Login_MouseLeftButtonDown"/>
- <Label Grid.Row="1" Grid.Column="0" Content="璧勬簮鐩綍锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
- <TextBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource tb}" x:Name="tbDir"/>
- <Button Grid.Row="1" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Dir_MouseLeftButtonDown" x:Name="btnDir"/>
+ <Label Grid.Row="1" Grid.Column="0" Content="浠ょ墝锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
+ <TextBox Grid.Row="1" Grid.Column="1" Style="{StaticResource tb}" IsReadOnly="True" x:Name="tbToken"/>
+ <Label Grid.Row="1" Grid.Column="2" Content="鍏冩暟鎹被鍨嬶細" VerticalAlignment="Center" HorizontalAlignment="Right" />
+ <!--<TextBox Grid.Row="1" Grid.Column="3" Style="{StaticResource tb}" x:Name="tbAcqTim2e"/>-->
+ <!--<ComboBox Grid.Row="1" Grid.Column="3" IsReadOnly="True" DisplayMemberPath="Name" Style="{StaticResource ComboBoxStyle}" Width="320" Height="30" HorizontalAlignment="Left" x:Name="cbMetaType"></ComboBox>-->
+ <ComboBox Grid.Row="1" Grid.Column="3" HorizontalAlignment="Left" VerticalContentAlignment="Center" Background="White" SelectedIndex="0" Width="322" Height="38" BorderThickness="0" x:Name="cbMetaType">
+ <ComboBoxItem>璇烽�夋嫨</ComboBoxItem>
+ <ComboBoxItem>鏁板瓧姝ｅ皠褰卞儚鍥�</ComboBoxItem>
+ <ComboBoxItem>鏁板瓧楂樼▼妯″瀷</ComboBoxItem>
+ <ComboBoxItem>鍗曟尝娈垫爡鏍兼暟鎹�</ComboBoxItem>
+ <ComboBoxItem>澶氬厜璋辨爡鏍兼暟鎹�</ComboBoxItem>
+ <ComboBoxItem>楂樺厜璋辨爡鏍兼暟鎹�</ComboBoxItem>
+ <ComboBoxItem>鐭㈤噺鏁版嵁</ComboBoxItem>
+ <ComboBoxItem>涓夌淮妯″瀷</ComboBoxItem>
+ </ComboBox>
- <Label Grid.Row="2" Grid.Column="0" Content="鏁版嵁鐩綍锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
- <TextBox Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource tb}" x:Name="tbSource"/>
- <Button Grid.Row="2" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Source_MouseLeftButtonDown" x:Name="btnSource"/>
+ <Label Grid.Row="2" Grid.Column="0" Content="浼犳劅鍣ㄧ被鍨嬶細" VerticalAlignment="Center" HorizontalAlignment="Right" />
+ <TextBox Grid.Row="2" Grid.Column="1" Style="{StaticResource tb}" x:Name="tbSensorType"/>
+ <Label Grid.Row="2" Grid.Column="2" Content="閲囬泦鏃堕棿锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
+ <TextBox Grid.Row="2" Grid.Column="3" Style="{StaticResource tb}" x:Name="tbAcqTime"/>
- <Label Grid.Row="3" Grid.Column="0" Content="鍏ュ簱鐩綍锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
- <TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource tb}" x:Name="tbTarget"/>
- <Button Grid.Row="3" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Target_MouseLeftButtonDown" x:Name="btnTarget"/>
+ <Label Grid.Row="3" Grid.Column="0" Content="璧勬簮鐩綍锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
+ <TextBox Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource tb}" x:Name="tbDir"/>
+ <Button Grid.Row="3" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Dir_MouseLeftButtonDown" x:Name="btnDir"/>
- <ScrollViewer Grid.Row="4" Grid.RowSpan="3" Grid.Column="0" Grid.ColumnSpan="4" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Margin="2">
+ <Label Grid.Row="4" Grid.Column="0" Content="鏁版嵁鐩綍锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
+ <TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource tb}" x:Name="tbSource"/>
+ <Button Grid.Row="4" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Source_MouseLeftButtonDown" x:Name="btnSource"/>
+
+ <Label Grid.Row="5" Grid.Column="0" Content="鍏ュ簱鐩綍锛�" VerticalAlignment="Center" HorizontalAlignment="Right" />
+ <TextBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Style="{StaticResource tb}" x:Name="tbTarget"/>
+ <Button Grid.Row="5" Grid.Column="4" Content="閫� 鎷�" Style="{StaticResource btn}" Click="Target_MouseLeftButtonDown" x:Name="btnTarget"/>
+
+ <ScrollViewer Grid.Row="6" Grid.RowSpan="3" Grid.Column="0" Grid.ColumnSpan="4" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Margin="5 5 0 5">
<ListView x:Name="lvView">
<ListView.View>
<GridView>
@@ -84,7 +207,7 @@
</ListView>
</ScrollViewer>
- <Button x:Name="btnLoad" Grid.Row="4" Grid.Column="4" Content="鍔� 杞�" Style="{StaticResource btn}" Click="Load_MouseLeftButtonDown"/>
- <Button x:Name="btnImport" Grid.Row="5" Grid.Column="4" Content="瀵� 鍏�" Style="{StaticResource btn}" VerticalAlignment="Top" Click="Import_MouseLeftButtonDown"/>
+ <Button x:Name="btnLoad" Grid.Row="6" Grid.Column="4" Content="鍔� 杞�" Style="{StaticResource btn}" Click="Load_MouseLeftButtonDown"/>
+ <Button x:Name="btnImport" Grid.Row="7" Grid.Column="4" Content="瀵� 鍏�" Style="{StaticResource btn}" VerticalAlignment="Top" Click="Import_MouseLeftButtonDown"/>
</Grid>
</Window>
diff --git a/DataLoader/MainWindow.xaml.cs b/DataLoader/MainWindow.xaml.cs
index e5dd13f..012e33f 100644
--- a/DataLoader/MainWindow.xaml.cs
+++ b/DataLoader/MainWindow.xaml.cs
@@ -30,6 +30,8 @@
CommonProp.Owner = this;
CommonProp.Init();
+ //this.cbMetaType.ItemsSource= GetMetaTypes();
+ //this.cbMetaType.SelectedIndex= 0;
this.btnLoad.IsEnabled = false;
this.btnImport.IsEnabled = false;
@@ -40,6 +42,21 @@
LogOut.Info("************ 搴旂敤绋嬪簭鍚姩鎴愬姛锛� ************");
}
+ private List<MetaType> GetMetaTypes()
+ {
+ List<MetaType> list = new List<MetaType>();
+ list.Add(new MetaType("榛樿"));
+ list.Add(new MetaType("鏁板瓧姝ｅ皠褰卞儚鍥�"));
+ list.Add(new MetaType("鏁板瓧楂樼▼妯″瀷"));
+ list.Add(new MetaType("鍗曟尝娈垫爡鏍兼暟鎹�"));
+ list.Add(new MetaType("澶氬厜璋辨爡鏍兼暟鎹�"));
+ list.Add(new MetaType("楂樺厜璋辨爡鏍兼暟鎹�"));
+ list.Add(new MetaType("鐭㈤噺鍥惧眰"));
+ list.Add(new MetaType("涓夌淮妯″瀷"));
+
+ return list;
+ }
+
// 璁剧疆
private void Login_MouseLeftButtonDown(object sender, RoutedEventArgs e)
{
diff --git a/DataLoader/Model/CommonProp.cs b/DataLoader/Model/CommonProp.cs
index cd55397..b015a67 100644
--- a/DataLoader/Model/CommonProp.cs
+++ b/DataLoader/Model/CommonProp.cs
@@ -95,6 +95,16 @@
/// </summary>
public static string TargetPath;
+ /// <summary>
+ /// 浼犳劅鍣ㄧ被鍨�
+ /// </summary>
+ public static string SensorType;
+
+ /// <summary>
+ /// 閲囬泦鏃堕棿
+ /// </summary>
+ public static DateTime AcqTime;
+
/*private string _sourcePath;
/// <summary>
diff --git a/DataLoader/Model/MetaType.cs b/DataLoader/Model/MetaType.cs
new file mode 100644
index 0000000..251f7e1
--- /dev/null
+++ b/DataLoader/Model/MetaType.cs
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataLoader.Model
+{
+ [Serializable]
+ public class MetaType
+ {
+ public MetaType() { }
+
+ public MetaType(string name)
+ {
+ this.Name = name;
+ this.Value = "榛樿" == name ? "" : name;
+ }
+
+ public string Name { set; get; }
+
+ public string Value { set; get; }
+ }
+}
--
Gitblit v1.9.3