diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/2a51541b-4d12-469c-bdc0-7d3646cd12b8.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/2a51541b-4d12-469c-bdc0-7d3646cd12b8.vsidx
deleted file mode 100644
index 0d27316..0000000
Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/2a51541b-4d12-469c-bdc0-7d3646cd12b8.vsidx and /dev/null differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/65ffa2a5-08b5-4de9-8ce6-75547ef2b855.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/65ffa2a5-08b5-4de9-8ce6-75547ef2b855.vsidx
new file mode 100644
index 0000000..c876bc0
Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/65ffa2a5-08b5-4de9-8ce6-75547ef2b855.vsidx differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/689cae45-06e2-414f-a762-1ce610d0e654.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/689cae45-06e2-414f-a762-1ce610d0e654.vsidx
deleted file mode 100644
index 3522896..0000000
Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/689cae45-06e2-414f-a762-1ce610d0e654.vsidx and /dev/null differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/f6a6c792-d6a1-47f3-a1ec-4942fb7621c5.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/c2a2c11d-c10b-42ae-b32c-de5a4f2b0958.vsidx
similarity index 66%
rename from .vs/LonglslandExhibitionCenterAPI/FileContentIndex/f6a6c792-d6a1-47f3-a1ec-4942fb7621c5.vsidx
rename to .vs/LonglslandExhibitionCenterAPI/FileContentIndex/c2a2c11d-c10b-42ae-b32c-de5a4f2b0958.vsidx
index f7917bd..f66fd26 100644
Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/f6a6c792-d6a1-47f3-a1ec-4942fb7621c5.vsidx and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/c2a2c11d-c10b-42ae-b32c-de5a4f2b0958.vsidx differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/cb9f9962-f8c0-4182-89de-8e22a10a2bb4.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/cb9f9962-f8c0-4182-89de-8e22a10a2bb4.vsidx
new file mode 100644
index 0000000..fa6223f
Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/cb9f9962-f8c0-4182-89de-8e22a10a2bb4.vsidx differ
diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/.suo b/.vs/LonglslandExhibitionCenterAPI/v17/.suo
index 28a874e..0624b69 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
deleted file mode 100644
index e8f6acd..0000000
--- a/DataService/BLL/policy_device.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-/** 版本信息模板在安装目录下,可自行修改。
-* 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
deleted file mode 100644
index 74acadc..0000000
--- a/DataService/DAL/policy_device.cs
+++ /dev/null
@@ -1,337 +0,0 @@
-/** 版本信息模板在安装目录下,可自行修改。
-* 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 865bb34..27d5c44 100644
--- a/DataService/DataService.csproj
+++ b/DataService/DataService.csproj
@@ -103,7 +103,6 @@
-
@@ -113,7 +112,6 @@
-
@@ -123,7 +121,6 @@
-
diff --git a/DataService/Model/policy_device.cs b/DataService/Model/policy_device.cs
deleted file mode 100644
index 2dc51e9..0000000
--- a/DataService/Model/policy_device.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-/** 版本信息模板在安装目录下,可自行修改。
-* 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/bin/Debug/DataService.dll b/DataService/bin/Debug/DataService.dll
index c56917e..6bced28 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 9f5ab39..75b8b12 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 9c79cd3..ff664b7 100644
--- a/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache
+++ b/DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-cf2cf77474c777e9f1588d28fda551996731fde6
+3d7b754a8e6bef93a538695d1bf4b7d4c716a7b3
diff --git a/DataService/obj/Debug/DataService.dll b/DataService/obj/Debug/DataService.dll
index c56917e..6bced28 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 9f5ab39..75b8b12 100644
Binary files a/DataService/obj/Debug/DataService.pdb and b/DataService/obj/Debug/DataService.pdb differ
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetPolicyEditingController.cs b/LonglslandExhibitionCenter/Controllers/api/GetPolicyEditingController.cs
index cbe185a..eacd642 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetPolicyEditingController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetPolicyEditingController.cs
@@ -26,7 +26,7 @@ namespace LonglslandExhibitionCenter.Controllers.api
var adata = new List();
var bdata = new List();
var cdata=new List();
- if (!string.IsNullOrEmpty(name)&&!string.IsNullOrEmpty(value))
+ if (!string.IsNullOrEmpty(name))
{
var blist = bll.GetModelList(" StrategyName='" + name + "'").FirstOrDefault();
var modellist = new DataService.Model.boot_strategy();
diff --git a/LonglslandExhibitionCenter/Controllers/api/GetStrategyCompilationController.cs b/LonglslandExhibitionCenter/Controllers/api/GetStrategyCompilationController.cs
index 372b779..8a7710c 100644
--- a/LonglslandExhibitionCenter/Controllers/api/GetStrategyCompilationController.cs
+++ b/LonglslandExhibitionCenter/Controllers/api/GetStrategyCompilationController.cs
@@ -17,7 +17,7 @@ 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();
+ DataService.BLL.unit_list bll_policy = new DataService.BLL.unit_list();
// GET api/
public HttpResponseMessage Get(string name = "")
{
@@ -33,14 +33,10 @@ namespace LonglslandExhibitionCenter.Controllers.api
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);
+ plist.Add(item.UnitName);
}
var model = new strategy_compilationData();
model.UnitName = blist;
diff --git a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user
index 16c8208..b1dae8e 100644
--- a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user
+++ b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user
@@ -8,7 +8,7 @@
- Debug|Any CPU
+ Release|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 cbce6f2..16136c5 100644
--- a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -79,19 +79,19 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
09/10/2013 16:29:20
- 03/20/2024 10:07:16
+ 03/20/2024 13:32:13
- 03/20/2024 10:07:16
+ 03/20/2024 13:32:13
12/13/2023 14:16:07
- 03/20/2024 10:14:04
+ 03/20/2024 13:40:35
- 03/20/2024 10:14:04
+ 03/20/2024 13:40:35
12/13/2023 14:16:06
@@ -448,7 +448,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
03/05/2024 14:24:07
- 03/12/2024 10:33:53
+ 03/20/2024 13:25:56
02/05/2024 13:40:46
@@ -460,7 +460,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
03/12/2024 11:14:36
- 03/20/2024 10:11:48
+ 03/20/2024 13:36:25
03/05/2024 14:24:04
diff --git a/LonglslandExhibitionCenter/bin/DataService.dll b/LonglslandExhibitionCenter/bin/DataService.dll
index c56917e..6bced28 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 9f5ab39..75b8b12 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 dbda299..4181377 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 a8389f9..dd22102 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 c4f1cb7..f9ebf44 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.dll b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll
index dbda299..c6669b9 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 a8389f9..386a7af 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 4b79570..05c11e9 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.dll b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll
index 8621592..4181377 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 a5796c9..dd22102 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 c56917e..6bced28 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 9f5ab39..75b8b12 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 8621592..4181377 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 a5796c9..dd22102 100644
Binary files a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb differ