xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor:删除了DeviceDto,VariableDto,VariableTableDto,改为使用DMS.Core中的实体

Browse Source
This commit is contained in:
David P.G
2025-10-07 17:51:24 +08:00
parent 94ad940e03
commit b753e5ea73
52 changed files with 291 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DMS.WPF/ViewModels/DeviceDetailViewModel.cs
View File

@@ -75,7 +75,7 @@ public partial class DeviceDetailViewModel : ViewModelBase
TargetViewKey = nameof(VariableTableViewModel)
};
int addVarTableId = await _wpfDataService.VariableTableDataService.AddVariableTable(
_mapper.Map<VariableTableDto>(VariableTableItem),
_mapper.Map<VariableTable>(VariableTableItem),
tableMenu, true);
if (addVarTableId > 0)

6
DMS.WPF/ViewModels/DevicesViewModel.cs
View File

@@ -95,7 +95,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
// 添加null检查
if (_mapper != null)
{
dto.Device = _mapper.Map<DeviceDto>(device);
dto.Device = _mapper.Map<Device>(device);
}
else
{
@@ -113,7 +113,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
if (device.IsAddDefVarTable)
{
dto.VariableTable = new VariableTableDto()
dto.VariableTable = new VariableTable()
{
Name = "默认变量表",
Description = "默认变量表",
@@ -273,7 +273,7 @@ public partial class DevicesViewModel : ViewModelBase, INavigatable
TargetViewKey = nameof(VariableTableViewModel)
};
int addVarTableId = await _wpfDataService.VariableTableDataService.AddVariableTable(
_mapper.Map<VariableTableDto>(VariableTableItem),
_mapper.Map<VariableTable>(VariableTableItem),
tableMenu, true);
if (addVarTableId > 0)

18
DMS.WPF/ViewModels/VariableTableViewModel.cs
View File

@@ -208,7 +208,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
editedVariable.UpdatedAt = DateTime.Now;
// 更新数据库中的变量数据
var updateResult = await _variableManagementService.UpdateVariableAsync(_mapper.Map<VariableDto>(editedVariable));
var updateResult = await _variableManagementService.UpdateVariableAsync(_mapper.Map<Variable>(editedVariable));
if (updateResult > 0)
@@ -245,7 +245,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
if (improtVariable == null || improtVariable.Count == 0) return;
var improtVariableDtos = _mapper.Map<List<VariableDto>>(improtVariable);
var improtVariableDtos = _mapper.Map<List<Variable>>(improtVariable);
foreach (var variableDto in improtVariableDtos)
{
variableDto.IsActive = true;
@@ -331,7 +331,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
// 将导入的变量转换为DTO并设置必要的属性
var importedVariableDtos = _mapper.Map<List<VariableDto>>(importedVariables);
var importedVariableDtos = _mapper.Map<List<Variable>>(importedVariables);
foreach (var variableDto in importedVariableDtos)
{
variableDto.CreatedAt = DateTime.Now;
@@ -420,7 +420,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
// // 添加变量数据到数据库
var addVariable
= await _variableManagementService.CreateVariableAsync(_mapper.Map<VariableDto>(variableItemViewModel));
= await _variableManagementService.CreateVariableAsync(_mapper.Map<Variable>(variableItemViewModel));
_mapper.Map(addVariable, variableItemViewModel);
// // 更新当前页面显示的数据：将新变量添加到集合中
_variableItemList.Add(variableItemViewModel);
@@ -526,7 +526,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 批量更新数据库中的变量数据
var variableDtos = _mapper.Map<List<VariableDto>>(validVariables);
var variableDtos = _mapper.Map<List<Variable>>(validVariables);
var result = await _variableManagementService.UpdateVariablesAsync(variableDtos);
if (result > 0)
@@ -568,7 +568,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 批量更新数据库中的变量数据
var variableDtos = _mapper.Map<List<VariableDto>>(validVariables);
var variableDtos = _mapper.Map<List<Variable>>(validVariables);
var result = await _variableManagementService.UpdateVariablesAsync(variableDtos);
if (result > 0)
@@ -720,7 +720,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 批量更新数据库中的变量数据
var variableDtos = _mapper.Map<List<VariableDto>>(validVariables);
var variableDtos = _mapper.Map<List<Variable>>(validVariables);
var result = await _variableManagementService.UpdateVariablesAsync(variableDtos);
if (result > 0)
@@ -800,7 +800,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 批量更新数据库中的变量数据
var variableDtos = _mapper.Map<List<VariableDto>>(validVariables);
var variableDtos = _mapper.Map<List<Variable>>(validVariables);
var updateResult = await _variableManagementService.UpdateVariablesAsync(variableDtos);
@@ -855,7 +855,7 @@ partial class VariableTableViewModel : ViewModelBase, INavigatable
}
// 批量更新数据库中的变量数据
var variableDtos = _mapper.Map<List<VariableDto>>(validVariables);
var variableDtos = _mapper.Map<List<Variable>>(validVariables);
var updateResult = await _variableManagementService.UpdateVariablesAsync(variableDtos);
if (updateResult > 0)