From 9e2697419a5ff361e0fd3e74b42a020d126c5ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E8=89=B3?= <2836604403@qq.com>
Date: Tue, 25 Jun 2024 18:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=89=88=E6=9C=AC=E8=A1=A8?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8B=E8=BD=BD=E5=8C=85=E9=87=8C=E7=9A=84?=
=?UTF-8?q?=E8=BD=AF=E4=BB=B6=E5=90=8D=E7=A7=B0=E8=B7=AF=E5=BE=84=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Competition.Mysql/DAL/v_model_version.cs | 25 +++++++++++++------
.../Model/v_model_version.cs | 11 +++++++-
.../PublishProfiles/FolderProfile1.pubxml | 1 -
.../FolderProfile1.pubxml.user | 2 +-
4 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs b/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs
index e902f2b..f8c2993 100644
--- a/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs
+++ b/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs
@@ -53,9 +53,9 @@ namespace Competition.Mysql.DAL
{
StringBuilder strSql = new StringBuilder();
strSql.Append("insert into v_model_version(");
- strSql.Append("ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName)");
+ strSql.Append("ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName,ModelResourcesPath)");
strSql.Append(" values (");
- strSql.Append("@ModelId,@MONITOR_ID,@ModelName,@VersionNumber,@MapLongitude,@MapLatitude,@TrainingSize,@ModelResources,@UpdateTime,@Remark1,@Remark2,@Remark3,@RegistryName)");
+ strSql.Append("@ModelId,@MONITOR_ID,@ModelName,@VersionNumber,@MapLongitude,@MapLatitude,@TrainingSize,@ModelResources,@UpdateTime,@Remark1,@Remark2,@Remark3,@RegistryName,@ModelResourcesPath)");
SqlParameter[] parameters = {
new SqlParameter("@ModelId", SqlDbType.VarChar,50),
new SqlParameter("@MONITOR_ID", SqlDbType.VarChar,40),
@@ -69,7 +69,8 @@ namespace Competition.Mysql.DAL
new SqlParameter("@Remark1", SqlDbType.VarChar,255),
new SqlParameter("@Remark2", SqlDbType.VarChar,255),
new SqlParameter("@Remark3", SqlDbType.VarChar,255),
- new SqlParameter("@RegistryName", SqlDbType.VarChar,255)};
+ new SqlParameter("@RegistryName", SqlDbType.VarChar,255),
+ new SqlParameter("@ModelResourcesPath", SqlDbType.VarChar,255)};
parameters[0].Value = model.ModelId;
parameters[1].Value = model.MONITOR_ID;
parameters[2].Value = model.ModelName;
@@ -83,6 +84,7 @@ namespace Competition.Mysql.DAL
parameters[10].Value = model.Remark2;
parameters[11].Value = model.Remark3;
parameters[12].Value = model.RegistryName;
+ parameters[13].Value = model.ModelResourcesPath;
int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
if (rows > 0)
@@ -112,7 +114,8 @@ namespace Competition.Mysql.DAL
strSql.Append("Remark1=@Remark1,");
strSql.Append("Remark2=@Remark2,");
strSql.Append("Remark3=@Remark3,");
- strSql.Append("RegistryName=@RegistryName");
+ strSql.Append("RegistryName=@RegistryName,");
+ strSql.Append("ModelResourcesPath=@ModelResourcesPath");
strSql.Append(" where ModelId=@ModelId ");
SqlParameter[] parameters = {
new SqlParameter("@MONITOR_ID", SqlDbType.VarChar,40),
@@ -127,6 +130,7 @@ namespace Competition.Mysql.DAL
new SqlParameter("@Remark2", SqlDbType.VarChar,255),
new SqlParameter("@Remark3", SqlDbType.VarChar,255),
new SqlParameter("@RegistryName", SqlDbType.VarChar,255),
+ new SqlParameter("@ModelResourcesPath", SqlDbType.VarChar,255),
new SqlParameter("@ModelId", SqlDbType.VarChar,50)};
parameters[0].Value = model.MONITOR_ID;
parameters[1].Value = model.ModelName;
@@ -140,7 +144,8 @@ namespace Competition.Mysql.DAL
parameters[9].Value = model.Remark2;
parameters[10].Value = model.Remark3;
parameters[11].Value = model.RegistryName;
- parameters[12].Value = model.ModelId;
+ parameters[12].Value = model.ModelResourcesPath;
+ parameters[13].Value = model.ModelId;
int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
if (rows > 0)
@@ -203,7 +208,7 @@ namespace Competition.Mysql.DAL
{
StringBuilder strSql = new StringBuilder();
- strSql.Append("select top 1 ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName from v_model_version ");
+ strSql.Append("select top 1 ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName,ModelResourcesPath from v_model_version ");
strSql.Append(" where ModelId=@ModelId ");
SqlParameter[] parameters = {
new SqlParameter("@ModelId", SqlDbType.VarChar,50) };
@@ -282,6 +287,10 @@ namespace Competition.Mysql.DAL
{
model.RegistryName = row["RegistryName"].ToString();
}
+ if (row["ModelResourcesPath"] != null)
+ {
+ model.ModelResourcesPath = row["ModelResourcesPath"].ToString();
+ }
}
return model;
}
@@ -292,7 +301,7 @@ namespace Competition.Mysql.DAL
public DataSet GetList(string strWhere)
{
StringBuilder strSql = new StringBuilder();
- strSql.Append("select ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName ");
+ strSql.Append("select ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName,ModelResourcesPath ");
strSql.Append(" FROM v_model_version ");
if (strWhere.Trim() != "")
{
@@ -312,7 +321,7 @@ namespace Competition.Mysql.DAL
{
strSql.Append(" top " + Top.ToString());
}
- strSql.Append(" ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName ");
+ strSql.Append(" ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName,ModelResourcesPath ");
strSql.Append(" FROM v_model_version ");
if (strWhere.Trim() != "")
{
diff --git a/CompetitionAPI/CompetitionAPI/Competition.Mysql/Model/v_model_version.cs b/CompetitionAPI/CompetitionAPI/Competition.Mysql/Model/v_model_version.cs
index 238f2a7..c91173e 100644
--- a/CompetitionAPI/CompetitionAPI/Competition.Mysql/Model/v_model_version.cs
+++ b/CompetitionAPI/CompetitionAPI/Competition.Mysql/Model/v_model_version.cs
@@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
-* V0.01 2024/6/14 10:15:18 N/A 初版
+* V0.01 2024/6/25 18:12:00 N/A 初版
*
* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
*┌──────────────────────────────────┐
@@ -39,6 +39,7 @@ namespace Competition.Mysql.Model
private string _remark2;
private string _remark3;
private string _registryname;
+ private string _modelresourcespath;
///
///
///
@@ -143,6 +144,14 @@ namespace Competition.Mysql.Model
set{ _registryname=value;}
get{return _registryname;}
}
+ ///
+ ///
+ ///
+ public string ModelResourcesPath
+ {
+ set{ _modelresourcespath=value;}
+ get{return _modelresourcespath;}
+ }
#endregion Model
}
diff --git a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml
index e0f03da..d908c8c 100644
--- a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml
+++ b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml
@@ -17,6 +17,5 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
net6.0
282944fe-ebe1-43de-8a19-ac2227eb0b49
false
- linux-arm64
\ No newline at end of file
diff --git a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 040c8f8..89496dc 100644
--- a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<_PublishTargetUrl>F:\项目\福州海关散货系统\项目\FuZhou_Custom_BulkCargo_Server\CompetitionAPI\CompetitionAPI\CompetitionAPI\bin\Release\net6.0\publish\
- False|2024-06-19T01:51:07.8834743Z;False|2024-06-19T09:50:19.8828059+08:00;False|2024-06-19T09:49:31.4782067+08:00;True|2024-06-19T09:48:29.2943012+08:00;False|2024-06-19T09:48:02.6516665+08:00;True|2024-06-19T09:47:33.8215337+08:00;True|2024-06-17T13:24:10.4995074+08:00;False|2024-06-17T13:21:44.7372628+08:00;False|2024-06-17T13:21:10.7509626+08:00;True|2024-06-17T09:13:25.9817638+08:00;True|2024-06-17T09:00:04.5016133+08:00;
+ True|2024-06-25T00:44:00.2470909Z;False|2024-06-25T08:43:35.7645713+08:00;False|2024-06-19T09:51:07.8834743+08:00;False|2024-06-19T09:50:19.8828059+08:00;False|2024-06-19T09:49:31.4782067+08:00;True|2024-06-19T09:48:29.2943012+08:00;False|2024-06-19T09:48:02.6516665+08:00;True|2024-06-19T09:47:33.8215337+08:00;True|2024-06-17T13:24:10.4995074+08:00;False|2024-06-17T13:21:44.7372628+08:00;False|2024-06-17T13:21:10.7509626+08:00;True|2024-06-17T09:13:25.9817638+08:00;True|2024-06-17T09:00:04.5016133+08:00;
\ No newline at end of file