chenxiangxue
/
FuZhou_Custom_BulkCargo_Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增32位模型包资源字段

This commit is contained in:
曾艳 2024-11-22 09:42:22 +08:00
parent 60d05d6e4b
commit 5a00ba426d
8 changed files with 96 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
CompetitionAPI/CompetitionAPI/Competition.Mysql/BLL/v_model_version.cs
View File

@ -147,25 +147,6 @@ namespace Competition.Mysql.BLL
return modelList;
}
public List<object> DataTableToObjectList(DataTable dt)
{
List<object> modelList = new List<object>();
int rowsCount = dt.Rows.Count;
if (rowsCount > 0)
{
object model;
for (int n = 0; n < rowsCount; n++)
{
model = dal.DataRowToModelByObject(dt.Rows[n]);
if (model != null)
{
modelList.Add(model);
}
}
}
return modelList;
}
/// <summary>
/// 获得数据列表
/// </summary>
@ -256,6 +237,25 @@ namespace Competition.Mysql.BLL
DataSet ds = dal.GetListByCustom(customids);
return DataTableToObjectList(ds.Tables[0]);
}
public List<object> DataTableToObjectList(DataTable dt)
{
List<object> modelList = new List<object>();
int rowsCount = dt.Rows.Count;
if (rowsCount > 0)
{
object model;
for (int n = 0; n < rowsCount; n++)
{
model = dal.DataRowToModelByObject(dt.Rows[n]);
if (model != null)
{
modelList.Add(model);
}
}
}
return modelList;
}
#endregion ExtensionMethod
}
}

84
CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs
View File

@ -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,ModelResourcesPath)");
strSql.Append("ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName,ModelResourcesPath,ModelResources32)");
strSql.Append(" values (");
strSql.Append("@ModelId,@MONITOR_ID,@ModelName,@VersionNumber,@MapLongitude,@MapLatitude,@TrainingSize,@ModelResources,@UpdateTime,@Remark1,@Remark2,@Remark3,@RegistryName,@ModelResourcesPath)");
strSql.Append("@ModelId,@MONITOR_ID,@ModelName,@VersionNumber,@MapLongitude,@MapLatitude,@TrainingSize,@ModelResources,@UpdateTime,@Remark1,@Remark2,@Remark3,@RegistryName,@ModelResourcesPath,@ModelResources32)");
SqlParameter[] parameters = {
new SqlParameter("@ModelId", SqlDbType.VarChar,50),
new SqlParameter("@MONITOR_ID", SqlDbType.VarChar,40),
@ -70,7 +70,8 @@ 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("@ModelResourcesPath", SqlDbType.VarChar,255),
new SqlParameter("@ModelResources32", SqlDbType.VarChar,2000)};
parameters[0].Value = model.ModelId;
parameters[1].Value = model.MONITOR_ID;
parameters[2].Value = model.ModelName;
@ -85,6 +86,7 @@ namespace Competition.Mysql.DAL
parameters[11].Value = model.Remark3;
parameters[12].Value = model.RegistryName;
parameters[13].Value = model.ModelResourcesPath;
parameters[14].Value = model.ModelResources32;
int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
if (rows > 0)
@ -115,7 +117,8 @@ namespace Competition.Mysql.DAL
strSql.Append("Remark2=@Remark2,");
strSql.Append("Remark3=@Remark3,");
strSql.Append("RegistryName=@RegistryName,");
strSql.Append("ModelResourcesPath=@ModelResourcesPath");
strSql.Append("ModelResourcesPath=@ModelResourcesPath,");
strSql.Append("ModelResources32=@ModelResources32");
strSql.Append(" where ModelId=@ModelId ");
SqlParameter[] parameters = {
new SqlParameter("@MONITOR_ID", SqlDbType.VarChar,40),
@ -131,6 +134,7 @@ namespace Competition.Mysql.DAL
new SqlParameter("@Remark3", SqlDbType.VarChar,255),
new SqlParameter("@RegistryName", SqlDbType.VarChar,255),
new SqlParameter("@ModelResourcesPath", SqlDbType.VarChar,255),
new SqlParameter("@ModelResources32", SqlDbType.VarChar,2000),
new SqlParameter("@ModelId", SqlDbType.VarChar,50)};
parameters[0].Value = model.MONITOR_ID;
parameters[1].Value = model.ModelName;
@ -145,7 +149,8 @@ namespace Competition.Mysql.DAL
parameters[10].Value = model.Remark3;
parameters[11].Value = model.RegistryName;
parameters[12].Value = model.ModelResourcesPath;
parameters[13].Value = model.ModelId;
parameters[13].Value = model.ModelResources32;
parameters[14].Value = model.ModelId;
int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
if (rows > 0)
@ -208,7 +213,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,ModelResourcesPath from v_model_version ");
strSql.Append("select top 1 ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName,ModelResourcesPath,ModelResources32 from v_model_version ");
strSql.Append(" where ModelId=@ModelId ");
SqlParameter[] parameters = {
new SqlParameter("@ModelId", SqlDbType.VarChar,50) };
@ -291,43 +296,21 @@ namespace Competition.Mysql.DAL
{
model.ModelResourcesPath = row["ModelResourcesPath"].ToString();
}
if (row["ModelResources32"] != null)
{
model.ModelResources32 = row["ModelResources32"].ToString();
}
}
return model;
}
public object DataRowToModelByObject(DataRow row)
{
if (row != null)
{
var tmpModel = new
{
ModelId = row["ModelId"].ToString(),
MONITOR_ID = row["MONITOR_ID"].ToString(),
ModelName = row["ModelName"].ToString(),
VersionNumber = row["VersionNumber"].ToString(),
MapLongitude = row["MapLongitude"].ToString(),
MapLatitude = row["MapLatitude"].ToString(),
TrainingSize = row["TrainingSize"].ToString(),
ModelResources = row["ModelResources"].ToString(),
UpdateTime = DateTime.Parse(row["UpdateTime"].ToString()),
Remark1 = row["Remark1"].ToString(),
Remark2 = row["Remark2"].ToString(),
Remark3 = row["Remark3"].ToString(),
RegistryName = row["RegistryName"].ToString(),
ModelResourcesPath = row["ModelResourcesPath"].ToString(),
CUSTOMS_CODE = row["CUSTOMS_CODE"].ToString()
};
return tmpModel;
}
return null;
}
/// <summary>
/// 获得数据列表
/// </summary>
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,ModelResourcesPath ");
strSql.Append("select ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName,ModelResourcesPath,ModelResources32 ");
strSql.Append(" FROM v_model_version ");
if (strWhere.Trim() != "")
{
@ -347,7 +330,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,ModelResourcesPath ");
strSql.Append(" ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName,ModelResourcesPath,ModelResources32 ");
strSql.Append(" FROM v_model_version ");
if (strWhere.Trim() != "")
{
@ -459,7 +442,7 @@ namespace Competition.Mysql.DAL
public DataSet GetErpriseList(string strWhere)
{
StringBuilder strSql = new StringBuilder();
strSql.Append("select T1.MONITOR_ID,T1.MONITOR_NAME,T1.CUSTOMS_CODE,T2.ModelId,T2.ModelName,T2.VersionNumber,T2.MapLongitude,T2.MapLatitude,T2.TrainingSize,T2.ModelResources,T2.UpdateTime,T2.RegistryName,T2.ModelResourcesPath from T_BAS_CORPORATION T1 left join v_model_version T2 on T2.MONITOR_ID=T1.MONITOR_ID ");
strSql.Append("select T1.MONITOR_ID,T1.MONITOR_NAME,T1.CUSTOMS_CODE,T2.ModelId,T2.ModelName,T2.VersionNumber,T2.MapLongitude,T2.MapLatitude,T2.TrainingSize,T2.ModelResources,T2.UpdateTime,T2.RegistryName,T2.ModelResourcesPath,T2.ModelResources32 from T_BAS_CORPORATION T1 left join v_model_version T2 on T2.MONITOR_ID=T1.MONITOR_ID ");
if (strWhere.Trim() != "")
{
strSql.Append(" where " + strWhere);
@ -541,6 +524,10 @@ namespace Competition.Mysql.DAL
{
model.ModelResourcesPath = row["ModelResourcesPath"].ToString();
}
if (row["ModelResources32"] != null)
{
model.ModelResources32 = row["ModelResources32"].ToString();
}
}
return model;
}
@ -575,6 +562,33 @@ namespace Competition.Mysql.DAL
return DbHelperSQL.Query(strSql.ToString());
}
public object DataRowToModelByObject(DataRow row)
{
if (row != null)
{
var tmpModel = new
{
ModelId = row["ModelId"].ToString(),
MONITOR_ID = row["MONITOR_ID"].ToString(),
ModelName = row["ModelName"].ToString(),
VersionNumber = row["VersionNumber"].ToString(),
MapLongitude = row["MapLongitude"].ToString(),
MapLatitude = row["MapLatitude"].ToString(),
TrainingSize = row["TrainingSize"].ToString(),
ModelResources = row["ModelResources"].ToString(),
UpdateTime = DateTime.Parse(row["UpdateTime"].ToString()),
Remark1 = row["Remark1"].ToString(),
Remark2 = row["Remark2"].ToString(),
Remark3 = row["Remark3"].ToString(),
RegistryName = row["RegistryName"].ToString(),
ModelResourcesPath = row["ModelResourcesPath"].ToString(),
CUSTOMS_CODE = row["CUSTOMS_CODE"].ToString()
};
return tmpModel;
}
return null;
}
#endregion ExtensionMethod
}
}

11
CompetitionAPI/CompetitionAPI/Competition.Mysql/Model/v_model_version.cs
View File

@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
* V0.01 2024/6/25 18:12:00 N/A 初版
* V0.01 2024/11/21 15:17:41 N/A 初版
*
* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
*┌──────────────────────────────────┐
@ -40,6 +40,7 @@ namespace Competition.Mysql.Model
private string _remark3;
private string _registryname;
private string _modelresourcespath;
private string _modelresources32;
/// <summary>
///
/// </summary>
@ -152,6 +153,14 @@ namespace Competition.Mysql.Model
set{ _modelresourcespath=value;}
get{return _modelresourcespath;}
}
/// <summary>
///
/// </summary>
public string ModelResources32
{
set{ _modelresources32=value;}
get{return _modelresources32;}
}
#endregion Model
}

5
CompetitionAPI/CompetitionAPI/Competition.Mysql/Other/erprise_model_version.cs
View File

@ -73,5 +73,10 @@ namespace Competition.Mysql.Other
/// 软件名称路径
/// </summary>
public string ModelResourcesPath { get; set; }
/// <summary>
/// 32位模型包地址
/// </summary>
public string ModelResources32 { get; set; }
}
}

8
CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/EditModelController.cs
View File

@ -54,7 +54,11 @@ namespace CompetitionAPI.Controllers.version
}
if (!System.IO.File.Exists(webRootPath + "/" + req.ModelResources))
{
return Json(Tool.GetJsonWithCode(APICode.Fail, "模型包资源不存在，请先上传模型包资源"));
return Json(Tool.GetJsonWithCode(APICode.Fail, "64位模型包资源不存在，请先上传64位模型包资源"));
}
if (!System.IO.File.Exists(webRootPath + "/" + req.ModelResources32))
{
return Json(Tool.GetJsonWithCode(APICode.Fail, "32位模型包资源不存在，请先上传32位模型包资源"));
}
if (string.IsNullOrWhiteSpace(req.ModelResourcesPath))
{
@ -75,6 +79,7 @@ namespace CompetitionAPI.Controllers.version
model.UpdateTime = DateTime.Now;
model.RegistryName = req.RegistryName;
model.ModelResourcesPath = req.ModelResourcesPath;
model.ModelResources32 = req.ModelResources32;
if (bll.Add(model))
{
return Json(Tool.GetJsonWithCode(APICode.Success, "编辑成功！"));
@ -96,6 +101,7 @@ namespace CompetitionAPI.Controllers.version
model.UpdateTime = DateTime.Now;
model.RegistryName = req.RegistryName;
model.ModelResourcesPath = req.ModelResourcesPath;
model.ModelResources32 = req.ModelResources32;
if (bll.Update(model))
{
if (req.ModelResources != old_model_resources)

2
CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>F:\项目\福州海关散货系统\项目\FuZhou_Custom_BulkCargo_Server\CompetitionAPI\CompetitionAPI\CompetitionAPI\bin\Release\net6.0\publish\</_PublishTargetUrl>
<History>True|2024-10-12T06:53:07.0125528Z;True|2024-10-12T14:28:17.9484560+08:00;True|2024-10-12T09:55:53.8762261+08:00;True|2024-10-12T08:50:07.5328749+08:00;True|2024-08-02T17:06:40.5029721+08:00;True|2024-08-02T16:59:32.6009342+08:00;True|2024-07-22T16:21:26.4663897+08:00;True|2024-07-19T15:01:14.4150497+08:00;True|2024-07-19T15:00:33.8774616+08:00;True|2024-07-18T13:19:55.4659060+08:00;True|2024-07-11T16:15:57.1832176+08:00;True|2024-07-10T19:40:12.0560772+08:00;True|2024-07-03T08:34:47.9012194+08:00;True|2024-07-02T13:27:08.8864811+08:00;True|2024-06-30T10:44:01.4199530+08:00;True|2024-06-27T17:04:34.5042782+08:00;True|2024-06-26T15:13:55.0392343+08:00;True|2024-06-26T09:36:09.9993202+08:00;True|2024-06-25T18:55:08.1751359+08:00;True|2024-06-25T18:47:04.7420194+08:00;True|2024-06-25T18:44:23.4689695+08:00;True|2024-06-25T18:19:40.9912935+08:00;True|2024-06-25T08:44:00.2470909+08:00;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;</History>
<History>True|2024-11-21T07:46:48.2168261Z;True|2024-10-12T14:53:07.0125528+08:00;True|2024-10-12T14:28:17.9484560+08:00;True|2024-10-12T09:55:53.8762261+08:00;True|2024-10-12T08:50:07.5328749+08:00;True|2024-08-02T17:06:40.5029721+08:00;True|2024-08-02T16:59:32.6009342+08:00;True|2024-07-22T16:21:26.4663897+08:00;True|2024-07-19T15:01:14.4150497+08:00;True|2024-07-19T15:00:33.8774616+08:00;True|2024-07-18T13:19:55.4659060+08:00;True|2024-07-11T16:15:57.1832176+08:00;True|2024-07-10T19:40:12.0560772+08:00;True|2024-07-03T08:34:47.9012194+08:00;True|2024-07-02T13:27:08.8864811+08:00;True|2024-06-30T10:44:01.4199530+08:00;True|2024-06-27T17:04:34.5042782+08:00;True|2024-06-26T15:13:55.0392343+08:00;True|2024-06-26T09:36:09.9993202+08:00;True|2024-06-25T18:55:08.1751359+08:00;True|2024-06-25T18:47:04.7420194+08:00;True|2024-06-25T18:44:23.4689695+08:00;True|2024-06-25T18:19:40.9912935+08:00;True|2024-06-25T08:44:00.2470909+08:00;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;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>

5
CompetitionAPI/CompetitionAPI/CompetitionAPI/api/version/EditModelRequest.cs
View File

@ -46,5 +46,10 @@
/// 注册表名称
/// </summary>
public string RegistryName { get; set; }
/// <summary>
/// 32位模型包资源
/// </summary>
public string ModelResources32 { get; set; }
}
}

BIN
CompetitionAPI/CompetitionAPI/CompetitionAPI/wwwroot/Upload/ict.zip Normal file
View File

Binary file not shown.