diff --git a/CompetitionAPI/CompetitionAPI/Competition.Mysql/BLL/v_model_version.cs b/CompetitionAPI/CompetitionAPI/Competition.Mysql/BLL/v_model_version.cs index 00d2e57..b974753 100644 --- a/CompetitionAPI/CompetitionAPI/Competition.Mysql/BLL/v_model_version.cs +++ b/CompetitionAPI/CompetitionAPI/Competition.Mysql/BLL/v_model_version.cs @@ -21,166 +21,181 @@ using Maticsoft.Common; using Competition.Mysql.Model; namespace Competition.Mysql.BLL { - /// - /// v_model_version - /// - public partial class 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 - /// - /// 是否存在该记录 - /// - public bool Exists(string ModelId) - { - return dal.Exists(ModelId); - } + /// + /// v_model_version + /// + public partial class 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 + /// + /// 是否存在该记录 + /// + public bool Exists(string ModelId) + { + return dal.Exists(ModelId); + } - /// - /// 增加一条数据 - /// - public bool Add(Competition.Mysql.Model.v_model_version model) - { - return dal.Add(model); - } + /// + /// 增加一条数据 + /// + public bool Add(Competition.Mysql.Model.v_model_version model) + { + return dal.Add(model); + } - /// - /// 更新一条数据 - /// - public bool Update(Competition.Mysql.Model.v_model_version model) - { - return dal.Update(model); - } + /// + /// 更新一条数据 + /// + public bool Update(Competition.Mysql.Model.v_model_version model) + { + return dal.Update(model); + } - /// - /// 删除一条数据 - /// - public bool Delete(string ModelId) - { - - return dal.Delete(ModelId); - } - /// - /// 删除一条数据 - /// - public bool DeleteList(string ModelIdlist ) - { - return dal.DeleteList(ModelIdlist ); - } + /// + /// 删除一条数据 + /// + public bool Delete(string ModelId) + { - /// - /// 得到一个对象实体 - /// - public Competition.Mysql.Model.v_model_version GetModel(string ModelId) - { - - return dal.GetModel(ModelId); - } + return dal.Delete(ModelId); + } + /// + /// 删除一条数据 + /// + public bool DeleteList(string ModelIdlist) + { + return dal.DeleteList(ModelIdlist); + } - /// - /// 得到一个对象实体，从缓存中 - /// - public Competition.Mysql.Model.v_model_version GetModelByCache(string ModelId) - { - - string CacheKey = "v_model_versionModel-" + ModelId; - object objModel = Maticsoft.Common.DataCache.GetCache(CacheKey); - if (objModel == null) - { - try - { - objModel = dal.GetModel(ModelId); - if (objModel != null) - { - int ModelCache = Maticsoft.Common.ConfigHelper.GetConfigInt("ModelCache"); - Maticsoft.Common.DataCache.SetCache(CacheKey, objModel, DateTime.Now.AddMinutes(ModelCache), TimeSpan.Zero); - } - } - catch{} - } - return (Competition.Mysql.Model.v_model_version)objModel; - } + /// + /// 得到一个对象实体 + /// + public Competition.Mysql.Model.v_model_version GetModel(string ModelId) + { - /// - /// 获得数据列表 - /// - public DataSet GetList(string strWhere) - { - return dal.GetList(strWhere); - } - /// - /// 获得前几行数据 - /// - public DataSet GetList(int Top,string strWhere,string filedOrder) - { - return dal.GetList(Top,strWhere,filedOrder); - } - /// - /// 获得数据列表 - /// - public List GetModelList(string strWhere) - { - DataSet ds = dal.GetList(strWhere); - return DataTableToList(ds.Tables[0]); - } - /// - /// 获得数据列表 - /// - public List DataTableToList(DataTable dt) - { - List modelList = new List(); - int rowsCount = dt.Rows.Count; - if (rowsCount > 0) - { - Competition.Mysql.Model.v_model_version model; - for (int n = 0; n < rowsCount; n++) - { - model = dal.DataRowToModel(dt.Rows[n]); - if (model != null) - { - modelList.Add(model); - } - } - } - return modelList; - } + return dal.GetModel(ModelId); + } - /// - /// 获得数据列表 - /// - public DataSet GetAllList() - { - return GetList(""); - } + /// + /// 得到一个对象实体，从缓存中 + /// + public Competition.Mysql.Model.v_model_version GetModelByCache(string ModelId) + { - /// - /// 分页获取数据列表 - /// - public int GetRecordCount(string strWhere) - { - return dal.GetRecordCount(strWhere); - } - /// - /// 分页获取数据列表 - /// - public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex) - { - return dal.GetListByPage( strWhere, orderby, startIndex, endIndex); - } - /// - /// 分页获取数据列表 - /// - //public DataSet GetList(int PageSize,int PageIndex,string strWhere) - //{ - //return dal.GetList(PageSize,PageIndex,strWhere); - //} + string CacheKey = "v_model_versionModel-" + ModelId; + object objModel = Maticsoft.Common.DataCache.GetCache(CacheKey); + if (objModel == null) + { + try + { + objModel = dal.GetModel(ModelId); + if (objModel != null) + { + int ModelCache = Maticsoft.Common.ConfigHelper.GetConfigInt("ModelCache"); + Maticsoft.Common.DataCache.SetCache(CacheKey, objModel, DateTime.Now.AddMinutes(ModelCache), TimeSpan.Zero); + } + } + catch { } + } + return (Competition.Mysql.Model.v_model_version)objModel; + } - #endregion BasicMethod - #region ExtensionMethod + /// + /// 获得数据列表 + /// + public DataSet GetList(string strWhere) + { + return dal.GetList(strWhere); + } + /// + /// 获得前几行数据 + /// + public DataSet GetList(int Top, string strWhere, string filedOrder) + { + return dal.GetList(Top, strWhere, filedOrder); + } + /// + /// 获得数据列表 + /// + public List GetModelList(string strWhere) + { + DataSet ds = dal.GetList(strWhere); + return DataTableToList(ds.Tables[0]); + } + /// + /// 获得数据列表 + /// + public List DataTableToList(DataTable dt) + { + List modelList = new List(); + int rowsCount = dt.Rows.Count; + if (rowsCount > 0) + { + Competition.Mysql.Model.v_model_version model; + for (int n = 0; n < rowsCount; n++) + { + model = dal.DataRowToModel(dt.Rows[n]); + if (model != null) + { + modelList.Add(model); + } + } + } + return modelList; + } - #endregion ExtensionMethod - } + /// + /// 获得数据列表 + /// + public DataSet GetAllList() + { + return GetList(""); + } + + /// + /// 分页获取数据列表 + /// + public int GetRecordCount(string strWhere) + { + return dal.GetRecordCount(strWhere); + } + /// + /// 分页获取数据列表 + /// + public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex) + { + return dal.GetListByPage(strWhere, orderby, startIndex, endIndex); + } + /// + /// 分页获取数据列表 + /// + //public DataSet GetList(int PageSize,int PageIndex,string strWhere) + //{ + //return dal.GetList(PageSize,PageIndex,strWhere); + //} + + #endregion BasicMethod + #region ExtensionMethod + /// + /// 获取记录总数 + /// + public int GetRecordentErpriseCount(string strWhere) + { + return dal.GetRecordentErpriseCount(strWhere); + } + + /// + /// 获得数据列表 + /// + public List GetErpriseList(string strWhere) + { + DataSet ds = dal.GetList(strWhere); + return DataTableToList(ds.Tables[0]); + } + #endregion ExtensionMethod + } } diff --git a/CompetitionAPI/CompetitionAPI/Competition.Mysql/Competition.Mysql.csproj b/CompetitionAPI/CompetitionAPI/Competition.Mysql/Competition.Mysql.csproj index 0bdd6d5..429421e 100644 --- a/CompetitionAPI/CompetitionAPI/Competition.Mysql/Competition.Mysql.csproj +++ b/CompetitionAPI/CompetitionAPI/Competition.Mysql/Competition.Mysql.csproj @@ -27,8 +27,4 @@ - - - - diff --git a/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs b/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs index e169f43..b131c30 100644 --- a/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs +++ b/CompetitionAPI/CompetitionAPI/Competition.Mysql/DAL/v_model_version.cs @@ -21,346 +21,346 @@ using System.Data.SqlClient; using Maticsoft.DBUtility;//Please add references namespace Competition.Mysql.DAL { - /// - /// 数据访问类:v_model_version - /// - public partial class v_model_version - { - public v_model_version() - {} - #region BasicMethod + /// + /// 数据访问类:v_model_version + /// + public partial class v_model_version + { + public v_model_version() + { } + #region BasicMethod - /// - /// 是否存在该记录 - /// - public bool Exists(string ModelId) - { - 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; + /// + /// 是否存在该记录 + /// + public bool Exists(string ModelId) + { + 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); + } - /// - /// 增加一条数据 - /// - public bool Add(Competition.Mysql.Model.v_model_version model) - { - 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 ("); - strSql.Append("@ModelId,@MONITOR_ID,@ModelName,@VersionNumber,@MapLongitude,@MapLatitude,@TrainingSize,@ModelResources,@UpdateTime,@Remark1,@Remark2,@Remark3)"); - SqlParameter[] parameters = { - new SqlParameter("@ModelId", SqlDbType.VarChar,50), - new SqlParameter("@MONITOR_ID", SqlDbType.VarChar,40), - new SqlParameter("@ModelName", SqlDbType.VarChar,255), - new SqlParameter("@VersionNumber", SqlDbType.VarChar,255), - new SqlParameter("@MapLongitude", SqlDbType.VarChar,255), - new SqlParameter("@MapLatitude", SqlDbType.VarChar,255), - new SqlParameter("@TrainingSize", SqlDbType.VarChar,255), - new SqlParameter("@ModelResources", SqlDbType.VarChar,2000), - new SqlParameter("@UpdateTime", SqlDbType.DateTime), - new SqlParameter("@Remark1", SqlDbType.VarChar,255), - new SqlParameter("@Remark2", SqlDbType.VarChar,255), - new SqlParameter("@Remark3", SqlDbType.VarChar,255)}; - parameters[0].Value = model.ModelId; - parameters[1].Value = model.MONITOR_ID; - parameters[2].Value = model.ModelName; - parameters[3].Value = model.VersionNumber; - parameters[4].Value = model.MapLongitude; - parameters[5].Value = model.MapLatitude; - parameters[6].Value = model.TrainingSize; - parameters[7].Value = model.ModelResources; - parameters[8].Value = model.UpdateTime; - parameters[9].Value = model.Remark1; - parameters[10].Value = model.Remark2; - parameters[11].Value = model.Remark3; + /// + /// 增加一条数据 + /// + public bool Add(Competition.Mysql.Model.v_model_version model) + { + 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 ("); + strSql.Append("@ModelId,@MONITOR_ID,@ModelName,@VersionNumber,@MapLongitude,@MapLatitude,@TrainingSize,@ModelResources,@UpdateTime,@Remark1,@Remark2,@Remark3)"); + SqlParameter[] parameters = { + new SqlParameter("@ModelId", SqlDbType.VarChar,50), + new SqlParameter("@MONITOR_ID", SqlDbType.VarChar,40), + new SqlParameter("@ModelName", SqlDbType.VarChar,255), + new SqlParameter("@VersionNumber", SqlDbType.VarChar,255), + new SqlParameter("@MapLongitude", SqlDbType.VarChar,255), + new SqlParameter("@MapLatitude", SqlDbType.VarChar,255), + new SqlParameter("@TrainingSize", SqlDbType.VarChar,255), + new SqlParameter("@ModelResources", SqlDbType.VarChar,2000), + new SqlParameter("@UpdateTime", SqlDbType.DateTime), + new SqlParameter("@Remark1", SqlDbType.VarChar,255), + new SqlParameter("@Remark2", SqlDbType.VarChar,255), + new SqlParameter("@Remark3", SqlDbType.VarChar,255)}; + parameters[0].Value = model.ModelId; + parameters[1].Value = model.MONITOR_ID; + parameters[2].Value = model.ModelName; + parameters[3].Value = model.VersionNumber; + parameters[4].Value = model.MapLongitude; + parameters[5].Value = model.MapLatitude; + parameters[6].Value = model.TrainingSize; + parameters[7].Value = model.ModelResources; + parameters[8].Value = model.UpdateTime; + parameters[9].Value = model.Remark1; + parameters[10].Value = model.Remark2; + parameters[11].Value = model.Remark3; - int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters); - if (rows > 0) - { - return true; - } - else - { - return false; - } - } - /// - /// 更新一条数据 - /// - public bool Update(Competition.Mysql.Model.v_model_version model) - { - StringBuilder strSql=new StringBuilder(); - strSql.Append("update v_model_version set "); - strSql.Append("MONITOR_ID=@MONITOR_ID,"); - strSql.Append("ModelName=@ModelName,"); - strSql.Append("VersionNumber=@VersionNumber,"); - strSql.Append("MapLongitude=@MapLongitude,"); - strSql.Append("MapLatitude=@MapLatitude,"); - strSql.Append("TrainingSize=@TrainingSize,"); - strSql.Append("ModelResources=@ModelResources,"); - strSql.Append("UpdateTime=@UpdateTime,"); - strSql.Append("Remark1=@Remark1,"); - strSql.Append("Remark2=@Remark2,"); - strSql.Append("Remark3=@Remark3"); - strSql.Append(" where ModelId=@ModelId "); - SqlParameter[] parameters = { - new SqlParameter("@MONITOR_ID", SqlDbType.VarChar,40), - new SqlParameter("@ModelName", SqlDbType.VarChar,255), - new SqlParameter("@VersionNumber", SqlDbType.VarChar,255), - new SqlParameter("@MapLongitude", SqlDbType.VarChar,255), - new SqlParameter("@MapLatitude", SqlDbType.VarChar,255), - new SqlParameter("@TrainingSize", SqlDbType.VarChar,255), - new SqlParameter("@ModelResources", SqlDbType.VarChar,2000), - 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("@ModelId", SqlDbType.VarChar,50)}; - parameters[0].Value = model.MONITOR_ID; - parameters[1].Value = model.ModelName; - parameters[2].Value = model.VersionNumber; - parameters[3].Value = model.MapLongitude; - parameters[4].Value = model.MapLatitude; - parameters[5].Value = model.TrainingSize; - parameters[6].Value = model.ModelResources; - parameters[7].Value = model.UpdateTime; - parameters[8].Value = model.Remark1; - parameters[9].Value = model.Remark2; - parameters[10].Value = model.Remark3; - parameters[11].Value = model.ModelId; + int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + /// + /// 更新一条数据 + /// + public bool Update(Competition.Mysql.Model.v_model_version model) + { + StringBuilder strSql = new StringBuilder(); + strSql.Append("update v_model_version set "); + strSql.Append("MONITOR_ID=@MONITOR_ID,"); + strSql.Append("ModelName=@ModelName,"); + strSql.Append("VersionNumber=@VersionNumber,"); + strSql.Append("MapLongitude=@MapLongitude,"); + strSql.Append("MapLatitude=@MapLatitude,"); + strSql.Append("TrainingSize=@TrainingSize,"); + strSql.Append("ModelResources=@ModelResources,"); + strSql.Append("UpdateTime=@UpdateTime,"); + strSql.Append("Remark1=@Remark1,"); + strSql.Append("Remark2=@Remark2,"); + strSql.Append("Remark3=@Remark3"); + strSql.Append(" where ModelId=@ModelId "); + SqlParameter[] parameters = { + new SqlParameter("@MONITOR_ID", SqlDbType.VarChar,40), + new SqlParameter("@ModelName", SqlDbType.VarChar,255), + new SqlParameter("@VersionNumber", SqlDbType.VarChar,255), + new SqlParameter("@MapLongitude", SqlDbType.VarChar,255), + new SqlParameter("@MapLatitude", SqlDbType.VarChar,255), + new SqlParameter("@TrainingSize", SqlDbType.VarChar,255), + new SqlParameter("@ModelResources", SqlDbType.VarChar,2000), + 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("@ModelId", SqlDbType.VarChar,50)}; + parameters[0].Value = model.MONITOR_ID; + parameters[1].Value = model.ModelName; + parameters[2].Value = model.VersionNumber; + parameters[3].Value = model.MapLongitude; + parameters[4].Value = model.MapLatitude; + parameters[5].Value = model.TrainingSize; + parameters[6].Value = model.ModelResources; + parameters[7].Value = model.UpdateTime; + parameters[8].Value = model.Remark1; + parameters[9].Value = model.Remark2; + parameters[10].Value = model.Remark3; + parameters[11].Value = model.ModelId; - int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters); - if (rows > 0) - { - return true; - } - else - { - return false; - } - } + int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } - /// - /// 删除一条数据 - /// - public bool Delete(string ModelId) - { - - 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; + /// + /// 删除一条数据 + /// + public bool Delete(string ModelId) + { - int rows=DbHelperSQL.ExecuteSql(strSql.ToString(),parameters); - if (rows > 0) - { - return true; - } - else - { - return false; - } - } - /// - /// 批量删除数据 - /// - public bool DeleteList(string ModelIdlist ) - { - StringBuilder strSql=new StringBuilder(); - strSql.Append("delete from v_model_version "); - strSql.Append(" where ModelId in ("+ModelIdlist + ") "); - int rows=DbHelperSQL.ExecuteSql(strSql.ToString()); - if (rows > 0) - { - return true; - } - else - { - return false; - } - } + 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); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + /// + /// 批量删除数据 + /// + public bool DeleteList(string ModelIdlist) + { + StringBuilder strSql = new StringBuilder(); + strSql.Append("delete from v_model_version "); + strSql.Append(" where ModelId in (" + ModelIdlist + ") "); + int rows = DbHelperSQL.ExecuteSql(strSql.ToString()); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } - /// - /// 得到一个对象实体 - /// - public Competition.Mysql.Model.v_model_version GetModel(string ModelId) - { - - 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; + /// + /// 得到一个对象实体 + /// + public Competition.Mysql.Model.v_model_version GetModel(string 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) - { - return DataRowToModel(ds.Tables[0].Rows[0]); - } - else - { - return null; - } - } + 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) + { + return DataRowToModel(ds.Tables[0].Rows[0]); + } + else + { + return null; + } + } - /// - /// 得到一个对象实体 - /// - public Competition.Mysql.Model.v_model_version DataRowToModel(DataRow row) - { - Competition.Mysql.Model.v_model_version model=new Competition.Mysql.Model.v_model_version(); - if (row != null) - { - if(row["ModelId"]!=null) - { - model.ModelId=row["ModelId"].ToString(); - } - if(row["MONITOR_ID"]!=null) - { - model.MONITOR_ID=row["MONITOR_ID"].ToString(); - } - if(row["ModelName"]!=null) - { - model.ModelName=row["ModelName"].ToString(); - } - if(row["VersionNumber"]!=null) - { - model.VersionNumber=row["VersionNumber"].ToString(); - } - if(row["MapLongitude"]!=null) - { - model.MapLongitude=row["MapLongitude"].ToString(); - } - if(row["MapLatitude"]!=null) - { - model.MapLatitude=row["MapLatitude"].ToString(); - } - if(row["TrainingSize"]!=null) - { - model.TrainingSize=row["TrainingSize"].ToString(); - } - if(row["ModelResources"]!=null) - { - model.ModelResources=row["ModelResources"].ToString(); - } - if(row["UpdateTime"]!=null && row["UpdateTime"].ToString()!="") - { - model.UpdateTime=DateTime.Parse(row["UpdateTime"].ToString()); - } - if(row["Remark1"]!=null) - { - model.Remark1=row["Remark1"].ToString(); - } - if(row["Remark2"]!=null) - { - model.Remark2=row["Remark2"].ToString(); - } - if(row["Remark3"]!=null) - { - model.Remark3=row["Remark3"].ToString(); - } - } - return model; - } + /// + /// 得到一个对象实体 + /// + public Competition.Mysql.Model.v_model_version DataRowToModel(DataRow row) + { + Competition.Mysql.Model.v_model_version model = new Competition.Mysql.Model.v_model_version(); + if (row != null) + { + if (row["ModelId"] != null) + { + model.ModelId = row["ModelId"].ToString(); + } + if (row["MONITOR_ID"] != null) + { + model.MONITOR_ID = row["MONITOR_ID"].ToString(); + } + if (row["ModelName"] != null) + { + model.ModelName = row["ModelName"].ToString(); + } + if (row["VersionNumber"] != null) + { + model.VersionNumber = row["VersionNumber"].ToString(); + } + if (row["MapLongitude"] != null) + { + model.MapLongitude = row["MapLongitude"].ToString(); + } + if (row["MapLatitude"] != null) + { + model.MapLatitude = row["MapLatitude"].ToString(); + } + if (row["TrainingSize"] != null) + { + model.TrainingSize = row["TrainingSize"].ToString(); + } + if (row["ModelResources"] != null) + { + model.ModelResources = row["ModelResources"].ToString(); + } + if (row["UpdateTime"] != null && row["UpdateTime"].ToString() != "") + { + model.UpdateTime = DateTime.Parse(row["UpdateTime"].ToString()); + } + if (row["Remark1"] != null) + { + model.Remark1 = row["Remark1"].ToString(); + } + if (row["Remark2"] != null) + { + model.Remark2 = row["Remark2"].ToString(); + } + if (row["Remark3"] != null) + { + model.Remark3 = row["Remark3"].ToString(); + } + } + return model; + } - /// - /// 获得数据列表 - /// - 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(" FROM v_model_version "); - if(strWhere.Trim()!="") - { - strSql.Append(" where "+strWhere); - } - return DbHelperSQL.Query(strSql.ToString()); - } + /// + /// 获得数据列表 + /// + 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(" FROM v_model_version "); + if (strWhere.Trim() != "") + { + strSql.Append(" where " + strWhere); + } + return DbHelperSQL.Query(strSql.ToString()); + } - /// - /// 获得前几行数据 - /// - public DataSet GetList(int Top,string strWhere,string filedOrder) - { - StringBuilder strSql=new StringBuilder(); - strSql.Append("select "); - if(Top>0) - { - 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()!="") - { - strSql.Append(" where "+strWhere); - } - strSql.Append(" order by " + filedOrder); - return DbHelperSQL.Query(strSql.ToString()); - } + /// + /// 获得前几行数据 + /// + public DataSet GetList(int Top, string strWhere, string filedOrder) + { + StringBuilder strSql = new StringBuilder(); + strSql.Append("select "); + if (Top > 0) + { + 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() != "") + { + strSql.Append(" where " + strWhere); + } + strSql.Append(" order by " + filedOrder); + return DbHelperSQL.Query(strSql.ToString()); + } - /// - /// 获取记录总数 - /// - public int GetRecordCount(string strWhere) - { - StringBuilder strSql=new StringBuilder(); - strSql.Append("select count(1) FROM v_model_version "); - if(strWhere.Trim()!="") - { - strSql.Append(" where "+strWhere); - } - object obj = DbHelperSQL.GetSingle(strSql.ToString()); - if (obj == null) - { - return 0; - } - else - { - return Convert.ToInt32(obj); - } - } - /// - /// 分页获取数据列表 - /// - public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex) - { - 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 ); - } - else - { - strSql.Append("order by T.ModelId desc"); - } - strSql.Append(")AS Row, T.* from v_model_version T "); - if (!string.IsNullOrEmpty(strWhere.Trim())) - { - strSql.Append(" WHERE " + strWhere); - } - strSql.Append(" ) TT"); - strSql.AppendFormat(" WHERE TT.Row between {0} and {1}", startIndex, endIndex); - return DbHelperSQL.Query(strSql.ToString()); - } + /// + /// 获取记录总数 + /// + public int GetRecordCount(string strWhere) + { + StringBuilder strSql = new StringBuilder(); + strSql.Append("select count(1) FROM v_model_version "); + if (strWhere.Trim() != "") + { + strSql.Append(" where " + strWhere); + } + object obj = DbHelperSQL.GetSingle(strSql.ToString()); + if (obj == null) + { + return 0; + } + else + { + return Convert.ToInt32(obj); + } + } + /// + /// 分页获取数据列表 + /// + public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex) + { + 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); + } + else + { + strSql.Append("order by T.ModelId desc"); + } + strSql.Append(")AS Row, T.* from v_model_version T "); + if (!string.IsNullOrEmpty(strWhere.Trim())) + { + strSql.Append(" WHERE " + strWhere); + } + strSql.Append(" ) TT"); + strSql.AppendFormat(" WHERE TT.Row between {0} and {1}", startIndex, endIndex); + return DbHelperSQL.Query(strSql.ToString()); + } - /* + /* /// /// 分页获取数据列表 /// @@ -385,10 +385,44 @@ namespace Competition.Mysql.DAL return DbHelperSQL.RunProcedure("UP_GetRecordByPage",parameters,"ds"); }*/ - #endregion BasicMethod - #region ExtensionMethod + #endregion BasicMethod + #region ExtensionMethod + /// + /// 获取记录总数 + /// + 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); + } + } - #endregion ExtensionMethod - } + /// + /// 获得数据列表 + /// + 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 + } } diff --git a/CompetitionAPI/CompetitionAPI/Competition.Mysql/Other/erprise_model_version.cs b/CompetitionAPI/CompetitionAPI/Competition.Mysql/Other/erprise_model_version.cs new file mode 100644 index 0000000..9e55b36 --- /dev/null +++ b/CompetitionAPI/CompetitionAPI/Competition.Mysql/Other/erprise_model_version.cs @@ -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 + { + } +} diff --git a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/EditStarterController.cs b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/EditStarterController.cs index 83ceafc..f8a04ad 100644 --- a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/EditStarterController.cs +++ b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/EditStarterController.cs @@ -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; + } + + /// + /// 编辑启动器接口 + /// + /// 请求参数 + /// + [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, "编辑失败！")); + } + } } } diff --git a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetModelListController.cs b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetModelListController.cs index 4c4e055..dbdf50f 100644 --- a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetModelListController.cs +++ b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetModelListController.cs @@ -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() + { + + } + /// + /// 获取模型版本列表接口 + /// + /// 企业名称 + /// 企业编码 + /// 模型名称/param> + /// 页码/param> + /// 每页数量/param> + /// + [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 })); + } } } diff --git a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetStarterListController.cs b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetStarterListController.cs index befbc8c..c9aefe1 100644 --- a/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetStarterListController.cs +++ b/CompetitionAPI/CompetitionAPI/CompetitionAPI/Controllers/version/GetStarterListController.cs @@ -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() + { - //} + } - ///// - ///// 获取企业接口 - ///// - ///// - ///// - //[HttpGet] - //public JsonResult Index() - //{ - // //读取配置文件示例 - // var mysql = Configuration.GetConnectionString("MySQL").ToString(); - - // //查询企业表所有数据 - // var list = bll.GetModelList(""); - - // return Json(Tool.GetJsonWithCode(APICode.Success, list)); - //} + /// + /// 获取启动器列表接口 + /// + /// + /// + [HttpGet] + public JsonResult Index() + { + var list = bll.GetModelList(""); + return Json(Tool.GetJsonWithCode(APICode.Success, list)); + } } } diff --git a/CompetitionAPI/CompetitionAPI/CompetitionAPI/api/version/EditStarterRequest.cs b/CompetitionAPI/CompetitionAPI/CompetitionAPI/api/version/EditStarterRequest.cs index 0ecf93b..d8a8a8a 100644 --- a/CompetitionAPI/CompetitionAPI/CompetitionAPI/api/version/EditStarterRequest.cs +++ b/CompetitionAPI/CompetitionAPI/CompetitionAPI/api/version/EditStarterRequest.cs @@ -1,6 +1,32 @@ -namespace CompetitionAPI.api.version +using System.Reflection.Metadata.Ecma335; + +namespace CompetitionAPI.api.version { public class EditStarterRequest { + /// + /// 版本id + /// + public string StarterId { get; set; } + + /// + /// 软件名称 + /// + public string SoftwareName { get; set; } + + /// + /// 版本号 + /// + public string VersionNumber { get; set; } + + /// + /// 启动器资源 + /// + public string LauncherResources { get; set; } + + /// + /// 更新包资源 + /// + public string UpdateResources { get; set; } } }