)objModel;
+ }
+
#endregion ExtensionMethod
}
}
diff --git a/DataService/DAL/pro_app.cs b/DataService/DAL/pro_app.cs
index aa4ecb0..ac0baf9 100644
--- a/DataService/DAL/pro_app.cs
+++ b/DataService/DAL/pro_app.cs
@@ -35,14 +35,14 @@ namespace DataService.DAL
///
public bool Exists(string id)
{
- StringBuilder strSql=new StringBuilder();
+ StringBuilder strSql = new StringBuilder();
strSql.Append("select count(1) from pro_app");
strSql.Append(" where id=@id ");
MySqlParameter[] parameters = {
- new MySqlParameter("@id", MySqlDbType.VarChar,50) };
+ new MySqlParameter("@id", MySqlDbType.VarChar,50) };
parameters[0].Value = id;
- return DbHelperMySQL.Exists(strSql.ToString(),parameters);
+ return DbHelperMySQL.Exists(strSql.ToString(), parameters);
}
@@ -51,14 +51,15 @@ namespace DataService.DAL
///
public bool Add(DataService.Model.pro_app model)
{
- StringBuilder strSql=new StringBuilder();
+ StringBuilder strSql = new StringBuilder();
strSql.Append("insert into pro_app(");
- strSql.Append("id,app_name,subject_id,major_id,soft_id,platform,train_scene,config_condition,online_time,soft_dsc,yw_dsc,func_dsc,user_id,video_url,is_hot,favor_num,create_time,r1,r2,r3)");
+ strSql.Append("id,app_name,type,subject_id,major_id,soft_id,platform,train_scene,config_condition,online_time,soft_dsc,yw_dsc,func_dsc,user_id,video_url,cover_pic_url,app_url,is_hot,favor_num,create_time,r1,r2,r3)");
strSql.Append(" values (");
- strSql.Append("@id,@app_name,@subject_id,@major_id,@soft_id,@platform,@train_scene,@config_condition,@online_time,@soft_dsc,@yw_dsc,@func_dsc,@user_id,@video_url,@is_hot,@favor_num,@create_time,@r1,@r2,@r3)");
+ strSql.Append("@id,@app_name,@type,@subject_id,@major_id,@soft_id,@platform,@train_scene,@config_condition,@online_time,@soft_dsc,@yw_dsc,@func_dsc,@user_id,@video_url,@cover_pic_url,@app_url,@is_hot,@favor_num,@create_time,@r1,@r2,@r3)");
MySqlParameter[] parameters = {
new MySqlParameter("@id", MySqlDbType.VarChar,50),
new MySqlParameter("@app_name", MySqlDbType.VarChar,50),
+ new MySqlParameter("@type", MySqlDbType.VarChar,255),
new MySqlParameter("@subject_id", MySqlDbType.VarChar,50),
new MySqlParameter("@major_id", MySqlDbType.VarChar,50),
new MySqlParameter("@soft_id", MySqlDbType.VarChar,50),
@@ -70,7 +71,9 @@ namespace DataService.DAL
new MySqlParameter("@yw_dsc", MySqlDbType.LongText),
new MySqlParameter("@func_dsc", MySqlDbType.LongText),
new MySqlParameter("@user_id", MySqlDbType.VarChar,50),
- new MySqlParameter("@video_url", MySqlDbType.VarChar,50),
+ new MySqlParameter("@video_url", MySqlDbType.VarChar,255),
+ new MySqlParameter("@cover_pic_url", MySqlDbType.VarChar,255),
+ new MySqlParameter("@app_url", MySqlDbType.VarChar,255),
new MySqlParameter("@is_hot", MySqlDbType.VarChar,255),
new MySqlParameter("@favor_num", MySqlDbType.Int64),
new MySqlParameter("@create_time", MySqlDbType.DateTime),
@@ -79,26 +82,29 @@ namespace DataService.DAL
new MySqlParameter("@r3", MySqlDbType.VarChar,500)};
parameters[0].Value = model.id;
parameters[1].Value = model.app_name;
- parameters[2].Value = model.subject_id;
- parameters[3].Value = model.major_id;
- parameters[4].Value = model.soft_id;
- parameters[5].Value = model.platform;
- parameters[6].Value = model.train_scene;
- parameters[7].Value = model.config_condition;
- parameters[8].Value = model.online_time;
- parameters[9].Value = model.soft_dsc;
- parameters[10].Value = model.yw_dsc;
- parameters[11].Value = model.func_dsc;
- parameters[12].Value = model.user_id;
- parameters[13].Value = model.video_url;
- parameters[14].Value = model.is_hot;
- parameters[15].Value = model.favor_num;
- parameters[16].Value = model.create_time;
- parameters[17].Value = model.r1;
- parameters[18].Value = model.r2;
- parameters[19].Value = model.r3;
+ parameters[2].Value = model.type;
+ parameters[3].Value = model.subject_id;
+ parameters[4].Value = model.major_id;
+ parameters[5].Value = model.soft_id;
+ parameters[6].Value = model.platform;
+ parameters[7].Value = model.train_scene;
+ parameters[8].Value = model.config_condition;
+ parameters[9].Value = model.online_time;
+ parameters[10].Value = model.soft_dsc;
+ parameters[11].Value = model.yw_dsc;
+ parameters[12].Value = model.func_dsc;
+ parameters[13].Value = model.user_id;
+ parameters[14].Value = model.video_url;
+ parameters[15].Value = model.cover_pic_url;
+ parameters[16].Value = model.app_url;
+ parameters[17].Value = model.is_hot;
+ parameters[18].Value = model.favor_num;
+ parameters[19].Value = model.create_time;
+ parameters[20].Value = model.r1;
+ parameters[21].Value = model.r2;
+ parameters[22].Value = model.r3;
- int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters);
+ int rows = DbHelperMySQL.ExecuteSql(strSql.ToString(), parameters);
if (rows > 0)
{
return true;
@@ -113,9 +119,10 @@ namespace DataService.DAL
///
public bool Update(DataService.Model.pro_app model)
{
- StringBuilder strSql=new StringBuilder();
+ StringBuilder strSql = new StringBuilder();
strSql.Append("update pro_app set ");
strSql.Append("app_name=@app_name,");
+ strSql.Append("type=@type,");
strSql.Append("subject_id=@subject_id,");
strSql.Append("major_id=@major_id,");
strSql.Append("soft_id=@soft_id,");
@@ -128,6 +135,8 @@ namespace DataService.DAL
strSql.Append("func_dsc=@func_dsc,");
strSql.Append("user_id=@user_id,");
strSql.Append("video_url=@video_url,");
+ strSql.Append("cover_pic_url=@cover_pic_url,");
+ strSql.Append("app_url=@app_url,");
strSql.Append("is_hot=@is_hot,");
strSql.Append("favor_num=@favor_num,");
strSql.Append("create_time=@create_time,");
@@ -137,6 +146,7 @@ namespace DataService.DAL
strSql.Append(" where id=@id ");
MySqlParameter[] parameters = {
new MySqlParameter("@app_name", MySqlDbType.VarChar,50),
+ new MySqlParameter("@type", MySqlDbType.VarChar,255),
new MySqlParameter("@subject_id", MySqlDbType.VarChar,50),
new MySqlParameter("@major_id", MySqlDbType.VarChar,50),
new MySqlParameter("@soft_id", MySqlDbType.VarChar,50),
@@ -148,7 +158,9 @@ namespace DataService.DAL
new MySqlParameter("@yw_dsc", MySqlDbType.LongText),
new MySqlParameter("@func_dsc", MySqlDbType.LongText),
new MySqlParameter("@user_id", MySqlDbType.VarChar,50),
- new MySqlParameter("@video_url", MySqlDbType.VarChar,50),
+ new MySqlParameter("@video_url", MySqlDbType.VarChar,255),
+ new MySqlParameter("@cover_pic_url", MySqlDbType.VarChar,255),
+ new MySqlParameter("@app_url", MySqlDbType.VarChar,255),
new MySqlParameter("@is_hot", MySqlDbType.VarChar,255),
new MySqlParameter("@favor_num", MySqlDbType.Int64),
new MySqlParameter("@create_time", MySqlDbType.DateTime),
@@ -157,27 +169,30 @@ namespace DataService.DAL
new MySqlParameter("@r3", MySqlDbType.VarChar,500),
new MySqlParameter("@id", MySqlDbType.VarChar,50)};
parameters[0].Value = model.app_name;
- parameters[1].Value = model.subject_id;
- parameters[2].Value = model.major_id;
- parameters[3].Value = model.soft_id;
- parameters[4].Value = model.platform;
- parameters[5].Value = model.train_scene;
- parameters[6].Value = model.config_condition;
- parameters[7].Value = model.online_time;
- parameters[8].Value = model.soft_dsc;
- parameters[9].Value = model.yw_dsc;
- parameters[10].Value = model.func_dsc;
- parameters[11].Value = model.user_id;
- parameters[12].Value = model.video_url;
- parameters[13].Value = model.is_hot;
- parameters[14].Value = model.favor_num;
- parameters[15].Value = model.create_time;
- parameters[16].Value = model.r1;
- parameters[17].Value = model.r2;
- parameters[18].Value = model.r3;
- parameters[19].Value = model.id;
+ parameters[1].Value = model.type;
+ parameters[2].Value = model.subject_id;
+ parameters[3].Value = model.major_id;
+ parameters[4].Value = model.soft_id;
+ parameters[5].Value = model.platform;
+ parameters[6].Value = model.train_scene;
+ parameters[7].Value = model.config_condition;
+ parameters[8].Value = model.online_time;
+ parameters[9].Value = model.soft_dsc;
+ parameters[10].Value = model.yw_dsc;
+ parameters[11].Value = model.func_dsc;
+ parameters[12].Value = model.user_id;
+ parameters[13].Value = model.video_url;
+ parameters[14].Value = model.cover_pic_url;
+ parameters[15].Value = model.app_url;
+ parameters[16].Value = model.is_hot;
+ parameters[17].Value = model.favor_num;
+ parameters[18].Value = model.create_time;
+ parameters[19].Value = model.r1;
+ parameters[20].Value = model.r2;
+ parameters[21].Value = model.r3;
+ parameters[22].Value = model.id;
- int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters);
+ int rows = DbHelperMySQL.ExecuteSql(strSql.ToString(), parameters);
if (rows > 0)
{
return true;
@@ -193,15 +208,15 @@ namespace DataService.DAL
///
public bool Delete(string id)
{
-
- StringBuilder strSql=new StringBuilder();
+
+ StringBuilder strSql = new StringBuilder();
strSql.Append("delete from pro_app ");
strSql.Append(" where id=@id ");
MySqlParameter[] parameters = {
- new MySqlParameter("@id", MySqlDbType.VarChar,50) };
+ new MySqlParameter("@id", MySqlDbType.VarChar,50) };
parameters[0].Value = id;
- int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters);
+ int rows = DbHelperMySQL.ExecuteSql(strSql.ToString(), parameters);
if (rows > 0)
{
return true;
@@ -214,12 +229,12 @@ namespace DataService.DAL
///
/// 批量删除数据
///
- public bool DeleteList(string idlist )
+ public bool DeleteList(string idlist)
{
- StringBuilder strSql=new StringBuilder();
+ StringBuilder strSql = new StringBuilder();
strSql.Append("delete from pro_app ");
- strSql.Append(" where id in ("+idlist + ") ");
- int rows=DbHelperMySQL.ExecuteSql(strSql.ToString());
+ strSql.Append(" where id in (" + idlist + ") ");
+ int rows = DbHelperMySQL.ExecuteSql(strSql.ToString());
if (rows > 0)
{
return true;
@@ -236,17 +251,17 @@ namespace DataService.DAL
///
public DataService.Model.pro_app GetModel(string id)
{
-
- StringBuilder strSql=new StringBuilder();
- strSql.Append("select id,app_name,subject_id,major_id,soft_id,platform,train_scene,config_condition,online_time,soft_dsc,yw_dsc,func_dsc,user_id,video_url,is_hot,favor_num,create_time,r1,r2,r3 from pro_app ");
+
+ StringBuilder strSql = new StringBuilder();
+ strSql.Append("select id,app_name,type,subject_id,major_id,soft_id,platform,train_scene,config_condition,online_time,soft_dsc,yw_dsc,func_dsc,user_id,video_url,cover_pic_url,app_url,is_hot,favor_num,create_time,r1,r2,r3 from pro_app ");
strSql.Append(" where id=@id ");
MySqlParameter[] parameters = {
- new MySqlParameter("@id", MySqlDbType.VarChar,50) };
+ new MySqlParameter("@id", MySqlDbType.VarChar,50) };
parameters[0].Value = id;
- DataService.Model.pro_app model=new DataService.Model.pro_app();
- DataSet ds=DbHelperMySQL.Query(strSql.ToString(),parameters);
- if(ds.Tables[0].Rows.Count>0)
+ DataService.Model.pro_app model = new DataService.Model.pro_app();
+ DataSet ds = DbHelperMySQL.Query(strSql.ToString(), parameters);
+ if (ds.Tables[0].Rows.Count > 0)
{
return DataRowToModel(ds.Tables[0].Rows[0]);
}
@@ -262,88 +277,100 @@ namespace DataService.DAL
///
public DataService.Model.pro_app DataRowToModel(DataRow row)
{
- DataService.Model.pro_app model=new DataService.Model.pro_app();
+ DataService.Model.pro_app model = new DataService.Model.pro_app();
if (row != null)
{
- if(row["id"]!=null)
+ if (row["id"] != null)
{
- model.id=row["id"].ToString();
+ model.id = row["id"].ToString();
}
- if(row["app_name"]!=null)
+ if (row["app_name"] != null)
{
- model.app_name=row["app_name"].ToString();
+ model.app_name = row["app_name"].ToString();
}
- if(row["subject_id"]!=null)
+ if (row["type"] != null)
{
- model.subject_id=row["subject_id"].ToString();
+ model.type = row["type"].ToString();
}
- if(row["major_id"]!=null)
+ if (row["subject_id"] != null)
{
- model.major_id=row["major_id"].ToString();
+ model.subject_id = row["subject_id"].ToString();
}
- if(row["soft_id"]!=null)
+ if (row["major_id"] != null)
{
- model.soft_id=row["soft_id"].ToString();
+ model.major_id = row["major_id"].ToString();
}
- if(row["platform"]!=null)
+ if (row["soft_id"] != null)
{
- model.platform=row["platform"].ToString();
+ model.soft_id = row["soft_id"].ToString();
}
- if(row["train_scene"]!=null)
+ if (row["platform"] != null)
{
- model.train_scene=row["train_scene"].ToString();
+ model.platform = row["platform"].ToString();
}
- if(row["config_condition"]!=null)
+ if (row["train_scene"] != null)
{
- model.config_condition=row["config_condition"].ToString();
+ model.train_scene = row["train_scene"].ToString();
}
- if(row["online_time"]!=null && row["online_time"].ToString()!="")
+ if (row["config_condition"] != null)
{
- model.online_time=DateTime.Parse(row["online_time"].ToString());
+ model.config_condition = row["config_condition"].ToString();
}
- if(row["soft_dsc"]!=null)
+ if (row["online_time"] != null && row["online_time"].ToString() != "")
{
- model.soft_dsc=row["soft_dsc"].ToString();
+ model.online_time = DateTime.Parse(row["online_time"].ToString());
}
- if(row["yw_dsc"]!=null)
+ if (row["soft_dsc"] != null)
{
- model.yw_dsc=row["yw_dsc"].ToString();
+ model.soft_dsc = row["soft_dsc"].ToString();
}
- if(row["func_dsc"]!=null)
+ if (row["yw_dsc"] != null)
{
- model.func_dsc=row["func_dsc"].ToString();
+ model.yw_dsc = row["yw_dsc"].ToString();
}
- if(row["user_id"]!=null)
+ if (row["func_dsc"] != null)
{
- model.user_id=row["user_id"].ToString();
+ model.func_dsc = row["func_dsc"].ToString();
}
- if(row["video_url"]!=null)
+ if (row["user_id"] != null)
{
- model.video_url=row["video_url"].ToString();
+ model.user_id = row["user_id"].ToString();
}
- if(row["is_hot"]!=null)
+ if (row["video_url"] != null)
{
- model.is_hot=row["is_hot"].ToString();
+ model.video_url = row["video_url"].ToString();
}
- if(row["favor_num"]!=null && row["favor_num"].ToString()!="")
+ if (row["cover_pic_url"] != null)
{
- model.favor_num=long.Parse(row["favor_num"].ToString());
+ model.cover_pic_url = row["cover_pic_url"].ToString();
}
- if(row["create_time"]!=null && row["create_time"].ToString()!="")
+ if (row["app_url"] != null)
{
- model.create_time=DateTime.Parse(row["create_time"].ToString());
+ model.app_url = row["app_url"].ToString();
}
- if(row["r1"]!=null)
+ if (row["is_hot"] != null)
{
- model.r1=row["r1"].ToString();
+ model.is_hot = row["is_hot"].ToString();
}
- if(row["r2"]!=null)
+ if (row["favor_num"] != null && row["favor_num"].ToString() != "")
{
- model.r2=row["r2"].ToString();
+ model.favor_num = long.Parse(row["favor_num"].ToString());
}
- if(row["r3"]!=null)
+ if (row["create_time"] != null && row["create_time"].ToString() != "")
{
- model.r3=row["r3"].ToString();
+ model.create_time = DateTime.Parse(row["create_time"].ToString());
+ }
+ if (row["r1"] != null)
+ {
+ model.r1 = row["r1"].ToString();
+ }
+ if (row["r2"] != null)
+ {
+ model.r2 = row["r2"].ToString();
+ }
+ if (row["r3"] != null)
+ {
+ model.r3 = row["r3"].ToString();
}
}
return model;
@@ -354,12 +381,12 @@ namespace DataService.DAL
///
public DataSet GetList(string strWhere)
{
- StringBuilder strSql=new StringBuilder();
- strSql.Append("select id,app_name,subject_id,major_id,soft_id,platform,train_scene,config_condition,online_time,soft_dsc,yw_dsc,func_dsc,user_id,video_url,is_hot,favor_num,create_time,r1,r2,r3 ");
+ StringBuilder strSql = new StringBuilder();
+ strSql.Append("select id,app_name,type,subject_id,major_id,soft_id,platform,train_scene,config_condition,online_time,soft_dsc,yw_dsc,func_dsc,user_id,video_url,cover_pic_url,app_url,is_hot,favor_num,create_time,r1,r2,r3 ");
strSql.Append(" FROM pro_app ");
- if(strWhere.Trim()!="")
+ if (strWhere.Trim() != "")
{
- strSql.Append(" where "+strWhere);
+ strSql.Append(" where " + strWhere);
}
return DbHelperMySQL.Query(strSql.ToString());
}
@@ -369,13 +396,13 @@ namespace DataService.DAL
///
public int GetRecordCount(string strWhere)
{
- StringBuilder strSql=new StringBuilder();
+ StringBuilder strSql = new StringBuilder();
strSql.Append("select count(1) FROM pro_app ");
- if(strWhere.Trim()!="")
+ if (strWhere.Trim() != "")
{
- strSql.Append(" where "+strWhere);
+ strSql.Append(" where " + strWhere);
}
- object obj = DbHelperSQL.GetSingle(strSql.ToString());
+ object obj = DbHelperMySQL.GetSingle(strSql.ToString());
if (obj == null)
{
return 0;
@@ -390,12 +417,12 @@ namespace DataService.DAL
///
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
{
@@ -437,6 +464,7 @@ namespace DataService.DAL
}*/
#endregion BasicMethod
+
#region ExtensionMethod
/// 获得数据列表
diff --git a/DataService/Model/pro_app.cs b/DataService/Model/pro_app.cs
index 0516988..590b456 100644
--- a/DataService/Model/pro_app.cs
+++ b/DataService/Model/pro_app.cs
@@ -28,6 +28,7 @@ namespace DataService.Model
#region Model
private string _id;
private string _app_name;
+ private string _type = "软件";
private string _subject_id;
private string _major_id;
private string _soft_id;
@@ -40,8 +41,10 @@ namespace DataService.Model
private string _func_dsc;
private string _user_id;
private string _video_url;
- private string _is_hot= "0";
- private long _favor_num=0;
+ private string _cover_pic_url;
+ private string _app_url;
+ private string _is_hot = "否";
+ private long _favor_num = 0;
private DateTime? _create_time;
private string _r1;
private string _r2;
@@ -51,163 +54,211 @@ namespace DataService.Model
///
public string id
{
- set{ _id=value;}
- get{return _id;}
+ set { _id = value; }
+ get { return _id; }
}
///
///
///
public string app_name
{
- set{ _app_name=value;}
- get{return _app_name;}
+ set { _app_name = value; }
+ get { return _app_name; }
+ }
+ ///
+ ///
+ ///
+ public string type
+ {
+ set { _type = value; }
+ get { return _type; }
}
///
///
///
public string subject_id
{
- set{ _subject_id=value;}
- get{return _subject_id;}
+ set { _subject_id = value; }
+ get { return _subject_id; }
}
///
///
///
public string major_id
{
- set{ _major_id=value;}
- get{return _major_id;}
+ set { _major_id = value; }
+ get { return _major_id; }
}
///
///
///
public string soft_id
{
- set{ _soft_id=value;}
- get{return _soft_id;}
+ set { _soft_id = value; }
+ get { return _soft_id; }
}
///
///
///
public string platform
{
- set{ _platform=value;}
- get{return _platform;}
+ set { _platform = value; }
+ get { return _platform; }
}
///
///
///
public string train_scene
{
- set{ _train_scene=value;}
- get{return _train_scene;}
+ set { _train_scene = value; }
+ get { return _train_scene; }
}
///
///
///
public string config_condition
{
- set{ _config_condition=value;}
- get{return _config_condition;}
+ set { _config_condition = value; }
+ get { return _config_condition; }
}
///
///
///
public DateTime? online_time
{
- set{ _online_time=value;}
- get{return _online_time;}
+ set { _online_time = value; }
+ get { return _online_time; }
}
///
///
///
public string soft_dsc
{
- set{ _soft_dsc=value;}
- get{return _soft_dsc;}
+ set { _soft_dsc = value; }
+ get { return _soft_dsc; }
}
///
///
///
public string yw_dsc
{
- set{ _yw_dsc=value;}
- get{return _yw_dsc;}
+ set { _yw_dsc = value; }
+ get { return _yw_dsc; }
}
///
///
///
public string func_dsc
{
- set{ _func_dsc=value;}
- get{return _func_dsc;}
+ set { _func_dsc = value; }
+ get { return _func_dsc; }
}
///
///
///
public string user_id
{
- set{ _user_id=value;}
- get{return _user_id;}
+ set { _user_id = value; }
+ get { return _user_id; }
}
///
///
///
public string video_url
{
- set{ _video_url=value;}
- get{return _video_url;}
+ set { _video_url = value; }
+ get { return _video_url; }
+ }
+ ///
+ ///
+ ///
+ public string cover_pic_url
+ {
+ set { _cover_pic_url = value; }
+ get { return _cover_pic_url; }
+ }
+ ///
+ ///
+ ///
+ public string app_url
+ {
+ set { _app_url = value; }
+ get { return _app_url; }
}
///
///
///
public string is_hot
{
- set{ _is_hot=value;}
- get{return _is_hot;}
+ set { _is_hot = value; }
+ get { return _is_hot; }
}
///
///
///
public long favor_num
{
- set{ _favor_num=value;}
- get{return _favor_num;}
+ set { _favor_num = value; }
+ get { return _favor_num; }
}
///
///
///
public DateTime? create_time
{
- set{ _create_time=value;}
- get{return _create_time;}
+ set { _create_time = value; }
+ get { return _create_time; }
}
///
///
///
public string r1
{
- set{ _r1=value;}
- get{return _r1;}
+ set { _r1 = value; }
+ get { return _r1; }
}
///
///
///
public string r2
{
- set{ _r2=value;}
- get{return _r2;}
+ set { _r2 = value; }
+ get { return _r2; }
}
///
///
///
public string r3
{
- set{ _r3=value;}
- get{return _r3;}
+ set { _r3 = value; }
+ get { return _r3; }
}
#endregion Model
+
+ #region Extend Models
+
+ ///
+ /// 浏览次数
+ ///
+ public long view_count { get; set; }
+
+ ///
+ /// 终端类型名称
+ ///
+ public string soft_name { get; set; }
+
+ ///
+ /// 业务场景名称
+ ///
+ public string major_name { get; set; }
+
+ ///
+ /// 业务场景专业分类名称
+ ///
+ public string subject_name { get; set; }
+
+ #endregion
}
}
diff --git a/VRS/Handler/$$公司应用仿真.txt b/VRS/Handler/$$公司应用仿真.txt
index 905168b..05d2eee 100644
--- a/VRS/Handler/$$公司应用仿真.txt
+++ b/VRS/Handler/$$公司应用仿真.txt
@@ -15,8 +15,11 @@ http://111.229.30.246:8798/Handler/Files.ashx?action=Add
action=Add
file=唯一文件名 （12345678.pdf）
-记录
-用户是否存在unit 单位信息
+
+用户登录 post
+http://172.16.1.254:13010/Handler/user.ashx?action=login
+参数 login_name :账号 (test)
+参数 password : 密码(12345)
查询终端类型
@@ -34,10 +37,49 @@ major_name : 场景名称
http://172.16.1.254:13010/Handler/data.ashx?action=scenezy&major_id=1745394606
参数 major_id :场景id
返回
-subject_id: 分类id
+subject_id: 专业分类id
subject_name:分类名称
+查询软件、课程接口
+http://172.16.1.254:13010/Handler/app.ashx?action=queryapp
+http://172.16.1.254:13010/Handler/app.ashx?action=queryapp&page_size=1&page_index=1&type=课程
+参数 page_size：每页大小
+参数 page_index ：页索引从1开始
+参数 soft_id :终端类型id
+参数 major_id :场景id
+参数 subject_id: 专业分类id
+参数 is_hot：热门 是、否
+参数 type：类型 软件、课程
+
+查询单个软件、课程接口
+http://172.16.1.254:13010/Handler/app.ashx?action=queryappone
+参数 app_id ：软件、课程id
+
+
+软件、课程浏览详情页面接口
+http://172.16.1.254:13010/Handler/app.ashx?action=viewapp&app_id=app1745481912
+参数 action：viewapp
+参数 app_id ：软件、课程id
+
+
+软件、课程查询收藏接口
+http://172.16.1.254:13010/Handler/app.ashx?action=appfavorquery&user_id=123
+参数 user_id：用户id
+
+软件、课程添加收藏接口
+http://172.16.1.254:13010/Handler/app.ashx?action=appfavoradd&app_id=app1745481912&user_id=123
+参数 user_id：用户id
+参数 app_id ：软件、课程id
+
+软件、课程删除收藏接口
+http://172.16.1.254:13010/Handler/app.ashx?action=appfavordel&app_id=app1745481912&user_id=123
+参数 user_id：用户id
+参数 app_id ：软件、课程id
+
+
+
+通常建议绿豆与大米的比例可以在1:2到1:3之间。例如，如果您使用了50克绿豆，则可以搭配100克至150克的大米。
diff --git a/VRS/Handler/App.ashx.cs b/VRS/Handler/App.ashx.cs
index 28e930e..ffcb75b 100644
--- a/VRS/Handler/App.ashx.cs
+++ b/VRS/Handler/App.ashx.cs
@@ -11,8 +11,11 @@ namespace VRS.Handler
public class App : BaseHandler, IHttpHandler
{
DataService.BLL.pro_app bll_app = new DataService.BLL.pro_app();
+ DataService.BLL.pro_app_view bll_app_view = new DataService.BLL.pro_app_view();
+
+ DataService.BLL.pro_app_favor bll_app_favor = new DataService.BLL.pro_app_favor();
+
-
public void ProcessRequest(HttpContext context)
{
baseContext = context;
@@ -37,6 +40,30 @@ namespace VRS.Handler
QueryApp(context);
break;
+ //查询单个软件、课程
+ case "queryappone":
+ QueryAppOne(context);
+ break;
+
+ case "viewapp":
+ ViewApp(context);
+ break;
+
+ //查询收藏
+ case "appfavorquery":
+ AppFavorQuery(context);
+ break;
+
+ //添加收藏
+ case "appfavoradd":
+ AppFavorAdd(context);
+ break;
+
+ //删除收藏
+ case "appfavordel":
+ AppFavorDel(context);
+ break;
+
default:
var result = GetResult(false, "方法名不存在：" + action);
context.Response.Write(result);
@@ -44,6 +71,243 @@ namespace VRS.Handler
}
}
+ ///
+ /// 应用收藏添加接口
+ ///
+ ///
+ public void AppFavorAdd(HttpContext context)
+ {
+ string app_id = context.Request["app_id"];
+ if (string.IsNullOrEmpty(app_id))
+ {
+ var result = GetResult(false, "缺少参数：app_id");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+
+ var model = bll_app.GetModel(app_id);
+ if (null == model)
+ {
+ var result = GetResult(false, "应用不存在：app_id " + app_id);
+ context.Response.Write(result);
+ context.Response.End();
+ }
+
+ string user_id = context.Request["user_id"];
+ if (string.IsNullOrEmpty(app_id))
+ {
+ var result = GetResult(false, "缺少参数：user_id");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+
+ var qry = string.Format("app_id='{0}' and user_id='{1}' ", app_id, user_id);
+ var list = bll_app_favor.GetModelList(qry);
+ if (list.Count > 0)
+ {
+ var result = GetResult(false, "收藏记录已经存在：时间 " + list[0].favor_time.Value.ToString("yyyy-MM-dd HH:mm:ss"));
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ else
+ {
+ var add = new DataService.Model.pro_app_favor();
+ add.id = BasePage.GetId();
+ add.app_id = app_id;
+ add.user_id = user_id;
+ add.favor_time = DateTime.Now;
+ if (bll_app_favor.Add(add))
+ {
+ var result = GetResult(true, null, "");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ else
+ {
+ var result = GetResult(false, null, "添加收藏记录失败");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ }
+ }
+
+ ///
+ /// 应用收藏查询接口
+ ///
+ ///
+ public void AppFavorQuery(HttpContext context)
+ {
+ string user_id = context.Request["user_id"];
+ if (string.IsNullOrEmpty(user_id))
+ {
+ var result = GetResult(false, "缺少参数：user_id");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+
+ string str_page_size = context.Request["page_size"];
+ string str_page_index = context.Request["page_index"];
+ int page_size = 10;
+ int page_index = 1;
+
+ if (int.TryParse(str_page_size, out int i_page_size))
+ {
+ page_size = i_page_size;
+ }
+ if (int.TryParse(str_page_index, out int i_page_index))
+ {
+ page_index = i_page_index;
+ }
+ int recordCount = 0;
+ var qry = string.Format(" id in (select app_id from pro_app_favor where user_id='{0}' ) ", user_id);
+ var list = bll_app.GetModelPageList(qry, page_index, page_size, ref recordCount);
+ foreach(var item in list)
+ {
+ bll_app.GetSoftMajorDetails(item);
+ }
+ if (true)
+ {
+ var obj = new
+ {
+ total = recordCount,
+ list = list
+ };
+ var result = GetResult(true, obj, "");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ }
+
+ ///
+ /// 应用收藏删除接口
+ ///
+ ///
+ public void AppFavorDel(HttpContext context)
+ {
+ string app_id = context.Request["app_id"];
+ if (string.IsNullOrEmpty(app_id))
+ {
+ var result = GetResult(false, "缺少参数：app_id");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+
+ string user_id = context.Request["user_id"];
+ if (string.IsNullOrEmpty(app_id))
+ {
+ var result = GetResult(false, "缺少参数：user_id");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+
+ var qry = string.Format("app_id='{0}' and user_id='{1}' ", app_id, user_id);
+ var model = bll_app_favor.GetModelList(qry).FirstOrDefault();
+ if (null== model)
+ {
+ var result = GetResult(false, "收藏记录不存在 ");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ else
+ {
+ var id = model.id;
+ if (bll_app_favor.Delete(id))
+ {
+ var result = GetResult(true, null, "");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ else
+ {
+ var result = GetResult(false, null, "删除收藏记录失败");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ }
+ }
+
+ ///
+ /// 应用浏览接口
+ ///
+ ///
+ public void ViewApp(HttpContext context)
+ {
+ string app_id = context.Request["app_id"];
+ if (string.IsNullOrEmpty(app_id))
+ {
+ var result = GetResult(false, "缺少参数：app_id");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+
+ var model = bll_app.GetModel(app_id);
+ if (null== model)
+ {
+ var result = GetResult(false, "应用不存在：app_id "+ app_id);
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ var ip =HttpContext.Current.Request.UserHostAddress;
+ var qry = string.Format("app_id='{0}' and view_ip='{1}' ", app_id, ip);
+ var list = bll_app_view.GetModelList(qry);
+ if (list.Count>0)
+ {
+ var result = GetResult(false, "浏览记录已经存在：时间 " + list[0].view_time.Value.ToString("yyyy-MM-dd HH:mm:ss"));
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ else
+ {
+ var add = new DataService.Model.pro_app_view();
+ add.id = BasePage.GetId();
+ add.app_id = app_id;
+ add.view_ip = ip;
+ add.view_time = DateTime.Now;
+ if (bll_app_view.Add(add))
+ {
+ var result = GetResult(true, null,"");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ else
+ {
+ var result = GetResult(false, null, "添加浏览记录失败");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ }
+ }
+
+ ///
+ /// 查询单个软件、课程
+ ///
+ ///
+ public void QueryAppOne(HttpContext context)
+ {
+ string app_id = context.Request["app_id"];
+ if (string.IsNullOrEmpty(app_id))
+ {
+ context.Response.Write(GetResult(false, "参数app_id不能为空"));
+ context.Response.End();
+ }
+ DataService.BLL.pro_app bll = new DataService.BLL.pro_app();
+ var model = bll.GetModel(app_id);
+ if (null != model)
+ {
+ bll.GetSoftMajorDetails(model);
+ var result = GetResult(true, model, "");
+ context.Response.Write(result);
+ context.Response.End();
+ }
+ else
+ {
+ var result = GetResult(false, null, "记录不存在："+ app_id);
+ context.Response.Write(result);
+ context.Response.End();
+ }
+
+ }
+
///
/// 应用查询
///
@@ -55,6 +319,13 @@ namespace VRS.Handler
string str_page_index = context.Request["page_index"];
int page_size = 10;
int page_index = 1;
+ /*
+ `type` COMMENT '类型：软件、课程',
+ `subject_id` COMMENT '科目ID',
+ `major_id` COMMENT '专业ID',
+ `soft_id` '软件类型ID',
+ is_hot 热门 是、否
+ */
if (int.TryParse(str_page_size, out int i_page_size))
{
page_size = i_page_size;
@@ -70,16 +341,49 @@ namespace VRS.Handler
{
qry = qry + string.Format(" and app_name like '%{0}%'", name); //月份
}
+
+ string type = context.Request["type"];
+ string subject_id = context.Request["subject_id"];
+ string major_id = context.Request["major_id"];
+ string soft_id = context.Request["soft_id"];
+ string is_hot = context.Request["is_hot"];
+
+ if (!string.IsNullOrEmpty(type))
+ {
+ qry = qry + string.Format(" and type = '{0}' ", type); //月份
+ }
+ if (!string.IsNullOrEmpty(subject_id))
+ {
+ qry = qry + string.Format(" and subject_id = '{0}' ", subject_id); //月份
+ }
+ if (!string.IsNullOrEmpty(major_id))
+ {
+ qry = qry + string.Format(" and major_id = '{0}' ", major_id); //
+ }
+ if (!string.IsNullOrEmpty(soft_id))
+ {
+ qry = qry + string.Format(" and soft_id = '{0}' ", soft_id); //
+ }
+
+ if (!string.IsNullOrEmpty(is_hot))
+ {
+ qry = qry + string.Format(" and is_hot = '{0}' ", is_hot); //热门
+ }
+
int recordCount = 0;
var list = bll_app.GetModelPageList(qry, page_index, page_size, ref recordCount);
foreach (var item in list)
{
+ /*
var Authority = context.Request.Url.Authority;
if (!string.IsNullOrEmpty(item.video_url))
{
var new_url = "http://" + Authority + item.video_url.Replace("~", "");
item.video_url = new_url;
}
+ */
+
+ bll_app.GetSoftMajorDetails(item);
}
var obj = new
{
diff --git a/VRS/Handler/User.ashx.cs b/VRS/Handler/User.ashx.cs
index bd50cdc..13aa945 100644
--- a/VRS/Handler/User.ashx.cs
+++ b/VRS/Handler/User.ashx.cs
@@ -302,17 +302,22 @@ namespace VRS.Handler
}
else
{
- var info = string.Format("用户登录，姓名：{0}，角色：{1}，id：{2}", userModel.real_name, ConfigInfo.DicRole.ContainsKey(userModel.user_role) ? ConfigInfo.DicRole[userModel.user_role] : userModel.user_role, userModel.user_id);
+ var dic = BasePage.DicRole();
+
+ var info = string.Format("网站用户登录，姓名：{0}，角色：{1}，id：{2}", userModel.real_name, dic.ContainsKey(userModel.user_role) ? dic[userModel.user_role] : userModel.user_role, userModel.user_id);
log.write_user_log(userModel, info);
userModel.password = "******";
+
+ /*
var Authority = context.Request.Url.Authority;
if (!string.IsNullOrEmpty(userModel.photo))
{
var new_url = "http://" + Authority + userModel.photo.Replace("~", "");
userModel.photo = new_url;
}
+ */
- var dic = BasePage.DicRole();
+
if (dic.ContainsKey(userModel.user_role))
{
userModel.user_role_dsc = dic[userModel.user_role];
diff --git a/VRS/Login.aspx.cs b/VRS/Login.aspx.cs
index 6c5634c..5ebf527 100644
--- a/VRS/Login.aspx.cs
+++ b/VRS/Login.aspx.cs
@@ -21,6 +21,8 @@ namespace VRS
var value = "887E7A6FF8867D0CE6A0A45CA5FCB8469C0BA50D4ACB7F95A9E73E7F0D2F6448E1851DB1D53DA2D7EC0FECE8CF8657102A4CC80B01A61702942C893770E99BF3BBF320EB338CE4D11EC8E4F075B29BD7";
var key = "kGBxaThxMCMGaysp";
var pack = AESHelper.AesDecrypt(value, key);
+
+ //var zz = typeof(DataService.Model.admin_major).Name;
}
}
diff --git a/VRS/Management/App.aspx b/VRS/Management/App.aspx
index ed64c8d..dfa82c4 100644
--- a/VRS/Management/App.aspx
+++ b/VRS/Management/App.aspx
@@ -6,7 +6,7 @@
- 应用方案管理
+ 软件课程管理
@@ -16,19 +16,19 @@
function OpenWindowAdd() {
var oWnd = radopen("App_Add.aspx", "RadWindowManager1");
//oWnd.maximize();
- oWnd.setSize(760, 650);
+ oWnd.setSize(760, 790);
oWnd.center();
}
function OpenWindowDetail(Id) {
var oWnd = radopen("App_Edit.aspx?Id=" + Id, "RadWindowManager1");
- oWnd.setSize(760, 650);
+ oWnd.setSize(760, 790);
oWnd.center();
}
function OpenWindowFuncDsc(Id) {
var oWnd = radopen("App_Func_Dsc.aspx?Id=" + Id, "RadWindowManager1");
- oWnd.setSize(760, 720);
+ oWnd.setSize(760, 750);
oWnd.center();
}
@@ -75,6 +75,20 @@
+ 类型：
+
+
+
+
+
+
+ 热门：
+
+
+
+
+
+
业务场景：
专业分类：
终端类型：
@@ -124,6 +138,12 @@
+
+
+
+
+
+
@@ -143,7 +163,7 @@
-
+
<%--
--%>
@@ -189,7 +209,7 @@
-
@@ -226,6 +246,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/VRS/Management/App.aspx.cs b/VRS/Management/App.aspx.cs
index 8ca0422..dafb226 100644
--- a/VRS/Management/App.aspx.cs
+++ b/VRS/Management/App.aspx.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using System.Text;
using System.Web;
@@ -53,6 +54,16 @@ namespace VRS.Management
query.AppendFormat(" AND T.soft_id = '{0}' ", dp_soft.SelectedValue);
}
+ if (!string.IsNullOrEmpty(dp_type.SelectedValue))
+ {
+ query.AppendFormat(" AND T.type = '{0}' ", dp_type.SelectedValue);
+ }
+
+ if (!string.IsNullOrEmpty(dp_hot.SelectedValue))
+ {
+ query.AppendFormat(" AND T.is_hot = '{0}' ", dp_hot.SelectedValue);
+ }
+
var data = bll.GetMoreList(query.ToString());
/*
foreach (var item in data)
@@ -121,7 +132,46 @@ namespace VRS.Management
log.write_log("删除成功。" + "姓名：" + model.real_name + "，ID：" + IdInput.Value);
}
*/
- DataLoad();
+
+ if (bll.Delete(model.id))
+ {
+ //视频介绍
+ if (!string.IsNullOrEmpty(model.video_url))
+ {
+ string path = Server.MapPath(model.video_url);
+ if (File.Exists(path))
+ {
+ File.SetAttributes(path, FileAttributes.Normal);
+ File.Delete(path);
+ }
+ }
+
+ //软件
+ if (!string.IsNullOrEmpty(model.app_url))
+ {
+ string path = Server.MapPath(model.app_url);
+ if (File.Exists(path))
+ {
+ File.SetAttributes(path, FileAttributes.Normal);
+ File.Delete(path);
+ }
+ }
+
+ //封面
+ if (!string.IsNullOrEmpty(model.cover_pic_url))
+ {
+ string path = Server.MapPath(model.cover_pic_url);
+ if (File.Exists(path))
+ {
+ File.SetAttributes(path, FileAttributes.Normal);
+ File.Delete(path);
+ }
+ }
+
+ log.write_log("删除应用成功。" + "类型：" + model.type + ",名称：" + model.app_name + "，ID：" + IdInput.Value);
+ DataLoad();
+ }
+
}
protected void dataList_ItemDataBound(object sender, GridItemEventArgs e)
@@ -154,5 +204,10 @@ namespace VRS.Management
{
DataLoad();
}
+
+ protected void dp_type_SelectedIndexChanged(object sender, DropDownListEventArgs e)
+ {
+ DataLoad();
+ }
}
}
\ No newline at end of file
diff --git a/VRS/Management/App.aspx.designer.cs b/VRS/Management/App.aspx.designer.cs
index 7a10aba..a6c16a5 100644
--- a/VRS/Management/App.aspx.designer.cs
+++ b/VRS/Management/App.aspx.designer.cs
@@ -59,6 +59,24 @@ namespace VRS.Management
///
protected global::Telerik.Web.UI.RadTextBox app_name;
+ ///
+ /// dp_type 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::Telerik.Web.UI.RadDropDownList dp_type;
+
+ ///
+ /// dp_hot 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::Telerik.Web.UI.RadDropDownList dp_hot;
+
///
/// dp_major 控件。
///
diff --git a/VRS/Management/App_Add.aspx b/VRS/Management/App_Add.aspx
index b2c85f8..67915e7 100644
--- a/VRS/Management/App_Add.aspx
+++ b/VRS/Management/App_Add.aspx
@@ -7,7 +7,7 @@
- 添加应用
+ 添加软件、课程
@@ -59,6 +59,9 @@
+
+
+
-
diff --git a/VRS/Management/Course.aspx b/VRS/Management/Course.aspx
index cfb9cce..cb28441 100644
--- a/VRS/Management/Course.aspx
+++ b/VRS/Management/Course.aspx
@@ -178,7 +178,7 @@
-
diff --git a/VRS/Management/Course_Add.aspx b/VRS/Management/Course_Add.aspx
index 3bf5b06..0b9c2f8 100644
--- a/VRS/Management/Course_Add.aspx
+++ b/VRS/Management/Course_Add.aspx
@@ -121,6 +121,7 @@
+
|
diff --git a/VRS/Management/Course_Edit.aspx b/VRS/Management/Course_Edit.aspx
index 4e1d5fa..4355711 100644
--- a/VRS/Management/Course_Edit.aspx
+++ b/VRS/Management/Course_Edit.aspx
@@ -104,6 +104,7 @@
+
diff --git a/VRS/Management/FirstCooper.aspx b/VRS/Management/FirstCooper.aspx
index ca7ed0c..f9662fc 100644
--- a/VRS/Management/FirstCooper.aspx
+++ b/VRS/Management/FirstCooper.aspx
@@ -16,13 +16,13 @@
function OpenWindowAdd() {
var oWnd = radopen("FirstCooper_Add.aspx", "RadWindowManager1");
//oWnd.maximize();
- oWnd.setSize(760, 445);
+ oWnd.setSize(760, 495);
oWnd.center();
}
function OpenWindowDetail(Id) {
var oWnd = radopen("FirstCooper_Edit.aspx?Id=" + Id, "RadWindowManager1");
- oWnd.setSize(760, 445);
+ oWnd.setSize(760, 495);
oWnd.center();
}
@@ -196,7 +196,7 @@
-
diff --git a/VRS/Management/FirstCooper_Add.aspx b/VRS/Management/FirstCooper_Add.aspx
index ba7b2b2..04de94a 100644
--- a/VRS/Management/FirstCooper_Add.aspx
+++ b/VRS/Management/FirstCooper_Add.aspx
@@ -84,6 +84,7 @@
+
diff --git a/VRS/Management/FirstCooper_Edit.aspx b/VRS/Management/FirstCooper_Edit.aspx
index 2860b9d..aad827a 100644
--- a/VRS/Management/FirstCooper_Edit.aspx
+++ b/VRS/Management/FirstCooper_Edit.aspx
@@ -84,6 +84,7 @@
+
diff --git a/VRS/Management/Home.aspx b/VRS/Management/Home.aspx
index 7072ead..7373b23 100644
--- a/VRS/Management/Home.aspx
+++ b/VRS/Management/Home.aspx
@@ -104,7 +104,7 @@
<%--
巡检报表
--%>
@@ -115,7 +115,7 @@
业务场景
- 应用方案
+ 软件课程
<%--课程应用 --%>
@@ -126,7 +126,7 @@
关于我们
合作厂商
- <%-- 轮播内容 --%>
+ <%-- 轮播内容 --%>
<%--
设备巡检要素管理
@@ -148,7 +148,7 @@
diff --git a/VRS/Management/Loop.aspx b/VRS/Management/Loop.aspx
index c4adeb3..7b21b8f 100644
--- a/VRS/Management/Loop.aspx
+++ b/VRS/Management/Loop.aspx
@@ -200,7 +200,7 @@
-
diff --git a/VRS/Management/Loop_Edit.aspx b/VRS/Management/Loop_Edit.aspx
index 5c79e72..e19327a 100644
--- a/VRS/Management/Loop_Edit.aspx
+++ b/VRS/Management/Loop_Edit.aspx
@@ -130,9 +130,6 @@
-
-
-
diff --git a/VRS/Management/Major.aspx b/VRS/Management/Major.aspx
index a816855..c77f152 100644
--- a/VRS/Management/Major.aspx
+++ b/VRS/Management/Major.aspx
@@ -299,7 +299,7 @@
-
diff --git a/VRS/Management/Major.aspx.cs b/VRS/Management/Major.aspx.cs
index 6b33a47..1dfa458 100644
--- a/VRS/Management/Major.aspx.cs
+++ b/VRS/Management/Major.aspx.cs
@@ -15,6 +15,8 @@ namespace VRS.Management
DataService.BLL.admin_major bll = new DataService.BLL.admin_major();
DataService.BLL.admin_log log = new DataService.BLL.admin_log();
DataService.BLL.admin_subject bll_subject = new DataService.BLL.admin_subject();
+
+ DataService.BLL.pro_app bll_app = new DataService.BLL.pro_app();
protected override void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
@@ -75,6 +77,15 @@ namespace VRS.Management
protected void btnDelete_Click(object sender, EventArgs e)
{
var model = bll.GetModel(IdInput.Value);
+
+ var major_id = IdInput.Value;
+ var list = bll_app.GetModelList("major_id='" + major_id + "' ");
+ if (list.Count > 0)
+ {
+ RadAjaxManager1.Alert("无法删除，该终端类型已经在使用中！");
+ return;
+ }
+
if (bll.Delete(IdInput.Value))
{
log.write_log("删除专业成功。" + "专业名称：" + model.major_name + "，ID：" + IdInput.Value);
@@ -124,17 +135,17 @@ namespace VRS.Management
var sub_id = hd_subId.Value;
var model = bll_subject.GetModel(sub_id);
+
+ var subject_id = IdInput.Value;
+ var list = bll_app.GetModelList("subject_id='" + subject_id + "' ");
+ if (list.Count > 0)
+ {
+ RadAjaxManager1.Alert("无法删除，该专业分类已经在使用中！");
+ return;
+ }
+
if (bll_subject.Delete(sub_id))
{
- /*
- if (!string.IsNullOrEmpty(model.url))
- {
- string path = Server.MapPath(model.url);
- if (File.Exists(path))
- {
- File.Delete(path);
- }
- }*/
RadAjaxManager1.Alert("删除科目成功！");
log.write_log("删除科目成功。" + "名称：" + model.subject_name + "，ID：" + sub_id + "，专业id：" + model.major_id );
}
@@ -142,7 +153,5 @@ namespace VRS.Management
}
#endregion
-
-
}
}
\ No newline at end of file
diff --git a/VRS/Management/SoftManagement.aspx b/VRS/Management/SoftManagement.aspx
index 88e1f5f..5ec46cd 100644
--- a/VRS/Management/SoftManagement.aspx
+++ b/VRS/Management/SoftManagement.aspx
@@ -212,7 +212,7 @@
-
diff --git a/VRS/Management/UserManage.aspx b/VRS/Management/UserManage.aspx
index eccd631..f92cbed 100644
--- a/VRS/Management/UserManage.aspx
+++ b/VRS/Management/UserManage.aspx
@@ -174,7 +174,7 @@
-
diff --git a/VRS/Management/UserManage_Add.aspx b/VRS/Management/UserManage_Add.aspx
index 7ed2331..dd7d152 100644
--- a/VRS/Management/UserManage_Add.aspx
+++ b/VRS/Management/UserManage_Add.aspx
@@ -149,6 +149,7 @@
+
diff --git a/VRS/Management/UserManage_Edit.aspx b/VRS/Management/UserManage_Edit.aspx
index b85f5cc..da25470 100644
--- a/VRS/Management/UserManage_Edit.aspx
+++ b/VRS/Management/UserManage_Edit.aspx
@@ -133,6 +133,7 @@
+
diff --git a/VRS/Util/BasePage.cs b/VRS/Util/BasePage.cs
index fbdb6d4..17375f9 100644
--- a/VRS/Util/BasePage.cs
+++ b/VRS/Util/BasePage.cs
@@ -664,7 +664,8 @@ namespace VRS
public static bool SaveFile(UploadedFile fileUpload, HttpContext httpContext, out string filePath)
{
- string dirPath = httpContext.Server.MapPath("~/Upload/");
+ //string dirPath = httpContext.Server.MapPath("~/Upload/");
+ string dirPath = httpContext.Server.MapPath("~/uploads/");
if (!Directory.Exists(dirPath))
Directory.CreateDirectory(dirPath);
//string fileName = Guid.NewGuid().ToString() + fileUpload.GetExtension();
@@ -673,7 +674,8 @@ namespace VRS
fileUpload.SaveAs(savePath);
- filePath = "/Upload/" + fileName;
+ //filePath = "/Upload/" + fileName;
+ filePath = "/uploads/" + fileName;
return true;
}
diff --git a/VRS/Web.config b/VRS/Web.config
index c922a02..56b2454 100644
--- a/VRS/Web.config
+++ b/VRS/Web.config
@@ -18,6 +18,8 @@
+
+