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

提交

This commit is contained in:
xukanghao 2024-01-09 13:32:08 +08:00
parent 1e1a51c87e
commit 613df5fdb8
26 changed files with 691 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,179 @@
/** 版本信息模板在安装目录下，可自行修改。
* device_info.cs
*
* 功 能： N/A
* 类 名： device_info
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
* V0.01 2024/1/9 13:14:33 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_info
/// </summary>
public partial class device_info
{
private readonly DataServer.DAL.device_info dal=new DataServer.DAL.device_info();
public device_info()
{}
#region BasicMethod
/// <summary>
/// 是否存在该记录
/// </summary>
public bool Exists(string DeviceId)
{
return dal.Exists(DeviceId);
}
/// <summary>
/// 增加一条数据
/// </summary>
public bool Add(DataServer.Model.device_info model)
{
return dal.Add(model);
}
/// <summary>
/// 更新一条数据
/// </summary>
public bool Update(DataServer.Model.device_info model)
{
return dal.Update(model);
}
/// <summary>
/// 删除一条数据
/// </summary>
public bool Delete(string DeviceId)
{
return dal.Delete(DeviceId);
}
/// <summary>
/// 删除一条数据
/// </summary>
public bool DeleteList(string DeviceIdlist )
{
return dal.DeleteList(DeviceIdlist );
}
/// <summary>
/// 得到一个对象实体
/// </summary>
public DataServer.Model.device_info GetModel(string DeviceId)
{
return dal.GetModel(DeviceId);
}
/// <summary>
/// 得到一个对象实体，从缓存中
/// </summary>
public DataServer.Model.device_info GetModelByCache(string DeviceId)
{
string CacheKey = "device_infoModel-" + DeviceId;
object objModel = Maticsoft.Common.DataCache.GetCache(CacheKey);
if (objModel == null)
{
try
{
objModel = dal.GetModel(DeviceId);
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_info)objModel;
}
/// <summary>
/// 获得数据列表
/// </summary>
public DataSet GetList(string strWhere)
{
return dal.GetList(strWhere);
}
/// <summary>
/// 获得数据列表
/// </summary>
public List<DataServer.Model.device_info> GetModelList(string strWhere)
{
DataSet ds = dal.GetList(strWhere);
return DataTableToList(ds.Tables[0]);
}
/// <summary>
/// 获得数据列表
/// </summary>
public List<DataServer.Model.device_info> DataTableToList(DataTable dt)
{
List<DataServer.Model.device_info> modelList = new List<DataServer.Model.device_info>();
int rowsCount = dt.Rows.Count;
if (rowsCount > 0)
{
DataServer.Model.device_info 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
}
}

337
DataServer/DAL/device_info.cs Normal file
View File

@ -0,0 +1,337 @@
/** 版本信息模板在安装目录下，可自行修改。
* device_info.cs
*
* 功 能： N/A
* 类 名： device_info
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
* V0.01 2024/1/9 13:14:33 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_info
/// </summary>
public partial class device_info
{
public device_info()
{}
#region BasicMethod
/// <summary>
/// 是否存在该记录
/// </summary>
public bool Exists(string DeviceId)
{
StringBuilder strSql=new StringBuilder();
strSql.Append("select count(1) from device_info");
strSql.Append(" where DeviceId=@DeviceId ");
MySqlParameter[] parameters = {
new MySqlParameter("@DeviceId", MySqlDbType.VarChar,255) };
parameters[0].Value = DeviceId;
return DbHelperMySQL.Exists(strSql.ToString(),parameters);
}
/// <summary>
/// 增加一条数据
/// </summary>
public bool Add(DataServer.Model.device_info model)
{
StringBuilder strSql=new StringBuilder();
strSql.Append("insert into device_info(");
strSql.Append("DeviceId,FloorName,DeviceName,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5)");
strSql.Append(" values (");
strSql.Append("@DeviceId,@FloorName,@DeviceName,@Reserve1,@Reserve2,@Reserve3,@Reserve4,@Reserve5)");
MySqlParameter[] parameters = {
new MySqlParameter("@DeviceId", MySqlDbType.VarChar,255),
new MySqlParameter("@FloorName", MySqlDbType.VarChar,255),
new MySqlParameter("@DeviceName", 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.DeviceId;
parameters[1].Value = model.FloorName;
parameters[2].Value = model.DeviceName;
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;
}
}
/// <summary>
/// 更新一条数据
/// </summary>
public bool Update(DataServer.Model.device_info model)
{
StringBuilder strSql=new StringBuilder();
strSql.Append("update device_info set ");
strSql.Append("FloorName=@FloorName,");
strSql.Append("DeviceName=@DeviceName,");
strSql.Append("Reserve1=@Reserve1,");
strSql.Append("Reserve2=@Reserve2,");
strSql.Append("Reserve3=@Reserve3,");
strSql.Append("Reserve4=@Reserve4,");
strSql.Append("Reserve5=@Reserve5");
strSql.Append(" where DeviceId=@DeviceId ");
MySqlParameter[] parameters = {
new MySqlParameter("@FloorName", MySqlDbType.VarChar,255),
new MySqlParameter("@DeviceName", 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("@DeviceId", MySqlDbType.VarChar,255)};
parameters[0].Value = model.FloorName;
parameters[1].Value = model.DeviceName;
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.DeviceId;
int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters);
if (rows > 0)
{
return true;
}
else
{
return false;
}
}
/// <summary>
/// 删除一条数据
/// </summary>
public bool Delete(string DeviceId)
{
StringBuilder strSql=new StringBuilder();
strSql.Append("delete from device_info ");
strSql.Append(" where DeviceId=@DeviceId ");
MySqlParameter[] parameters = {
new MySqlParameter("@DeviceId", MySqlDbType.VarChar,255) };
parameters[0].Value = DeviceId;
int rows=DbHelperMySQL.ExecuteSql(strSql.ToString(),parameters);
if (rows > 0)
{
return true;
}
else
{
return false;
}
}
/// <summary>
/// 批量删除数据
/// </summary>
public bool DeleteList(string DeviceIdlist )
{
StringBuilder strSql=new StringBuilder();
strSql.Append("delete from device_info ");
strSql.Append(" where DeviceId in ("+DeviceIdlist + ") ");
int rows=DbHelperMySQL.ExecuteSql(strSql.ToString());
if (rows > 0)
{
return true;
}
else
{
return false;
}
}
/// <summary>
/// 得到一个对象实体
/// </summary>
public DataServer.Model.device_info GetModel(string DeviceId)
{
StringBuilder strSql=new StringBuilder();
strSql.Append("select DeviceId,FloorName,DeviceName,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 from device_info ");
strSql.Append(" where DeviceId=@DeviceId ");
MySqlParameter[] parameters = {
new MySqlParameter("@DeviceId", MySqlDbType.VarChar,255) };
parameters[0].Value = DeviceId;
DataServer.Model.device_info model=new DataServer.Model.device_info();
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_info DataRowToModel(DataRow row)
{
DataServer.Model.device_info model=new DataServer.Model.device_info();
if (row != null)
{
if(row["DeviceId"]!=null)
{
model.DeviceId=row["DeviceId"].ToString();
}
if(row["FloorName"]!=null)
{
model.FloorName=row["FloorName"].ToString();
}
if(row["DeviceName"]!=null)
{
model.DeviceName=row["DeviceName"].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 DeviceId,FloorName,DeviceName,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 ");
strSql.Append(" FROM device_info ");
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_info ");
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.DeviceId desc");
}
strSql.Append(")AS Row, T.* from device_info 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_info";
parameters[1].Value = "DeviceId";
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
}
}

3
DataServer/DataServer.csproj
View File

@ -78,15 +78,18 @@
<Compile Include="api\select_switching_room.cs" />
<Compile Include="api\Test.cs" />
<Compile Include="BLL\device_data.cs" />
<Compile Include="BLL\device_info.cs" />
<Compile Include="BLL\device_operation.cs" />
<Compile Include="BLL\electricity_data.cs" />
<Compile Include="BLL\electricity_price.cs" />
<Compile Include="DAL\device_data.cs" />
<Compile Include="api\get_realtime_data.cs" />
<Compile Include="DAL\device_info.cs" />
<Compile Include="DAL\device_operation.cs" />
<Compile Include="DAL\electricity_data.cs" />
<Compile Include="DAL\electricity_price.cs" />
<Compile Include="Model\device_data.cs" />
<Compile Include="Model\device_info.cs" />
<Compile Include="Model\device_operation.cs" />
<Compile Include="Model\electricity_data.cs" />
<Compile Include="Model\electricity_price.cs" />

105
DataServer/Model/device_info.cs Normal file
View File

@ -0,0 +1,105 @@
/** 版本信息模板在安装目录下，可自行修改。
* device_info.cs
*
* 功 能： N/A
* 类 名： device_info
*
* Ver 变更日期 负责人 变更内容
* ───────────────────────────────────
* V0.01 2024/1/9 13:14:33 N/A 初版
*
* Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
*┌──────────────────────────────────┐
*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│
*│　版权所有：动软卓越（北京）科技有限公司　　　　　　　　　　　　　　│
*└──────────────────────────────────┘
*/
using System;
namespace DataServer.Model
{
/// <summary>
/// device_info:实体类(属性说明自动提取数据库字段的描述信息)
/// </summary>
[Serializable]
public partial class device_info
{
public device_info()
{}
#region Model
private string _deviceid;
private string _floorname;
private string _devicename;
private string _reserve1;
private string _reserve2;
private string _reserve3;
private string _reserve4;
private string _reserve5;
/// <summary>
///
/// </summary>
public string DeviceId
{
set{ _deviceid=value;}
get{return _deviceid;}
}
/// <summary>
///
/// </summary>
public string FloorName
{
set{ _floorname=value;}
get{return _floorname;}
}
/// <summary>
///
/// </summary>
public string DeviceName
{
set{ _devicename=value;}
get{return _devicename;}
}
/// <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
}
}

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

Binary file not shown.

2
DataServer/obj/Debug/DataServer.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
7d79bf438b24b7911c0f400411eb86a062fada60
15bbb4e196dffff88387fbe73c0b6671cf6e1fc8

10
DataServer/obj/Debug/DataServer.csproj.FileListAbsolute.txt
View File

@ -8,3 +8,13 @@ E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DataServer\bin\Debug
E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DataServer\bin\Debug\Maticsoft.DBUtility.dll
E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DataServer\bin\Debug\MySql.Data.dll
E:\林谷项目\东营两馆一宫\后端框架\DongYingAPI\DataServer\obj\Debug\DataServer.csproj.CopyComplete
E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\DataServer.dll
E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\DataServer.pdb
E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\Maticsoft.Common.dll
E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\Maticsoft.DBUtility.dll
E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\bin\Debug\MySql.Data.dll
E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.csproj.AssemblyReference.cache
E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.csproj.CoreCompileInputs.cache
E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.csproj.CopyComplete
E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.dll
E:\林谷项目\东营两馆一宫\后端框架\DongYing\DataServer\obj\Debug\DataServer.pdb

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

Binary file not shown.

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

Binary file not shown.

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

@ -15,8 +15,8 @@ namespace DongYingAPI.Controllers.api
/// </summary>
public class GetAirConditionerController : ApiController
{
DataServer.BLL.device_data bll = new DataServer.BLL.device_data();
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 = "")
{
var res = new get_air_conditioner();
@ -25,7 +25,7 @@ namespace DongYingAPI.Controllers.api
if (!string.IsNullOrEmpty(date))
{
var data = new List<air_conditionerData>();
var list = bll.GetModelList("").Where(x=>x.DeviceName.Contains("空调")).ToList();
var list = bll_info.GetModelList("").Where(x=>x.DeviceName.Contains("空调")).ToList();
if (date == "日")
{
@ -35,34 +35,28 @@ namespace DongYingAPI.Controllers.api
{
var model = new air_conditionerData();
var j = i * 150;
var j = i * 120;
b = Convert.ToInt32(a);
string now = "";
if (b < 30)
{
model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00");
now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
//b =Convert.ToInt32(DateTime.Now.AddMinutes(-30).ToString("mm"));
a = "31";
}
else
{
model.time = DateTime.Now.AddMinutes(-j).ToString("HH:30");
now = DateTime.Now.ToString("yyyy-MM-dd HH:31:00");
a = "29";
}
model.time = DateTime.Now.AddMinutes(-j).ToString("HH:00");
now = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
a = "31";
var datetime = Convert.ToDateTime(now);
var sdate = datetime.AddMinutes(-(i + 1) * 150);
var sdate = datetime.AddMinutes(-(i + 1) * 120);
var edate = datetime.AddMinutes(-j);
var list1 = bll.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.CreateTime >= sdate && x.CreateTime < edate).ToList();
decimal? num1 = 0;
foreach (var item in list1)
var time = DateTime.Now.ToString("yyyyMM");
//var list1 = bll_info.GetModelList("").Where(x =>x.DeviceName.Contains("空调")&& x.CreateTime >= sdate && x.CreateTime < edate).ToList();
foreach (var item in list)
{
num1 += item.P;
var list1=bll.GetModelListDate("",time).Where(x=>x.DeviceId== item.DeviceId&&x.CreateTime>=sdate&&x.CreateTime<edate).ToList();
decimal? num1 = 0;
foreach (var aitem in list1)
{
num1 += aitem.P;
}
model.P = num1;
data.Add(model);
}
model.P = num1;
data.Add(model);
}
}
else if (date == "月")
@ -75,13 +69,18 @@ namespace DongYingAPI.Controllers.api
var now = DateTime.Now.AddMonths(-i);
var sdate = now.ToString("yyyy-MM") + "-01 00:00:00";
var edate = now.AddMonths(+1).ToString("yyyy-MM") + "-01 00:00:00";
var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList();
decimal? num = 0;
foreach (var item in alist)
foreach (var item in list)
{
num += item.P;
var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList();
var alist = list1.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList();
decimal? num = 0;
foreach (var aitem in alist)
{
num += aitem.P;
}
model.P = num;
}
model.P = num;
data.Add(model);
}
}
@ -95,13 +94,16 @@ namespace DongYingAPI.Controllers.api
var now = DateTime.Now.AddYears(-i);
var sdate = now.ToString("yyyy") + "-01-01 00:00:00";
var edate = now.AddYears(+1).ToString("yyyy") + "-01-01 00:00:00";
var alist = list.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList();
decimal? num = 0;
foreach (var item in alist)
{
num += item.P;
foreach (var item in list){
var list1 = bll.GetModelListDate("", time).Where(x => x.DeviceId == item.DeviceId).ToList();
var alist = list1.Where(x => x.CreateTime >= Convert.ToDateTime(sdate) && x.CreateTime < Convert.ToDateTime(edate)).ToList();
decimal? num = 0;
foreach (var aitem in alist)
{
num += aitem.P;
}
model.P = num;
}
model.P = num;
data.Add(model);
}
}

3
DongYingAPI/DongYingAPI.csproj
View File

@ -45,7 +45,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="DataServer">
<Reference Include="DataServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\DataServer\bin\Debug\DataServer.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />

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.

10
Security/bin/Debug/App_Data/Logs_20240109.txt
View File

@ -200,3 +200,13 @@
2024-01-09 10:50:07,243 [7] INFO loginfo - ½øÈë·½·¨
2024-01-09 10:50:08,636 [7] INFO loginfo - Êý¾Ý1data{"devs":[{"d":[{"dq":192,"m":"010400051","ts":1704342327,"v":88.667},{"dq":192,"m":"01040005","ts":1704342327,"v":5.000},{"dq":192,"m":"1040006","ts":1704342327,"v":4.000},{"dq":192,"m":"1040007","ts":1704342327,"v":3.000},{"dq":192,"m":"1040008","ts":1704342327,"v":2.000},{"dq":192,"m":"1040009","ts":1704342327,"v":1.000}],"dev":"310510043001"}],"pKey":"data","sn":"6e352ec4-82fc-4db4-80fd-6699871dd1d2","ts":1704342327,"ver":"2.0.0"}
------------------------------------------------
------------------------------------------------
------------------------------------------------
2024-01-09 13:24:05,861 [3] INFO loginfo - 服务开始
2024-01-09 13:24:05,970 [3] INFO loginfo - 开始
2024-01-09 13:24:06,078 [3] INFO loginfo - 连接成功
------------------------------------------------
------------------------------------------------
2024-01-09 13:24:06,082 [3] INFO loginfo - 服务开始
2024-01-09 13:24:06,083 [3] INFO loginfo - 发布连接成功

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>EBfB7rWH7rhlMMF8pi/rhBpJbTKgP4sBeCT9vVAl6h8=</dsig:DigestValue>
<dsig:DigestValue>brRB6Tj3UIh+1hHSCP7cVnP1AJt+M46i6AtPawgLXRE=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

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

@ -42,14 +42,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="66560">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="72192">
<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>ixPV+LB7PJDxkCpxkYqydnifOk0LM5ysR4G0127en+0=</dsig:DigestValue>
<dsig:DigestValue>pmVu1FdbipTM+/iwPnGrii8WA9GAUkEuZ67Robx/skY=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

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>EBfB7rWH7rhlMMF8pi/rhBpJbTKgP4sBeCT9vVAl6h8=</dsig:DigestValue>
<dsig:DigestValue>brRB6Tj3UIh+1hHSCP7cVnP1AJt+M46i6AtPawgLXRE=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>

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

@ -42,14 +42,14 @@
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="66560">
<dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataServer.dll" size="72192">
<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>ixPV+LB7PJDxkCpxkYqydnifOk0LM5ysR4G0127en+0=</dsig:DigestValue>
<dsig:DigestValue>pmVu1FdbipTM+/iwPnGrii8WA9GAUkEuZ67Robx/skY=</dsig:DigestValue>
</hash>
</dependentAssembly>
</dependency>