yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat 手动上传,手动设置时间范围

Browse Source
This commit is contained in:
liguoyang
2024-12-19 15:21:45 +08:00
parent e8632b0d49
commit 0f69c56a93
39 changed files with 458 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Basic/Appointment/Services/Implements/AppointmentAreaService.cs
View File

@@ -108,7 +108,6 @@ public class AppointmentAreaService : IAppointmentAreaService
DeviceUniqueNo = devices.First(item => item.Code == x).UniqueNo,
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
CancellationId = 0,
Source = "预约区域和设备组关系变更生成",
Priority = 99
}));
@@ -121,7 +120,6 @@ public class AppointmentAreaService : IAppointmentAreaService
DeviceUniqueNo = devices.First(item => item.Code == x).UniqueNo,
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
CancellationId = 0,
Source = "预约区域和设备组关系变更生成",
Priority = 99
}));

2
Src/Dlhis.Basic/Device/Services/Implements/BasePermissionAnalyzeService.cs
View File

@@ -83,7 +83,6 @@ public abstract class BasePermissionAnalyzeService : IPermissionAnalyzeService
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
ResultMessage = null,
CancellationId = 0,
Source = source,
Priority = 0,
TenantId = x.TenantId,
@@ -99,7 +98,6 @@ public abstract class BasePermissionAnalyzeService : IPermissionAnalyzeService
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
ResultMessage = null,
CancellationId = 0,
Source = source,
Priority = 0,
TenantId = x.TenantId,

2
Src/Dlhis.Basic/Device/Services/Implements/DeviceGroupService.cs
View File

@@ -225,7 +225,6 @@ public class DeviceGroupService : IDeviceGroupService
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
ResultMessage = null,
CancellationId = 0,
Source = "人员分组分配",
Priority = 0,
TenantId = x.TenantId
@@ -259,7 +258,6 @@ public class DeviceGroupService : IDeviceGroupService
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
ResultMessage = null,
CancellationId = 0,
Source = "人员分组分配",
Priority = 0,
TenantId = x.TenantId,

1
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionAnalyzeService.cs
View File

@@ -125,7 +125,6 @@ public class DevicePermissionAnalyzeService : IDevicePermissionAnalyzeService
DeviceUniqueNo = devices.First(item => item.Code == x).UniqueNo,
Status = DeviceTaskStatusEnumType.Wait,
Type = DeviceTaskEnumType.Delete,
CancellationId = 0,
DeviceType = devices.First(item => item.Code == x).Type,
UserNo = userNo,
Version = 0,

4
Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
View File

@@ -101,7 +101,6 @@ public class DevicePermissionService : IDevicePermissionService
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
ResultMessage = null,
CancellationId = 0,
Source = "人员分配到设备unique",
Priority = 0,
TenantId = currentTenantId,
@@ -129,7 +128,6 @@ public class DevicePermissionService : IDevicePermissionService
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
ResultMessage = null,
CancellationId = 20,
Source = "人员分配到设备unique",
Priority = 0,
TenantId = currentTenantId
@@ -207,7 +205,6 @@ public class DevicePermissionService : IDevicePermissionService
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
ResultMessage = null,
CancellationId = 0,
Source = "人员分配到设备import",
Priority = 0,
TenantId = device.TenantId,
@@ -423,7 +420,6 @@ public class DevicePermissionService : IDevicePermissionService
Type = taskType,
DeviceType = x.Type,
UserNo = userNo,
CancellationId = 0,
Priority = 0,
Version = 0,
TenantId = x.TenantId,

4
Src/Dlhis.Basic/Device/Services/Implements/DeviceTimePeriodService.cs
View File

@@ -158,7 +158,6 @@ public class DeviceTimePeriodService : IDeviceTimePeriodService
DeviceUniqueNo = deviceUniqueNo,
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
CancellationId = 0,
Source = source,
Priority = 90,
TenantId = device.TenantId
@@ -191,7 +190,6 @@ public class DeviceTimePeriodService : IDeviceTimePeriodService
DeviceUniqueNo = deviceUniqueNo,
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
CancellationId = 0,
Source = source,
Priority = 90,
TenantId = device.TenantId
@@ -213,7 +211,7 @@ public class DeviceTimePeriodService : IDeviceTimePeriodService
var devices = await _dbContext.Queryable<DeviceEntity>()
.Where(x => !SqlFunc.IsNullOrEmpty(x.TemplateCode))
.Where(x => templateCodes.Contains(x.TemplateCode.Value) || deviceCodes.Contains(x.Code))
.Where(x => templateCodes.Contains(x.TemplateCode) || deviceCodes.Contains(x.Code))
.Where(x => x.Enable && x.EnableTimePeriod)
.ToListAsync();

2
Src/Dlhis.Basic/Organization/Services/Implements/GainfoGroupService.cs
View File

@@ -189,7 +189,6 @@ public class GainfoGroupService : IGainfoGroupService
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
ResultMessage = null,
CancellationId = 0,
Source = "手动操作人员分组关系",
Priority = 0,
TenantId = device.TenantId
@@ -209,7 +208,6 @@ public class GainfoGroupService : IGainfoGroupService
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
ResultMessage = null,
CancellationId = 0,
Source = "手动操作人员分组关系",
Priority = 0,
TenantId = device.TenantId

1
Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
View File

@@ -305,7 +305,6 @@ public class GainfoService : IGainfoService
Status = DeviceTaskStatusEnumType.Wait,
Version = 0,
ResultMessage = null,
CancellationId = 0,
Source = "安全级别提高",
Priority = 60,
TenantId = x.TenantId

2
Src/Dlhis.Basic/appsettings.Development.json
View File

@@ -22,7 +22,7 @@
"Timeout": 30,
"SlowSqlTime": 1,
"EnableSqlLog": true,
"Generate": false
"Generate": true
},
"SwaggerOptions": {
"Enable": true,