From d633d8200bacc4a05996ba367d81e1dc6e60d572 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 17 一月 2023 10:45:59 +0800
Subject: [PATCH] 1
---
/dev/null | 38 ------------
DataLoader/App.config | 2
DataLoader/CS/Importor.cs | 49 ++++++----------
DataLoader/DataLoader.csproj | 1
DataLoader/Model/SysMeta.cs | 31 +++++-----
DataLoader/htmls/login.html | 4
6 files changed, 37 insertions(+), 88 deletions(-)
diff --git a/DataLoader/App.config b/DataLoader/App.config
index d63f503..59c9ee9 100644
--- a/DataLoader/App.config
+++ b/DataLoader/App.config
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<appSettings>
- <add key="pgConn" value="Server=127.0.0.1;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>
+ <add key="pgConn" value="Server=192.168.20.83;Port=5433;Database=moon;User Id=postgres;Password=postgres;"/>
</appSettings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
diff --git a/DataLoader/CS/Importor.cs b/DataLoader/CS/Importor.cs
index b860aba..0520b40 100644
--- a/DataLoader/CS/Importor.cs
+++ b/DataLoader/CS/Importor.cs
@@ -25,9 +25,7 @@
}
}
- 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) returning id";
-
- 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)";
+ private static readonly string insertMeta = "insert into lf.sys_meta (eventid, metaid, dirid, depid, verid, name, type, guid, path, sizes, tab, rows, create_user, create_time) values (@eventid, @metaid, @dirid, @depid, @verid, @name, @type, @guid, @path, @sizes, @tab, @rows, @create_user, now()) returning id";
public static string GetFilePathByGuid(string guid)
{
@@ -51,19 +49,9 @@
public static int InsertMeta(SysMeta meta)
{
- // string sql = "INSERT INTO public.data_files(mid, guid, name, ext, path, subs, remark) VALUES (@mid, @guid, @name, @ext, @path, @subs, @remark) returning id";
List<DbParameter> list = Tool.GetParams<SysMeta>(insertMeta, meta);
object obj = Helper.GetScalar(insertMeta, list.ToArray());
-
- return obj == null ? 0 : Convert.ToInt32(obj);
- }
-
- public static int InsertMetaFile(SysMetaFile metaFile)
- {
- List<DbParameter> list = Tool.GetParams<SysMetaFile>(insertMetaFile, metaFile);
-
- object obj = Helper.ExecuteNonQuery(insertMetaFile, list.ToArray());
return obj == null ? 0 : Convert.ToInt32(obj);
}
@@ -89,17 +77,11 @@
vd.Meta = new SysMeta();
vd.Meta.name = fi.Name;
- vd.Meta.dirid = 0;
- vd.Meta.depid = 0;
+ vd.Meta.dirid = 1;
+ vd.Meta.depid = 1;
vd.Meta.verid = 0;
- vd.Meta.type = "file";
+ vd.Meta.type = fi.Extension.ToLower().Replace(".", "");
vd.Meta.sizes = Tool.SizeToMb(fi.Length);
- vd.Meta.cs = null;
- vd.Meta.scale = null;
- vd.Meta.resolution = null;
- vd.Meta.gather = DateTime.Now;
- vd.Meta.batch = null;
- vd.Meta.descr = null;
vd.Meta.create_user = Tool.UserId;
}
@@ -119,16 +101,15 @@
}
vd.Status = "鎻掑叆鏁版嵁搴�...";
- int metaId = InsertMeta(vd.Meta);
+ start = GetSubPath(target, start);
+ SysMeta mf = GetMetaFile(vd, start, guid);
+
+ int metaId = InsertMeta(mf);
if (metaId == 0)
{
vd.Status = "鍏冩暟鎹嚭閿欙紒";
continue;
}
-
- start = GetSubPath(target, start);
- SysMetaFile mf = GetMetaFile(vd, metaId, start, guid);
- InsertMetaFile(mf);
vd.Status = "澶嶅埗鏂囦欢...";
CopyFile(vd.FilePath, Path.Combine(target, mf.path));
@@ -163,15 +144,21 @@
}
}
- private static SysMetaFile GetMetaFile(ViewData vd, int metaId, int subPath, string guid)
+ private static SysMeta GetMetaFile(ViewData vd, int subPath, string guid)
{
- SysMetaFile mf = new SysMetaFile();
+ SysMeta mf = new SysMeta();
+ mf.eventid = Guid.NewGuid().ToString();
+ mf.metaid = 0;
+ mf.dirid = vd.Meta.dirid;
+ mf.depid = vd.Meta.depid;
+ mf.verid = vd.Meta.verid;
mf.name = vd.Meta.name;
- mf.metaid = metaId;
- mf.fileid = 0;
+ mf.type = vd.Meta.type;
mf.guid = guid;
mf.path = subPath + "\\" + mf.name;
mf.sizes = vd.Meta.sizes;
+ mf.tab = null;
+ mf.rows = 0;
mf.create_user = vd.Meta.create_user;
return mf;
diff --git a/DataLoader/DataLoader.csproj b/DataLoader/DataLoader.csproj
index 1605825..a5033bd 100644
--- a/DataLoader/DataLoader.csproj
+++ b/DataLoader/DataLoader.csproj
@@ -93,7 +93,6 @@
<Compile Include="CS\ModelHandler.cs" />
<Compile Include="Model\NtstWeb.cs" />
<Compile Include="CS\PostgreHelper.cs" />
- <Compile Include="Model\SysMetaFile.cs" />
<Compile Include="Model\ViewData.cs" />
<Compile Include="LoginWin.xaml.cs">
<DependentUpon>LoginWin.xaml</DependentUpon>
diff --git a/DataLoader/Model/SysMeta.cs b/DataLoader/Model/SysMeta.cs
index a14a2b9..51ffe37 100644
--- a/DataLoader/Model/SysMeta.cs
+++ b/DataLoader/Model/SysMeta.cs
@@ -10,11 +10,16 @@
namespace DataLoader.Model
{
+ /// <summary>
+ /// 鍏冩暟鎹�
+ /// </summary>
public class SysMeta
{
public int id { set; get; }
- public string name { set; get; }
+ public string eventid { set; get; }
+
+ public int metaid { set; get; }
public int dirid { set; get; }
@@ -22,21 +27,19 @@
public int verid { set; get; }
+ public string name { set; get; }
+
public string type { set; get; }
+
+ public string guid { set; get; }
+
+ public string path { set; get; }
public double sizes { set; get; }
- public string cs { set; get; }
+ public string tab { 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 rows { set; get; }
public int create_user { set; get; }
@@ -46,11 +49,9 @@
public DateTime update_time { set; get; }
+ public string bak { 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
deleted file mode 100644
index 9886372..0000000
--- a/DataLoader/Model/SysMetaFile.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-锘縰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 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/htmls/login.html b/DataLoader/htmls/login.html
index 14c35d9..54500a6 100644
--- a/DataLoader/htmls/login.html
+++ b/DataLoader/htmls/login.html
@@ -28,7 +28,7 @@
<div class="loginpwd" style='width: 400px; margin-right: 20px; margin-top: 30px; border-bottom: 1px solid #fff;'>
<span style="visibility: hidden;">请</span><label for="password">密码：</label>
<input class="required" placeholder="请输入密码" type="password" id="password" size="20" tabindex="2"
- accesskey="p" autocomplete="off" name="password" value="Admin@123" /><span id="capslock-on" style="display: none;">
+ accesskey="p" autocomplete="off" name="password" value="Admin@1234_lf" /><span id="capslock-on" style="display: none;">
<i class="fa fa-exclamation-circle"></i>
<span>CAPSLOCK key is turned on!</span>
</span>
@@ -41,7 +41,7 @@
</section>
</div>
<script>
- var url = "http://127.0.0.1:12316/server/";
+ var url = "http://192.168.20.83:12316/server/";
var isBusy = false;
--
Gitblit v1.9.3