XKH
/
DongYing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

拉取

This commit is contained in:
xukanghao 2024-01-31 18:10:44 +08:00
parent 520161b384
commit f40307769a
48 changed files with 1301 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
DataServer/BLL/device_host.cs Normal file
View File

@ -0,0 +1,179 @@
/** 版本信息模板在安装目录下，可自行修改。
* device_host.cs
*
* 功 能： N/A
* 类 名： device_host
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
* V0.01 2024/1/31 17:25:11 N/A 初版
*
* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
*┌──────────────────────────────────┐
*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
*│　版权所有：动软卓越（北京）科技有限公司　　　　　　　　　　　　　　│
*└──────────────────────────────────┘
*/
using System;
using System.Data;
using System.Collections.Generic;
using Maticsoft.Common;
using DataServer.Model;
namespace DataServer.BLL
{
/// <summary>
/// device_host
/// </summary>
public partial class device_host
{
private readonly DataServer.DAL.device_host dal=new DataServer.DAL.device_host();
public device_host()
{}
#region BasicMethod
/// <summary>
/// 是否存在该记录
/// </summary>
public bool Exists(string HostId)
{
return dal.Exists(HostId);
}
/// <summary>
/// 增加一条数据
/// </summary>
public bool Add(DataServer.Model.device_host model)
{
return dal.Add(model);
}
/// <summary>
/// 更新一条数据
/// </summary>
public bool Update(DataServer.Model.device_host model)
{
return dal.Update(model);
}
/// <summary>
/// 删除一条数据
/// </summary>
public bool Delete(string HostId)
{
return dal.Delete(HostId);
}
/// <summary>
/// 删除一条数据
/// </summary>
public bool DeleteList(string HostIdlist )
{
return dal.DeleteList(HostIdlist );
}
/// <summary>
/// 得到一个对象实体
/// </summary>
public DataServer.Model.device_host GetModel(string HostId)
{
return dal.GetModel(HostId);
}
/// <summary>
/// 得到一个对象实体，从缓存中
/// </summary>
public DataServer.Model.device_host GetModelByCache(string HostId)
{
string CacheKey = "device_hostModel-" + HostId;
object objModel = Maticsoft.Common.DataCache.GetCache(CacheKey);
if (objModel == null)
{
try
{
objModel = dal.GetModel(HostId);
if (objModel != null)
{
int ModelCache = Maticsoft.Common.ConfigHelper.GetConfigInt("ModelCache");
Maticsoft.Common.DataCache.SetCache(CacheKey, objModel, DateTime.Now.AddMinutes(ModelCache), TimeSpan.Zero);
}
}
catch{}
}
return (DataServer.Model.device_host)objModel;
}
/// <summary>
/// 获得数据列表
/// </summary>
public DataSet GetList(string strWhere)
{
return dal.GetList(strWhere);
}
/// <summary>
/// 获得数据列表
/// </summary>
public List<DataServer.Model.device_host> GetModelList(string strWhere)
{
DataSet ds = dal.GetList(strWhere);
return DataTableToList(ds.Tables[0]);
}
/// <summary>
/// 获得数据列表
/// </summary>
public List<DataServer.Model.device_host> DataTableToList(DataTable dt)
{
List<DataServer.Model.device_host> modelList = new List<DataServer.Model.device_host>();
int rowsCount = dt.Rows.Count;
if (rowsCount > 0)
{
DataServer.Model.device_host model;
for (int n = 0; n < rowsCount; n++)
{
model = dal.DataRowToModel(dt.Rows[n]);
if (model != null)
{
modelList.Add(model);
}
}
}
return modelList;
}
/// <summary>
/// 获得数据列表
/// </summary>
public DataSet GetAllList()
{
return GetList("");
}
/// <summary>
/// 分页获取数据列表
/// </summary>
public int GetRecordCount(string strWhere)
{
return dal.GetRecordCount(strWhere);
}
/// <summary>
/// 分页获取数据列表
/// </summary>
public DataSet GetListByPage(string strWhere, string orderby, int startIndex, int endIndex)
{
return dal.GetListByPage( strWhere, orderby, startIndex, endIndex);
}
/// <summary>
/// 分页获取数据列表
/// </summary>
//public DataSet GetList(int PageSize,int PageIndex,string strWhere)
//{
//return dal.GetList(PageSize,PageIndex,strWhere);
//}
#endregion BasicMethod
#region ExtensionMethod
#endregion ExtensionMethod
}
}

364
DataServer/DAL/device_host.cs Normal file
View File

@ -0,0 +1,364 @@
/** 版本信息模板在安装目录下，可自行修改。
* device_host.cs
*
* 功 能： N/A
* 类 名： device_host
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
* V0.01 2024/1/31 17:25:11 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 DataServer.DAL
{
/// <summary>
/// 数据访问类:device_host
/// </summary>
public partial class device_host
{
public device_host()
{}
#region BasicMethod
/// <summary>
/// 是否存在该记录
/// </summary>
public bool Exists(string HostId)
{
StringBuilder strSql=new StringBuilder();
strSql.Append("select count(1) from device_host");
strSql.Append(" where HostId=@HostId ");
MySqlParameter[] parameters = {
new MySqlParameter("@HostId", MySqlDbType.VarChar,255) };
parameters[0].Value = HostId;
return DbHelperMySQL.Exists(strSql.ToString(),parameters);
}
/// <summary>
/// 增加一条数据
/// </summary>
public bool Add(DataServer.Model.device_host model)
{
StringBuilder strSql=new StringBuilder();
strSql.Append("insert into device_host(");
strSql.Append("HostId,HostName,DeviceName,DeviceValue,CreateTime,EntireTime,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5)");
strSql.Append(" values (");
strSql.Append("@HostId,@HostName,@DeviceName,@DeviceValue,@CreateTime,@EntireTime,@Reserve1,@Reserve2,@Reserve3,@Reserve4,@Reserve5)");
MySqlParameter[] parameters = {
new MySqlParameter("@HostId", MySqlDbType.VarChar,255),
new MySqlParameter("@HostName", MySqlDbType.VarChar,255),
new MySqlParameter("@DeviceName", MySqlDbType.VarChar,255),
new MySqlParameter("@DeviceValue", MySqlDbType.VarChar,255),
new MySqlParameter("@CreateTime", MySqlDbType.DateTime),
new MySqlParameter("@EntireTime", MySqlDbType.DateTime),
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.HostId;
parameters[1].Value = model.HostName;
parameters[2].Value = model.DeviceName;
parameters[3].Value = model.DeviceValue;
parameters[4].Value = model.CreateTime;
parameters[5].Value = model.EntireTime;
parameters[6].Value = model.Reserve1;
parameters[7].Value = model.Reserve2;
parameters[8].Value = model.Reserve3;
parameters[9].Value = model.Reserve4;
parameters[10].Value = model.Reserve5;
int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters);
if (rows > 0)
{
return true;
}
else
{
return false;
}
}
/// <summary>
/// 更新一条数据
/// </summary>
public bool Update(DataServer.Model.device_host model)
{
StringBuilder strSql=new StringBuilder();
strSql.Append("update device_host set ");
strSql.Append("HostName=@HostName,");
strSql.Append("DeviceName=@DeviceName,");
strSql.Append("DeviceValue=@DeviceValue,");
strSql.Append("CreateTime=@CreateTime,");
strSql.Append("EntireTime=@EntireTime,");
strSql.Append("Reserve1=@Reserve1,");
strSql.Append("Reserve2=@Reserve2,");
strSql.Append("Reserve3=@Reserve3,");
strSql.Append("Reserve4=@Reserve4,");
strSql.Append("Reserve5=@Reserve5");
strSql.Append(" where HostId=@HostId ");
MySqlParameter[] parameters = {
new MySqlParameter("@HostName", MySqlDbType.VarChar,255),
new MySqlParameter("@DeviceName", MySqlDbType.VarChar,255),
new MySqlParameter("@DeviceValue", MySqlDbType.VarChar,255),
new MySqlParameter("@CreateTime", MySqlDbType.DateTime),
new MySqlParameter("@EntireTime", MySqlDbType.DateTime),
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("@HostId", MySqlDbType.VarChar,255)};
parameters[0].Value = model.HostName;
parameters[1].Value = model.DeviceName;
parameters[2].Value = model.DeviceValue;
parameters[3].Value = model.CreateTime;
parameters[4].Value = model.EntireTime;
parameters[5].Value = model.Reserve1;
parameters[6].Value = model.Reserve2;
parameters[7].Value = model.Reserve3;
parameters[8].Value = model.Reserve4;
parameters[9].Value = model.Reserve5;
parameters[10].Value = model.HostId;
int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters);
if (rows > 0)
{
return true;
}
else
{
return false;
}
}
/// <summary>
/// 删除一条数据
/// </summary>
public bool Delete(string HostId)
{
StringBuilder strSql=new StringBuilder();
strSql.Append("delete from device_host ");
strSql.Append(" where HostId=@HostId ");
MySqlParameter[] parameters = {
new MySqlParameter("@HostId", MySqlDbType.VarChar,255) };
parameters[0].Value = HostId;
int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters);
if (rows > 0)
{
return true;
}
else
{
return false;
}
}
/// <summary>
/// 批量删除数据
/// </summary>
public bool DeleteList(string HostIdlist )
{
StringBuilder strSql=new StringBuilder();
strSql.Append("delete from device_host ");
strSql.Append(" where HostId in ("+HostIdlist + ") ");
int rows=DbHelperMySQL.ExecuteSql(strSql.ToString());
if (rows > 0)
{
return true;
}
else
{
return false;
}
}
/// <summary>
/// 得到一个对象实体
/// </summary>
public DataServer.Model.device_host GetModel(string HostId)
{
StringBuilder strSql=new StringBuilder();
strSql.Append("select HostId,HostName,DeviceName,DeviceValue,CreateTime,EntireTime,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 from device_host ");
strSql.Append(" where HostId=@HostId ");
MySqlParameter[] parameters = {
new MySqlParameter("@HostId", MySqlDbType.VarChar,255) };
parameters[0].Value = HostId;
DataServer.Model.device_host model=new DataServer.Model.device_host();
DataSet ds=DbHelperMySQL.Query(strSql.ToString(),parameters);
if(ds.Tables[0].Rows.Count>0)
{
return DataRowToModel(ds.Tables[0].Rows[0]);
}
else
{
return null;
}
}
/// <summary>
/// 得到一个对象实体
/// </summary>
public DataServer.Model.device_host DataRowToModel(DataRow row)
{
DataServer.Model.device_host model=new DataServer.Model.device_host();
if (row != null)
{
if(row["HostId"]!=null)
{
model.HostId=row["HostId"].ToString();
}
if(row["HostName"]!=null)
{
model.HostName=row["HostName"].ToString();
}
if(row["DeviceName"]!=null)
{
model.DeviceName=row["DeviceName"].ToString();
}
if(row["DeviceValue"]!=null)
{
model.DeviceValue=row["DeviceValue"].ToString();
}
if(row["CreateTime"]!=null && row["CreateTime"].ToString()!="")
{
model.CreateTime=DateTime.Parse(row["CreateTime"].ToString());
}
if(row["EntireTime"]!=null && row["EntireTime"].ToString()!="")
{
model.EntireTime=DateTime.Parse(row["EntireTime"].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;
}
/// <summary>
/// 获得数据列表
/// </summary>
public DataSet GetList(string strWhere)
{
StringBuilder strSql=new StringBuilder();
strSql.Append("select HostId,HostName,DeviceName,DeviceValue,CreateTime,EntireTime,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 ");
strSql.Append(" FROM device_host ");
if(strWhere.Trim()!="")
{
strSql.Append(" where "+strWhere);
}
return DbHelperMySQL.Query(strSql.ToString());
}
/// <summary>
/// 获取记录总数
/// </summary>
public int GetRecordCount(string strWhere)
{
StringBuilder strSql=new StringBuilder();
strSql.Append("select count(1) FROM device_host ");
if(strWhere.Trim()!="")
{
strSql.Append(" where "+strWhere);
}
object obj = DbHelperSQL.GetSingle(strSql.ToString());
if (obj == null)
{
return 0;
}
else
{
return Convert.ToInt32(obj);
}
}
/// <summary>
/// 分页获取数据列表
/// </summary>
public DataSet 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.HostId desc");
}
strSql.Append(")AS Row, T.* from device_host 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());
}
/*
/// <summary>
/// 分页获取数据列表
/// </summary>
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 = "device_host";
parameters[1].Value = "HostId";
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
}
}

132
DataServer/Model/device_host.cs Normal file
View File

@ -0,0 +1,132 @@
/** 版本信息模板在安装目录下，可自行修改。
* device_host.cs
*
* 功 能： N/A
* 类 名： device_host
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
* V0.01 2024/1/31 17:25:11 N/A 初版
*
* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
*┌──────────────────────────────────┐
*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
*│　版权所有：动软卓越（北京）科技有限公司　　　　　　　　　　　　　　│
*└──────────────────────────────────┘
*/
using System;
namespace DataServer.Model
{
/// <summary>
/// device_host:实体类(属性说明自动提取数据库字段的描述信息)
/// </summary>
[Serializable]
public partial class device_host
{
public device_host()
{}
#region Model
private string _hostid;
private string _hostname;
private string _devicename;
private string _devicevalue;
private DateTime? _createtime;
private DateTime? _entiretime;
private string _reserve1;
private string _reserve2;
private string _reserve3;
private string _reserve4;
private string _reserve5;
/// <summary>
///
/// </summary>
public string HostId
{
set{ _hostid=value;}
get{return _hostid;}
}
/// <summary>
///
/// </summary>
public string HostName
{
set{ _hostname=value;}
get{return _hostname;}
}
/// <summary>
///
/// </summary>
public string DeviceName
{
set{ _devicename=value;}
get{return _devicename;}
}
/// <summary>
///
/// </summary>
public string DeviceValue
{
set{ _devicevalue=value;}
get{return _devicevalue;}
}
/// <summary>
///
/// </summary>
public DateTime? CreateTime
{
set{ _createtime=value;}
get{return _createtime;}
}
/// <summary>
///
/// </summary>
public DateTime? EntireTime
{
set{ _entiretime=value;}
get{return _entiretime;}
}
/// <summary>
///
/// </summary>
public string Reserve1
{
set{ _reserve1=value;}
get{return _reserve1;}
}
/// <summary>
///
/// </summary>
public string Reserve2
{
set{ _reserve2=value;}
get{return _reserve2;}
}
/// <summary>
///
/// </summary>
public string Reserve3
{
set{ _reserve3=value;}
get{return _reserve3;}
}
/// <summary>
///
/// </summary>
public string Reserve4
{
set{ _reserve4=value;}
get{return _reserve4;}
}
/// <summary>
///
/// </summary>
public string Reserve5
{
set{ _reserve5=value;}
get{return _reserve5;}
}
#endregion Model
}
}

58
DataServer/api/get_essential_information.cs
View File

@ -25,33 +25,35 @@ namespace DataServer.api
}
public class essential_informationData
{
/// <summary>
/// 设备名称
/// </summary>
public string DeviceName { get; set; }
/// <summary>
/// 设备型号
/// </summary>
public string UnitType { get; set; }
/// <summary>
/// 生产厂家
/// </summary>
public string ManuFacturer { get; set; }
/// <summary>
/// 额定容量
/// </summary>
public string RatedCapacity { get; set; }
/// <summary>
/// 额定电压
/// </summary>
public string NominalVoltage { get; set; }
/// <summary>
/// 投运日期
/// </summary>
public string CarryDate { get; set; }
/// <summary>
/// 投运状态
/// </summary>
public string CarryState { get; set; }
///// <summary>
///// 设备名称
///// </summary>
//public string DeviceName { get; set; }
///// <summary>
///// 设备型号
///// </summary>
//public string UnitType { get; set; }
///// <summary>
///// 生产厂家
///// </summary>
//public string ManuFacturer { get; set; }
///// <summary>
///// 额定容量
///// </summary>
//public string RatedCapacity { get; set; }
///// <summary>
///// 额定电压
///// </summary>
//public string NominalVoltage { get; set; }
///// <summary>
///// 投运日期
///// </summary>
//public string CarryDate { get; set; }
///// <summary>
///// 投运状态
///// </summary>
//public string CarryState { get; set; }
public string name { get; set; }
public string value { get; set; }
}
}

BIN
DataServer/bin/Debug/DataServer.pdb
View File

Binary file not shown.

BIN
DataServer/obj/Debug/DataServer.dll
View File

Binary file not shown.

BIN
DataServer/obj/Debug/DataServer.pdb
View File

Binary file not shown.

5
DongYingAPI/Controllers/api/GetAirConditionerController.cs
View File

@ -57,7 +57,7 @@ namespace DongYingAPI.Controllers.api
{
for (int i = 0; i < 6; i++)
{
var atime = DateTime.Now.AddDays(-i).ToString("dd号");
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00";
@ -97,9 +97,10 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata=data.OrderBy(x=>x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
else
{

86
DongYingAPI/Controllers/api/GetCarbonEmissionController.cs
View File

@ -63,27 +63,28 @@ namespace DongYingAPI.Controllers.api
decimal? num4 = 0;
decimal? num5 = 0;
decimal? num6 = 0;
var alist1 = bll.GetModelListDate("EntireTime='" + ztime + "'", time);
var alist2 = bll.GetModelListDate(" EntireTime='" + stime + "'", atime);
foreach (var item in alist)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + ztime + "'", time);
num1 = Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
num4 = Convert.ToDecimal(list2.Sum(x => x.EH));
var list1 = alist1.Where(x => x.DeviceId == item.DeviceId);
num1 += Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = alist2.Where(x => x.DeviceId == item.DeviceId);
num4 += Convert.ToDecimal(list2.Sum(x => x.EH));
}
foreach (var item in blist)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + ztime + "'", time);
num2 = Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
num5 = Convert.ToDecimal(list2.Sum(x => x.EH));
var list1 = alist1.Where(x => x.DeviceId == item.DeviceId);
num2 += Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = alist2.Where(x => x.DeviceId == item.DeviceId);
num5 += Convert.ToDecimal(list2.Sum(x => x.EH));
}
foreach (var item in clist)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + ztime + "'", time);
num3 = Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
num6 = Convert.ToDecimal(list2.Sum(x => x.EH));
var list1 = alist1.Where(x => x.DeviceId == item.DeviceId);
num3 += Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = alist2.Where(x => x.DeviceId == item.DeviceId);
num6 += Convert.ToDecimal(list2.Sum(x => x.EH));
}
var model = new carbon_emissionData()
@ -113,7 +114,7 @@ namespace DongYingAPI.Controllers.api
{
bll.CreateTable(time);
}
var jtime = now.AddDays(-i).ToString("dd号");
var jtime = now.AddDays(-i).ToString("MM-dd");
var ztime = "";
if (i == 0)
{
@ -140,27 +141,28 @@ namespace DongYingAPI.Controllers.api
decimal? num4 = 0;
decimal? num5 = 0;
decimal? num6 = 0;
var alist1 = bll.GetModelListDate("EntireTime='" + ztime + "'", time);
var alist2= bll.GetModelListDate(" EntireTime='" + stime + "'", atime);
foreach (var item in alist)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + ztime + "'", time);
num1 = Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
num4 = Convert.ToDecimal(list2.Sum(x => x.EH));
var list1 = alist1.Where(x=>x.DeviceId==item.DeviceId);
num1 += Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = alist2.Where(x => x.DeviceId == item.DeviceId);
num4 += Convert.ToDecimal(list2.Sum(x => x.EH));
}
foreach (var item in blist)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + ztime + "'", time);
num2 = Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
num5 = Convert.ToDecimal(list2.Sum(x => x.EH));
var list1 = alist1.Where(x => x.DeviceId == item.DeviceId);
num2 += Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = alist2.Where(x => x.DeviceId == item.DeviceId);
num5 += Convert.ToDecimal(list2.Sum(x => x.EH));
}
foreach (var item in clist)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + ztime + "'", time);
num3 = Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
num6 = Convert.ToDecimal(list2.Sum(x => x.EH));
var list1 = alist1.Where(x => x.DeviceId == item.DeviceId);
num3 += Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = alist2.Where(x => x.DeviceId == item.DeviceId);
num6 += Convert.ToDecimal(list2.Sum(x => x.EH));
}
var model = new carbon_emissionData()
@ -225,26 +227,28 @@ namespace DongYingAPI.Controllers.api
decimal? num5 = 0;
decimal? num6 = 0;
var alist1 = bll.GetModelListDate("EntireTime='" + ztime + "'", time);
var alist2 = bll.GetModelListDate(" EntireTime='" + stime + "'", atime);
foreach (var item in alist)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + ztime + "'", time);
num1 = Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
num4 = Convert.ToDecimal(list2.Sum(x => x.EH));
var list1 = alist1.Where(x => x.DeviceId == item.DeviceId);
num1 += Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = alist2.Where(x => x.DeviceId == item.DeviceId);
num4 += Convert.ToDecimal(list2.Sum(x => x.EH));
}
foreach (var item in blist)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + ztime + "'", time);
num2 = Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
num5 = Convert.ToDecimal(list2.Sum(x => x.EH));
var list1 = alist1.Where(x => x.DeviceId == item.DeviceId);
num2 += Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = alist2.Where(x => x.DeviceId == item.DeviceId);
num5 += Convert.ToDecimal(list2.Sum(x => x.EH));
}
foreach (var item in clist)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + ztime + "'", time);
num3 = Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
num6 = Convert.ToDecimal(list2.Sum(x => x.EH));
var list1 = alist1.Where(x => x.DeviceId == item.DeviceId);
num3 += Convert.ToDecimal(list1.Sum(x => x.EH));
var list2 = alist2.Where(x => x.DeviceId == item.DeviceId);
num6 += Convert.ToDecimal(list2.Sum(x => x.EH));
}
var model = new carbon_emissionData()
@ -259,10 +263,10 @@ namespace DongYingAPI.Controllers.api
}
}
var adata=data.OrderBy(x=>x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
else
{

5
DongYingAPI/Controllers/api/GetCarbonMeasureController.cs
View File

@ -50,7 +50,7 @@ namespace DongYingAPI.Controllers
{
bll.CreateTable(time);
}
var jtime = now.AddDays(-i).ToString("dd号");
var jtime = now.AddDays(-i).ToString("MM-dd");
var ztime = "";
if (i == 0)
{
@ -153,9 +153,10 @@ namespace DongYingAPI.Controllers
}
}
var adata=data.OrderBy(x=>x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
else
{

42
DongYingAPI/Controllers/api/GetChamberLoadController.cs
View File

@ -40,9 +40,10 @@ namespace DongYingAPI.Controllers.api
var sdate = datetime.AddHours(-i).ToString("yyyy");
var edate = datetime.AddHours(-i + 1);
decimal? num1 = 0;
var alist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='"+item.DeviceId+ "' and EntireTime>='"+sdate+ "' and EntireTime<'"+edate+"'", time);
var list1 = alist.Where(x=>x.DeviceId== item.DeviceId).ToList();
num1 += list1.Sum(x => Convert.ToDecimal(x.P));
}
var model = new power_loadData()
@ -58,14 +59,15 @@ namespace DongYingAPI.Controllers.api
{
for (int i = 0; i < 6; i++)
{
var atime = DateTime.Now.AddDays(-i).ToString("dd号");
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00";
decimal? num1 = 0;
var alist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
var list1 = alist.Where(x => x.DeviceId == item.DeviceId).ToList();
num1 += list1.Sum(x => Convert.ToDecimal(x.P));
}
var model = new power_loadData()
@ -85,9 +87,10 @@ namespace DongYingAPI.Controllers.api
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
var edate = now.AddYears(+1).ToString("yyyy-MM-dd") + " 00:00:00";
decimal? num1 = 0;
var alist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
var list1 = alist.Where(x => x.DeviceId == item.DeviceId).ToList();
num1 += list1.Sum(x => Convert.ToDecimal(x.P));
}
var model = new power_loadData()
@ -98,9 +101,10 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata=data.OrderBy(x=>x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
if (type == "配电室2")
{
@ -117,9 +121,10 @@ namespace DongYingAPI.Controllers.api
var sdate = datetime.AddHours(-i).ToString("yyyy");
var edate = datetime.AddHours(-i + 1);
decimal? num1 = 0;
var alist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
var list1 = alist.Where(x => x.DeviceId == item.DeviceId).ToList();
num1 += list1.Sum(x => Convert.ToDecimal(x.P));
}
var model = new power_loadData()
@ -135,14 +140,15 @@ namespace DongYingAPI.Controllers.api
{
for (int i = 0; i < 6; i++)
{
var atime = DateTime.Now.AddDays(-i).ToString("dd号");
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00";
decimal? num1 = 0;
var alist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
var list1 = alist.Where(x => x.DeviceId == item.DeviceId).ToList();
num1 += list1.Sum(x => Convert.ToDecimal(x.P));
}
var model = new power_loadData()
@ -162,9 +168,10 @@ namespace DongYingAPI.Controllers.api
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
var edate = now.AddYears(+1).ToString("yyyy-MM-dd") + " 00:00:00";
decimal? num1 = 0;
var alist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
var list1 = alist.Where(x => x.DeviceId == item.DeviceId).ToList();
num1 += list1.Sum(x => Convert.ToDecimal(x.P));
}
var model = new power_loadData()
@ -175,9 +182,10 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
if (type == "配电室3")
{
@ -194,9 +202,10 @@ namespace DongYingAPI.Controllers.api
var sdate = datetime.AddHours(-i).ToString("yyyy");
var edate = datetime.AddHours(-i + 1);
decimal? num1 = 0;
var alist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
var list1 = alist.Where(x => x.DeviceId == item.DeviceId).ToList();
num1 += list1.Sum(x => Convert.ToDecimal(x.P));
}
var model = new power_loadData()
@ -212,14 +221,15 @@ namespace DongYingAPI.Controllers.api
{
for (int i = 0; i < 6; i++)
{
var atime = DateTime.Now.AddDays(-i).ToString("dd号");
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00";
decimal? num1 = 0;
var alist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
var list1 = alist.Where(x => x.DeviceId == item.DeviceId).ToList();
num1 += list1.Sum(x => Convert.ToDecimal(x.P));
}
var model = new power_loadData()
@ -239,9 +249,10 @@ namespace DongYingAPI.Controllers.api
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
var edate = now.AddYears(+1).ToString("yyyy-MM-dd") + " 00:00:00";
decimal? num1 = 0;
var alist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
var list1 = alist.Where(x => x.DeviceId == item.DeviceId).ToList();
num1 += list1.Sum(x => Convert.ToDecimal(x.P));
}
var model = new power_loadData()
@ -252,9 +263,10 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
}
else

12
DongYingAPI/Controllers/api/GetCurrentVoltageController.cs
View File

@ -6,6 +6,7 @@ using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Security.Policy;
using System.Text;
using System.Web.Http;
@ -37,10 +38,17 @@ namespace DongYingAPI.Controllers.api
var sdate = now.ToString("yyyy-MM-dd HH:00:00");
var edate = now.AddHours(1).ToString("yyyy-MM-dd HH:00:00");
var list = bll_info.GetModelList("").Where(x => x.DeviceName == room.name).ToList();
var list = bll_info.GetModelList(" DeviceName='"+ room.name + "'");
var alist= bll.GetModelListDate(" EntireTime >='"+sdate+ "' and EntireTime<'"+edate+"'", time);
foreach (var item in list)
{
var list1=bll.GetModelListDate("",time).Where(x=>x.EntireTime>=Convert.ToDateTime(sdate)&&x.EntireTime<Convert.ToDateTime(edate));
var list1=alist.Where(x=>x.DeviceId==item.DeviceId).ToList();
if (list1 == null)
{
model.A = 0;
model.B = 0;
model.C = 0;
}
foreach (var aitem in list1)
{
model.A = aitem.Ia;

3
DongYingAPI/Controllers/api/GetDistributionPowerController.cs
View File

@ -37,9 +37,10 @@ namespace DongYingAPI.Controllers.api
var sdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var edate = now.AddHours(-i + 1).ToString("yyyy-MM-dd HH:00:00");
decimal? num = 0;
var list1= bll.GetModelListDate(" EntireTime>='"+ sdate + "' and EntireTime<'"+ edate + "'", time);
foreach (var item in list)
{
var alist = bll.GetModelListDate("",time).Where(x =>x.DeviceId==item.DeviceId&&x.EntireTime>= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate));
var alist = list1.Where(x => x.DeviceId == item.DeviceId);
foreach (var aitem in alist)
{
num += aitem.EH;

6
DongYingAPI/Controllers/api/GetElectricEquipmentController.cs
View File

@ -50,12 +50,14 @@ namespace DongYingAPI.Controllers.api
var alist = bll_info.GetModelList("");
decimal? num = 0;
decimal? num1 = 0;
var ljlist = bll.GetModelListDate(" EntireTime='" + jdate + "'", jtime);
var lzlist = bll.GetModelListDate(" EntireTime='" + zdate + "'", ztime);
foreach (var item in alist)
{
var model = new electrical_rankingData();
model.ElectricaName = item.DeviceName;
var jlist = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + jdate + "'", jtime);
var zlist = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "'and EntireTime='" + zdate + "'", ztime);
var jlist = ljlist.Where(x=>x.DeviceId== item.DeviceId).ToList();
var zlist = lzlist.Where(x=>x.DeviceId== item.DeviceId).ToList();
num = jlist.Sum(x => Convert.ToDecimal(x.EH));
num1 = zlist.Sum(x => Convert.ToDecimal(x.EH));
model.ElectricaValue = num-num1;

5
DongYingAPI/Controllers/api/GetElectricQuantityController.cs
View File

@ -108,7 +108,7 @@ namespace DongYingAPI.Controllers.api
decimal? num1 = jlist.Sum(item => Convert.ToDecimal(item.EH));
decimal? num2 = slist.Sum(item => Convert.ToDecimal(item.EH));
var model = new electric_quantityData();
model.time = DateTime.Now.AddDays(-i).ToString("dd号");
model.time = DateTime.Now.AddDays(-i).ToString("MM-dd");
model.EH = num1 - num2;
data.Add(model);
}
@ -154,9 +154,10 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata=data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
else
{

46
DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs
View File

@ -22,7 +22,7 @@ namespace DongYingAPI.Controllers
DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data();
DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info();
public HttpResponseMessage Get(string date="")
public HttpResponseMessage Get(string date = "")
{
var res = new get_electricity_consumption();
//表名
@ -32,9 +32,9 @@ namespace DongYingAPI.Controllers
if (!string.IsNullOrEmpty(date))
{
var data = new List<electricity_consumptionData>();
var now=DateTime.Now;
var now = DateTime.Now;
if (date == "日")
{
{
for (int i = 0; i < 6; i++)
{
var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
@ -51,7 +51,7 @@ namespace DongYingAPI.Controllers
{
bll.CreateTable(stime);
}
var jlist = bll.GetModelListDate(" EntireTime='"+jdate+"'", jtime);
var jlist = bll.GetModelListDate(" EntireTime='" + jdate + "'", jtime);
var slist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
//var jlist = bll.GetModelListDate("", jtime).Where(x=>x.EntireTime==Convert.ToDateTime(jdate)).ToList();
//var slist = bll.GetModelListDate("", stime).Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList();
@ -64,23 +64,23 @@ namespace DongYingAPI.Controllers
};
data.Add(model);
}
else
{
decimal? num1 = jlist.Sum(item => Convert.ToDecimal(item.EH));
decimal? num2 = slist.Sum(item => Convert.ToDecimal(item.EH));
var model = new electricity_consumptionData
else
{
Time = Convert.ToDateTime(jdate).ToString("HH:00"),
EH = num1 - num2
};
decimal? num1 = jlist.Sum(item => Convert.ToDecimal(item.EH));
decimal? num2 = slist.Sum(item => Convert.ToDecimal(item.EH));
var model = new electricity_consumptionData
{
Time = Convert.ToDateTime(jdate).ToString("HH:00"),
EH = num1 - num2
};
data.Add(model);
}
}
}
if (date == "月")
if (date == "月")
{
for (int i = 0; i < 6; i++)
{
@ -89,7 +89,7 @@ namespace DongYingAPI.Controllers
{
jdate = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
}
{
jdate = now.AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
}
@ -111,24 +111,24 @@ namespace DongYingAPI.Controllers
decimal? num1 = jlist.Sum(item => Convert.ToDecimal(item.EH));
decimal? num2 = slist.Sum(item => Convert.ToDecimal(item.EH));
var model = new electricity_consumptionData(); ;
model.Time = DateTime.Now.AddDays(-i).ToString("dd号");
model.Time = DateTime.Now.AddDays(-i).ToString("MM-dd");
model.EH = num1 - num2;
data.Add(model);
}
}
if (date == "年")
if (date == "年")
{
for (int i = 0; i < 6; i++)
{
DateTime jdate;
if(i == 0)
if (i == 0)
{
var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00");
jdate=Convert.ToDateTime(jdate1);
var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00");
jdate = Convert.ToDateTime(jdate1);
}
else
{
var jdate1 = now.AddMonths(-i+1).ToString("yyyy-MM-01 00:00:00");
var jdate1 = now.AddMonths(-i + 1).ToString("yyyy-MM-01 00:00:00");
var jdate2 = Convert.ToDateTime(jdate1);
jdate = jdate2.AddDays(-i);
}
@ -138,7 +138,7 @@ namespace DongYingAPI.Controllers
{
bll.CreateTable(jtime);
}
var sdate1= now.AddMonths(-(i)).ToString("yyyy-MM-01 00:00:00");
var sdate1 = now.AddMonths(-(i)).ToString("yyyy-MM-01 00:00:00");
var sdate2 = Convert.ToDateTime(sdate1);
var sdate = sdate2.AddDays(-1);
var stime = sdate.ToString("yyyyMM");

3
DongYingAPI/Controllers/api/GetEnergyTrendsController.cs
View File

@ -104,7 +104,7 @@ namespace DongYingAPI.Controllers.api
}
var model = new energy_trendData()
{
time = DateTime.Now.AddDays(-i).ToString("dd号"),
time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
EH = num1 - num2
};
data.Add(model);
@ -158,6 +158,7 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata=data.OrderBy(x=>x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;

18
DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs
View File

@ -55,11 +55,13 @@ namespace DongYingAPI.Controllers.api
}
var list = bll_info.GetModelList(" FloorName='科技馆一楼'");
var count = 0;
var lalist= bll.GetModelListDate(" EntireTime='" + ztime + "'", time);
var lblist= bll.GetModelListDate(" EntireTime='" + stime + "'", atime);
foreach (var item in list)
{
count++;
//今天
var alist = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + ztime + "'", time);
var alist = lalist.Where(x=>x.DeviceId== item.DeviceId).ToList();
var model = new equipment_monitoringData();
model.SerialNumber = count;
decimal? num1 = 0;
@ -67,7 +69,7 @@ namespace DongYingAPI.Controllers.api
// model.CellName = item.DeviceName;
num1 =alist.Sum(x=>Convert.ToDecimal(x.EH));
//上天
var blist = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
var blist = lblist.Where(x => x.DeviceId == item.DeviceId).ToList();
decimal? num2 = 0;
num2 = blist.Sum(x => Convert.ToDecimal(x.EH));
model.EH = num1 - num2;
@ -102,11 +104,13 @@ namespace DongYingAPI.Controllers.api
}
var list = bll_info.GetModelList(" FloorName='科技馆负一层地源热泵'");
var count = 0;
var lalist = bll.GetModelListDate(" EntireTime='" + ztime + "'", time);
var lblist = bll.GetModelListDate(" EntireTime='" + stime + "'", atime);
foreach (var item in list)
{
count++;
//今天
var alist = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + ztime + "'", time);
var alist = lalist.Where(x => x.DeviceId == item.DeviceId).ToList();
var model = new equipment_monitoringData();
model.SerialNumber = count;
decimal? num1 = 0;
@ -114,7 +118,7 @@ namespace DongYingAPI.Controllers.api
// model.CellName = item.DeviceName;
num1 = alist.Sum(x => Convert.ToDecimal(x.EH));
//上天
var blist = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
var blist = lblist.Where(x => x.DeviceId == item.DeviceId).ToList();
decimal? num2 = 0;
num2 = blist.Sum(x => Convert.ToDecimal(x.EH));
model.EH = num1 - num2;
@ -149,11 +153,13 @@ namespace DongYingAPI.Controllers.api
}
var list = bll_info.GetModelList(" FloorName='图书馆一楼'");
var count = 0;
var lalist = bll.GetModelListDate(" EntireTime='" + ztime + "'", time);
var lblist = bll.GetModelListDate(" EntireTime='" + stime + "'", atime);
foreach (var item in list)
{
count++;
//今天
var alist = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + ztime + "'", time);
var alist = lalist.Where(x => x.DeviceId == item.DeviceId).ToList();
var model = new equipment_monitoringData();
model.SerialNumber = count;
decimal? num1 = 0;
@ -161,7 +167,7 @@ namespace DongYingAPI.Controllers.api
// model.CellName = item.DeviceName;
num1 = alist.Sum(x => Convert.ToDecimal(x.EH));
//上天
var blist = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime='" + stime + "'", atime);
var blist = lblist.Where(x => x.DeviceId == item.DeviceId).ToList();
decimal? num2 = 0;
num2 = blist.Sum(x => Convert.ToDecimal(x.EH));
model.EH = num1 - num2;

41
DongYingAPI/Controllers/api/GetEssentialInformationController.cs
View File

@ -10,6 +10,9 @@ using System.Web.Http;
namespace DongYingAPI.Controllers.api
{
/// <summary>
/// 基本信息
/// </summary>
public class GetEssentialInformationController : ApiController
{
DataServer.BLL.electrotherapy_room bll = new DataServer.BLL.electrotherapy_room();
@ -21,18 +24,38 @@ namespace DongYingAPI.Controllers.api
if (!string.IsNullOrEmpty(room.name))
{
var data = new List<essential_informationData>();
var model=new essential_informationData();
var list=bll.GetModelList("").Where(x=>x.DeviceName== room.name).ToList();
foreach (var item in list)
{
model.DeviceName = item.DeviceName;
model.UnitType = item.UnitType;
model.ManuFacturer =item.ManufactureFactory;
model.RatedCapacity = item.RatedCapacity;
model.NominalVoltage = item.NominalVoltage;
model.CarryDate = item.ManufactureDate;
model.CarryState = item.OperationalCondition;
data.Add(model);
var model1 = new essential_informationData();
model1.name = "设备名称";
model1.value = item.DeviceName;
data.Add(model1);
var model2 = new essential_informationData();
model2.name = "设备型号";
model2.value = item.UnitType;
data.Add(model2);
var model3 = new essential_informationData();
model3.name = "生产厂家";
model3.value = item.ManufactureFactory;
data.Add(model3);
var model4 = new essential_informationData();
model4.name = "额定容量";
model4.value = item.RatedCapacity;
data.Add(model4);
var model5 = new essential_informationData();
model5.name = "额定电压";
model5.value = item.NominalVoltage;
data.Add(model5);
var model6 = new essential_informationData();
model6.name = "投运日期";
model6.value = item.ManufactureDate;
data.Add(model6);
var model7 = new essential_informationData();
model7.name = "投运状态";
model7.value = item.OperationalCondition;
data.Add(model7);
}
res.code = 200;
res.msg = "成功";

5
DongYingAPI/Controllers/api/GetGasConsumptionController.cs
View File

@ -42,7 +42,7 @@ namespace DongYingAPI.Controllers.api
for (int i = 0; i < 6; i++)
{
var now = DateTime.Now;
var time = now.AddDays(-i).ToString("dd号");
var time = now.AddDays(-i).ToString("MM-dd");
var model = new gas_consumptionData();
model.time = time;
model.GasValue = 4400 / 12/31;
@ -69,9 +69,10 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata=data.OrderBy(x=>x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
catch (Exception ex)

5
DongYingAPI/Controllers/api/GetIlluminationLoadController.cs
View File

@ -110,7 +110,7 @@ namespace DongYingAPI.Controllers.api
for (int i = 0; i < 6; i++)
{
var model = new illumination_loadData();
var atime = DateTime.Now.AddDays(-i).ToString("dd号");
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
model.time = atime;
var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
@ -173,9 +173,10 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata=data.OrderBy(x=>x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
catch (Exception ex)

14
DongYingAPI/Controllers/api/GetLightingLoadController.cs
View File

@ -40,9 +40,10 @@ namespace DongYingAPI.Controllers.api
var sdate = datetime.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
var edate = datetime.AddHours(-i + 1).ToString("yyyy-MM-dd HH:00:00");
decimal? num1 = 0;
var llist= bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
var list1 = llist.Where(x => x.DeviceId == item.DeviceId).ToList();
num1 += list1.Sum(x => Convert.ToDecimal(x.P));
}
var model = new lighting_loadData()
@ -58,14 +59,15 @@ namespace DongYingAPI.Controllers.api
{
for (int i = 0; i < 6; i++)
{
var atime = DateTime.Now.AddDays(-i).ToString("dd号");
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
var edate = now.AddDays(+1).ToString("yyyy-MM-dd") + " 00:00:00";
decimal? num1 = 0;
var llist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
var list1 = llist.Where(x => x.DeviceId == item.DeviceId).ToList();
num1 += list1.Sum(x => Convert.ToDecimal(x.P));
}
var model = new lighting_loadData()
@ -85,9 +87,10 @@ namespace DongYingAPI.Controllers.api
var sdate = now.ToString("yyyy-MM") + "-01 00:00:00";
var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00";
decimal? num1 = 0;
var llist = bll.GetModelListDate(" EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
foreach (var item in list)
{
var list1 = bll.GetModelListDate(" DeviceId='" + item.DeviceId + "' and EntireTime>='" + sdate + "' and EntireTime<'" + edate + "'", time);
var list1 = llist.Where(x => x.DeviceId == item.DeviceId).ToList();
num1 += list1.Sum(x => Convert.ToDecimal(x.P));
}
var model = new lighting_loadData()
@ -98,9 +101,10 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata=data.OrderBy(x=>x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
else
{

14
DongYingAPI/Controllers/api/GetPowerLoadController.cs
View File

@ -16,7 +16,6 @@ namespace DongYingAPI.Controllers.api
public class GetPowerLoadController : ApiController
{
DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data();
DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info();
public HttpResponseMessage Get(string date = "")
{
@ -27,9 +26,9 @@ namespace DongYingAPI.Controllers.api
{
var data = new List<power_loadData>();
var time = DateTime.Now.ToString("yyyyMM");
var list = bll.GetModelListDate("", time);
if (date == "日")
{
for (int i = 0; i < 6; i++)
{
@ -39,7 +38,7 @@ namespace DongYingAPI.Controllers.api
var sdate = datetime.AddHours(-i);
var edate = datetime.AddHours(-i + 1);
decimal? num1 = 0;
var list1 = bll.GetModelListDate(" EntireTime='"+ edate + "'", time);
var list1 = list.Where(x=>x.EntireTime>=sdate&&x.EntireTime<edate).ToList();
num1 = list1.Sum(x => Convert.ToDecimal(x.P));
var model = new power_loadData()
{
@ -54,12 +53,12 @@ namespace DongYingAPI.Controllers.api
{
for (int i = 0; i < 6; i++)
{
var atime = DateTime.Now.AddDays(-i).ToString("dd号");
var atime = DateTime.Now.AddDays(-i).ToString("MM-dd");
var now = DateTime.Now.AddDays(-i);
var sdate = now.ToString("yyyy-MM-dd") + " 00:00:00";
var edate = now.AddMonths(+1).ToString("yyyy-MM-dd") + " 00:00:00";
decimal? num1 = 0;
var list1 = bll.GetModelListDate(" EntireTime>='"+sdate+"'and EntireTime<'" + edate + "'", time);
var list1 = list.Where(x => x.EntireTime >=Convert.ToDateTime(sdate) && x.EntireTime <Convert.ToDateTime(edate)).ToList();
num1 = list1.Sum(x => Convert.ToDecimal(x.P));
var model = new power_loadData()
{
@ -78,7 +77,7 @@ namespace DongYingAPI.Controllers.api
var sdate = now.ToString("yyyy-MM") + "-01 00:00:00";
var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00";
decimal? num1 = 0;
var list1 = bll.GetModelListDate(" EntireTime>='" + sdate + "'and EntireTime<'" + edate + "'", time);
var list1 = list.Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate)).ToList();
num1 = list1.Sum(x => Convert.ToDecimal(x.P));
var model = new power_loadData()
{
@ -88,9 +87,10 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata=data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
else
{

70
DongYingAPI/Controllers/api/GetRoomElectricityController.cs
View File

@ -6,6 +6,7 @@ using System.Configuration;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Security.Policy;
using System.Text;
using System.Web.Http;
@ -53,10 +54,12 @@ namespace DongYingAPI.Controllers.api
}
decimal? num1 = 0;
decimal? num2 = 0;
var ljlist = bll.GetModelListDate(" EntireTime='" + jdate + "'", jtime);
var lslist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
foreach (var aitem in list)
{
var jlist = bll.GetModelListDate(" DeviceId='"+ aitem.DeviceId + "' and EntireTime='"+ jdate + "'", jtime);
var slist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + sdate + "'", stime);
var jlist = ljlist.Where(x=>x.DeviceId== aitem.DeviceId).ToList();
var slist = lslist.Where(x=>x.DeviceId== aitem.DeviceId).ToList();
num1 += jlist.Sum(x => Convert.ToDecimal(x.EH));
num2 += slist.Sum(x => Convert.ToDecimal(x.EH));
}
@ -99,16 +102,18 @@ namespace DongYingAPI.Controllers.api
}
decimal? num1 = 0;
decimal? num2 = 0;
var ljlist = bll.GetModelListDate(" EntireTime='" + jdate + "'", jtime);
var lslist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
foreach (var aitem in list)
{
var jlist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + jdate + "'", jtime);
var slist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + sdate + "'", stime);
var jlist = ljlist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
var slist = lslist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
num1 += jlist.Sum(x => Convert.ToDecimal(x.EH));
num2 += slist.Sum(x => Convert.ToDecimal(x.EH));
}
var model = new room_electricityData()
{
time = DateTime.Now.AddDays(-i).ToString("dd号"),
time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
EH = num1 - num2
};
data.Add(model);
@ -147,10 +152,12 @@ namespace DongYingAPI.Controllers.api
}
decimal? num1 = 0;
decimal? num2 = 0;
var ljlist = bll.GetModelListDate(" EntireTime='" + jdate + "'", jtime);
var lslist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
foreach (var aitem in list)
{
var jlist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + jdate + "'", jtime);
var slist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + sdate + "'", stime);
var jlist = ljlist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
var slist = lslist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
num1 += jlist.Sum(x => Convert.ToDecimal(x.EH));
num2 += slist.Sum(x => Convert.ToDecimal(x.EH));
}
@ -162,9 +169,10 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
if (type == "配电室2")
{
@ -191,10 +199,12 @@ namespace DongYingAPI.Controllers.api
}
decimal? num1 = 0;
decimal? num2 = 0;
var ljlist = bll.GetModelListDate(" EntireTime='" + jdate + "'", jtime);
var lslist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
foreach (var aitem in list)
{
var jlist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + jdate + "'", jtime);
var slist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + sdate + "'", stime);
var jlist = ljlist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
var slist = lslist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
num1 += jlist.Sum(x => Convert.ToDecimal(x.EH));
num2 += slist.Sum(x => Convert.ToDecimal(x.EH));
}
@ -237,16 +247,18 @@ namespace DongYingAPI.Controllers.api
}
decimal? num1 = 0;
decimal? num2 = 0;
var ljlist = bll.GetModelListDate(" EntireTime='" + jdate + "'", jtime);
var lslist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
foreach (var aitem in list)
{
var jlist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + jdate + "'", jtime);
var slist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + sdate + "'", stime);
var jlist = ljlist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
var slist = lslist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
num1 += jlist.Sum(x => Convert.ToDecimal(x.EH));
num2 += slist.Sum(x => Convert.ToDecimal(x.EH));
}
var model = new room_electricityData()
{
time = DateTime.Now.AddDays(-i).ToString("dd号"),
time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
EH = num1 - num2
};
data.Add(model);
@ -285,10 +297,12 @@ namespace DongYingAPI.Controllers.api
}
decimal? num1 = 0;
decimal? num2 = 0;
var ljlist = bll.GetModelListDate(" EntireTime='" + jdate + "'", jtime);
var lslist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
foreach (var aitem in list)
{
var jlist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + jdate + "'", jtime);
var slist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + sdate + "'", stime);
var jlist = ljlist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
var slist = lslist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
num1 += jlist.Sum(x => Convert.ToDecimal(x.EH));
num2 += slist.Sum(x => Convert.ToDecimal(x.EH));
}
@ -300,9 +314,10 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
if (type == "配电室3")
{
@ -329,10 +344,12 @@ namespace DongYingAPI.Controllers.api
}
decimal? num1 = 0;
decimal? num2 = 0;
var ljlist = bll.GetModelListDate(" EntireTime='" + jdate + "'", jtime);
var lslist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
foreach (var aitem in list)
{
var jlist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + jdate + "'", jtime);
var slist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + sdate + "'", stime);
var jlist = ljlist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
var slist = lslist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
num1 += jlist.Sum(x => Convert.ToDecimal(x.EH));
num2 += slist.Sum(x => Convert.ToDecimal(x.EH));
}
@ -375,16 +392,18 @@ namespace DongYingAPI.Controllers.api
}
decimal? num1 = 0;
decimal? num2 = 0;
var ljlist = bll.GetModelListDate(" EntireTime='" + jdate + "'", jtime);
var lslist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
foreach (var aitem in list)
{
var jlist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + jdate + "'", jtime);
var slist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + sdate + "'", stime);
var jlist = ljlist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
var slist = lslist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
num1 += jlist.Sum(x => Convert.ToDecimal(x.EH));
num2 += slist.Sum(x => Convert.ToDecimal(x.EH));
}
var model = new room_electricityData()
{
time = DateTime.Now.AddDays(-i).ToString("dd号"),
time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
EH = num1 - num2
};
data.Add(model);
@ -423,10 +442,12 @@ namespace DongYingAPI.Controllers.api
}
decimal? num1 = 0;
decimal? num2 = 0;
var ljlist = bll.GetModelListDate(" EntireTime='" + jdate + "'", jtime);
var lslist = bll.GetModelListDate(" EntireTime='" + sdate + "'", stime);
foreach (var aitem in list)
{
var jlist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + jdate + "'", jtime);
var slist = bll.GetModelListDate(" DeviceId='" + aitem.DeviceId + "' and EntireTime='" + sdate + "'", stime);
var jlist = ljlist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
var slist = lslist.Where(x => x.DeviceId == aitem.DeviceId).ToList();
num1 += jlist.Sum(x => Convert.ToDecimal(x.EH));
num2 += slist.Sum(x => Convert.ToDecimal(x.EH));
}
@ -438,9 +459,10 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata = data.OrderBy(x => x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
}
else

5
DongYingAPI/Controllers/api/GetWaterConsumptionController.cs
View File

@ -59,7 +59,7 @@ namespace DongYingAPI.Controllers.api
for (int i = 0; i < 6; i++)
{
var now = DateTime.Now;
var time = now.AddDays(-i).ToString("dd号");
var time = now.AddDays(-i).ToString("MM-dd");
var ztime = "";
if (i == 0)
{
@ -141,9 +141,10 @@ namespace DongYingAPI.Controllers.api
data.Add(model);
}
}
var adata=data.OrderBy(x=>x.time).ToList();
res.code = 200;
res.msg = "成功";
res.data = data;
res.data = adata;
}
catch (Exception ex)

2
DongYingAPI/DongYingAPI.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>

40
DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
View File

@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Project>
<PropertyGroup>
<_PublishTargetUrl>E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\bin\app.publish\</_PublishTargetUrl>
<History>True|2024-01-30T07:15:26.7880164Z;True|2024-01-30T14:10:09.8489640+08:00;True|2024-01-30T13:16:11.0447202+08:00;True|2024-01-30T09:45:36.4140361+08:00;True|2024-01-29T14:17:38.5560371+08:00;True|2024-01-29T14:16:41.5597407+08:00;True|2024-01-24T17:31:19.5804558+08:00;True|2024-01-20T14:34:47.0539217+08:00;False|2024-01-15T13:49:44.5332318+08:00;True|2024-01-15T11:01:00.7602516+08:00;True|2024-01-15T09:26:27.2161156+08:00;True|2024-01-10T17:34:07.8440850+08:00;False|2024-01-10T17:33:54.1670007+08:00;True|2024-01-10T17:32:39.4867251+08:00;True|2024-01-10T14:45:12.0400450+08:00;</History>
<History>True|2024-01-31T08:21:08.6583762Z;True|2024-01-31T13:41:30.5192673+08:00;True|2024-01-30T15:15:26.7880164+08:00;True|2024-01-30T14:10:09.8489640+08:00;True|2024-01-30T13:16:11.0447202+08:00;True|2024-01-30T09:45:36.4140361+08:00;True|2024-01-29T14:17:38.5560371+08:00;True|2024-01-29T14:16:41.5597407+08:00;True|2024-01-24T17:31:19.5804558+08:00;True|2024-01-20T14:34:47.0539217+08:00;False|2024-01-15T13:49:44.5332318+08:00;True|2024-01-15T11:01:00.7602516+08:00;True|2024-01-15T09:26:27.2161156+08:00;True|2024-01-10T17:34:07.8440850+08:00;False|2024-01-10T17:33:54.1670007+08:00;True|2024-01-10T17:32:39.4867251+08:00;True|2024-01-10T14:45:12.0400450+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@ -79,16 +79,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>09/10/2013 16:29:20</publishTime>
</File>
<File Include="bin/DataServer.dll">
<publishTime>01/24/2024 17:21:03</publishTime>
<publishTime>01/30/2024 18:41:38</publishTime>
</File>
<File Include="bin/DataServer.pdb">
<publishTime>01/24/2024 17:21:03</publishTime>
<publishTime>01/30/2024 18:41:38</publishTime>
</File>
<File Include="bin/DongYingAPI.dll">
<publishTime>01/30/2024 18:00:50</publishTime>
<publishTime>01/31/2024 16:21:08</publishTime>
</File>
<File Include="bin/DongYingAPI.pdb">
<publishTime>01/30/2024 18:00:50</publishTime>
<publishTime>01/31/2024 16:21:08</publishTime>
</File>
<File Include="bin/HslCommunication.dll">
<publishTime>08/03/2021 14:52:26</publishTime>
@ -394,13 +394,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/10/2024 13:26:12</publishTime>
</File>
<File Include="Controllers/api/GetAirConditionerController.cs">
<publishTime>01/30/2024 15:00:22</publishTime>
<publishTime>01/31/2024 13:20:43</publishTime>
</File>
<File Include="Controllers/api/GetBuildingLightingController.cs">
<publishTime>01/30/2024 17:58:16</publishTime>
</File>
<File Include="Controllers/api/GetCarbonEmissionController.cs">
<publishTime>01/30/2024 13:56:56</publishTime>
<publishTime>01/31/2024 16:15:50</publishTime>
</File>
<File Include="Controllers/api/GetCarbonFluxController.cs">
<publishTime>01/11/2024 18:27:33</publishTime>
@ -409,7 +409,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/12/2024 09:45:18</publishTime>
</File>
<File Include="Controllers/api/GetCarbonMeasureController.cs">
<publishTime>01/30/2024 16:54:51</publishTime>
<publishTime>01/31/2024 13:27:02</publishTime>
</File>
<File Include="Controllers/api/GetCarbonOffsetController.cs">
<publishTime>01/10/2024 13:25:43</publishTime>
@ -421,7 +421,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/30/2024 16:49:54</publishTime>
</File>
<File Include="Controllers/api/GetChamberLoadController.cs">
<publishTime>01/30/2024 15:31:37</publishTime>
<publishTime>01/31/2024 13:30:35</publishTime>
</File>
<File Include="Controllers/api/GetCurrentVoltageController.cs">
<publishTime>01/30/2024 09:36:06</publishTime>
@ -436,7 +436,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/12/2024 15:11:10</publishTime>
</File>
<File Include="Controllers/api/GetDistributionPowerController.cs">
<publishTime>01/30/2024 09:36:06</publishTime>
<publishTime>01/31/2024 16:19:42</publishTime>
</File>
<File Include="Controllers/api/GetElectricalConditionController.cs">
<publishTime>01/30/2024 17:01:12</publishTime>
@ -448,34 +448,34 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/30/2024 15:12:00</publishTime>
</File>
<File Include="Controllers/api/GetElectricityConsumptionController.cs">
<publishTime>01/30/2024 13:15:42</publishTime>
<publishTime>01/31/2024 15:59:26</publishTime>
</File>
<File Include="Controllers/api/GetElectricQuantityController.cs">
<publishTime>01/30/2024 14:43:24</publishTime>
<publishTime>01/31/2024 13:38:45</publishTime>
</File>
<File Include="Controllers/api/GetEnergyTrendsController.cs">
<publishTime>01/30/2024 17:21:38</publishTime>
<publishTime>01/31/2024 13:38:45</publishTime>
</File>
<File Include="Controllers/api/GetEquipmentMonitoringController.cs">
<publishTime>01/30/2024 16:43:36</publishTime>
</File>
<File Include="Controllers/api/GetEssentialInformationController.cs">
<publishTime>01/30/2024 09:35:37</publishTime>
<publishTime>01/30/2024 18:43:35</publishTime>
</File>
<File Include="Controllers/api/GetFaultConditionController.cs">
<publishTime>01/11/2024 13:37:00</publishTime>
</File>
<File Include="Controllers/api/GetGasConsumptionController.cs">
<publishTime>01/24/2024 16:40:47</publishTime>
<publishTime>01/31/2024 13:38:45</publishTime>
</File>
<File Include="Controllers/api/GetGeneralCatalogueController.cs">
<publishTime>01/24/2024 17:21:00</publishTime>
</File>
<File Include="Controllers/api/GetIlluminationLoadController.cs">
<publishTime>01/30/2024 17:50:40</publishTime>
<publishTime>01/31/2024 13:36:10</publishTime>
</File>
<File Include="Controllers/api/GetLightingLoadController.cs">
<publishTime>01/30/2024 15:02:26</publishTime>
<publishTime>01/31/2024 13:38:45</publishTime>
</File>
<File Include="Controllers/api/GetLightingMonitoringController.cs">
<publishTime>01/10/2024 16:58:07</publishTime>
@ -487,7 +487,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/30/2024 17:36:42</publishTime>
</File>
<File Include="Controllers/api/GetPowerLoadController.cs">
<publishTime>01/30/2024 14:34:03</publishTime>
<publishTime>01/31/2024 13:38:45</publishTime>
</File>
<File Include="Controllers/api/GetRealtimeDataController.cs">
<publishTime>01/30/2024 09:43:45</publishTime>
@ -496,13 +496,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>01/09/2024 17:02:14</publishTime>
</File>
<File Include="Controllers/api/GetRoomElectricityController.cs">
<publishTime>01/30/2024 16:37:27</publishTime>
<publishTime>01/31/2024 13:34:44</publishTime>
</File>
<File Include="Controllers/api/GetRunningStatusController.cs">
<publishTime>01/30/2024 17:33:34</publishTime>
</File>
<File Include="Controllers/api/GetWaterConsumptionController.cs">
<publishTime>01/11/2024 16:51:02</publishTime>
<publishTime>01/31/2024 13:37:17</publishTime>
</File>
<File Include="Controllers/api/loginController.cs">
<publishTime>01/09/2024 10:54:33</publishTime>

BIN
DongYingAPI/bin/DataServer.dll
View File

Binary file not shown.

BIN
DongYingAPI/bin/DataServer.pdb
View File

Binary file not shown.

BIN
DongYingAPI/bin/DongYingAPI.dll
View File

Binary file not shown.

BIN
DongYingAPI/bin/DongYingAPI.pdb
View File

Binary file not shown.

BIN
DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache
View File

Binary file not shown.

BIN
DongYingAPI/obj/Debug/DongYingAPI.dll
View File

Binary file not shown.

BIN
DongYingAPI/obj/Debug/DongYingAPI.pdb
View File

Binary file not shown.

2
Security/Program.cs
View File

@ -29,7 +29,7 @@ namespace Security
t.Start();
Console.ReadLine();
}
else
{
ServiceBase[] ServicesToRun;
ServicesToRun = new ServiceBase[]

373
Security/ServiceSecurity.cs
View File

@ -34,6 +34,7 @@ namespace Security
static DataServer.BLL.meteorological_station bll_meteorological =new DataServer.BLL.meteorological_station();
static DataServer.BLL.device_state bll_state=new DataServer.BLL.device_state();
static DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info();
//static DataServer.BLL.device_host bll_host=new DataServer.BLL.device_host();
public ServiceSecurity()
{
InitializeComponent();
@ -351,53 +352,58 @@ namespace Security
else
{
var alist = bll_info.GetModelList("").Where(x => x.DeviceId == name).ToList();
if (alist.Count == 0)
if (alist.Count != 0)
{
var model = new DataServer.Model.electricity_data();
model.ElectricityId = Guid.NewGuid().ToString("N");
model.DeviceId = name;
var clist = bll.GetModelListDate("", date).Where(x => x.DeviceId == name && x.EntireTime == Convert.ToDateTime(edate)).ToList();
if (clist.Count == 0)
{
var model = new DataServer.Model.electricity_data();
model.ElectricityId = Guid.NewGuid().ToString("N");
model.DeviceId = name;
#region 数据添加
if (item.dl.ContainsKey("01040005"))
{
model.EH = item.dl["01040005"];
#region 数据添加
if (item.dl.ContainsKey("01040005"))
{
model.EH = item.dl["01040005"];
}
if (item.dl.ContainsKey("01010001"))
{
model.Ua = item.dl["01010001"];
}
if (item.dl.ContainsKey("01010002"))
{
model.Ub = item.dl["01010002"];
}
if (item.dl.ContainsKey("01010003"))
{
model.Uc = item.dl["01010003"];
}
if (item.dl.ContainsKey("01020001"))
{
model.Ia = item.dl["01020001"];
}
if (item.dl.ContainsKey("01020002"))
{
model.Ib = item.dl["01020001"];
}
if (item.dl.ContainsKey("01020003"))
{
model.Ic = item.dl["01020003"];
}
if (item.dl.ContainsKey("01030004"))
{
model.P = item.dl["01030004"];
}
if (item.dl.ContainsKey("01030012"))
{
model.Kvar = item.dl["01030012"];
}
#endregion
model.CreateTime = DateTime.Now;
model.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
bll.AddDate(model, date);
}
if (item.dl.ContainsKey("01010001"))
{
model.Ua = item.dl["01010001"];
}
if (item.dl.ContainsKey("01010002"))
{
model.Ub = item.dl["01010002"];
}
if (item.dl.ContainsKey("01010003"))
{
model.Uc = item.dl["01010003"];
}
if (item.dl.ContainsKey("01020001"))
{
model.Ia = item.dl["01020001"];
}
if (item.dl.ContainsKey("01020002"))
{
model.Ib = item.dl["01020001"];
}
if (item.dl.ContainsKey("01020003"))
{
model.Ic = item.dl["01020003"];
}
if (item.dl.ContainsKey("01030004"))
{
model.P = item.dl["01030004"];
}
if (item.dl.ContainsKey("01030012"))
{
model.Kvar = item.dl["01030012"];
}
#endregion
model.CreateTime = DateTime.Now;
model.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
bll.AddDate(model, date);
}
}
}
@ -5709,6 +5715,285 @@ namespace Security
}
}
}
////设备参数
//if (topic.Contains("/ce5a0665-b5eb-4e75-a6a5-799449c3f092"))
//{
// log.Info("设备参数msg" + msg);
// //设备参数
// var j = msg.Substring(1);
// var data = JsonConvert.DeserializeObject<DataServer.api.get_data_state>(j);
// log.Info("设备参数:" + data);
// if (data.b != null)
// {
// foreach (var item in data.b.dvl)
// {
// var name = "";
// char delimiter = '.'; // 分隔符
// int lastDotIndex = item.da.LastIndexOf(delimiter); // 查找最后一个分隔符的位置
// if (lastDotIndex != -1) // 如果找到分隔符
// {
// name = item.da.Substring(lastDotIndex + 1); // 截取分隔符后面的子字符串
// }
// var now = DateTime.Now;
// var edate = Convert.ToDateTime(now.ToString("yyyy-MM-dd HH:00:00"));
// var alist = bll_state.GetModelList("").Where(x => x.EntireTime == edate).ToList();
// if (alist.Count == 0)
// {
// if (name == "1")
// {
// if (item.dl.ContainsKey("1号压缩机当前容量"))
// {
// var hmodel = new DataServer.Model.device_host();
// hmodel.HostId = Guid.NewGuid().ToString("N");
// hmodel.HostName = "一号主机";
// hmodel.DeviceName = "1号压缩机当前容量";
// int number;
// var stringnumber = item.dl["1号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符
// {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// //smodel.DeviceOneState = number;
// }
// else
// {
// var num = Convert.ToInt32(stringnumber);
// // smodel.DeviceOneState = num;
// }
// }
// if (item.dl.ContainsKey("1号压缩机主机运行状态"))
// {
// var hmodel = new DataServer.Model.device_host();
// int number;
// var stringnumber = item.dl["1号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符
// {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceOneState = number;
// }
// else
// {
// var num = Convert.ToInt32(stringnumber);
// smodel.DeviceOneState = num;
// }
// }
// }
// if (name == "2")
// {
// //状态
// smodel.DeviceId = Guid.NewGuid().ToString("N");
// smodel.DeviceName = "二号主机";
// if (item.dl.ContainsKey("1号压缩机主机运行状态"))
// {
// int number;
// var stringnumber = item.dl["1号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符
// {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceOneState = number;
// }
// else
// {
// var num = Convert.ToInt32(stringnumber);
// smodel.DeviceOneState = num;
// }
// }
// if (item.dl.ContainsKey("2号压缩机主机运行状态"))
// {
// int number;
// var stringnumber = item.dl["2号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符
// {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceTwoState = number;
// }
// else
// {
// var num = Convert.ToInt32(stringnumber);
// smodel.DeviceTwoState = num;
// }
// }
// if (item.dl.ContainsKey("3号压缩机主机运行状态"))
// {
// int number;
// var stringnumber = item.dl["3号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符
// {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceThreeState = number;
// }
// else
// {
// var num = Convert.ToInt32(stringnumber);
// smodel.DeviceThreeState = num;
// }
// }
// smodel.CreateTime = DateTime.Now;
// smodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
// bll_state.Add(smodel);
// }
// if (name == "3")
// {
// //状态
// smodel.DeviceId = Guid.NewGuid().ToString("N");
// smodel.DeviceName = "三号主机";
// if (item.dl.ContainsKey("1号压缩机主机运行状态"))
// {
// int number;
// var stringnumber = item.dl["1号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符
// {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceOneState = number;
// }
// else
// {
// var num = Convert.ToInt32(stringnumber);
// smodel.DeviceOneState = num;
// }
// }
// if (item.dl.ContainsKey("2号压缩机主机运行状态"))
// {
// int number;
// var stringnumber = item.dl["2号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符
// {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceTwoState = number;
// }
// else
// {
// var num = Convert.ToInt32(stringnumber);
// smodel.DeviceTwoState = num;
// }
// }
// if (item.dl.ContainsKey("3号压缩机主机运行状态"))
// {
// int number;
// var stringnumber = item.dl["3号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符
// {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceThreeState = number;
// }
// else
// {
// var num = Convert.ToInt32(stringnumber);
// smodel.DeviceThreeState = num;
// }
// }
// smodel.CreateTime = DateTime.Now;
// smodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
// bll_state.Add(smodel);
// }
// if (name == "4")
// {
// //状态
// smodel.DeviceId = Guid.NewGuid().ToString("N");
// smodel.DeviceName = "四号主机";
// if (item.dl.ContainsKey("1号压缩机主机运行状态"))
// {
// int number;
// var stringnumber = item.dl["1号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符
// {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceOneState = number;
// }
// else
// {
// var num = Convert.ToInt32(stringnumber);
// smodel.DeviceOneState = num;
// }
// }
// if (item.dl.ContainsKey("2号压缩机主机运行状态"))
// {
// int number;
// var stringnumber = item.dl["2号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符
// {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceTwoState = number;
// }
// else
// {
// var num = Convert.ToInt32(stringnumber);
// smodel.DeviceTwoState = num;
// }
// }
// if (item.dl.ContainsKey("3号压缩机主机运行状态"))
// {
// int number;
// var stringnumber = item.dl["3号压缩机主机运行状态"];
// char delimiters = ':'; // 分隔符
// int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
// if (lastDotIndexs != -1) // 如果找到分隔符
// {
// var num = stringnumber.Substring(lastDotIndexs + 1, 1);
// number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
// smodel.DeviceThreeState = number;
// }
// else
// {
// var num = Convert.ToInt32(stringnumber);
// smodel.DeviceThreeState = num;
// }
// }
// smodel.CreateTime = DateTime.Now;
// smodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
// bll_state.Add(smodel);
// }
// }
// }
// }
//}
}
catch (Exception ex)
{

BIN
Security/bin/Debug/DataServer.dll
View File

Binary file not shown.

BIN
Security/bin/Debug/DataServer.pdb
View File

Binary file not shown.

2
Security/bin/Debug/ServiceSecurity.application
View File

@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>0ULmJRYZeWNGvUL5pyvAHqTddil3hcBECeSD+v41Jl4=</dsig:DigestValue>
<dsig:DigestValue>aoc88+8FY3klsP2A/z6KMToSWOQIttHrHP8rOil7WM4=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

BIN
Security/bin/Debug/ServiceSecurity.exe
View File

Binary file not shown.

6
Security/bin/Debug/ServiceSecurity.exe.manifest
View File

@ -42,14 +42,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="163328">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="162304">
<assemblyIdentity name="DataServer" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>f/141RUNQ9u5Ublwk4MRmCmq7mezFnP1L2Sl13sKkrk=</dsig:DigestValue>
<dsig:DigestValue>Mxmk0J80etfRN6I7K6yBoXL0FSF/sshPcFmgRYVeTyQ=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
@ -145,7 +145,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>bsHRD/7TgZFNTnSuZWmAuOpMZaL+hYlpeZFNwm35/PY=</dsig:DigestValue>
<dsig:DigestValue>Zf3WECvVV2p3md+BpjkXIW9z4PJgHamKdrFraeGHhgg=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

BIN
Security/bin/Debug/ServiceSecurity.pdb
View File

Binary file not shown.

BIN
Security/bin/Debug/app.publish/ServiceSecurity.exe
View File

Binary file not shown.

BIN
Security/obj/Debug/Security.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Security/obj/Debug/ServiceSecurity.application
View File

@ -14,7 +14,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>0ULmJRYZeWNGvUL5pyvAHqTddil3hcBECeSD+v41Jl4=</dsig:DigestValue>
<dsig:DigestValue>aoc88+8FY3klsP2A/z6KMToSWOQIttHrHP8rOil7WM4=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

BIN
Security/obj/Debug/ServiceSecurity.exe
View File

Binary file not shown.

6
Security/obj/Debug/ServiceSecurity.exe.manifest
View File

@ -42,14 +42,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="163328">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="162304">
<assemblyIdentity name="DataServer" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
<hash>
<dsig:Transforms>
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>f/141RUNQ9u5Ublwk4MRmCmq7mezFnP1L2Sl13sKkrk=</dsig:DigestValue>
<dsig:DigestValue>Mxmk0J80etfRN6I7K6yBoXL0FSF/sshPcFmgRYVeTyQ=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>
@ -145,7 +145,7 @@
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
</dsig:Transforms>
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
<dsig:DigestValue>bsHRD/7TgZFNTnSuZWmAuOpMZaL+hYlpeZFNwm35/PY=</dsig:DigestValue>
<dsig:DigestValue>Zf3WECvVV2p3md+BpjkXIW9z4PJgHamKdrFraeGHhgg=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

BIN
Security/obj/Debug/ServiceSecurity.pdb
View File

Binary file not shown.