From 208143942a6d81e4fb2a2e6abdd8ee807007fc39 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 01 一月 2023 15:12:16 +0800
Subject: [PATCH] 1.1.2
---
DataLoader/Model/ViewData.cs | 2
DataLoader/MainWindow.xaml.cs | 1
DataLoader/Model/Main.cs | 2
DataLoader/CS/Importor.cs | 7 ++
DataLoader/DataLoader.csproj | 8 +-
DataLoader/LoginWin.xaml.cs | 2
DataLoader/Model/SysMetaFile.cs | 39 +++++++++++++
DataLoader/Model/NtstWeb.cs | 2
DataLoader/Model/SysMeta.cs | 58 +++++++++++++++++++
9 files changed, 113 insertions(+), 8 deletions(-)
diff --git a/DataLoader/CS/Importor.cs b/DataLoader/CS/Importor.cs
index c5c00f1..51ea5a9 100644
--- a/DataLoader/CS/Importor.cs
+++ b/DataLoader/CS/Importor.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing DataLoader.Model;
+using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
@@ -9,6 +10,10 @@
{
public class Importor
{
+ private static readonly string insertMeta = "insert into lf.sys_meta(name, dirid, depid, verid, type, sizes, cs, scale, resolution, gather, batch, descr, create_user) values @name, @dirid, @depid, @verid, @type, @sizes, @cs, @scale, @resolution, @gather, @batch, @descr, @create_user)";
+
+ private static readonly string insertMetaFile = "insert into lf.sys_meta_file(name, metaid, fileid, guid, path, sizes, create_user) values (@name, @metaid, @fileid, @guid, @path, @sizes, @create_user)";
+
public static void Import(ObservableCollection<ViewData> viewDatas, string source, string target)
{
diff --git a/DataLoader/DataLoader.csproj b/DataLoader/DataLoader.csproj
index 554f05c..8459f0e 100644
--- a/DataLoader/DataLoader.csproj
+++ b/DataLoader/DataLoader.csproj
@@ -88,11 +88,12 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="CS\Importor.cs" />
- <Compile Include="CS\Main.cs" />
+ <Compile Include="Model\Main.cs" />
<Compile Include="CS\ModelHandler.cs" />
- <Compile Include="CS\NtstWeb.cs" />
+ <Compile Include="Model\NtstWeb.cs" />
<Compile Include="CS\PostgreHelper.cs" />
- <Compile Include="CS\ViewData.cs" />
+ <Compile Include="Model\SysMetaFile.cs" />
+ <Compile Include="Model\ViewData.cs" />
<Compile Include="LoginWin.xaml.cs">
<DependentUpon>LoginWin.xaml</DependentUpon>
</Compile>
@@ -102,6 +103,7 @@
</Compile>
</ItemGroup>
<ItemGroup>
+ <Compile Include="Model\SysMeta.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
diff --git a/DataLoader/LoginWin.xaml.cs b/DataLoader/LoginWin.xaml.cs
index 769fec1..15df86e 100644
--- a/DataLoader/LoginWin.xaml.cs
+++ b/DataLoader/LoginWin.xaml.cs
@@ -1,5 +1,5 @@
锘縰sing CefSharp;
-using DataLoader.CS;
+using DataLoader.Model;
using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/DataLoader/MainWindow.xaml.cs b/DataLoader/MainWindow.xaml.cs
index ac93f5d..99e9fc8 100644
--- a/DataLoader/MainWindow.xaml.cs
+++ b/DataLoader/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
锘縰sing DataLoader.CS;
+using DataLoader.Model;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
diff --git a/DataLoader/CS/Main.cs b/DataLoader/Model/Main.cs
similarity index 93%
rename from DataLoader/CS/Main.cs
rename to DataLoader/Model/Main.cs
index 314a910..1af79c3 100644
--- a/DataLoader/CS/Main.cs
+++ b/DataLoader/Model/Main.cs
@@ -5,7 +5,7 @@
using System.Threading.Tasks;
using System.Windows;
-namespace DataLoader.CS
+namespace DataLoader.Model
{
public class Main
{
diff --git a/DataLoader/CS/NtstWeb.cs b/DataLoader/Model/NtstWeb.cs
similarity index 96%
rename from DataLoader/CS/NtstWeb.cs
rename to DataLoader/Model/NtstWeb.cs
index 61b8ab2..fc67c96 100644
--- a/DataLoader/CS/NtstWeb.cs
+++ b/DataLoader/Model/NtstWeb.cs
@@ -5,7 +5,7 @@
using System.Threading.Tasks;
using System.Windows;
-namespace DataLoader.CS
+namespace DataLoader.Model
{
public class NtstWeb
{
diff --git a/DataLoader/Model/SysMeta.cs b/DataLoader/Model/SysMeta.cs
new file mode 100644
index 0000000..20ab1e8
--- /dev/null
+++ b/DataLoader/Model/SysMeta.cs
@@ -0,0 +1,58 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices.ComTypes;
+using System.Security.Cryptography;
+using System.Security.Policy;
+using System.Text;
+using System.Threading.Tasks;
+using static Mono.Security.X509.X520;
+using System.Windows.Controls;
+
+namespace DataLoader.Model
+{
+ public class SysMeta
+ {
+ public int id { set; get; }
+
+ public string name { set; get; }
+
+ public int dirid { set; get; }
+
+ public int depid { set; get; }
+
+ public int verid { set; get; }
+
+ public string type { set; get; }
+
+ public double sizes { set; get; }
+
+ public string cs { set; get; }
+
+ public string scale { set; get; }
+
+ public string resolution { set; get; }
+
+ public DateTime gather { set; get; }
+
+ public string batch { set; get; }
+
+ public string descr { set; get; }
+
+ public int create_user { set; get; }
+
+ public DateTime create_time { set; get; }
+
+ public int update_user { set; get; }
+
+ public DateTime update_time { set; get; }
+
+ public string geom { set; get; }
+
+ public string tab { set; get; }
+
+ public int rows { set; get; }
+
+ public SysMeta() { }
+ }
+}
diff --git a/DataLoader/Model/SysMetaFile.cs b/DataLoader/Model/SysMetaFile.cs
new file mode 100644
index 0000000..27bdfb5
--- /dev/null
+++ b/DataLoader/Model/SysMetaFile.cs
@@ -0,0 +1,39 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices.ComTypes;
+using System.Security.Policy;
+using System.Text;
+using System.Threading.Tasks;
+using static Mono.Security.X509.X520;
+using System.Windows.Controls;
+
+namespace DataLoader.Model
+{
+ public class SysMetaFile
+ {
+ public int id { get; set; }
+
+ public string name { get; set; }
+
+ public int metaid { get; set; }
+
+ public int fileid { get; set; }
+
+ public string guid { get; set; }
+
+ public string path { get; set; }
+
+ public double sizes { get; set; }
+
+ public int create_user { get; set; }
+
+ public DateTime create_time { get; set; }
+
+ public int update_user { get; set; }
+
+ public DateTime update_time { get; set; }
+
+ public SysMetaFile() { }
+ }
+}
diff --git a/DataLoader/CS/ViewData.cs b/DataLoader/Model/ViewData.cs
similarity index 98%
rename from DataLoader/CS/ViewData.cs
rename to DataLoader/Model/ViewData.cs
index 6529ea8..8cd7dee 100644
--- a/DataLoader/CS/ViewData.cs
+++ b/DataLoader/Model/ViewData.cs
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace DataLoader.CS
+namespace DataLoader.Model
{
public class ViewData : INotifyPropertyChanged
{
--
Gitblit v1.9.3