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-13 16:23:16 +08:00
parent 75b2e279a0
commit c24d526707
8 changed files with 712 additions and 507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,9 +26,9 @@ namespace Competition.Mysql.BLL
/// </summary>
public partial class v_model_version
{
private readonly Competition.Mysql.DAL.v_model_version dal=new Competition.Mysql.DAL.v_model_version();
private readonly Competition.Mysql.DAL.v_model_version dal = new Competition.Mysql.DAL.v_model_version();
public v_model_version()
{}
{ }
#region BasicMethod
/// <summary>
/// 是否存在该记录
@ -65,9 +65,9 @@ namespace Competition.Mysql.BLL
/// <summary>
/// 删除一条数据
/// </summary>
public bool DeleteList(string ModelIdlist )
public bool DeleteList(string ModelIdlist)
{
return dal.DeleteList(ModelIdlist );
return dal.DeleteList(ModelIdlist);
}
/// <summary>
@ -98,7 +98,7 @@ namespace Competition.Mysql.BLL
Maticsoft.Common.DataCache.SetCache(CacheKey, objModel, DateTime.Now.AddMinutes(ModelCache), TimeSpan.Zero);
}
}
catch{}
catch { }
}
return (Competition.Mysql.Model.v_model_version)objModel;
}
@ -113,9 +113,9 @@ namespace Competition.Mysql.BLL
/// <summary>
/// 获得前几行数据
/// </summary>
public DataSet GetList(int Top,string strWhere,string filedOrder)
public DataSet GetList(int Top, string strWhere, string filedOrder)
{
return dal.GetList(Top,strWhere,filedOrder);
return dal.GetList(Top, strWhere, filedOrder);
}
/// <summary>
/// 获得数据列表
@ -167,7 +167,7 @@ namespace Competition.Mysql.BLL
/// </summary>
public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
{
return dal.GetListByPage( strWhere, orderby, startIndex, endIndex);
return dal.GetListByPage(strWhere, orderby, startIndex, endIndex);
}
/// <summary>
/// 分页获取数据列表
@ -179,7 +179,22 @@ namespace Competition.Mysql.BLL
#endregion BasicMethod
#region ExtensionMethod
/// <summary>
/// 获取记录总数
/// </summary>
public int GetRecordentErpriseCount(string strWhere)
{
return dal.GetRecordentErpriseCount(strWhere);
}
/// <summary>
/// 获得数据列表
/// </summary>
public List<Competition.Mysql.Model.v_model_version> GetErpriseList(string strWhere)
{
DataSet ds = dal.GetList(strWhere);
return DataTableToList(ds.Tables[0]);
}
#endregion ExtensionMethod
}
}

4
CompetitionAPI/CompetitionAPI/Competition.Mysql/Competition.Mysql.csproj
View File

@ -27,8 +27,4 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Folder Include="Other\" />
</ItemGroup>
</Project>

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

@ -27,7 +27,7 @@ namespace Competition.Mysql.DAL
public partial class v_model_version
{
public v_model_version()
{}
{ }
#region BasicMethod
/// <summary>
@ -35,14 +35,14 @@ namespace Competition.Mysql.DAL
/// </summary>
public bool Exists(string ModelId)
{
StringBuilder strSql=new StringBuilder();
StringBuilder strSql = new StringBuilder();
strSql.Append("select count(1) from v_model_version");
strSql.Append(" where ModelId=@ModelId ");
SqlParameter[] parameters = {
new SqlParameter("@ModelId", SqlDbType.VarChar,50) };
parameters[0].Value = ModelId;
return DbHelperSQL.Exists(strSql.ToString(),parameters);
return DbHelperSQL.Exists(strSql.ToString(), parameters);
}
@ -51,7 +51,7 @@ namespace Competition.Mysql.DAL
/// </summary>
public bool Add(Competition.Mysql.Model.v_model_version model)
{
StringBuilder strSql=new StringBuilder();
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(" values (");
@ -82,7 +82,7 @@ namespace Competition.Mysql.DAL
parameters[10].Value = model.Remark2;
parameters[11].Value = model.Remark3;
int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
if (rows > 0)
{
return true;
@ -97,7 +97,7 @@ namespace Competition.Mysql.DAL
/// </summary>
public bool Update(Competition.Mysql.Model.v_model_version model)
{
StringBuilder strSql=new StringBuilder();
StringBuilder strSql = new StringBuilder();
strSql.Append("update v_model_version set ");
strSql.Append("MONITOR_ID=@MONITOR_ID,");
strSql.Append("ModelName=@ModelName,");
@ -137,7 +137,7 @@ namespace Competition.Mysql.DAL
parameters[10].Value = model.Remark3;
parameters[11].Value = model.ModelId;
int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
if (rows > 0)
{
return true;
@ -154,14 +154,14 @@ namespace Competition.Mysql.DAL
public bool Delete(string ModelId)
{
StringBuilder strSql=new StringBuilder();
StringBuilder strSql = new StringBuilder();
strSql.Append("delete from v_model_version ");
strSql.Append(" where ModelId=@ModelId ");
SqlParameter[] parameters = {
new SqlParameter("@ModelId", SqlDbType.VarChar,50) };
parameters[0].Value = ModelId;
int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters);
int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
if (rows > 0)
{
return true;
@ -174,12 +174,12 @@ namespace Competition.Mysql.DAL
/// <summary>
/// 批量删除数据
/// </summary>
public bool DeleteList(string ModelIdlist )
public bool DeleteList(string ModelIdlist)
{
StringBuilder strSql=new StringBuilder();
StringBuilder strSql = new StringBuilder();
strSql.Append("delete from v_model_version ");
strSql.Append(" where ModelId in ("+ModelIdlist + ") ");
int rows=DbHelperSQL.ExecuteSql(strSql.ToString());
strSql.Append(" where ModelId in (" + ModelIdlist + ") ");
int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
if (rows > 0)
{
return true;
@ -197,16 +197,16 @@ namespace Competition.Mysql.DAL
public Competition.Mysql.Model.v_model_version GetModel(string ModelId)
{
StringBuilder strSql=new StringBuilder();
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(" where ModelId=@ModelId ");
SqlParameter[] parameters = {
new SqlParameter("@ModelId", SqlDbType.VarChar,50) };
parameters[0].Value = ModelId;
Competition.Mysql.Model.v_model_version model=new Competition.Mysql.Model.v_model_version();
DataSet ds=DbHelperSQL.Query(strSql.ToString(),parameters);
if(ds.Tables[0].Rows.Count>0)
Competition.Mysql.Model.v_model_version model = new Competition.Mysql.Model.v_model_version();
DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
if (ds.Tables[0].Rows.Count > 0)
{
return DataRowToModel(ds.Tables[0].Rows[0]);
}
@ -222,56 +222,56 @@ namespace Competition.Mysql.DAL
/// </summary>
public Competition.Mysql.Model.v_model_version DataRowToModel(DataRow row)
{
Competition.Mysql.Model.v_model_version model=new Competition.Mysql.Model.v_model_version();
Competition.Mysql.Model.v_model_version model = new Competition.Mysql.Model.v_model_version();
if (row != null)
{
if(row["ModelId"]!=null)
if (row["ModelId"] != null)
{
model.ModelId=row["ModelId"].ToString();
model.ModelId = row["ModelId"].ToString();
}
if(row["MONITOR_ID"]!=null)
if (row["MONITOR_ID"] != null)
{
model.MONITOR_ID=row["MONITOR_ID"].ToString();
model.MONITOR_ID = row["MONITOR_ID"].ToString();
}
if(row["ModelName"]!=null)
if (row["ModelName"] != null)
{
model.ModelName=row["ModelName"].ToString();
model.ModelName = row["ModelName"].ToString();
}
if(row["VersionNumber"]!=null)
if (row["VersionNumber"] != null)
{
model.VersionNumber=row["VersionNumber"].ToString();
model.VersionNumber = row["VersionNumber"].ToString();
}
if(row["MapLongitude"]!=null)
if (row["MapLongitude"] != null)
{
model.MapLongitude=row["MapLongitude"].ToString();
model.MapLongitude = row["MapLongitude"].ToString();
}
if(row["MapLatitude"]!=null)
if (row["MapLatitude"] != null)
{
model.MapLatitude=row["MapLatitude"].ToString();
model.MapLatitude = row["MapLatitude"].ToString();
}
if(row["TrainingSize"]!=null)
if (row["TrainingSize"] != null)
{
model.TrainingSize=row["TrainingSize"].ToString();
model.TrainingSize = row["TrainingSize"].ToString();
}
if(row["ModelResources"]!=null)
if (row["ModelResources"] != null)
{
model.ModelResources=row["ModelResources"].ToString();
model.ModelResources = row["ModelResources"].ToString();
}
if(row["UpdateTime"]!=null && row["UpdateTime"].ToString()!="")
if (row["UpdateTime"] != null && row["UpdateTime"].ToString() != "")
{
model.UpdateTime=DateTime.Parse(row["UpdateTime"].ToString());
model.UpdateTime = DateTime.Parse(row["UpdateTime"].ToString());
}
if(row["Remark1"]!=null)
if (row["Remark1"] != null)
{
model.Remark1=row["Remark1"].ToString();
model.Remark1 = row["Remark1"].ToString();
}
if(row["Remark2"]!=null)
if (row["Remark2"] != null)
{
model.Remark2=row["Remark2"].ToString();
model.Remark2 = row["Remark2"].ToString();
}
if(row["Remark3"]!=null)
if (row["Remark3"] != null)
{
model.Remark3=row["Remark3"].ToString();
model.Remark3 = row["Remark3"].ToString();
}
}
return model;
@ -282,12 +282,12 @@ namespace Competition.Mysql.DAL
/// </summary>
public DataSet GetList(string strWhere)
{
StringBuilder strSql=new StringBuilder();
StringBuilder strSql = new StringBuilder();
strSql.Append("select ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3 ");
strSql.Append(" FROM v_model_version ");
if(strWhere.Trim()!="")
if (strWhere.Trim() != "")
{
strSql.Append(" where "+strWhere);
strSql.Append(" where " + strWhere);
}
return DbHelperSQL.Query(strSql.ToString());
}
@ -295,19 +295,19 @@ namespace Competition.Mysql.DAL
/// <summary>
/// 获得前几行数据
/// </summary>
public DataSet GetList(int Top,string strWhere,string filedOrder)
public DataSet GetList(int Top, string strWhere, string filedOrder)
{
StringBuilder strSql=new StringBuilder();
StringBuilder strSql = new StringBuilder();
strSql.Append("select ");
if(Top>0)
if (Top > 0)
{
strSql.Append(" top "+Top.ToString());
strSql.Append(" top " + Top.ToString());
}
strSql.Append(" ModelId,MONITOR_ID,ModelName,VersionNumber,MapLongitude,MapLatitude,TrainingSize,ModelResources,UpdateTime,Remark1,Remark2,Remark3 ");
strSql.Append(" FROM v_model_version ");
if(strWhere.Trim()!="")
if (strWhere.Trim() != "")
{
strSql.Append(" where "+strWhere);
strSql.Append(" where " + strWhere);
}
strSql.Append(" order by " + filedOrder);
return DbHelperSQL.Query(strSql.ToString());
@ -318,11 +318,11 @@ namespace Competition.Mysql.DAL
/// </summary>
public int GetRecordCount(string strWhere)
{
StringBuilder strSql=new StringBuilder();
StringBuilder strSql = new StringBuilder();
strSql.Append("select count(1) FROM v_model_version ");
if(strWhere.Trim()!="")
if (strWhere.Trim() != "")
{
strSql.Append(" where "+strWhere);
strSql.Append(" where " + strWhere);
}
object obj = DbHelperSQL.GetSingle(strSql.ToString());
if (obj == null)
@ -339,12 +339,12 @@ namespace Competition.Mysql.DAL
/// </summary>
public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
{
StringBuilder strSql=new StringBuilder();
StringBuilder strSql = new StringBuilder();
strSql.Append("SELECT * FROM ( ");
strSql.Append(" SELECT ROW_NUMBER() OVER (");
if (!string.IsNullOrEmpty(orderby.Trim()))
{
strSql.Append("order by T." + orderby );
strSql.Append("order by T." + orderby);
}
else
{
@ -387,7 +387,41 @@ namespace Competition.Mysql.DAL
#endregion BasicMethod
#region ExtensionMethod
/// <summary>
/// 获取记录总数
/// </summary>
public int GetRecordentErpriseCount(string strWhere)
{
StringBuilder strSql = new StringBuilder();
strSql.Append("select count(1) 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);
}
object obj = DbHelperSQL.GetSingle(strSql.ToString());
if (obj == null)
{
return 0;
}
else
{
return Convert.ToInt32(obj);
}
}
/// <summary>
/// 获得数据列表
/// </summary>
public DataSet GetErpriseList(string strWhere)
{
StringBuilder strSql = new StringBuilder();
strSql.Append("select T1.MONITOR_ID,T1.MONITOR_NAME,T1.CUSTOMS_CODE,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 ");
if (strWhere.Trim() != "")
{
strSql.Append(" where " + strWhere);
}
return DbHelperSQL.Query(strSql.ToString());
}
#endregion ExtensionMethod
}
}

12
CompetitionAPI/CompetitionAPI/Competition.Mysql/Other/erprise_model_version.cs Normal file
View File

@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Competition.Mysql.Other
{
public class erprise_model_version
{
}
}

80
CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/EditStarterController.cs
View File

@ -1,11 +1,87 @@
using Microsoft.AspNetCore.Http;
using Competition.Common.Util;
using CompetitionAPI.api.version;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
namespace CompetitionAPI.Controllers.version
{
[Route("api/[controller]")]
[ApiController]
public class EditStarterController : ControllerBase
public class EditStarterController : Controller
{
private readonly IWebHostEnvironment _webHostEnvironment;
Competition.Mysql.BLL.v_starter_version bll = new Competition.Mysql.BLL.v_starter_version();
public EditStarterController(IWebHostEnvironment webHostEnvironment)
{
_webHostEnvironment = webHostEnvironment;
}
/// <summary>
/// 编辑启动器接口
/// </summary>
/// <param name="req">请求参数</param>
/// <returns></returns>
[Authorize]
[HttpPost]
public JsonResult Index([FromBody] EditStarterRequest req)
{
//获取当前web目录
var webRootPath = _webHostEnvironment.WebRootPath;
if (string.IsNullOrWhiteSpace(req.StarterId))
{
return Json(Tool.GetJsonWithCode(APICode.Fail, "版本id不能为空"));
}
if (string.IsNullOrWhiteSpace(req.SoftwareName))
{
return Json(Tool.GetJsonWithCode(APICode.Fail, "软件名称不能为空"));
}
if (string.IsNullOrWhiteSpace(req.VersionNumber))
{
return Json(Tool.GetJsonWithCode(APICode.Fail, "版本号不能为空"));
}
if (!System.IO.File.Exists(webRootPath + "/" + req.LauncherResources))
{
return Json(Tool.GetJsonWithCode(APICode.Fail, "启动器资源不存在，请先上传启动器资源"));
}
if (!System.IO.File.Exists(webRootPath + "/" + req.UpdateResources))
{
return Json(Tool.GetJsonWithCode(APICode.Fail, "更新包资源不存在，请先上传更新包资源"));
}
var model = bll.GetModel(req.StarterId);
model.SoftwareName = req.SoftwareName;
model.VersionNumber = req.VersionNumber;
var old_launcher_resources = model.LauncherResources;
model.LauncherResources = req.LauncherResources;
var old_update_resources = model.UpdateResources;
model.UpdateResources = req.UpdateResources;
if (bll.Update(model))
{
if (req.LauncherResources != old_launcher_resources)
{
if (System.IO.File.Exists(webRootPath + "/" + old_launcher_resources))
{
System.IO.File.Delete(webRootPath + "/" + old_launcher_resources);
}
}
if (req.UpdateResources != old_update_resources)
{
if (System.IO.File.Exists(webRootPath + "/" + old_update_resources))
{
System.IO.File.Delete(webRootPath + "/" + old_update_resources);
}
}
return Json(Tool.GetJsonWithCode(APICode.Success, "编辑成功！"));
}
else
{
return Json(Tool.GetJsonWithCode(APICode.Fail, "编辑失败！"));
}
}
}
}

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

@ -1,11 +1,62 @@
using Microsoft.AspNetCore.Http;
using Competition.Common.Util;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Text;
namespace CompetitionAPI.Controllers.version
{
[Route("api/[controller]")]
[ApiController]
public class GetModelListController : ControllerBase
public class GetModelListController : Controller
{
Competition.Mysql.BLL.v_model_version bll = new Competition.Mysql.BLL.v_model_version();
public GetModelListController()
{
}
/// <summary>
/// 获取模型版本列表接口
/// </summary>
/// <param name="EnterpriseName">企业名称</param>
/// <param name="EnterpriseCode">企业编码</param>
/// <param name="ModelName">模型名称/param>
/// <param name="PageIndex">页码/param>
/// <param name="PageSize">每页数量/param>
/// <returns></returns>
[HttpGet]
public JsonResult Index(int PageIndex, int PageSize, string EnterpriseName = "", string EnterpriseCode = "", string ModelName = "")
{
var query = new StringBuilder(" 1 = 1 ");
var total_query = new StringBuilder(" 1 = 1 ");
//学习名称
if (!string.IsNullOrWhiteSpace(StudyName))
{
query.AppendFormat(" AND StudyName LIKE '%{0}%'", StudyName);
total_query.AppendFormat(" AND StudyName LIKE '%{0}%' ", StudyName);
}
//学习分类
if (!string.IsNullOrWhiteSpace(StudyClass))
{
query.AppendFormat(" AND StudyClass='{0}' ", StudyClass);
total_query.AppendFormat(" AND StudyClass='{0}' ", StudyClass);
}
if (!string.IsNullOrEmpty(Status))
{
query.AppendFormat(" AND Status='{0}' ", Status);
total_query.AppendFormat(" AND Status='{0}' ", Status);
}
var offset = (PageIndex - 1) * PageSize;
query.AppendFormat(" order by CreateTime desc LIMIT {0} OFFSET {1} ", PageSize, offset);
var total = bll.GetRecordCount(total_query.ToString());
var list = bll.GetModelList(query.ToString());
return Json(Tool.GetJsonWithCode(APICode.Success, new { total = total, list = list }));
}
}
}

35
CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetStarterListController.cs
View File

@ -8,29 +8,24 @@ namespace CompetitionAPI.Controllers.version
[ApiController]
public class GetStarterListController : Controller
{
//Competition.Mysql.BLL.v bll = new Competition.Mysql.BLL.T_BAS_CORPORATION();
Competition.Mysql.BLL.v_starter_version bll = new Competition.Mysql.BLL.v_starter_version();
//public GetStarterListController()
//{
public GetStarterListController()
{
//}
}
///// <summary>
///// 获取企业接口
///// </summary>
///// <param name="req"></param>
///// <returns></returns>
//[HttpGet]
//public JsonResult Index()
//{
// //读取配置文件示例
// var mysql = Configuration.GetConnectionString("MySQL").ToString();
// //查询企业表所有数据
// var list = bll.GetModelList("");
// return Json(Tool.GetJsonWithCode(APICode.Success, list));
//}
/// <summary>
/// 获取启动器列表接口
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
[HttpGet]
public JsonResult Index()
{
var list = bll.GetModelList("");
return Json(Tool.GetJsonWithCode(APICode.Success, list));
}
}
}

28
CompetitionAPI/CompetitionAPI/CompetitionAPI/api/version/EditStarterRequest.cs
View File

@ -1,6 +1,32 @@
namespace CompetitionAPI.api.version
using System.Reflection.Metadata.Ecma335;
namespace CompetitionAPI.api.version
{
public class EditStarterRequest
{
/// <summary>
/// 版本id
/// </summary>
public string StarterId { get; set; }
/// <summary>
/// 软件名称
/// </summary>
public string SoftwareName { get; set; }
/// <summary>
/// 版本号
/// </summary>
public string VersionNumber { get; set; }
/// <summary>
/// 启动器资源
/// </summary>
public string LauncherResources { get; set; }
/// <summary>
/// 更新包资源
/// </summary>
public string UpdateResources { get; set; }
}
}