From ce551906a751642d8880961ec20ced1acb94ad5d 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:17:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0ModelResourcesPath?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Competition.Mysql/DAL/v_model_version.cs | 4 ++++
.../Competition.Mysql/Other/erprise_model_version.cs | 5 +++++
.../Controllers/version/EditModelController.cs | 7 ++++++-
.../CompetitionAPI/api/version/EditModelRequest.cs | 5 +++++
4 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs b/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs
index f8c2993..9220dc4 100644
--- a/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs
+++ b/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs
@@ -497,6 +497,10 @@ namespace Competition.Mysql.DAL
{
model.RegistryName = row["RegistryName"].ToString();
}
+ if (row["ModelResourcesPath"] != null)
+ {
+ model.ModelResourcesPath = row["ModelResourcesPath"].ToString();
+ }
}
return model;
}
diff --git a/CompetitionAPI/CompetitionAPI/Competition.Mysql/Other/erprise_model_version.cs b/CompetitionAPI/CompetitionAPI/Competition.Mysql/Other/erprise_model_version.cs
index e409082..ba249fd 100644
--- a/CompetitionAPI/CompetitionAPI/Competition.Mysql/Other/erprise_model_version.cs
+++ b/CompetitionAPI/CompetitionAPI/Competition.Mysql/Other/erprise_model_version.cs
@@ -68,5 +68,10 @@ namespace Competition.Mysql.Other
/// 注册表名称
///
public string RegistryName { get; set; }
+
+ ///
+ /// 软件名称路径
+ ///
+ public string ModelResourcesPath { get; set; }
}
}
diff --git a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/EditModelController.cs b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/EditModelController.cs
index 0222669..b03f304 100644
--- a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/EditModelController.cs
+++ b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/EditModelController.cs
@@ -56,7 +56,10 @@ namespace CompetitionAPI.Controllers.version
{
return Json(Tool.GetJsonWithCode(APICode.Fail, "模型包资源不存在,请先上传模型包资源"));
}
-
+ if (string.IsNullOrWhiteSpace(req.ModelResourcesPath))
+ {
+ return Json(Tool.GetJsonWithCode(APICode.Fail, "软件名称路径不能为空"));
+ }
var model = bll.GetModelList(string.Format(" MONITOR_ID='{0}' ", req.EnterpriseCode)).FirstOrDefault(); ;
if (model == null)
{
@@ -71,6 +74,7 @@ namespace CompetitionAPI.Controllers.version
model.ModelResources = req.ModelResources;
model.UpdateTime = DateTime.Now;
model.RegistryName = req.RegistryName;
+ model.ModelResourcesPath = req.ModelResourcesPath;
if (bll.Add(model))
{
return Json(Tool.GetJsonWithCode(APICode.Success, "编辑成功!"));
@@ -91,6 +95,7 @@ namespace CompetitionAPI.Controllers.version
model.ModelResources = req.ModelResources;
model.UpdateTime = DateTime.Now;
model.RegistryName = req.RegistryName;
+ model.ModelResourcesPath = req.ModelResourcesPath;
if (bll.Update(model))
{
if (req.ModelResources != old_model_resources)
diff --git a/CompetitionAPI/CompetitionAPI/CompetitionAPI/api/version/EditModelRequest.cs b/CompetitionAPI/CompetitionAPI/CompetitionAPI/api/version/EditModelRequest.cs
index 49bd2c4..7a650c1 100644
--- a/CompetitionAPI/CompetitionAPI/CompetitionAPI/api/version/EditModelRequest.cs
+++ b/CompetitionAPI/CompetitionAPI/CompetitionAPI/api/version/EditModelRequest.cs
@@ -37,6 +37,11 @@
///
public string ModelResources { get; set; }
+ ///
+ /// 软件名称路径
+ ///
+ public string ModelResourcesPath { get; set; }
+
///
/// 注册表名称
///