diff --git a/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs b/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs index 6f2ee82..21fcf41 100644 --- a/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs +++ b/Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs @@ -75,7 +75,7 @@ namespace Txgy.RBS.Server.WebApi.Controllers public ApiResult StartProject(ProjectUsedDTO usedDTO) { // 更新当前项目配置 - var res = _projectInfoService.UpdateCurrentProjectUsed(usedDTO); + var res = new ApiResult();// _projectInfoService.UpdateCurrentProjectUsed(usedDTO); var curProject = this.GetProjectInfo(usedDTO.current_project_id); var staVpn = _stationsService.GetStationNumVpn(); diff --git a/Txgy.RBS.Server.WebApi/rbs_server_db.db b/Txgy.RBS.Server.WebApi/rbs_server_db.db index 149b72d..6e9fc73 100644 Binary files a/Txgy.RBS.Server.WebApi/rbs_server_db.db and b/Txgy.RBS.Server.WebApi/rbs_server_db.db differ diff --git a/Txgy.RBS.Services/ProcessManagerService.cs b/Txgy.RBS.Services/ProcessManagerService.cs index 7b3dc64..49a1f18 100644 --- a/Txgy.RBS.Services/ProcessManagerService.cs +++ b/Txgy.RBS.Services/ProcessManagerService.cs @@ -2,8 +2,7 @@ using Microsoft.Extensions.Caching.Memory; using System.Collections.Concurrent; using System.Data; -using System.Diagnostics; -using Txgy.RBS.DTO; + using Txgy.RBS.DTO; using Txgy.RBS.Framework; using Txgy.RBS.Framework.Api; using Txgy.RBS.Framework.FileWatcherHelper; diff --git a/Txgy.RBS.Services/ProjectInfoService.cs b/Txgy.RBS.Services/ProjectInfoService.cs index e2fd343..7164415 100644 --- a/Txgy.RBS.Services/ProjectInfoService.cs +++ b/Txgy.RBS.Services/ProjectInfoService.cs @@ -93,8 +93,12 @@ namespace Txgy.RBS.Services public ProjectInfoDTO GetProjectInfo(int id) { var projectInfo = _Client.Queryable().Where(p => p.project_id == id).Includes(p=>p.station_file, s=>s.stations).Includes(p=>p.time_tab).ToList(); - ProjectInfoDTO projectInfoDTO = _iMapper.Map(projectInfo[0]); - return projectInfoDTO; + if (projectInfo != null && projectInfo.Count() > 0) + { + ProjectInfoDTO projectInfoDTO = _iMapper.Map(projectInfo[0]); + return projectInfoDTO; + } + return null; }