Commit b37ca779 authored by 潘栩锋's avatar 潘栩锋 🚴

v6.21.0

parent 3df07100
...@@ -51,7 +51,7 @@ using System.Windows; ...@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.21.0.0")]
[assembly: AssemblyFileVersion("6.0.0.0")] [assembly: AssemblyFileVersion("6.21.0.0")]
[assembly: Guid("32104657-86E9-4380-9113-606589E6D812")] [assembly: Guid("32104657-86E9-4380-9113-606589E6D812")]
...@@ -51,7 +51,7 @@ using System.Windows; ...@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.1.0.0")] [assembly: AssemblyVersion("6.21.0.0")]
[assembly: AssemblyFileVersion("6.1.0.0")] [assembly: AssemblyFileVersion("6.21.0.0")]
[assembly: Guid("47D1FF95-69E3-40E5-B094-D7DAEAA87AD9")] [assembly: Guid("47D1FF95-69E3-40E5-B094-D7DAEAA87AD9")]
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示: //通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.20.0.0")] [assembly: AssemblyVersion("6.21.0.0")]
[assembly: AssemblyFileVersion("6.20.0.0")] [assembly: AssemblyFileVersion("6.21.0.0")]
[assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")] [assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.20.0")] [assembly: AssemblyVersion("6.21.0")]
[assembly: AssemblyFileVersion("6.20.0")] [assembly: AssemblyFileVersion("6.21.0")]
[assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")] [assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")]
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示: //通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.20.0.0")] [assembly: AssemblyVersion("6.21.0.0")]
[assembly: AssemblyFileVersion("6.20.0.0")] [assembly: AssemblyFileVersion("6.21.0.0")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")] [assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
...@@ -51,7 +51,7 @@ using System.Windows; ...@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.20.0.0")] [assembly: AssemblyVersion("6.21.0.0")]
[assembly: AssemblyFileVersion("6.20.0.0")] [assembly: AssemblyFileVersion("6.21.0.0")]
[assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")] [assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")]
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.4.0.0")] [assembly: AssemblyVersion("6.21.0.0")]
[assembly: AssemblyFileVersion("6.4.0.0")] [assembly: AssemblyFileVersion("6.21.0.0")]
[assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")] [assembly: Guid("AC4FFE57-FF42-4B4D-9E23-FF583D78187D")]
...@@ -16,12 +16,15 @@ namespace FLY.Weight2.Server.Model ...@@ -16,12 +16,15 @@ namespace FLY.Weight2.Server.Model
public class Db_Flow: IDbBase public class Db_Flow: IDbBase
{ {
[Key] [Key]
[Index]
[PropertyIndex(0)] [PropertyIndex(0)]
public Int64 ID { get; set; } public Int64 ID { get; set; }
/// <summary> /// <summary>
/// 开始时间 /// 开始时间
/// </summary> /// </summary>
[Index]
[Time]
[PropertyIndex(1)] [PropertyIndex(1)]
public DateTime Time { get; set; } public DateTime Time { get; set; }
......
...@@ -37,29 +37,6 @@ namespace FLY.Weight2.Server.Model ...@@ -37,29 +37,6 @@ namespace FLY.Weight2.Server.Model
ErrorBuffer.Init(dBModel.TbError); ErrorBuffer.Init(dBModel.TbError);
} }
/// <summary>
/// 按时间删除数据库
/// </summary>
/// <param name="month"></param>
public void KeepDBSize(int month)
{
if (month <= 3)
month = 3;
DateTime del_time = DateTime.Now - TimeSpan.FromDays(month * 30);
string det_time_str = del_time.ToStringOfSQLiteFieldType();
List<string> sqls = new List<string>();
sqls.Add(
$"DELETE FROM {dbModel.TbFlow.TableName}" +
$" WHERE Time < {det_time_str}");
sqls.Add(
$"DELETE FROM {dbModel.TbError.TableName}" +
$" WHERE Time < {det_time_str}");
dbModel.sqliteHelper.QueryTran(sqls);
}
public void AddFlow( public void AddFlow(
Lc_Flow flow Lc_Flow flow
......
...@@ -65,10 +65,9 @@ namespace FLY.Weight2.Server ...@@ -65,10 +65,9 @@ namespace FLY.Weight2.Server
//数据库 //数据库
mDbModel = new DbModel(); mDbModel = new DbModel();
mDbModel.Init(); mDbModel.Init();
mDbModel.KeepDBSize(mSysParam.DBKeepMonth);
mHistoryDb = new HistoryDb(); mHistoryDb = new HistoryDb();
mHistoryDb.Init(mDbModel, mData.ItemsCnt); mHistoryDb.Init(mDbModel, mData.ItemsCnt);
mHistoryDb.KeepDBSize(mSysParam.DBKeepMonth);
mWarning = new WarningSystem(); mWarning = new WarningSystem();
mWarning.Init(mHistoryDb.ErrorBuffer); mWarning.Init(mHistoryDb.ErrorBuffer);
......
...@@ -12,7 +12,7 @@ using System.Windows; ...@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("收卷服务器")] [assembly: AssemblyProduct("收卷服务器")]
[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyCopyright("Copyright © 2020")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
...@@ -51,6 +51,6 @@ using System.Windows; ...@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: : // 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.0.0.0")] [assembly: AssemblyVersion("6.21.0.0")]
[assembly: AssemblyFileVersion("6.0.0.0")] [assembly: AssemblyFileVersion("6.21.0.0")]
[assembly: Guid("0CE35EA7-927A-41C0-9DC6-80511329760B")] [assembly: Guid("0CE35EA7-927A-41C0-9DC6-80511329760B")]
using FLY.OBJComponents.IService;
using FLY.Winder.IService;
using FLY.Winder.Server.Model;
using FObjBase;
using FObjBase.Reflect;
using System;
namespace FLY.Winder.Client
{
public class BulkDbServiceClient : FObjBase.Reflect.Reflect_SeviceClient, IBulkDbService
{
protected override Type InterfaceType => typeof(IBulkDbService);
public BulkDbServiceClient(UInt32 id) : base(id) { }
public BulkDbServiceClient(UInt32 serviceId, string connName) : base(serviceId, connName) { }
#region IBulkDBService
/// <summary>
/// 最后一条数据Id
/// </summary>
public long LastId { get; set; } = -1;
/// <summary>
/// 获取纵向趋势图
/// </summary>
/// <param name="request"></param>
/// <param name="asyncDelegate"></param>
/// <param name="asyncContext"></param>
[Call(typeof(Pack_GetTrendReponse<Db_WinderInfo>))]
public void GetTrend(
Pack_GetTrendRequest request,
AsyncCBHandler asyncDelegate, object asyncContext)
{
Call(nameof(GetTrend), new { request }, asyncDelegate, asyncContext);
}
#endregion
}
}
...@@ -46,10 +46,12 @@ ...@@ -46,10 +46,12 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Client\BulkDbServiceClient.cs" />
<Compile Include="Client\WinderSystemServiceClient.cs" /> <Compile Include="Client\WinderSystemServiceClient.cs" />
<Compile Include="Common\WinderAccessory.cs" /> <Compile Include="Common\WinderAccessory.cs" />
<Compile Include="Common\WinderInsideOutside.cs" /> <Compile Include="Common\WinderInsideOutside.cs" />
<Compile Include="Common\WinderSystemData.cs" /> <Compile Include="Common\WinderSystemData.cs" />
<Compile Include="IService\IBulkDbService.cs" />
<Compile Include="IService\IWinderSystemService.cs" /> <Compile Include="IService\IWinderSystemService.cs" />
<Compile Include="OBJ_INTERFACE\WINDER_OBJ_INTERFACE.cs" /> <Compile Include="OBJ_INTERFACE\WINDER_OBJ_INTERFACE.cs" />
<Compile Include="OBJ_INTERFACE\OBJ_INTERFACE.cs" /> <Compile Include="OBJ_INTERFACE\OBJ_INTERFACE.cs" />
...@@ -67,6 +69,10 @@ ...@@ -67,6 +69,10 @@
<Content Include="FodyWeavers.xml" /> <Content Include="FodyWeavers.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\thick_public\Project.FLY.FObjSys\FObjBaseReflect\FObjBase.Reflect.csproj">
<Project>{15f40c32-d546-4b2a-8d80-b3ddbcdaa690}</Project>
<Name>FObjBase.Reflect</Name>
</ProjectReference>
<ProjectReference Include="..\..\thick_public\Project.FLY.FObjSys\FObjSys\FObjBase.csproj"> <ProjectReference Include="..\..\thick_public\Project.FLY.FObjSys\FObjSys\FObjBase.csproj">
<Project>{abfe87d4-b692-4ae9-a8c0-1f470b8acbb8}</Project> <Project>{abfe87d4-b692-4ae9-a8c0-1f470b8acbb8}</Project>
<Name>FObjBase</Name> <Name>FObjBase</Name>
......

using FLY.OBJComponents.IService;
using FLY.Winder.Server.Model;
using FObjBase;
using FObjBase.Reflect;
namespace FLY.Winder.IService
{
public interface IBulkDbService : IBulkDbSQLiteService
{
/// <summary>
/// 最后一条数据Id
/// </summary>
long LastId { get; }
/// <summary>
/// 获取纵向趋势图
/// </summary>
/// <param name="request"></param>
/// <param name="asyncDelegate"></param>
/// <param name="asyncContext"></param>
[Call(typeof(Pack_GetTrendReponse<Db_WinderInfo>))]
void GetTrend(
Pack_GetTrendRequest request,
AsyncCBHandler asyncDelegate, object asyncContext);
}
}
 
using FLY.OBJComponents.Server.OBJProxy; using FLY.OBJComponents.Server.OBJProxy;
using FLY.Winder.IService;
using FLY.Winder.Server.Model; using FLY.Winder.Server.Model;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
...@@ -12,28 +13,24 @@ namespace FLY.Winder.Server.OBJProxy ...@@ -12,28 +13,24 @@ namespace FLY.Winder.Server.OBJProxy
{ {
public class OBJProxy public class OBJProxy
{ {
WinderSystem_OBJProxy winderSystemOBJProxy;
Buffer_OBJProxy<Db_WinderInfo> mInfoListOBJProxy;
WarningSystem_OBJProxy mWarnSystemOBJProxy;
public OBJProxy(int objsys_idx, TDGage gage) public OBJProxy(int objsys_idx, TDGage gage)
{ {
TDGage mGage = gage; TDGage mGage = gage;
winderSystemOBJProxy = new WinderSystem_OBJProxy(objsys_idx, gage.mData); var winderSystemOBJProxy = new WinderSystem_OBJProxy(objsys_idx, gage.mData);
mInfoListOBJProxy = new Buffer_OBJProxy<Db_WinderInfo>( var mInfoListOBJProxy = new FObjBase.Reflect.Reflect_Proxy(
objsys_idx, objsys_idx,
OBJ_INTERFACE.OBJ_INTERFACE.WINDER_OBJ_INFOLIST_ID, OBJ_INTERFACE.OBJ_INTERFACE.WINDER_OBJ_INFOLIST_ID,
typeof(IBulkDbService),
gage.mHistoryDb.WinderInfoBuffer); gage.mHistoryDb.WinderInfoBuffer);
mWarnSystemOBJProxy = new WarningSystem_OBJProxy( var mWarnSystemOBJProxy = new WarningSystem_OBJProxy(
objsys_idx, objsys_idx,
OBJ_INTERFACE.OBJ_INTERFACE.WARNING_OBJ_ID, OBJ_INTERFACE.OBJ_INTERFACE.WARNING_OBJ_ID,
gage.mWarning); gage.mWarning);
winderSystemOBJProxy.CurrObjSys.Start_Conn_Server( winderSystemOBJProxy.CurrObjSys.Start_Conn_Server(
new IPEndPoint(IPAddress.Any, gage.mSysParam.OBJ_Port), winderSystemOBJProxy.ID); new IPEndPoint(IPAddress.Any, gage.mSysParam.OBJ_Port));
} }
} }
......
...@@ -16,12 +16,15 @@ namespace FLY.Winder.Server.Model ...@@ -16,12 +16,15 @@ namespace FLY.Winder.Server.Model
public class Db_WinderInfo : IDbBase public class Db_WinderInfo : IDbBase
{ {
[Key] [Key]
[Index]
[PropertyIndex(0)] [PropertyIndex(0)]
public Int64 ID { get; set; } public Int64 ID { get; set; }
/// <summary> /// <summary>
/// 时间 /// 时间
/// </summary> /// </summary>
[Index]
[Time]
[PropertyIndex(1)] [PropertyIndex(1)]
public DateTime Time { get; set; } public DateTime Time { get; set; }
......
...@@ -18,7 +18,7 @@ namespace FLY.Winder.Server.Model ...@@ -18,7 +18,7 @@ namespace FLY.Winder.Server.Model
public class HistoryDb public class HistoryDb
{ {
DbModel dbModel; DbModel dbModel;
public BufferSQLite<Db_WinderInfo> WinderInfoBuffer; public BulkDbSQLite<Db_WinderInfo> WinderInfoBuffer;
public BufferError ErrorBuffer; public BufferError ErrorBuffer;
/// <summary> /// <summary>
/// ///
...@@ -27,36 +27,14 @@ namespace FLY.Winder.Server.Model ...@@ -27,36 +27,14 @@ namespace FLY.Winder.Server.Model
public void Init(DbModel dBModel) public void Init(DbModel dBModel)
{ {
this.dbModel = dBModel; this.dbModel = dBModel;
WinderInfoBuffer = new BufferSQLite<Db_WinderInfo>(); WinderInfoBuffer = new BulkDbSQLite<Db_WinderInfo>();
WinderInfoBuffer.Init(dBModel.TbWinderInfo); WinderInfoBuffer.Init(dBModel.TbWinderInfo);
ErrorBuffer = new BufferError(); ErrorBuffer = new BufferError();
ErrorBuffer.Init(dBModel.TbError); ErrorBuffer.Init(dBModel.TbError);
} }
/// <summary>
/// 按时间删除数据库
/// </summary>
/// <param name="month"></param>
public void KeepDBSize(int month)
{
if (month <= 3)
month = 3;
DateTime del_time = DateTime.Now - TimeSpan.FromDays(month * 30);
string det_time_str = del_time.ToStringOfSQLiteFieldType();
List<string> sqls = new List<string>();
sqls.Add(
$"DELETE FROM {dbModel.TbWinderInfo.TableName}" +
$" WHERE Time < {det_time_str}");
sqls.Add(
$"DELETE FROM {dbModel.TbError.TableName}" +
$" WHERE Time < {det_time_str}");
dbModel.sqliteHelper.QueryTran(sqls);
}
public void AddWinderInfo( public void AddWinderInfo(
Db_WinderInfo winderInfo Db_WinderInfo winderInfo
......
...@@ -59,10 +59,9 @@ namespace FLY.Winder.Server ...@@ -59,10 +59,9 @@ namespace FLY.Winder.Server
//数据库 //数据库
mDbModel = new DbModel(); mDbModel = new DbModel();
mDbModel.Init(); mDbModel.Init();
mDbModel.KeepDBSize(mSysParam.DBKeepMonth);
mHistoryDb = new HistoryDb(); mHistoryDb = new HistoryDb();
mHistoryDb.Init(mDbModel); mHistoryDb.Init(mDbModel);
mHistoryDb.KeepDBSize(mSysParam.DBKeepMonth);
mWarning = new WarningSystem(); mWarning = new WarningSystem();
mWarning.Init(mHistoryDb.ErrorBuffer); mWarning.Init(mHistoryDb.ErrorBuffer);
......
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration" />
</configSections>
<unity>
<assembly name="FLY.Thick.Base.UI" />
<namespace name="FLY.Thick.Base.UI.UiModule" />
<alias alias="IUiModule2" type="MultiLayout.UiModule.IUiModule2, MultiLayout" />
<container>
<register type="IUiModule2" mapTo="UiModule2_MenuMotion" name="base_mm" />
<register type="IUiModule2" mapTo="UiModule2_DynAreaThick" name="base_dathk" />
<register type="IUiModule2" mapTo="UiModule2_DynAreaSample" name="base_das" />
<register type="IUiModule2" mapTo="UiModule2_DynAreaIO" name="base_daio" />
<register type="IUiModule2" mapTo="UiModule2_FixGraph" name="base_fg" />
</container>
</unity>
</configuration>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration" />
</configSections>
<unity>
<assembly name="FLY.Thick.BlowingScan.UI" />
<namespace name="FLY.Thick.BlowingScan.UI.Client.UiModule" />
<assembly name="FLY.Thick.Blowing.UI" />
<namespace name="FLY.Thick.Blowing.UI.Fix.Client.UiModule" />
<alias alias="IUiModule2" type="MultiLayout.UiModule.IUiModule2, MultiLayout" />
<container>
<register type="IUiModule2" mapTo="UiModule2_MenuSetting" name="blowing_ms" />
<register type="IUiModule2" mapTo="UiModule2_MenuProfile" name="blowing_mp" />
<register type="IUiModule2" mapTo="UiModule2_DynAreaProfile" name="blowing_dap" />
<register type="IUiModule2" mapTo="UiModule2_DynAreaBlowing" name="blowing_dab" />
<register type="IUiModule2" mapTo="UiModule2_DynAreaFilmWidth" name="blowing_dafw" />
<register type="IUiModule2" mapTo="UiModule2_ScanGraph" name="blowing_sg" />
<register type="IUiModule2" mapTo="UiModule2_ScanGraph2" name="blowing_sg2" />
<register type="IUiModule2" mapTo="UiModule2_ScanGraphCircular" name="blowing_sgc" />
<register type="IUiModule2" mapTo="UiModule2_TrendGraph" name="blowing_tg" />
</container>
</unity>
</configuration>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration" />
</configSections>
<unity>
<assembly name="FLY.Thick.BlowingScan" />
<namespace name="FLY.Thick.BlowingScan.IService" />
<namespace name="FLY.Thick.BlowingScan.Client" />
<assembly name="FLY.Thick.Blowing" />
<namespace name="FLY.Thick.Blowing.IService" />
<namespace name="FLY.Thick.Blowing.Client" />
<assembly name="FLY.Thick.Base" />
<namespace name="FLY.Thick.Base.IService" />
<namespace name="FLY.Thick.Base.Client" />
<assembly name="FLY.OBJComponents" />
<namespace name="FLY.OBJComponents.IService" />
<namespace name="FLY.OBJComponents.Client" />
<alias alias="WarningReasonWindow" type="FLY.Thick.Base.UI.WarningReasonWindow,FLY.Thick.Base.UI" />
<container>
<register type="IBlowingFixProfileService" mapTo="BlowingFixProfileServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30002" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="ICurveService" mapTo="CurveServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30003" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="IInitParamService" mapTo="InitParamServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30004" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="IDynAreaService" mapTo="DynAreaServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30005" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="IFlyADService" mapTo="FlyADServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30006" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="IFixService" mapTo="FixServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30007" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="ITDGageService" mapTo="TDGageServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30008" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="IBlowingService" mapTo="BlowingScanServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30009" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="IBlowingDetectService" mapTo="BlowingDetectServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30010" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="IScanWarningService" mapTo="ScanWarningServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30011" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="IBulkDbService" mapTo="BulkDbServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30012" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="IBorderSearchService" mapTo="BorderSearchServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30013" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="IGetSampleService" mapTo="GetSampleServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30014" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="IScanCorrService" mapTo="ScanCorrServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30015" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="IGageInfoService" mapTo="GageInfoServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="30016" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="IWarningService" mapTo="WarningServiceClient">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="20000" />
<param name="connName" dependencyName="cn0" />
</constructor>
</register>
<register type="WarningReasonWindow">
<lifetime type="singleton" />
<constructor>
<param name="warningService" />
<param name="size" value="100" />
</constructor>
</register>
</container>
</unity>
</configuration>
\ No newline at end of file
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<param name="connName" dependencyName="cn3" /> <param name="connName" dependencyName="cn3" />
</constructor> </constructor>
</register> </register>
<register type="IBuffer[Db_Width]" mapTo="BufferServiceClient[Db_Width]"> <register type="IBulkDbWidthService" mapTo="BulkDbWidthServiceClient">
<lifetime type="singleton" /> <lifetime type="singleton" />
<constructor> <constructor>
<param name="serviceId" value="32004" /> <param name="serviceId" value="32004" />
......
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration" />
</configSections>
<unity>
<assembly name="FLY.Thick.Base.UI" />
<namespace name="FLY.Thick.Base.UI.OnInit" />
<alias alias="IOnInit" type="MultiLayout.UiModule.IOnInit, MultiLayout" />
<container>
<register type="IOnInit" mapTo="OnInitAutoScan" name="autoscan">
<lifetime type="singleton" />
</register>
<register type="IOnInit" mapTo="OnInitGageCommand" name="gageCmd">
<lifetime type="singleton" />
</register>
<register type="IOnInit" mapTo="OnInitControllerState" name="controllerState">
<lifetime type="singleton" />
</register>
</container>
</unity>
</configuration>
\ No newline at end of file
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<param name="connName" dependencyName="cn2" /> <param name="connName" dependencyName="cn2" />
</constructor> </constructor>
</register> </register>
<register type="IBuffer[Lc_Flow]" mapTo="BufferServiceClient[Lc_Flow]"> <register type="IBulkDbFlowService" mapTo="BulkDbFlowServiceClient">
<lifetime type="singleton" /> <lifetime type="singleton" />
<constructor> <constructor>
<param name="serviceId" value="35004" /> <param name="serviceId" value="35004" />
......
...@@ -20,13 +20,6 @@ ...@@ -20,13 +20,6 @@
<param name="connName" dependencyName="cn4" /> <param name="connName" dependencyName="cn4" />
</constructor> </constructor>
</register> </register>
<register type="IBuffer[Db_WinderInfo]" mapTo="BufferServiceClient[Db_WinderInfo]">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="33004" />
<param name="connName" dependencyName="cn4" />
</constructor>
</register>
<register type="IWarningService" mapTo="WarningServiceClient" name="winderWarningService"> <register type="IWarningService" mapTo="WarningServiceClient" name="winderWarningService">
<lifetime type="singleton" /> <lifetime type="singleton" />
<constructor> <constructor>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<param name="connName" dependencyName="cn3" /> <param name="connName" dependencyName="cn3" />
</constructor> </constructor>
</register> </register>
<register type="IBuffer[Db_Width]" mapTo="BufferServiceClient[Db_Width]"> <register type="IBulkDbWidthService" mapTo="BulkDbWidthServiceClient">
<lifetime type="singleton" /> <lifetime type="singleton" />
<constructor> <constructor>
<param name="serviceId" value="32004" /> <param name="serviceId" value="32004" />
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<param name="connName" dependencyName="cn2" /> <param name="connName" dependencyName="cn2" />
</constructor> </constructor>
</register> </register>
<register type="IBuffer[Lc_Flow]" mapTo="BufferServiceClient[Lc_Flow]"> <register type="IBulkDbFlowService" mapTo="BulkDbFlowServiceClient">
<lifetime type="singleton" /> <lifetime type="singleton" />
<constructor> <constructor>
<param name="serviceId" value="35004" /> <param name="serviceId" value="35004" />
......
...@@ -20,13 +20,6 @@ ...@@ -20,13 +20,6 @@
<param name="connName" dependencyName="cn4" /> <param name="connName" dependencyName="cn4" />
</constructor> </constructor>
</register> </register>
<register type="IBuffer[Db_WinderInfo]" mapTo="BufferServiceClient[Db_WinderInfo]">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="33004" />
<param name="connName" dependencyName="cn4" />
</constructor>
</register>
<register type="IWarningService" mapTo="WarningServiceClient" name="winderWarningService"> <register type="IWarningService" mapTo="WarningServiceClient" name="winderWarningService">
<lifetime type="singleton" /> <lifetime type="singleton" />
<constructor> <constructor>
......
...@@ -20,13 +20,6 @@ ...@@ -20,13 +20,6 @@
<param name="connName" dependencyName="cn4" /> <param name="connName" dependencyName="cn4" />
</constructor> </constructor>
</register> </register>
<register type="IBuffer[Db_WinderInfo]" mapTo="BufferServiceClient[Db_WinderInfo]">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="33004" />
<param name="connName" dependencyName="cn4" />
</constructor>
</register>
<register type="IWarningService" mapTo="WarningServiceClient" name="winderWarningService"> <register type="IWarningService" mapTo="WarningServiceClient" name="winderWarningService">
<lifetime type="singleton" /> <lifetime type="singleton" />
<constructor> <constructor>
......
...@@ -20,13 +20,6 @@ ...@@ -20,13 +20,6 @@
<param name="connName" dependencyName="cn4" /> <param name="connName" dependencyName="cn4" />
</constructor> </constructor>
</register> </register>
<register type="IBuffer[Db_WinderInfo]" mapTo="BufferServiceClient[Db_WinderInfo]">
<lifetime type="singleton" />
<constructor>
<param name="serviceId" value="33004" />
<param name="connName" dependencyName="cn4" />
</constructor>
</register>
<register type="IWarningService" mapTo="WarningServiceClient" name="winderWarningService"> <register type="IWarningService" mapTo="WarningServiceClient" name="winderWarningService">
<lifetime type="singleton" /> <lifetime type="singleton" />
<constructor> <constructor>
......
和美安装包_v6.21.0 -20201227
1. 修改 称重流量图,IBC控制图,称重与IBC的表,都改为用BulkDb结构,有按时间查找,间隔功能
和美安装包_v6.20.14 -20201213 和美安装包_v6.20.14 -20201213
1. 增加 称重_646_v3 1. 增加 称重_646_v3
......
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