diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/08b1d5e4-9715-4bad-bdca-cf6cf521eee1.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/08b1d5e4-9715-4bad-bdca-cf6cf521eee1.vsidx deleted file mode 100644 index 06182b0..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/08b1d5e4-9715-4bad-bdca-cf6cf521eee1.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/0af53d24-4e2b-4403-b3ce-dbad7777967b.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/0af53d24-4e2b-4403-b3ce-dbad7777967b.vsidx deleted file mode 100644 index e62b4be..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/0af53d24-4e2b-4403-b3ce-dbad7777967b.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/2a51541b-4d12-469c-bdc0-7d3646cd12b8.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/2a51541b-4d12-469c-bdc0-7d3646cd12b8.vsidx new file mode 100644 index 0000000..0d27316 Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/2a51541b-4d12-469c-bdc0-7d3646cd12b8.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/689cae45-06e2-414f-a762-1ce610d0e654.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/689cae45-06e2-414f-a762-1ce610d0e654.vsidx new file mode 100644 index 0000000..3522896 Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/689cae45-06e2-414f-a762-1ce610d0e654.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/83f8e20b-87ea-42ba-aac7-afd8266f475a.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/83f8e20b-87ea-42ba-aac7-afd8266f475a.vsidx deleted file mode 100644 index bd6adac..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/83f8e20b-87ea-42ba-aac7-afd8266f475a.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/5dfe01dc-7737-48dc-b144-aef60a88065f.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/d9363fb1-b299-4b7d-8550-3fc808249bf6.vsidx similarity index 99% rename from .vs/LonglslandExhibitionCenterAPI/FileContentIndex/5dfe01dc-7737-48dc-b144-aef60a88065f.vsidx rename to .vs/LonglslandExhibitionCenterAPI/FileContentIndex/d9363fb1-b299-4b7d-8550-3fc808249bf6.vsidx index 0957a89..814de28 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/5dfe01dc-7737-48dc-b144-aef60a88065f.vsidx and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/d9363fb1-b299-4b7d-8550-3fc808249bf6.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/f6a6c792-d6a1-47f3-a1ec-4942fb7621c5.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/f6a6c792-d6a1-47f3-a1ec-4942fb7621c5.vsidx new file mode 100644 index 0000000..f7917bd Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/f6a6c792-d6a1-47f3-a1ec-4942fb7621c5.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/.suo b/.vs/LonglslandExhibitionCenterAPI/v17/.suo index ddabca0..28a874e 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/.suo and b/.vs/LonglslandExhibitionCenterAPI/v17/.suo differ diff --git a/DataService/BLL/policy_device.cs b/DataService/BLL/policy_device.cs new file mode 100644 index 0000000..e8f6acd --- /dev/null +++ b/DataService/BLL/policy_device.cs @@ -0,0 +1,179 @@ +/** 版本信息模板在安装目录下，可自行修改。 +* policy_device.cs +* +* 功 能： N/A +* 类 名： policy_device +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +* V0.01 2024/3/20 9:39:56 N/A 初版 +* +* Copyright (c) 2012 Maticsoft Corporation. All rights reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　版权所有：动软卓越（北京）科技有限公司　　　　　　　　　　　　　　│ +*└──────────────────────────────────┘ +*/ +using System; +using System.Data; +using System.Collections.Generic; +using Maticsoft.Common; +using DataService.Model; +namespace DataService.BLL +{ + /// + /// policy_device + /// + public partial class policy_device + { + private readonly DataService.DAL.policy_device dal=new DataService.DAL.policy_device(); + public policy_device() + {} + #region BasicMethod + /// + /// 是否存在该记录 + /// + public bool Exists(string PolicyId) + { + return dal.Exists(PolicyId); + } + + /// + /// 增加一条数据 + /// + public bool Add(DataService.Model.policy_device model) + { + return dal.Add(model); + } + + /// + /// 更新一条数据 + /// + public bool Update(DataService.Model.policy_device model) + { + return dal.Update(model); + } + + /// + /// 删除一条数据 + /// + public bool Delete(string PolicyId) + { + + return dal.Delete(PolicyId); + } + /// + /// 删除一条数据 + /// + public bool DeleteList(string PolicyIdlist ) + { + return dal.DeleteList(PolicyIdlist ); + } + + /// + /// 得到一个对象实体 + /// + public DataService.Model.policy_device GetModel(string PolicyId) + { + + return dal.GetModel(PolicyId); + } + + /// + /// 得到一个对象实体，从缓存中 + /// + public DataService.Model.policy_device GetModelByCache(string PolicyId) + { + + string CacheKey = "policy_deviceModel-" + PolicyId; + object objModel = Maticsoft.Common.DataCache.GetCache(CacheKey); + if (objModel == null) + { + try + { + objModel = dal.GetModel(PolicyId); + if (objModel != null) + { + int ModelCache = Maticsoft.Common.ConfigHelper.GetConfigInt("ModelCache"); + Maticsoft.Common.DataCache.SetCache(CacheKey, objModel, DateTime.Now.AddMinutes(ModelCache), TimeSpan.Zero); + } + } + catch{} + } + return (DataService.Model.policy_device)objModel; + } + + /// + /// 获得数据列表 + /// + public DataSet GetList(string strWhere) + { + return dal.GetList(strWhere); + } + /// + /// 获得数据列表 + /// + 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) + { + DataService.Model.policy_device model; + for (int n = 0; n < rowsCount; n++) + { + model = dal.DataRowToModel(dt.Rows[n]); + if (model != null) + { + modelList.Add(model); + } + } + } + return modelList; + } + + /// + /// 获得数据列表 + /// + 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 + + #endregion ExtensionMethod + } +} + diff --git a/DataService/DAL/policy_device.cs b/DataService/DAL/policy_device.cs new file mode 100644 index 0000000..74acadc --- /dev/null +++ b/DataService/DAL/policy_device.cs @@ -0,0 +1,337 @@ +/** 版本信息模板在安装目录下，可自行修改。 +* policy_device.cs +* +* 功 能： N/A +* 类 名： policy_device +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +* V0.01 2024/3/20 9:39:56 N/A 初版 +* +* Copyright (c) 2012 Maticsoft Corporation. All rights reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　版权所有：动软卓越（北京）科技有限公司　　　　　　　　　　　　　　│ +*└──────────────────────────────────┘ +*/ +using System; +using System.Data; +using System.Text; +using MySql.Data.MySqlClient; +using Maticsoft.DBUtility;//Please add references +namespace DataService.DAL +{ + /// + /// 数据访问类:policy_device + /// + public partial class policy_device + { + public policy_device() + {} + #region BasicMethod + + /// + /// 是否存在该记录 + /// + public bool Exists(string PolicyId) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("select count(1) from policy_device"); + strSql.Append(" where PolicyId=@PolicyId "); + MySqlParameter[] parameters = { + new MySqlParameter("@PolicyId", MySqlDbType.VarChar,255) }; + parameters[0].Value = PolicyId; + + return DbHelperMySQL.Exists(strSql.ToString(),parameters); + } + + + /// + /// 增加一条数据 + /// + public bool Add(DataService.Model.policy_device model) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("insert into policy_device("); + strSql.Append("PolicyId,PolicyName,PolicyDevice,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5)"); + strSql.Append(" values ("); + strSql.Append("@PolicyId,@PolicyName,@PolicyDevice,@Reserve1,@Reserve2,@Reserve3,@Reserve4,@Reserve5)"); + MySqlParameter[] parameters = { + new MySqlParameter("@PolicyId", MySqlDbType.VarChar,255), + new MySqlParameter("@PolicyName", MySqlDbType.VarChar,255), + new MySqlParameter("@PolicyDevice", MySqlDbType.VarChar,255), + new MySqlParameter("@Reserve1", MySqlDbType.VarChar,255), + new MySqlParameter("@Reserve2", MySqlDbType.VarChar,255), + new MySqlParameter("@Reserve3", MySqlDbType.VarChar,255), + new MySqlParameter("@Reserve4", MySqlDbType.VarChar,255), + new MySqlParameter("@Reserve5", MySqlDbType.VarChar,255)}; + parameters[0].Value = model.PolicyId; + parameters[1].Value = model.PolicyName; + parameters[2].Value = model.PolicyDevice; + parameters[3].Value = model.Reserve1; + parameters[4].Value = model.Reserve2; + parameters[5].Value = model.Reserve3; + parameters[6].Value = model.Reserve4; + parameters[7].Value = model.Reserve5; + + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + /// + /// 更新一条数据 + /// + public bool Update(DataService.Model.policy_device model) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("update policy_device set "); + strSql.Append("PolicyName=@PolicyName,"); + strSql.Append("PolicyDevice=@PolicyDevice,"); + strSql.Append("Reserve1=@Reserve1,"); + strSql.Append("Reserve2=@Reserve2,"); + strSql.Append("Reserve3=@Reserve3,"); + strSql.Append("Reserve4=@Reserve4,"); + strSql.Append("Reserve5=@Reserve5"); + strSql.Append(" where PolicyId=@PolicyId "); + MySqlParameter[] parameters = { + new MySqlParameter("@PolicyName", MySqlDbType.VarChar,255), + new MySqlParameter("@PolicyDevice", MySqlDbType.VarChar,255), + new MySqlParameter("@Reserve1", MySqlDbType.VarChar,255), + new MySqlParameter("@Reserve2", MySqlDbType.VarChar,255), + new MySqlParameter("@Reserve3", MySqlDbType.VarChar,255), + new MySqlParameter("@Reserve4", MySqlDbType.VarChar,255), + new MySqlParameter("@Reserve5", MySqlDbType.VarChar,255), + new MySqlParameter("@PolicyId", MySqlDbType.VarChar,255)}; + parameters[0].Value = model.PolicyName; + parameters[1].Value = model.PolicyDevice; + parameters[2].Value = model.Reserve1; + parameters[3].Value = model.Reserve2; + parameters[4].Value = model.Reserve3; + parameters[5].Value = model.Reserve4; + parameters[6].Value = model.Reserve5; + parameters[7].Value = model.PolicyId; + + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + + /// + /// 删除一条数据 + /// + public bool Delete(string PolicyId) + { + + StringBuilder strSql=new StringBuilder(); + strSql.Append("delete from policy_device "); + strSql.Append(" where PolicyId=@PolicyId "); + MySqlParameter[] parameters = { + new MySqlParameter("@PolicyId", MySqlDbType.VarChar,255) }; + parameters[0].Value = PolicyId; + + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + /// + /// 批量删除数据 + /// + public bool DeleteList(string PolicyIdlist ) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("delete from policy_device "); + strSql.Append(" where PolicyId in ("+PolicyIdlist + ") "); + int rows=DbHelperMySQL.ExecuteSql(strSql.ToString()); + if (rows > 0) + { + return true; + } + else + { + return false; + } + } + + + /// + /// 得到一个对象实体 + /// + public DataService.Model.policy_device GetModel(string PolicyId) + { + + StringBuilder strSql=new StringBuilder(); + strSql.Append("select PolicyId,PolicyName,PolicyDevice,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 from policy_device "); + strSql.Append(" where PolicyId=@PolicyId "); + MySqlParameter[] parameters = { + new MySqlParameter("@PolicyId", MySqlDbType.VarChar,255) }; + parameters[0].Value = PolicyId; + + DataService.Model.policy_device model=new DataService.Model.policy_device(); + DataSet ds=DbHelperMySQL.Query(strSql.ToString(),parameters); + if(ds.Tables[0].Rows.Count>0) + { + return DataRowToModel(ds.Tables[0].Rows[0]); + } + else + { + return null; + } + } + + + /// + /// 得到一个对象实体 + /// + public DataService.Model.policy_device DataRowToModel(DataRow row) + { + DataService.Model.policy_device model=new DataService.Model.policy_device(); + if (row != null) + { + if(row["PolicyId"]!=null) + { + model.PolicyId=row["PolicyId"].ToString(); + } + if(row["PolicyName"]!=null) + { + model.PolicyName=row["PolicyName"].ToString(); + } + if(row["PolicyDevice"]!=null) + { + model.PolicyDevice=row["PolicyDevice"].ToString(); + } + if(row["Reserve1"]!=null) + { + model.Reserve1=row["Reserve1"].ToString(); + } + if(row["Reserve2"]!=null) + { + model.Reserve2=row["Reserve2"].ToString(); + } + if(row["Reserve3"]!=null) + { + model.Reserve3=row["Reserve3"].ToString(); + } + if(row["Reserve4"]!=null) + { + model.Reserve4=row["Reserve4"].ToString(); + } + if(row["Reserve5"]!=null) + { + model.Reserve5=row["Reserve5"].ToString(); + } + } + return model; + } + + /// + /// 获得数据列表 + /// + public DataSet GetList(string strWhere) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("select PolicyId,PolicyName,PolicyDevice,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 "); + strSql.Append(" FROM policy_device "); + if(strWhere.Trim()!="") + { + strSql.Append(" where "+strWhere); + } + return DbHelperMySQL.Query(strSql.ToString()); + } + + /// + /// 获取记录总数 + /// + public int GetRecordCount(string strWhere) + { + StringBuilder strSql=new StringBuilder(); + strSql.Append("select count(1) FROM policy_device "); + 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.PolicyId desc"); + } + strSql.Append(")AS Row, T.* from policy_device 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 DbHelperMySQL.Query(strSql.ToString()); + } + + /* + /// + /// 分页获取数据列表 + /// + public DataSet GetList(int PageSize,int PageIndex,string strWhere) + { + MySqlParameter[] parameters = { + new MySqlParameter("@tblName", MySqlDbType.VarChar, 255), + new MySqlParameter("@fldName", MySqlDbType.VarChar, 255), + new MySqlParameter("@PageSize", MySqlDbType.Int32), + new MySqlParameter("@PageIndex", MySqlDbType.Int32), + new MySqlParameter("@IsReCount", MySqlDbType.Bit), + new MySqlParameter("@OrderType", MySqlDbType.Bit), + new MySqlParameter("@strWhere", MySqlDbType.VarChar,1000), + }; + parameters[0].Value = "policy_device"; + parameters[1].Value = "PolicyId"; + parameters[2].Value = PageSize; + parameters[3].Value = PageIndex; + parameters[4].Value = 0; + parameters[5].Value = 0; + parameters[6].Value = strWhere; + return DbHelperMySQL.RunProcedure("UP_GetRecordByPage",parameters,"ds"); + }*/ + + #endregion BasicMethod + #region ExtensionMethod + + #endregion ExtensionMethod + } +} + diff --git a/DataService/DataService.csproj b/DataService/DataService.csproj index ca98b22..865bb34 100644 --- a/DataService/DataService.csproj +++ b/DataService/DataService.csproj @@ -89,6 +89,7 @@ + @@ -102,6 +103,7 @@ + @@ -111,6 +113,7 @@ + @@ -120,6 +123,7 @@ + diff --git a/DataService/Model/policy_device.cs b/DataService/Model/policy_device.cs new file mode 100644 index 0000000..2dc51e9 --- /dev/null +++ b/DataService/Model/policy_device.cs @@ -0,0 +1,105 @@ +/** 版本信息模板在安装目录下，可自行修改。 +* policy_device.cs +* +* 功 能： N/A +* 类 名： policy_device +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +* V0.01 2024/3/20 9:39:56 N/A 初版 +* +* Copyright (c) 2012 Maticsoft Corporation. All rights reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　版权所有：动软卓越（北京）科技有限公司　　　　　　　　　　　　　　│ +*└──────────────────────────────────┘ +*/ +using System; +namespace DataService.Model +{ + /// + /// policy_device:实体类(属性说明自动提取数据库字段的描述信息) + /// + [Serializable] + public partial class policy_device + { + public policy_device() + {} + #region Model + private string _policyid; + private string _policyname; + private string _policydevice; + private string _reserve1; + private string _reserve2; + private string _reserve3; + private string _reserve4; + private string _reserve5; + /// + /// + /// + public string PolicyId + { + set{ _policyid=value;} + get{return _policyid;} + } + /// + /// + /// + public string PolicyName + { + set{ _policyname=value;} + get{return _policyname;} + } + /// + /// + /// + public string PolicyDevice + { + set{ _policydevice=value;} + get{return _policydevice;} + } + /// + /// + /// + public string Reserve1 + { + set{ _reserve1=value;} + get{return _reserve1;} + } + /// + /// + /// + public string Reserve2 + { + set{ _reserve2=value;} + get{return _reserve2;} + } + /// + /// + /// + public string Reserve3 + { + set{ _reserve3=value;} + get{return _reserve3;} + } + /// + /// + /// + public string Reserve4 + { + set{ _reserve4=value;} + get{return _reserve4;} + } + /// + /// + /// + public string Reserve5 + { + set{ _reserve5=value;} + get{return _reserve5;} + } + #endregion Model + + } +} + diff --git a/DataService/api/get_single_control.cs b/DataService/api/get_single_control.cs index 5f86ea6..f10e31b 100644 --- a/DataService/api/get_single_control.cs +++ b/DataService/api/get_single_control.cs @@ -14,6 +14,7 @@ namespace DataService.api } public class single_controlData { + public string Id { get; set; } public string name { get; set; } public string State { get; set; } } diff --git a/DataService/api/get_strategy_compilation.cs b/DataService/api/get_strategy_compilation.cs new file mode 100644 index 0000000..5cebfcc --- /dev/null +++ b/DataService/api/get_strategy_compilation.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DataService.api +{ + public class get_strategy_compilation + { + public int code { get; set; } + public string msg { get; set; } + public List data { get; set; } + } + public class strategy_compilationData + { + public List PlantName { get; set; } + public List UnitName { get; set; } + } +} diff --git a/DataService/bin/Debug/DataService.dll b/DataService/bin/Debug/DataService.dll index 3c69fa4..c56917e 100644 Binary files a/DataService/bin/Debug/DataService.dll and b/DataService/bin/Debug/DataService.dll differ diff --git a/DataService/bin/Debug/DataService.pdb b/DataService/bin/Debug/DataService.pdb index 08a1f89..9f5ab39 100644 Binary files a/DataService/bin/Debug/DataService.pdb and b/DataService/bin/Debug/DataService.pdb differ diff --git a/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache b/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache index e8193c3..9c79cd3 100644 --- a/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache +++ b/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -b71e33957bcf55aa762eabbacd9ebc7eeb582c01 +cf2cf77474c777e9f1588d28fda551996731fde6 diff --git a/DataService/obj/Debug/DataService.dll b/DataService/obj/Debug/DataService.dll index 3c69fa4..c56917e 100644 Binary files a/DataService/obj/Debug/DataService.dll and b/DataService/obj/Debug/DataService.dll differ diff --git a/DataService/obj/Debug/DataService.pdb b/DataService/obj/Debug/DataService.pdb index 08a1f89..9f5ab39 100644 Binary files a/DataService/obj/Debug/DataService.pdb and b/DataService/obj/Debug/DataService.pdb differ diff --git a/LonglslandExhibitionCenter/Controllers/api/GetLoopRankingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetLoopRankingController.cs index 7ffac36..c012af0 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetLoopRankingController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetLoopRankingController.cs @@ -61,7 +61,11 @@ namespace LonglslandExhibitionCenter.Controllers.api EH = item.EH, Ranking = "TOP" + count }; - bdata.Add(model); + if (count < 6) + { + bdata.Add(model); + } + } res.code = 200; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetPolicyEditingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetPolicyEditingController.cs index 8ddda5a..cbe185a 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetPolicyEditingController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetPolicyEditingController.cs @@ -33,7 +33,14 @@ namespace LonglslandExhibitionCenter.Controllers.api modellist.StrategyId = blist.StrategyId; modellist.StrategyName = name; modellist.StrategyState= blist.StrategyState; - modellist.Reserve1 = value; + if (value == null) + { + modellist.Reserve1 = null; + } + else + { + modellist.Reserve1 = value; + } bll.Update(modellist); var list= bll.GetModelList(" StrategyName='" + name + "'").FirstOrDefault(); var alist = bll_unit.GetModelList(""); diff --git a/LonglslandExhibitionCenter/Controllers/api/GetSingleControlController.cs b/LonglslandExhibitionCenter/Controllers/api/GetSingleControlController.cs index 44ab3cf..85c9322 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetSingleControlController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetSingleControlController.cs @@ -30,6 +30,7 @@ namespace LonglslandExhibitionCenter.Controllers.api { var model = new single_controlData() { + Id=item.LightingId, name = item.LightingName, State = item.LightingState }; diff --git a/LonglslandExhibitionCenter/Controllers/api/GetStrategyCompilationController.cs b/LonglslandExhibitionCenter/Controllers/api/GetStrategyCompilationController.cs new file mode 100644 index 0000000..372b779 --- /dev/null +++ b/LonglslandExhibitionCenter/Controllers/api/GetStrategyCompilationController.cs @@ -0,0 +1,69 @@ +using DataService.api; +using Microsoft.Ajax.Utilities; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Text; +using System.Web.Http; + +namespace LonglslandExhibitionCenter.Controllers.api +{ + /// + /// 获取开机设备 + /// + public class GetStrategyCompilationController : ApiController + { + DataService.BLL.boot_strategy bll = new DataService.BLL.boot_strategy(); + DataService.BLL.policy_device bll_policy = new DataService.BLL.policy_device(); + // GET api/ + public HttpResponseMessage Get(string name = "") + { + var res = new get_strategy_compilation(); + try + { + if (!string.IsNullOrEmpty(name)) + { + var data = new List(); + var list = bll.GetModelList(""); + var list2 = bll_policy.GetModelList(""); + var alist = list.Where(x => x.StrategyName == name).FirstOrDefault(); + var slist1 = alist.Reserve1; + string[] strArray = slist1.Split(','); + List blist = new List(strArray); + foreach (var item in strArray) + { + blist.Add(item.Trim()); + } + var plist = new List(); + foreach (var item in list2) + { + plist.Add(item.PolicyName); + } + var model = new strategy_compilationData(); + model.UnitName = blist; + model.PlantName = plist; + data.Add(model); + res.code = 200; + res.msg = "成功"; + res.data = data; + } + else + { + res.code = 201; + res.msg = "参数不能为空"; + } + } + catch (Exception ex) + { + + res.code = 500; + res.msg = ex.Message; + } + HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") }; + return result; + } + } +} \ No newline at end of file diff --git a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj index 6af4d36..ea1456f 100644 --- a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj +++ b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj @@ -186,6 +186,7 @@ + diff --git a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user index b1dae8e..16c8208 100644 --- a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user +++ b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU E:\林谷项目\长岛展览馆项目\后端\LonglslandExhibitionCenter\LonglslandExhibitionCenter\Properties\PublishProfiles\FolderProfile.pubxml diff --git a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user index 8f1ce89..cbce6f2 100644 --- a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>E:\林谷项目\长岛展览馆项目\发布文件 - True|2024-03-07T08:29:08.9381292Z;True|2024-03-05T14:31:05.6269677+08:00;True|2024-03-04T14:37:08.7040845+08:00;True|2024-02-28T11:11:35.8506164+08:00; + True|2024-03-20T01:52:41.5444999Z;True|2024-03-20T09:52:28.9463180+08:00;True|2024-03-19T16:26:27.2407972+08:00;True|2024-03-19T15:50:07.1464827+08:00;True|2024-03-14T15:48:46.0852411+08:00;True|2024-03-12T11:15:35.2934238+08:00;True|2024-03-07T16:29:08.9381292+08:00;True|2024-03-05T14:31:05.6269677+08:00;True|2024-03-04T14:37:08.7040845+08:00;True|2024-02-28T11:11:35.8506164+08:00; @@ -79,19 +79,19 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 09/10/2013 16:29:20 - 03/04/2024 10:39:01 + 03/20/2024 10:07:16 - 03/04/2024 10:39:01 + 03/20/2024 10:07:16 12/13/2023 14:16:07 - 03/07/2024 16:29:08 + 03/20/2024 10:14:04 - 03/07/2024 16:29:08 + 03/20/2024 10:14:04 12/13/2023 14:16:06 @@ -430,7 +430,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 03/05/2024 14:17:15 - 03/04/2024 14:14:25 + 03/14/2024 15:48:22 02/28/2024 10:45:48 @@ -448,7 +448,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 03/05/2024 14:24:07 - 03/04/2024 11:29:09 + 03/12/2024 10:33:53 02/05/2024 13:40:46 @@ -457,7 +457,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 02/28/2024 10:41:48 - 02/23/2024 16:36:55 + 03/12/2024 11:14:36 + + + 03/20/2024 10:11:48 03/05/2024 14:24:04 diff --git a/LonglslandExhibitionCenter/bin/DataService.dll b/LonglslandExhibitionCenter/bin/DataService.dll index 3c69fa4..c56917e 100644 Binary files a/LonglslandExhibitionCenter/bin/DataService.dll and b/LonglslandExhibitionCenter/bin/DataService.dll differ diff --git a/LonglslandExhibitionCenter/bin/DataService.pdb b/LonglslandExhibitionCenter/bin/DataService.pdb index 08a1f89..9f5ab39 100644 Binary files a/LonglslandExhibitionCenter/bin/DataService.pdb and b/LonglslandExhibitionCenter/bin/DataService.pdb differ diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll index 1330f5b..dbda299 100644 Binary files a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb index e3ed1c2..a8389f9 100644 Binary files a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb differ diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache index f97a883..c4f1cb7 100644 Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache differ diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache index 99d0285..e1497c3 100644 --- a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache +++ b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -c7a2e736946fd38475aa805ed8a0929fcf1ad549 +65458ecc580a2202fc70a873c976f472e79ecacb diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll index 0a3b13b..dbda299 100644 Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb index 323bf2b..a8389f9 100644 Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb differ diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.AssemblyReference.cache b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.AssemblyReference.cache index eb71f02..4b79570 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.AssemblyReference.cache and b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.AssemblyReference.cache differ diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache index 88dc8c8..ecbe8d1 100644 --- a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache +++ b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -5e09c650feb6b30b4cef77487d691557cc5a57b4 +c1b222264fd394fa20624931d7820c15476d6379 diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll index 1330f5b..8621592 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb index e3ed1c2..a5796c9 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb differ diff --git a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.dll b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.dll index 3c69fa4..c56917e 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.dll and b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.dll differ diff --git a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.pdb b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.pdb index 08a1f89..9f5ab39 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.pdb and b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.pdb differ diff --git a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll index 1330f5b..8621592 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb index e3ed1c2..a5796c9 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb differ diff --git a/Security/bin/Debug/DataService.dll b/Security/bin/Debug/DataService.dll index 3c69fa4..c56917e 100644 Binary files a/Security/bin/Debug/DataService.dll and b/Security/bin/Debug/DataService.dll differ diff --git a/Security/bin/Debug/DataService.pdb b/Security/bin/Debug/DataService.pdb index 08a1f89..9f5ab39 100644 Binary files a/Security/bin/Debug/DataService.pdb and b/Security/bin/Debug/DataService.pdb differ diff --git a/Security/bin/Debug/ServiceSecurity.application b/Security/bin/Debug/ServiceSecurity.application index c4c0c8e..ecaca07 100644 --- a/Security/bin/Debug/ServiceSecurity.application +++ b/Security/bin/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - twzBcuNTw8doKi+yt8Dcftn3tpRPyy8wXHPGyymirdU= + ysT40iU2igpjZx6kj9cCT/Lt6BsLUnPOcZvNsro9iuE= diff --git a/Security/bin/Debug/ServiceSecurity.exe.manifest b/Security/bin/Debug/ServiceSecurity.exe.manifest index ab2bc81..fce3630 100644 --- a/Security/bin/Debug/ServiceSecurity.exe.manifest +++ b/Security/bin/Debug/ServiceSecurity.exe.manifest @@ -42,14 +42,14 @@ - + - /0gk9TivMCAYEfdiZbuFKZwfpgn1r6q9t3fB0uGtgy0= + lQLMjFJzajZHSOUSCvVbfOucJWf30Tx0kbX6cpFzI6I= diff --git a/Security/obj/Debug/Security.csproj.AssemblyReference.cache b/Security/obj/Debug/Security.csproj.AssemblyReference.cache index 0df39e1..207c46e 100644 Binary files a/Security/obj/Debug/Security.csproj.AssemblyReference.cache and b/Security/obj/Debug/Security.csproj.AssemblyReference.cache differ diff --git a/Security/obj/Debug/ServiceSecurity.application b/Security/obj/Debug/ServiceSecurity.application index c4c0c8e..ecaca07 100644 --- a/Security/obj/Debug/ServiceSecurity.application +++ b/Security/obj/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - twzBcuNTw8doKi+yt8Dcftn3tpRPyy8wXHPGyymirdU= + ysT40iU2igpjZx6kj9cCT/Lt6BsLUnPOcZvNsro9iuE= diff --git a/Security/obj/Debug/ServiceSecurity.exe.manifest b/Security/obj/Debug/ServiceSecurity.exe.manifest index ab2bc81..fce3630 100644 --- a/Security/obj/Debug/ServiceSecurity.exe.manifest +++ b/Security/obj/Debug/ServiceSecurity.exe.manifest @@ -42,14 +42,14 @@ - + - /0gk9TivMCAYEfdiZbuFKZwfpgn1r6q9t3fB0uGtgy0= + lQLMjFJzajZHSOUSCvVbfOucJWf30Tx0kbX6cpFzI6I=