修改测试问题

master
mzhifa 5 months ago
parent f0e09a2c9b
commit b6c4badd67

@ -75,7 +75,7 @@ namespace Txgy.RBS.Server.WebApi.Controllers
public ApiResult StartProject(ProjectUsedDTO usedDTO) 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 curProject = this.GetProjectInfo(usedDTO.current_project_id);
var staVpn = _stationsService.GetStationNumVpn(); var staVpn = _stationsService.GetStationNumVpn();

@ -2,8 +2,7 @@
using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Caching.Memory;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Data; using System.Data;
using System.Diagnostics; using Txgy.RBS.DTO;
using Txgy.RBS.DTO;
using Txgy.RBS.Framework; using Txgy.RBS.Framework;
using Txgy.RBS.Framework.Api; using Txgy.RBS.Framework.Api;
using Txgy.RBS.Framework.FileWatcherHelper; using Txgy.RBS.Framework.FileWatcherHelper;

@ -93,8 +93,12 @@ namespace Txgy.RBS.Services
public ProjectInfoDTO GetProjectInfo(int id) public ProjectInfoDTO GetProjectInfo(int id)
{ {
var projectInfo = _Client.Queryable<project_info>().Where(p => p.project_id == id).Includes(p=>p.station_file, s=>s.stations).Includes(p=>p.time_tab).ToList(); var projectInfo = _Client.Queryable<project_info>().Where(p => p.project_id == id).Includes(p=>p.station_file, s=>s.stations).Includes(p=>p.time_tab).ToList();
ProjectInfoDTO projectInfoDTO = _iMapper.Map<project_info, ProjectInfoDTO>(projectInfo[0]); if (projectInfo != null && projectInfo.Count() > 0)
return projectInfoDTO; {
ProjectInfoDTO projectInfoDTO = _iMapper.Map<project_info, ProjectInfoDTO>(projectInfo[0]);
return projectInfoDTO;
}
return null;
} }

Loading…
Cancel
Save