阅片时间修改到配置文件
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
bb111dbbeb
commit
e6c577e68b
|
@ -62,7 +62,11 @@
|
||||||
|
|
||||||
"AutoLoginOutMinutes": 1,
|
"AutoLoginOutMinutes": 1,
|
||||||
|
|
||||||
"OpenLoginMFA": false
|
"OpenLoginMFA": false,
|
||||||
|
|
||||||
|
"ContinuousReadingTimeMin": 120,
|
||||||
|
|
||||||
|
"ReadingRestTimeMin": 10
|
||||||
},
|
},
|
||||||
|
|
||||||
"SystemEmailSendConfig": {
|
"SystemEmailSendConfig": {
|
||||||
|
|
|
@ -21,6 +21,7 @@ using IRaCIS.Core.Application.Service.ReadingCalculate.Interface;
|
||||||
using AutoMapper.QueryableExtensions;
|
using AutoMapper.QueryableExtensions;
|
||||||
using IRaCIS.Application.Contracts;
|
using IRaCIS.Application.Contracts;
|
||||||
using IRaCIS.Core.Domain.Models;
|
using IRaCIS.Core.Domain.Models;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
|
||||||
namespace IRaCIS.Application.Services
|
namespace IRaCIS.Application.Services
|
||||||
{
|
{
|
||||||
|
@ -42,6 +43,7 @@ namespace IRaCIS.Application.Services
|
||||||
private readonly IReadingCalculateService _readingCalculateService;
|
private readonly IReadingCalculateService _readingCalculateService;
|
||||||
private readonly IRepository<SubjectVisit> _subjectVisitRepository;
|
private readonly IRepository<SubjectVisit> _subjectVisitRepository;
|
||||||
private readonly IRepository<Subject> _subjectRepository;
|
private readonly IRepository<Subject> _subjectRepository;
|
||||||
|
private readonly IOptionsMonitor<ServiceVerifyConfigOption> _verifyConfig;
|
||||||
private readonly IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository;
|
private readonly IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository;
|
||||||
private readonly IRepository<ReadingCriterionPage> _readingCriterionPageRepository;
|
private readonly IRepository<ReadingCriterionPage> _readingCriterionPageRepository;
|
||||||
private readonly IRepository<ReadingTaskRelation> _readingTaskRelationRepository;
|
private readonly IRepository<ReadingTaskRelation> _readingTaskRelationRepository;
|
||||||
|
@ -84,6 +86,7 @@ namespace IRaCIS.Application.Services
|
||||||
IReadingCalculateService readingCalculateService,
|
IReadingCalculateService readingCalculateService,
|
||||||
IRepository<SubjectVisit> subjectVisitRepository,
|
IRepository<SubjectVisit> subjectVisitRepository,
|
||||||
IRepository<Subject> subjectRepository,
|
IRepository<Subject> subjectRepository,
|
||||||
|
IOptionsMonitor<ServiceVerifyConfigOption> verifyConfig,
|
||||||
IRepository<ReadingGlobalTaskInfo> readingGlobalTaskInfoRepository,
|
IRepository<ReadingGlobalTaskInfo> readingGlobalTaskInfoRepository,
|
||||||
IRepository<ReadingCriterionPage> readingCriterionPageRepository,
|
IRepository<ReadingCriterionPage> readingCriterionPageRepository,
|
||||||
IRepository<ReadingTaskRelation> readingTaskRelationRepository,
|
IRepository<ReadingTaskRelation> readingTaskRelationRepository,
|
||||||
|
@ -125,6 +128,7 @@ namespace IRaCIS.Application.Services
|
||||||
this._readingCalculateService = readingCalculateService;
|
this._readingCalculateService = readingCalculateService;
|
||||||
this._subjectVisitRepository = subjectVisitRepository;
|
this._subjectVisitRepository = subjectVisitRepository;
|
||||||
this._subjectRepository = subjectRepository;
|
this._subjectRepository = subjectRepository;
|
||||||
|
this._verifyConfig = verifyConfig;
|
||||||
this._readingGlobalTaskInfoRepository = readingGlobalTaskInfoRepository;
|
this._readingGlobalTaskInfoRepository = readingGlobalTaskInfoRepository;
|
||||||
this._readingCriterionPageRepository = readingCriterionPageRepository;
|
this._readingCriterionPageRepository = readingCriterionPageRepository;
|
||||||
this._readingTaskRelationRepository = readingTaskRelationRepository;
|
this._readingTaskRelationRepository = readingTaskRelationRepository;
|
||||||
|
@ -2981,8 +2985,8 @@ namespace IRaCIS.Application.Services
|
||||||
var startReadingTimeKey = _userInfo.Id.ToString() + "StartReadingTime";
|
var startReadingTimeKey = _userInfo.Id.ToString() + "StartReadingTime";
|
||||||
var startRestTimeKey = _userInfo.Id.ToString() + "StartRestTime";
|
var startRestTimeKey = _userInfo.Id.ToString() + "StartRestTime";
|
||||||
|
|
||||||
int readingMinute = 120; // 为60整数
|
int readingMinute = _verifyConfig.CurrentValue.ContinuousReadingTimeMin; // 为60整数
|
||||||
int restMinute = 10; //
|
int restMinute = _verifyConfig.CurrentValue.ReadingRestTimeMin; //
|
||||||
var startReadingTime = _provider.Get<string>(startReadingTimeKey).Value;
|
var startReadingTime = _provider.Get<string>(startReadingTimeKey).Value;
|
||||||
var startRestTime = _provider.Get<string>(startRestTimeKey).Value;
|
var startRestTime = _provider.Get<string>(startRestTimeKey).Value;
|
||||||
if (startReadingTime == null && startRestTime == null)
|
if (startReadingTime == null && startRestTime == null)
|
||||||
|
|
|
@ -24,6 +24,17 @@ namespace IRaCIS.Core.Domain.Share
|
||||||
public int AutoLoginOutMinutes { get; set; }
|
public int AutoLoginOutMinutes { get; set; }
|
||||||
|
|
||||||
public bool OpenLoginMFA { get; set; }
|
public bool OpenLoginMFA { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 连续阅片时间 (min)
|
||||||
|
/// </summary>
|
||||||
|
public int ContinuousReadingTimeMin { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 休息时间 (min)
|
||||||
|
/// </summary>
|
||||||
|
public int ReadingRestTimeMin { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class SystemEmailSendConfig
|
public class SystemEmailSendConfig
|
||||||
|
|
Loading…
Reference in New Issue