Commit 1e5bcc41 authored by 潘栩锋's avatar 潘栩锋 🚴

1. 修复 AD盒连接断开,不允许被复位。

2. 优化 使用了只有IO状态,不提示报警的 的动态区 module
parent 96a1aa4d
...@@ -269,8 +269,41 @@ namespace FLY.Thick.FilmCasting.Server ...@@ -269,8 +269,41 @@ namespace FLY.Thick.FilmCasting.Server
profileParam.UniformShrinkPercent); profileParam.UniformShrinkPercent);
}, this, MARKNO_UPDATEBOLTMAP); }, this, MARKNO_UPDATEBOLTMAP);
} }
async Task Init_db()
{
//数据库 配置----------------------------------------
//就只是数据库操作会慢而已!!!!!!
dbModel.SetDBPath(Path.Combine(initParam.DbDirPath, "thickness.sqlite3"));
await Task.Factory.StartNew(() =>
{
dbModel.Init();
//删除不需要的备份数据
dbModel.KeepBackupSize(initParam.DBKeepMonth);
//备份上一个月之前的数据到 yyyy-MM 文件夹
dbModel.BackupBbInSize(initParam.DBKeepMonth);
//当前的数据库只保存上个月与这个月的数据
dbModel.KeepDBSize(1);
});
historyDb.Init(dbModel, localDb);
bulkDb.Init(historyDb, localDb, dbModel);
}
public async Task Init() public async Task Init()
{ {
//数据库 配置----------------------------------------
//就只是数据库操作会慢而已!!!!!!
await Init_db();
//数据库备份检查
BackupDbCheckInit();
#region 配置 #region 配置
...@@ -329,51 +362,7 @@ namespace FLY.Thick.FilmCasting.Server ...@@ -329,51 +362,7 @@ namespace FLY.Thick.FilmCasting.Server
}); });
#endregion #endregion
//数据库 配置----------------------------------------
#region
bool ret_db;
dbModel.SetDBPath(Path.Combine(initParam.DbDirPath, "thickness.sqlite3"));
ret_db = await Task.Factory.StartNew(() =>
{
var ret_db_load = dbModel.Init();
if (initParam.DBKeepMonth > 0)
{
//不备份
//删除不需要的备份数据
dbModel.KeepBackupSize(initParam.DBKeepMonth);
//备份上一个月之前的数据到 yyyy-MM 文件夹
dbModel.BackupBbInSize(initParam.DBKeepMonth);
}
//当前的数据库只保存上个月与这个月的数据
dbModel.KeepDBSize(1);
return ret_db_load;
});
historyDb.Init(dbModel, localDb);
bulkDb.Init(historyDb, localDb, dbModel);
warning.Init(historyDb.ErrorBuffer);
if (!ret_db)
{
//表加载异常
warning.Add(
ERRNOs.Instance.BASE_ERRNO_DB.Code,
ERRNOs.Instance.BASE_ERRNO_DB.Descrption);
//只为记录一下,不然它显示出来,所以立刻删除
warning.Remove(
ERRNOs.Instance.BASE_ERRNO_DB.Code);
}
//数据库备份检查
BackupDbCheckInit();
#endregion
...@@ -493,6 +482,7 @@ namespace FLY.Thick.FilmCasting.Server ...@@ -493,6 +482,7 @@ namespace FLY.Thick.FilmCasting.Server
//WarningSystem 配置---------------------------------------- //WarningSystem 配置----------------------------------------
warning.Init(historyDb.ErrorBuffer);
warning.PropertyChanged += (s, e) => warning.PropertyChanged += (s, e) =>
{ {
if (e.PropertyName == nameof(warning.IsRinging)) if (e.PropertyName == nameof(warning.IsRinging))
...@@ -698,6 +688,8 @@ namespace FLY.Thick.FilmCasting.Server ...@@ -698,6 +688,8 @@ namespace FLY.Thick.FilmCasting.Server
} }
}); });
foreach (ErrNoForCheckItem item in ErrNoForCheckItems) foreach (ErrNoForCheckItem item in ErrNoForCheckItems)
{ {
item.mWarning = warning; item.mWarning = warning;
...@@ -738,20 +730,7 @@ namespace FLY.Thick.FilmCasting.Server ...@@ -738,20 +730,7 @@ namespace FLY.Thick.FilmCasting.Server
} }
}); });
//AD盒连接断开
Misc.BindingOperations.SetBinding(DynArea, nameof(DynArea.FLYADIsConnect), () =>
{
if (!DynArea.FLYADIsConnect)
{
warning.Add(
ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED.Code,
ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED.Descrption);
}
else
{
warning.Remove(ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED.Code);
}
});
#endregion #endregion
...@@ -762,11 +741,18 @@ namespace FLY.Thick.FilmCasting.Server ...@@ -762,11 +741,18 @@ namespace FLY.Thick.FilmCasting.Server
{ {
if (!DynArea.FLYADIsConnect) if (!DynArea.FLYADIsConnect)
{ {
//AD盒连接断开,这个不能让它复位,通过时间查询
warning.Add(
ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED.Code,
ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED.Descrption);
foreach (ErrNoForCheckItem item in ErrNoForCheckItems) foreach (ErrNoForCheckItem item in ErrNoForCheckItems)
item.Clear(); item.Clear();
} }
else else
{ {
warning.Remove(ERRNOs.Instance.BASE_ERRNO_FLYAD7DISCONNECTED.Code);
foreach (ErrNoForCheckItem item in ErrNoForCheckItems) foreach (ErrNoForCheckItem item in ErrNoForCheckItems)
item.OnPoll(); item.OnPoll();
} }
......
Subproject commit 8a75715ab789e1ce34bf259776ea6ad9eb5dc68b Subproject commit cecb057a71c1b7d80cda1ca21b4f7007b82e14ad
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<register type="IUiModule2" mapTo="UiModule2_DynAreaSample" name="base_das" /> <register type="IUiModule2" mapTo="UiModule2_DynAreaSample" name="base_das" />
<register type="IUiModule2" mapTo="UiModule2_DynAreaFilmWidth" name="dynAreaFilmWidth" /> <register type="IUiModule2" mapTo="UiModule2_DynAreaFilmWidth" name="dynAreaFilmWidth" />
<register type="IUiModule2" mapTo="UiModule2_DynAreaIO" name="base_daio" /> <register type="IUiModule2" mapTo="UiModule2_DynAreaIO" name="base_daio" />
<register type="IUiModule2" mapTo="UiModule2_DynAreaIO2" name="base_daio2" />
<register type="IUiModule2" mapTo="UiModule2_FixGraph" name="base_fg" /> <register type="IUiModule2" mapTo="UiModule2_FixGraph" name="base_fg" />
</container> </container>
</unity> </unity>
......
...@@ -28,15 +28,18 @@ ...@@ -28,15 +28,18 @@
<param name="connName" value="blowing" /> <param name="connName" value="blowing" />
</constructor> </constructor>
</register> </register>
<register type="LCUS1" mapTo="LCUS1_dependOn">
<lifetime type="singleton" />
</register>
<register type="WarningSystemManager"> <register type="WarningSystemManager">
<lifetime type="singleton" /> <lifetime type="singleton" />
</register> </register>
<register type="IOnInit" mapTo="OnInitWarnings" name="warnings"> <register type="IOnInit" mapTo="OnInitWarnings" name="warnings">
<lifetime type="singleton" /> <lifetime type="singleton" />
</register> </register>
<register type="LCUS1" mapTo="LCUS1_dependOn">
<lifetime type="singleton" />
</register>
<register type="IOnInit" mapTo="OnInitLcus1_Multi" name="lcus1">
<lifetime type="singleton" />
</register>
</container> </container>
</unity> </unity>
</configuration> </configuration>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment