diff --git a/CompetitionAPI/CompetitionAPI/Competition.Mysql/BLL/v_model_version.cs b/CompetitionAPI/CompetitionAPI/Competition.Mysql/BLL/v_model_version.cs index 2ae1acb..5764bbc 100644 --- a/CompetitionAPI/CompetitionAPI/Competition.Mysql/BLL/v_model_version.cs +++ b/CompetitionAPI/CompetitionAPI/Competition.Mysql/BLL/v_model_version.cs @@ -215,6 +215,15 @@ namespace Competition.Mysql.BLL return DataTableToErpriseList(ds.Tables[0]); } + /// + /// 获得数据列表 + /// + public List GetErpriseVersionList(string strWhere) + { + DataSet ds = dal.GetErpriseVersionList(strWhere); + return DataTableToErpriseList(ds.Tables[0]); + } + /// /// 获得数据列表 /// diff --git a/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs b/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs index bccbfb5..0864eeb 100644 --- a/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs +++ b/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs @@ -467,6 +467,20 @@ namespace Competition.Mysql.DAL return DbHelperSQL.Query(strSql.ToString()); } + /// + /// 获得数据列表 + /// + public DataSet GetErpriseVersionList(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 inner join v_model_version T2 on T2.MONITOR_ID=T1.MONITOR_ID "); + if (strWhere.Trim() != "") + { + strSql.Append(" where " + strWhere); + } + return DbHelperSQL.Query(strSql.ToString()); + } + /// /// 得到一个对象实体 /// diff --git a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetModelVersionListController.cs b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetModelVersionListController.cs new file mode 100644 index 0000000..9ef999d --- /dev/null +++ b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetModelVersionListController.cs @@ -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 GetModelVersionListController : Controller + { + Competition.Mysql.BLL.v_model_version bll = new Competition.Mysql.BLL.v_model_version(); + + public GetModelVersionListController() + { + + } + + /// + /// 获取模型版本列表接口 + /// + /// + [HttpGet] + public JsonResult Index() + { + var query = new StringBuilder(" 1 = 1 order by T1.MONITOR_ID asc "); + var list = bll.GetErpriseVersionList(query.ToString()); + return Json(Tool.GetJsonWithCode(APICode.Success, new { total = list.Count(), list = list })); + } + } +} diff --git a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user index d57cc37..8d88878 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\ - True|2024-08-02T09:06:40.5029721Z;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; + True|2024-10-12T01:55:53.8762261Z;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; \ No newline at end of file