From b6c4badd674cb13c2434fe0433f828db28462028 Mon Sep 17 00:00:00 2001
From: mzhifa <mzhifa@foxmail.com>
Date: Tue, 30 Apr 2024 13:35:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/ProjectInfoController.cs      |   2 +-
 Txgy.RBS.Server.WebApi/rbs_server_db.db       | Bin 753664 -> 753664 bytes
 Txgy.RBS.Services/ProcessManagerService.cs    |   3 +--
 Txgy.RBS.Services/ProjectInfoService.cs       |   8 ++++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

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 149b72d8641354776c2e74b8549aa6a41b865c04..6e9fc73f21678dbab9f56693562bc6b97fdffe65 100644
GIT binary patch
delta 497
zcmZo@&}(SWn;<Qi!N9<<1Bg?BxCV$PP1G@F&0x^;ui2QgAfAJX{}}`S7yf6P1ru)Z
z3-idaFfd9p6_*rc=A|2QF|sglZvL6iu|Skdn1P-B5d;4^J`LVuyoTHc9BJ&2CRP<~
z?+{?@=44@DV3gf1F2(q1D&v>U0ta^RPh6lZ&CA5X2sBI%VHzi=B!si=03*u+F%I?u
z2F_eg6OP{;hd4U<Ti6TuX7J6}EGV#tjf?jt!z^)YYsN;`>4|wvGSmO(GKo*G&12Fu
zNiHoaO3f>YFDS~-N=+__&rDJ9^b679Qcy_F$plFN1wvdSz#<SiF3s%)=}g&dybSxr
z8^sgYv6>r)+gw~WaA^X=Q$bu+m9aUrBrz!`73QSU;?xu{yD>A79V{<8S(Zzi2U&jl
z{B$N!E*%A!wUZ4wL^$C-n4Hb7HhCtyXM0ON6A&{4F$)m00x=s9vjZ^)5OV@C*Y=it
H?iv9AlK7Xe

delta 518
zcmZo@&}(SWn;<Qi#K6F?1Bg?BxCV%uCh8coCNb!xz1o<vAfAnp|0@Ik*Uf?nSNSI{
z5M$wFWM<g>GoNDtFHk85`y&Sab$lAU$0in4ZSN3Z?B?7o%=LnG`)_$hz6tD$_*3}R
z_+D%l6u7}BWW&PG$mz_&%*4*Yz`+63%rbd@oQ{wUGnz2-WXpJ<FcX?E6G)gPhLN9h
z@-q3TZ3h@x7KpI37cg+<a++}b<~YRB$=||Wz+M2f>@yn+?@h+K$r)^k+Y8c}ve`Ho
zSBqO)Gq%T1e~`vxJo!Ack`P-Y8_)?r&pJl1gXCHyL2@yZe=y6`=a*#WrYeNEMug~a
zDJWFr<mV{_xjOoQIF&hxC2&qkYC%Z`oR^yeXQt+*7Nu9hxkb6faCSjPVsUD5d~$wi
zUWtOIAJ~S(+yZ0~C!jsWshP#OnaT0R`K3k42)Dq5Q!<NElS?v@9F|p_pBG<TQUrE3
jS9^0l6A&{4F$)m00x=s9vjZ^)5OV@C*Y@Uo?pgr=W7Cg4

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<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]);
-            return projectInfoDTO;
+            if (projectInfo != null && projectInfo.Count() > 0)
+            {
+                ProjectInfoDTO projectInfoDTO = _iMapper.Map<project_info, ProjectInfoDTO>(projectInfo[0]);
+                return projectInfoDTO;
+            }
+            return null;
         }