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

实现接口

This commit is contained in:
曾艳 2024-06-15 13:36:40 +08:00
parent 9c323ddebe
commit 2953dc7aa5
11 changed files with 94 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
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)");
strSql.Append("ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName)");
strSql.Append(" values (");
strSql.Append("@ModelId,@MONITOR_ID,@ModelName,@VersionNumber,@MapLongitude,@MapLatitude,@TrainingSize,@ModelResources,@UpdateTime,@Remark1,@Remark2,@Remark3)");
strSql.Append("@ModelId,@MONITOR_ID,@ModelName,@VersionNumber,@MapLongitude,@MapLatitude,@TrainingSize,@ModelResources,@UpdateTime,@Remark1,@Remark2,@Remark3,@RegistryName)");
SqlParameter[] parameters = {
new SqlParameter("@ModelId", SqlDbType.VarChar,50),
new SqlParameter("@MONITOR_ID", SqlDbType.VarChar,40),
@ -68,7 +68,8 @@ namespace Competition.Mysql.DAL
new SqlParameter("@UpdateTime", SqlDbType.DateTime),
new SqlParameter("@Remark1", SqlDbType.VarChar,255),
new SqlParameter("@Remark2", SqlDbType.VarChar,255),
new SqlParameter("@Remark3", SqlDbType.VarChar,255)};
new SqlParameter("@Remark3", SqlDbType.VarChar,255),
new SqlParameter("@RegistryName", SqlDbType.VarChar,255)};
parameters[0].Value = model.ModelId;
parameters[1].Value = model.MONITOR_ID;
parameters[2].Value = model.ModelName;
@ -81,6 +82,7 @@ namespace Competition.Mysql.DAL
parameters[9].Value = model.Remark1;
parameters[10].Value = model.Remark2;
parameters[11].Value = model.Remark3;
parameters[12].Value = model.RegistryName;
int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
if (rows > 0)
@ -109,7 +111,8 @@ namespace Competition.Mysql.DAL
strSql.Append("UpdateTime=@UpdateTime,");
strSql.Append("Remark1=@Remark1,");
strSql.Append("Remark2=@Remark2,");
strSql.Append("Remark3=@Remark3");
strSql.Append("Remark3=@Remark3,");
strSql.Append("RegistryName=@RegistryName");
strSql.Append(" where ModelId=@ModelId ");
SqlParameter[] parameters = {
new SqlParameter("@MONITOR_ID", SqlDbType.VarChar,40),
@ -123,6 +126,7 @@ 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("@ModelId", SqlDbType.VarChar,50)};
parameters[0].Value = model.MONITOR_ID;
parameters[1].Value = model.ModelName;
@ -135,7 +139,8 @@ namespace Competition.Mysql.DAL
parameters[8].Value = model.Remark1;
parameters[9].Value = model.Remark2;
parameters[10].Value = model.Remark3;
parameters[11].Value = model.ModelId;
parameters[11].Value = model.RegistryName;
parameters[12].Value = model.ModelId;
int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
if (rows > 0)
@ -198,7 +203,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 from v_model_version ");
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(" where ModelId=@ModelId ");
SqlParameter[] parameters = {
new SqlParameter("@ModelId", SqlDbType.VarChar,50) };
@ -273,6 +278,10 @@ namespace Competition.Mysql.DAL
{
model.Remark3 = row["Remark3"].ToString();
}
if (row["RegistryName"] != null)
{
model.RegistryName = row["RegistryName"].ToString();
}
}
return model;
}
@ -283,7 +292,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 ");
strSql.Append("select ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName ");
strSql.Append(" FROM v_model_version ");
if (strWhere.Trim() != "")
{
@ -303,7 +312,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 ");
strSql.Append(" ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3,RegistryName ");
strSql.Append(" FROM v_model_version ");
if (strWhere.Trim() != "")
{
@ -415,7 +424,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 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 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);
@ -433,15 +442,15 @@ namespace Competition.Mysql.DAL
{
if (row["MONITOR_ID"] != null)
{
model.MONITOR_ID = row["MONITOR_ID"].ToString();
model.EnterpriseCode = row["MONITOR_ID"].ToString();
}
if (row["MONITOR_NAME"] != null)
{
model.MONITOR_NAME = row["MONITOR_NAME"].ToString();
model.EnterpriseName = row["MONITOR_NAME"].ToString();
}
if (row["CUSTOMS_CODE"] != null)
{
model.CUSTOMS_CODE = row["CUSTOMS_CODE"].ToString();
model.DistrictCode = row["CUSTOMS_CODE"].ToString();
}
if (row["ModelId"] != null)
{
@ -475,6 +484,10 @@ namespace Competition.Mysql.DAL
{
model.UpdateTime = DateTime.Parse(row["UpdateTime"].ToString());
}
if (row["RegistryName"] != null)
{
model.RegistryName = row["RegistryName"].ToString();
}
}
return model;
}

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

@ -6,7 +6,7 @@
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
* V0.01 2024/6/13 13:55:19 N/A 初版
* V0.01 2024/6/14 10:15:18 N/A 初版
*
* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
*┌──────────────────────────────────┐
@ -38,6 +38,7 @@ namespace Competition.Mysql.Model
private string _remark1;
private string _remark2;
private string _remark3;
private string _registryname;
/// <summary>
///
/// </summary>
@ -134,6 +135,14 @@ namespace Competition.Mysql.Model
set{ _remark3=value;}
get{return _remark3;}
}
/// <summary>
///
/// </summary>
public string RegistryName
{
set{ _registryname=value;}
get{return _registryname;}
}
#endregion Model
}

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

@ -12,17 +12,17 @@ namespace Competition.Mysql.Other
/// <summary>
/// 企业编码
/// </summary>
public string MONITOR_ID { get; set; }
public string EnterpriseCode { get; set; }
/// <summary>
/// 企业名称
/// </summary>
public string MONITOR_NAME { get; set; }
public string EnterpriseName { get; set; }
/// <summary>
/// 关区代码
/// </summary>
public string CUSTOMS_CODE { get; set; }
public string DistrictCode { get; set; }
/// <summary>
/// 模型id
@ -63,5 +63,10 @@ namespace Competition.Mysql.Other
/// 最新时间
/// </summary>
public DateTime? UpdateTime { get; set; }
/// <summary>
/// 注册表名称
/// </summary>
public string RegistryName { get; set; }
}
}

4
CompetitionAPI/CompetitionAPI/CompetitionAPI/CompetitionAPI.csproj
View File

@ -86,8 +86,4 @@
</Content>
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\" />
</ItemGroup>
</Project>

4
CompetitionAPI/CompetitionAPI/CompetitionAPI/CompetitionAPI.csproj.user
View File

@ -2,8 +2,8 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ActiveDebugProfile>CompetitionAPI</ActiveDebugProfile>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Api</Controller_SelectedScaffolderCategoryPath>
<NameOfLastUsedPublishProfile>F:\项目\禄口机场农电竞赛\web\LKJCpowerSupplyOfficeSimulationSystem\CompetitionAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

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

@ -28,7 +28,7 @@ namespace CompetitionAPI.Controllers.version
{
//获取当前web目录
var webRootPath = _webHostEnvironment.WebRootPath;
if (string.IsNullOrWhiteSpace(req.MONITOR_ID))
if (string.IsNullOrWhiteSpace(req.EnterpriseCode))
{
return Json(Tool.GetJsonWithCode(APICode.Fail, "企业系统编码不能为空"));
}
@ -57,12 +57,12 @@ namespace CompetitionAPI.Controllers.version
return Json(Tool.GetJsonWithCode(APICode.Fail, "模型包资源不存在，请先上传模型包资源"));
}
var model = bll.GetModelList(string.Format(" MONITOR_ID='{0}' ", req.MONITOR_ID)).FirstOrDefault(); ;
var model = bll.GetModelList(string.Format(" MONITOR_ID='{0}' ", req.EnterpriseCode)).FirstOrDefault(); ;
if (model == null)
{
model = new Competition.Mysql.Model.v_model_version();
model.ModelId = Guid.NewGuid().ToString("N");
model.MONITOR_ID = req.MONITOR_ID;
model.MONITOR_ID = req.EnterpriseCode;
model.ModelName = req.ModelName;
model.VersionNumber = req.VersionNumber;
model.MapLongitude = req.MapLongitude;
@ -70,6 +70,7 @@ namespace CompetitionAPI.Controllers.version
model.TrainingSize = req.TrainingSize;
model.ModelResources = req.ModelResources;
model.UpdateTime = DateTime.Now;
model.RegistryName = req.RegistryName;
if (bll.Add(model))
{
return Json(Tool.GetJsonWithCode(APICode.Success, "编辑成功！"));
@ -89,6 +90,7 @@ namespace CompetitionAPI.Controllers.version
var old_model_resources = model.ModelResources;
model.ModelResources = req.ModelResources;
model.UpdateTime = DateTime.Now;
model.RegistryName = req.RegistryName;
if (bll.Update(model))
{
if (req.ModelResources != old_model_resources)

31
CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetModelDetailsController.cs Normal file
View File

@ -0,0 +1,31 @@
using Competition.Common.Util;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Text;
namespace CompetitionAPI.Controllers.version
{
[Route("api/[controller]")]
[ApiController]
public class GetModelDetailsController : Controller
{
Competition.Mysql.BLL.v_model_version bll = new Competition.Mysql.BLL.v_model_version();
public GetModelDetailsController()
{
}
/// <summary>
/// 获取单条模型版本数据接口
/// </summary>
/// <param name="EnterpriseCode">企业编码</param>
/// <returns></returns>
[HttpGet]
public JsonResult Index(string EnterpriseCode)
{
var model = bll.GetErpriseList(string.Format(" T1.MONITOR_ID='{0}' ", EnterpriseCode)).FirstOrDefault();
return Json(Tool.GetJsonWithCode(APICode.Success, model));
}
}
}

14
CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetModelListController.cs
View File

@ -34,24 +34,24 @@ namespace CompetitionAPI.Controllers.version
if (!string.IsNullOrWhiteSpace(EnterpriseName))
{
query.AppendFormat(" AND T1.EnterpriseName LIKE '%{0}%' ", EnterpriseName);
total_query.AppendFormat(" AND T1.EnterpriseName LIKE '%{0}%' ", EnterpriseName);
query.AppendFormat(" AND T1.MONITOR_NAME LIKE '%{0}%' ", EnterpriseName);
total_query.AppendFormat(" AND T1.MONITOR_NAME LIKE '%{0}%' ", EnterpriseName);
}
if (!string.IsNullOrWhiteSpace(EnterpriseCode))
{
query.AppendFormat(" AND T1.EnterpriseCode='{0}' ", EnterpriseCode);
total_query.AppendFormat(" AND T1.EnterpriseCode='{0}' ", EnterpriseCode);
query.AppendFormat(" AND T1.MONITOR_ID like '%{0}%' ", EnterpriseCode);
total_query.AppendFormat(" AND T1.MONITOR_ID like '%{0}%' ", EnterpriseCode);
}
if (!string.IsNullOrEmpty(ModelName))
{
query.AppendFormat(" AND T2.ModelName='{0}' ", ModelName);
total_query.AppendFormat(" AND T2.ModelName='{0}' ", ModelName);
query.AppendFormat(" AND T2.ModelName like '%{0}%' ", ModelName);
total_query.AppendFormat(" AND T2.ModelName like '%{0}%' ", ModelName);
}
var offset = (PageIndex - 1) * PageSize;
query.AppendFormat(" order by T1.MONITOR_ID asc OFFSET ({0} - 1) * {1} ROWS FETCH NEXT {1} ROWS ONLY; ", offset, PageSize);
query.AppendFormat(" order by T1.MONITOR_ID asc OFFSET {0} ROWS FETCH NEXT {1} ROWS ONLY; ", offset, PageSize);
var total = bll.GetRecordentErpriseCount(total_query.ToString());
var list = bll.GetErpriseList(query.ToString());

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

@ -5,7 +5,7 @@
/// <summary>
/// 企业编码
/// </summary>
public string MONITOR_ID { get; set; }
public string EnterpriseCode { get; set; }
/// <summary>
/// 模型名称
@ -36,5 +36,10 @@
/// 模型包资源
/// </summary>
public string ModelResources { get; set; }
/// <summary>
/// 注册表名称
/// </summary>
public string RegistryName { get; set; }
}
}

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

Binary file not shown.

BIN
CompetitionAPI/CompetitionAPI/CompetitionAPI/wwwroot/Upload/mysetup.exe Normal file
View File

Binary file not shown.