From 2170a55c693cc4fdeb1895c48b2ac9cb0ac5775c Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期六, 04 五月 2024 21:36:16 +0800
Subject: [PATCH] 完善预测DAL
---
.gitignore | 1
WaterPredict/IStation.ChEr.DAL.WaterPredict/IStation.ChEr.DAL.WaterPredict.csproj | 2
WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict_Instance.cs | 30 ++--
WaterPredict/IStation.ChEr.DAL.WaterPredict/Model/WaterPredictRecord.cs | 14 +-
WaterPredict/IStation.ChEr.WebApi.Predict/Startup.cs | 20 +-
WaterPredict/WaterPredict.zip | 0
WaterPredict/IStation.ChEr.Application.WaterPredict/01-info/DebugController.cs | 19 +-
WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict.cs | 213 +++++++++++++++++-------------
WaterPredict/IStation.ChEr.DAL.WaterPredict/Entity/WaterPredictRecord.cs | 14 +-
WaterPredict/IStation.ChEr.DAL.WaterPredict/DB/ConnectionFactory.cs | 48 +-----
10 files changed, 181 insertions(+), 180 deletions(-)
diff --git a/.gitignore b/.gitignore
index 1549c23..0c189d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@
/Library/IStation.Settings.dll
/Library/IStation.Settings.pdb
/WaterPredict/.vs
+/WaterPredict/Station.ChEr.Application.WaterPredict
diff --git a/WaterPredict/IStation.ChEr.Application.WaterPredict/01-info/DebugController.cs b/WaterPredict/IStation.ChEr.Application.WaterPredict/01-info/DebugController.cs
index 0e037c0..0b8046c 100644
--- a/WaterPredict/IStation.ChEr.Application.WaterPredict/01-info/DebugController.cs
+++ b/WaterPredict/IStation.ChEr.Application.WaterPredict/01-info/DebugController.cs
@@ -28,24 +28,25 @@
/// </summary>
[Route("GetLastRecord3")]
[HttpGet]
- public List<IStation.ChEr.Model.WaterPredict> GetLastRecord3()
+ public List<IStation.ChEr.Model.WaterPredictRecord> GetLastRecord3()
{
- IStation.ChEr.BLL.WaterPredict bll = new ChEr.BLL.WaterPredict();
+ IStation.ChEr.BLL.WaterPredictRecord bll = new ChEr.BLL.WaterPredictRecord();
return bll.GetLast(3);
}
+
+
/// <summary>
/// 淇濆瓨鍒版暟鎹簱
/// </summary>
- [Route("SaveDB")]
+ [Route("InsertRecord")]
[HttpGet]
- public string SaveDB()
+ public string InsertRecord()
{
- //var db = new MainDbContext();
- //db.InitTables();
- //var bll = new IStation.BLL.PredictData();
- //bll.GetAll();
- return null;
+ IStation.ChEr.BLL.WaterPredictRecord bll = new ChEr.BLL.WaterPredictRecord();
+ int dayHour = int.Parse(string.Format("{0:00}{1:00}{2:00}", DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour));
+ bll.Insert(new ChEr.Model.WaterPredictRecord() { DayHour = dayHour, RealValue = -1, LastPredictTime=DateTime.Now, PredictTime=DateTime.Now, LastPredictValue = 104, PredictValueList = "101,103,105,107" });
+ return "ok";
}
}
}
\ No newline at end of file
diff --git a/WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict.cs b/WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict.cs
index 985b96f..450a04a 100644
--- a/WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict.cs
+++ b/WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict.cs
@@ -6,7 +6,7 @@
/// <summary>
///
/// </summary>
- public partial class WaterPredict//: IStation.ChEr.DAL.BaseDAL<Entity.WaterPredict>
+ public partial class WaterPredictRecord
{
#region Get
@@ -15,145 +15,176 @@
/// <summary>
/// 鏌ヨnum鏉�
/// </summary>
- public List<Model.WaterPredict> GetLast (int num)
+ public List<Model.WaterPredictRecord> GetLast (int num)
{
var ConnectionConfig = ConnectionFactory.MainConnection(DateTime.Now.Year);
using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
{
- return Entity2Models(db.Queryable<Entity.WaterPredict>().Take(num).ToList());
+ var entitys = db.Queryable<Entity.WaterPredictRecord>().Take(num).ToList();
+ return Entity2Models(entitys);
}
}
/// <summary>
/// 鏌ヨ24鏉�
/// </summary>
- public List<Model.WaterPredict> GetLast24()
+ public List<Model.WaterPredictRecord> GetLast24()
{
var ConnectionConfig = ConnectionFactory.MainConnection(DateTime.Now.Year);
using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
{
- return Entity2Models(db.Queryable<Entity.WaterPredict>().Take(24).ToList());
+ return Entity2Models(db.Queryable<Entity.WaterPredictRecord>().Take(24).ToList());
}
}
/// <summary>
/// 鏌ヨ48鏉�
/// </summary>
- public List<Model.WaterPredict> GetLast48( )
+ public List<Model.WaterPredictRecord> GetLast48( )
{
var ConnectionConfig = ConnectionFactory.MainConnection(DateTime.Now.Year);
using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
{
- return Entity2Models(db.Queryable<Entity.WaterPredict>().Take(48).ToList());
+ return Entity2Models(db.Queryable<Entity.WaterPredictRecord>().Take(48).ToList());
}
}
/// <summary>
/// 鏍规嵁 ID 鏌ヨ
/// </summary>
- public Model.WaterPredict QueryByID(long id)
+ public Model.WaterPredictRecord QueryByID(long id)
{
var ConnectionConfig = ConnectionFactory.MainConnection(DateTime.Now.Year);
using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
{
- return Entity2Model(db.Queryable<Entity.WaterPredict>().First(x => x.ID == id));
+ return Entity2Model(db.Queryable<Entity.WaterPredictRecord>().First(x => x.ID == id));
}
}
-
+
#endregion Get
- //#region Insert
- ///// <summary>
- ///// 鎻掑叆
- ///// </summary>
- //public long Insert(Model.WaterPredict model)
- //{
- // if (model == null)
- // return default;
- // var entity = Model2Entity(model);
- // var ID = _dal.Insert(entity);
- // if (ID > 0)
- // {
- // UpdateCache(ID);
- // }
- // return ID;
- //}
+ /// <summary>
+ /// 鎵归噺璁剧疆:姣忔鏇存柊23鏉�, 娣诲姞1鏉�
+ /// </summary>
+ public bool BatSet(List<Model.WaterPredictRecord> list)
+ {
+ if (list == null || list.Count() < 1)
+ return default;
+ var entities = Model2Entities(list.ToList());
- ///// <summary>
- ///// 鎵归噺鎻掑叆
- ///// </summary>
- //public bool Inserts(List<Model.WaterPredict> list)
- //{
- // if (list == null || list.Count() < 1)
- // return default;
- // var entities = Model2Entities(list.ToList());
- // var Ids = _dal.InsertsR(entities);
- // if (Ids != null && Ids.Count > 0)
- // {
- // UpdateCache(Ids);
- // return true;
- // }
- // return false;
- //}
+ var insert_model = list.Find(x => x.ID == 0);
+ var update_models = list.Where(x => x.ID > 0);
- //#endregion Insert
+ var ConnectionConfig = ConnectionFactory.MainConnection(DateTime.Now.Year);
+ using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
+ {
+ //鎻掑叆鏂扮殑棰勬祴
+ if (insert_model != null)
+ {
+ var insert_entity = Model2Entity(insert_model);
+ db.Insertable(insert_entity).ExecuteReturnSnowflakeId();
+ }
+ //鏇存柊婊氬姩鏁版嵁
+ if (update_models != null)
+ {
+ foreach(var model in update_models)
+ {
+ Entity.WaterPredictRecord t = new Entity.WaterPredictRecord();
+ t.ID = model.ID;
+ t.LastPredictValue = model.LastPredictValue;
+ t.LastPredictTime = DateTime.Now;
- //#region Update
+ db.Updateable<Entity.WaterPredictRecord>(t).UpdateColumns(t => new { t.LastPredictValue, t.LastPredictTime }).Where(t => t.ID == model.ID).ExecuteCommand();
+ }
+ }
- ///// <summary>
- ///// 鏇存柊
- ///// </summary>
- //public bool Update(Model.WaterPredict model)
- //{
- // if (model == null)
- // return default;
- // if (model.ID < 1)
- // return default;
- // var entity = Model2Entity(model);
- // var bol = _dal.Update(entity);
- // if (bol)
- // {
- // UpdateCache(model.ID);
- // }
- // return bol;
- //}
+
+ }
- ///// <summary>
- ///// 鎵归噺鏇存柊
- ///// </summary>
- //public bool Updates(List<Model.WaterPredict> list)
- //{
- // if (list == null || list.Count() < 1)
- // return default;
- // if (list.ToList().Exists(x => x.ID < 1))
- // return default;
- // var entities = Model2Entities(list.ToList());
- // var bol = _dal.Updates(entities);
- // if (bol)
- // {
- // UpdateCache(list.Select(x => x.ID).ToList());
- // }
- // return bol;
- //}
- //#endregion Update
- //#region Exist
+ return true;
+ }
- ///// <summary>
- ///// 鏍规嵁 ID 鍒ゆ柇鏄惁瀛樺湪
- ///// </summary>
- //public bool IsExistByID(long id)
- //{
- // var all = GetAll();
- // return all.Exists(x => x.ID == id);
- //}
- //#endregion Exist
+ #region Insert
- //#region Delete
+ /// <summary>
+ /// 鎻掑叆
+ /// </summary>
+ public long Insert(Model.WaterPredictRecord model)
+ {
+ if (model == null)
+ return default;
+ var entity = Model2Entity(model);
+
+ var ConnectionConfig = ConnectionFactory.MainConnection(DateTime.Now.Year);
+ using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
+ {
+ return db.Insertable(entity).ExecuteReturnSnowflakeId();
+ }
+ }
+
+ /// <summary>
+ /// 鎵归噺鎻掑叆
+ /// </summary>
+ public bool Inserts(List<Model.WaterPredictRecord> list)
+ {
+ if (list == null || list.Count() < 1)
+ return default;
+ var entities = Model2Entities(list.ToList());
+ var ConnectionConfig = ConnectionFactory.MainConnection(DateTime.Now.Year);
+ using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
+ {
+ return db.Insertable(list).ExecuteReturnSnowflakeIdList().Count() > 0;
+ }
+ }
+
+ #endregion Insert
+
+ #region Update
+
+ /// <summary>
+ /// 鏇存柊
+ /// </summary>
+ public bool Update(Model.WaterPredictRecord model)
+ {
+ if (model == null)
+ return default;
+ if (model.ID < 1)
+ return default;
+ var entity = Model2Entity(model);
+ var ConnectionConfig = ConnectionFactory.MainConnection(model.PredictTime.Year);
+ using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
+ {
+ return db.Updateable(entity).ExecuteCommand() > 0;
+ }
+ }
+
+ /// <summary>
+ /// 鏇存柊 瀹炴椂鏁版嵁
+ /// </summary>
+ public int UpdateRealValue(long ID, DateTime PredictTime, double RealValue)
+ {
+ var ConnectionConfig = ConnectionFactory.MainConnection(PredictTime.Year);
+ using (SqlSugarClient db = new SqlSugarClient(ConnectionConfig))
+ {
+ Entity.WaterPredictRecord t = new Entity.WaterPredictRecord();
+ t.ID = ID;
+ t.RealValue = RealValue;
+
+ return db.Updateable<Entity.WaterPredictRecord>(t).UpdateColumns(t => new { t.RealValue }).Where(t => t.ID == ID).ExecuteCommand();
+ }
+ }
+
+ #endregion Update
+
+
+
+
+ #region Delete
///// <summary>
///// 鏍规嵁 ID 鍒犻櫎
@@ -169,6 +200,6 @@
// return bol;
//}
- //#endregion Delete
+ #endregion Delete
}
}
\ No newline at end of file
diff --git a/WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict_Instance.cs b/WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict_Instance.cs
index b6a12e2..f92dc3b 100644
--- a/WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict_Instance.cs
+++ b/WaterPredict/IStation.ChEr.DAL.WaterPredict/BLL/WaterPredict_Instance.cs
@@ -4,27 +4,27 @@
namespace IStation.ChEr.BLL
{
- public partial class WaterPredict
+ public partial class WaterPredictRecord
{
//Entity to GetModel
- private Model.WaterPredict Entity2Model(Entity.WaterPredict entities)
+ private Model.WaterPredictRecord Entity2Model(Entity.WaterPredictRecord entities)
{
if (entities == null)
return default;
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.WaterPredict, Model.WaterPredict>()
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.WaterPredictRecord, Model.WaterPredictRecord>()
).CreateMapper();
- var model = mapper.Map<Entity.WaterPredict, Model.WaterPredict>(entities);
+ var model = mapper.Map<Entity.WaterPredictRecord, Model.WaterPredictRecord>(entities);
return model;
}
//Entities to GetModels
- private List<Model.WaterPredict> Entity2Models(List<Entity.WaterPredict> entities)
+ private List<Model.WaterPredictRecord> Entity2Models(List<Entity.WaterPredictRecord> entities)
{
if (entities == null || entities.Count() < 1)
return default;
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.WaterPredict, Model.WaterPredict>()
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Entity.WaterPredictRecord, Model.WaterPredictRecord>()
).CreateMapper();
- var models = mapper.Map<List<Entity.WaterPredict>, List<Model.WaterPredict>>(entities);
+ var models = mapper.Map<List<Entity.WaterPredictRecord>, List<Model.WaterPredictRecord>>(entities);
return models;
}
@@ -43,33 +43,33 @@
//}
//Model to Entity
- private Entity.WaterPredict Model2Entity(Model.WaterPredict model)
+ private Entity.WaterPredictRecord Model2Entity(Model.WaterPredictRecord model)
{
if (model == null)
return default;
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.WaterPredict, Entity.WaterPredict>()
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.WaterPredictRecord, Entity.WaterPredictRecord>()
).CreateMapper();
- var entities = mapper.Map<Model.WaterPredict, Entity.WaterPredict>(model);
+ var entities = mapper.Map<Model.WaterPredictRecord, Entity.WaterPredictRecord>(model);
return entities;
}
//Models to Entities
- private List<Entity.WaterPredict> Model2Entities(List<Model.WaterPredict> models)
+ private List<Entity.WaterPredictRecord> Model2Entities(List<Model.WaterPredictRecord> models)
{
if (models == null || models.Count < 1)
return default;
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.WaterPredict, Entity.WaterPredict>()
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.WaterPredictRecord, Entity.WaterPredictRecord>()
).CreateMapper();
- var entities = mapper.Map<List<Model.WaterPredict>, List<Entity.WaterPredict>>(models);
+ var entities = mapper.Map<List<Model.WaterPredictRecord>, List<Entity.WaterPredictRecord>>(models);
return entities;
}
//Model to Entity
- private void Model2Entity(Model.WaterPredict model, Entity.WaterPredict entities)
+ private void Model2Entity(Model.WaterPredictRecord model, Entity.WaterPredictRecord entities)
{
if (model == null || entities == null)
return;
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.WaterPredict, Entity.WaterPredict>()
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Model.WaterPredictRecord, Entity.WaterPredictRecord>()
).CreateMapper();
mapper.Map(model, entities);
}
diff --git a/WaterPredict/IStation.ChEr.DAL.WaterPredict/DB/ConnectionFactory.cs b/WaterPredict/IStation.ChEr.DAL.WaterPredict/DB/ConnectionFactory.cs
index 8fb2673..f2e6cd0 100644
--- a/WaterPredict/IStation.ChEr.DAL.WaterPredict/DB/ConnectionFactory.cs
+++ b/WaterPredict/IStation.ChEr.DAL.WaterPredict/DB/ConnectionFactory.cs
@@ -8,7 +8,7 @@
/// </summary>
public class ConnectionFactory
{
- private static ConnectionConfig _mainConfig = null;
+ private static Dictionary<int, ConnectionConfig> _mainConfigDict = new Dictionary<int, ConnectionConfig>();
/// <summary>
/// 鍒涘缓杩炴帴瀵硅薄
@@ -17,67 +17,35 @@
{
try
{
- if (_mainConfig != null)
- return _mainConfig;
-
+ if (_mainConfigDict.ContainsKey(year))
+ return _mainConfigDict[year];
var root_directory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
var dsName = string.Format("WaterPredict{0}.db", year);
-
+
var filePath = Path.Combine(root_directory, "Data", dsName);
if (!System.IO.File.Exists(filePath))
{
throw new System.Exception($"{dsName}鏂囦欢涓嶅瓨鍦�!Path:{filePath}");
}
- _mainConfig = new ConnectionConfig()
+ var mainConfig = new ConnectionConfig()
{
ConnectionString = $"DataSource={filePath}",
IsAutoCloseConnection = true,
DbType = SqlSugar.DbType.Sqlite
};
- return _mainConfig;
+ _mainConfigDict[year] = mainConfig;
+ return mainConfig;
}
- catch (System.Exception ex)
+ catch //(System.Exception ex)
{
// LogHelper.Error(ex.Message);
return null;
}
}
- //private static ConnectionConfig _gyConfig = null;
- ///// <summary>
- ///// 鍥虹Щ鍒嗘瀽鏁版嵁搴撹繛鎺�
- ///// </summary>
- //public static ConnectionConfig GyConnection()
- //{
- // try
- // {
- // if (_gyConfig != null)
- // return _gyConfig;
-
- // var dbName = "GyFire.db";
- // var filePath = $"{Settings.File.LocalDataDirectory}\\{dbName}";
- // if (!System.IO.File.Exists(filePath))
- // {
- // throw new System.Exception($"{dbName}鏂囦欢涓嶅瓨鍦�!Path:{filePath}");
- // }
-
- // _gyConfig = new ConnectionConfig()
- // {
- // ConnectionString = $"DataSource={filePath}",
- // IsAutoCloseConnection = true,
- // DbType = SqlSugar.DbType.Sqlite
- // };
- // return _gyConfig;
- // }
- // catch (System.Exception ex)
- // {
- // //LogHelper.Error(ex.Message);
- // return null;
- // }
- //}
}
}
\ No newline at end of file
diff --git a/WaterPredict/IStation.ChEr.DAL.WaterPredict/Entity/WaterPredict.cs b/WaterPredict/IStation.ChEr.DAL.WaterPredict/Entity/WaterPredictRecord.cs
similarity index 79%
rename from WaterPredict/IStation.ChEr.DAL.WaterPredict/Entity/WaterPredict.cs
rename to WaterPredict/IStation.ChEr.DAL.WaterPredict/Entity/WaterPredictRecord.cs
index fdf603c..96d4ab9 100644
--- a/WaterPredict/IStation.ChEr.DAL.WaterPredict/Entity/WaterPredict.cs
+++ b/WaterPredict/IStation.ChEr.DAL.WaterPredict/Entity/WaterPredictRecord.cs
@@ -8,23 +8,23 @@
/// 姘撮噺棰勬祴
/// </summary>
[SugarTable("WaterPredictRecord")]
- public class WaterPredict// : BaseEntity//, Entity.ISorter, Entity.IFlags, Entity.ITagName, Entity.IUseStatus, System.ICloneable
+ public class WaterPredictRecord// : BaseEntity//, Entity.ISorter, Entity.IFlags, Entity.ITagName, Entity.IUseStatus, System.ICloneable
{
/// <summary>
///
/// </summary>
- public WaterPredict()
+ public WaterPredictRecord()
{ }
/// <summary>
///
/// </summary>
/// <param name="rhs"></param>
- public WaterPredict(WaterPredict rhs)
+ public WaterPredictRecord(WaterPredictRecord rhs)
{
this.ID = rhs.ID;
this.DayHour = rhs.DayHour;
- this.LastPredictValue = rhs.LastPredictValue;
+ this.LastPredictValue = rhs.LastPredictValue;
this.RealValue = rhs.RealValue;
this.LastPredictTime = rhs.LastPredictTime;
@@ -35,7 +35,7 @@
/// id
/// </summary>
[SugarColumn(IsPrimaryKey = true)]
- public long ID { get; set; }
+ public long ID { get; set; }
/// <summary>
/// 灏忔椂: 渚嬪2024-05-14 01:00 琛ㄧず涓� 24041401
@@ -72,9 +72,9 @@
///
/// </summary>
/// <returns></returns>
- public WaterPredict Clone()
+ public WaterPredictRecord Clone()
{
- return (WaterPredict)this.MemberwiseClone();
+ return (WaterPredictRecord)this.MemberwiseClone();
}
}
}
\ No newline at end of file
diff --git a/WaterPredict/IStation.ChEr.DAL.WaterPredict/IStation.ChEr.DAL.WaterPredict.csproj b/WaterPredict/IStation.ChEr.DAL.WaterPredict/IStation.ChEr.DAL.WaterPredict.csproj
index 003e48b..387ec78 100644
--- a/WaterPredict/IStation.ChEr.DAL.WaterPredict/IStation.ChEr.DAL.WaterPredict.csproj
+++ b/WaterPredict/IStation.ChEr.DAL.WaterPredict/IStation.ChEr.DAL.WaterPredict.csproj
@@ -44,7 +44,7 @@
<Compile Remove="DB\MainDbContext.cs" />
<Compile Remove="MemoryCacheHelper.cs" />
<Compile Remove="RandomHelper.cs" />
- <Compile Remove="WaterPredict.cs" />
+ <Compile Remove="WaterPredictRecord.cs" />
</ItemGroup>
<ItemGroup>
diff --git a/WaterPredict/IStation.ChEr.DAL.WaterPredict/Model/WaterPredict.cs b/WaterPredict/IStation.ChEr.DAL.WaterPredict/Model/WaterPredictRecord.cs
similarity index 78%
rename from WaterPredict/IStation.ChEr.DAL.WaterPredict/Model/WaterPredict.cs
rename to WaterPredict/IStation.ChEr.DAL.WaterPredict/Model/WaterPredictRecord.cs
index f066f21..86cff7b 100644
--- a/WaterPredict/IStation.ChEr.DAL.WaterPredict/Model/WaterPredict.cs
+++ b/WaterPredict/IStation.ChEr.DAL.WaterPredict/Model/WaterPredictRecord.cs
@@ -9,17 +9,17 @@
/// <summary>
///
/// </summary>
- public class WaterPredict //: Model.BaseModel, System.ICloneable
+ public class WaterPredictRecord //: Model.BaseModel, System.ICloneable
{
/// <summary>
///
/// </summary>
- public WaterPredict() { }
+ public WaterPredictRecord() { }
/// <summary>
///
/// </summary>
/// <param name="rhs"></param>
- public WaterPredict(WaterPredict rhs)
+ public WaterPredictRecord(WaterPredictRecord rhs)
{
this.ID = rhs.ID;
this.DayHour = rhs.DayHour;
@@ -37,7 +37,7 @@
public long ID { get; set; }
/// <summary>
- /// 灏忔椂: 渚嬪2024-05-14 01:00 琛ㄧず涓� 24041401
+ /// 灏忔椂: 渚嬪2024-05-14 01:00 琛ㄧず涓� 051401
/// </summary>
public int DayHour { get; set; }
@@ -47,12 +47,12 @@
public double RealValue { get; set; }
/// <summary>
- /// 鏈�鏂伴娴嬫祦閲�
+ /// 鏈�鏂伴娴嬫祦閲�(婊氬姩鍊�)
/// </summary>
public double LastPredictValue { get; set; }
/// <summary>
- /// 鏈�鏂伴娴嬫椂闂�
+ /// 鏈�鏂伴娴嬫椂闂�(婊氬姩鍊煎搴旀椂闂�)
/// </summary>
public DateTime LastPredictTime { get; set; }
@@ -62,7 +62,7 @@
public string PredictValueList { get; set; }
/// <summary>
- /// 棰勬祴娴侀噺鍊兼椂闂�
+ /// 棰勬祴娴侀噺鍊兼椂闂�:PredictValueList瀵瑰簲鏃堕棿
/// </summary>
public DateTime PredictTime { get; set; }
diff --git a/WaterPredict/IStation.ChEr.WebApi.Predict/Startup.cs b/WaterPredict/IStation.ChEr.WebApi.Predict/Startup.cs
index a63c64c..c93f411 100644
--- a/WaterPredict/IStation.ChEr.WebApi.Predict/Startup.cs
+++ b/WaterPredict/IStation.ChEr.WebApi.Predict/Startup.cs
@@ -69,11 +69,11 @@
// 娣诲姞鍗虫椂閫氳
//services.AddSignalR();
- //SnowFlakeSingle.WorkId = Settings.SqlSugarParasHelper.SqlSugar.SnowFlakeWorkId;
+ // SnowFlakeSingle.WorkId = 2;// Settings.SqlSugarParasHelper.SqlSugar.SnowFlakeWorkId;
- //IStation.LogHelper.Info("log4net initial OK");
+ IStation.LogHelper.Info("log4net initial OK");
////瀹氭椂浠诲姟
@@ -160,14 +160,14 @@
app.UseInject(string.Empty);
- //app.UseEndpoints(endpoints =>
- //{
- // // 娉ㄥ唽闆嗙嚎鍣�
- // //endpoints.MapHub<ChatHub>("/hubs/chathub");
- // endpoints.MapControllerRoute(
- // name: "default",
- // pattern: "{controller=Home}/{action=Index}/{id?}");
- //});
+ app.UseEndpoints(endpoints =>
+ {
+ // 娉ㄥ唽闆嗙嚎鍣�
+ //endpoints.MapHub<ChatHub>("/hubs/chathub");
+ endpoints.MapControllerRoute(
+ name: "default",
+ pattern: "{controller=Home}/{action=Index}/{id?}");
+ });
}
diff --git a/WaterPredict/WaterPredict.zip b/WaterPredict/WaterPredict.zip
new file mode 100644
index 0000000..b9469b8
--- /dev/null
+++ b/WaterPredict/WaterPredict.zip
Binary files differ
--
Gitblit v1.9.3