修改测试问题

Txgy.RBS.DTO/ProjectUsedDTO.cs

@@ -14,6 +14,9 @@ namespace Txgy.RBS.DTO
 
 
         }
+
+        public int id { get; set; }
+
         public int current_project_id { get; set; }
 
 

Txgy.RBS.DbModel/Models/project_used.cs

@@ -21,6 +21,8 @@ namespace Txgy.RBS.DbModel.Models
         /// Nullable:False
         /// </summary>    
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public int id { get; set; }
+
         public int current_project_id { get; set; }
 
 

Txgy.RBS.Framework/CommonData.cs

@@ -9,7 +9,6 @@ namespace Txgy.RBS.Framework
 {
     public class CommonData
     {
-        public static string BaseProjectPath { get; set; } = "c:\\Project";
         public static string RedisDefaultPath { get; set; } = "program\\server";
 
         public static string ApmsDefaultPath { get; set; } = "program\\apms\\gw.apms.json";
@@ -38,6 +37,7 @@ namespace Txgy.RBS.Framework
             {
                 string name = System.IO.Path.GetFileName(file);
                 string dest = System.IO.Path.Combine(destFolder, name);
+                if (file.Contains("program\\server")) continue;  //server目录文件不复制
                 System.IO.File.Copy(file, dest);//复制文件
             }
             //得到原文件根目录下的所有文件夹

Txgy.RBS.IServices/IGlobalConfigService.cs

@@ -16,7 +16,7 @@ namespace Txgy.RBS.IServices
      
         ApiResult UpdateGlobalConfig(GlobalConfigDTO globalConfigDTO);
 
-        GlobalConfigDTO GetGlobalConfig(int id);
+        GlobalConfigDTO GetGlobalConfig();
      
         List<GlobalConfigDTO> GetAllGlobalConfig();
     }

Txgy.RBS.IServices/IProjectInfoService.cs

@@ -22,10 +22,13 @@ namespace Txgy.RBS.IServices
      
         List<ProjectInfoDTO> GetAllProjectInfo();
 
-        ProjectUsedDTO GetCurrentProjectUsed();
+        ProjectUsedDTO GetCurrentProjectUsed(string clientName);
+        ProjectUsedDTO GetCurrentProjectUsed(int projectId);
 
         ApiResult UpdateCurrentProjectUsed(ProjectUsedDTO projectUsed);
 
+        ApiResult DeleteCurrentProjectUsed(int projectId);
+
         ApiResult StartProject(string projectName, ProcessConfig processConfig);
 
         ApiResult StopProject(string ProjectName);

Txgy.RBS.Server.WebApi/Controllers/GlobalConfigController.cs

@@ -33,7 +33,7 @@ namespace Txgy.RBS.Server.WebApi.Controllers
         [HttpGet("{id}")]
         public GlobalConfigDTO GetGlobalConfig(int id)
         {
-            return _globalConfigService.GetGlobalConfig(id);
+            return _globalConfigService.GetGlobalConfig();
         }
 
         [HttpGet]

Txgy.RBS.Server.WebApi/Controllers/ProjectInfoController.cs

@@ -20,24 +20,29 @@ namespace Txgy.RBS.Server.WebApi.Controllers
     {
         private readonly IProjectInfoService _projectInfoService;
         private readonly IStationsService _stationsService;
+        private readonly IGlobalConfigService _globalConfigService;
         private readonly ProcessConfig _processConfig;
 
-        public ProjectInfoController(ILogger<ProjectInfoController> logger, IProjectInfoService projectInfoService,IStationsService stationsService, IConfiguration configuration)
+        public ProjectInfoController(ILogger<ProjectInfoController> logger, IProjectInfoService projectInfoService,
+            IStationsService stationsService,
+            IGlobalConfigService globalConfigService,
+            IConfiguration configuration)
         {
             this._projectInfoService = projectInfoService;
             this._stationsService = stationsService;
+            this._globalConfigService = globalConfigService;
             this._processConfig = configuration.GetSection("process").Get<ProcessConfig>();
         }
 
         [HttpPost]
         public ApiResult AddProjectInfo(ProjectInfoDTO project)
         {
-          //var pro=  _projectInfoService.GetProjectInfo(1);
-          //  pro.id=project.id;
-          //  pro.project_id = project.project_id;
-          //  pro.project_name = project.project_name;
-          //  pro.moni_layer = project.moni_layer;    
-          //  pro.moni_num = project.moni_num;    
+            //var pro=  _projectInfoService.GetProjectInfo(1);
+            //  pro.id=project.id;
+            //  pro.project_id = project.project_id;
+            //  pro.project_name = project.project_name;
+            //  pro.moni_layer = project.moni_layer;    
+            //  pro.moni_num = project.moni_num;    
             return _projectInfoService.AddProjectInfo(project);
         }
 
@@ -65,12 +70,17 @@ namespace Txgy.RBS.Server.WebApi.Controllers
             return _projectInfoService.GetAllProjectInfo();
         }
 
-        [HttpGet]
-        public ProjectUsedDTO GetCurrentProjectUsed()
+        [HttpGet("{clientId}")]
+        public ProjectUsedDTO GetCurrentProjectUsed(string clientId)
         {
-            return _projectInfoService.GetCurrentProjectUsed();
+            return _projectInfoService.GetCurrentProjectUsed(clientId);
         }
 
+        [HttpGet]
+        public ProjectUsedDTO GetCurrentProjectUsed(int projectId)
+        {
+            return _projectInfoService.GetCurrentProjectUsed(projectId);
+        }
         [HttpPost]
         public ApiResult StartProject(ProjectUsedDTO usedDTO)
         {
@@ -79,11 +89,11 @@ namespace Txgy.RBS.Server.WebApi.Controllers
 
             var curProject = this.GetProjectInfo(usedDTO.current_project_id);
             var staVpn = _stationsService.GetStationNumVpn();
-
+            var globalConfig = _globalConfigService.GetGlobalConfig();
             if (res.Success && curProject != null)
             {
 
-                string path = Path.Combine(CommonData.BaseProjectPath, curProject.project_name);
+                string path = Path.Combine(globalConfig.base_path, curProject.project_name);
                 if (!Directory.Exists(path))
                 {
                     var direc = Directory.CreateDirectory(path);
@@ -105,8 +115,14 @@ namespace Txgy.RBS.Server.WebApi.Controllers
                 System.IO.File.WriteAllText(Path.Combine(path, "program\\apms", curProject.timeTab.filename), curProject.timeTab.file_content);
 
                 apm.is_write_slice = (curProject.local_save_result == 1) ? "YES" : "NO";
-                apm.savepath = Path.Combine(CommonData.BaseProjectPath, curProject.project_name, curProject.save_result_path) ;
+                apm.savepath = Path.Combine(globalConfig.base_path, curProject.project_name, curProject.save_result_path) ;
+                apm.push2wx= (curProject.push_wx==1)? "YES" : "NO";
                 apm.push_mag = curProject.push_wx_value;
+                apm.push_url = globalConfig.push_wx_url;
+                apm.company_id = globalConfig.push_wx_company_id;
+                apm.message_id = globalConfig.push_wx_message_id;
+                apm.content = globalConfig.push_wx_content;
+                apm.push_key = globalConfig.push_wx_key;
                 apm.channels = new List<StationChannelsModel>
                 {
                     new StationChannelsModel
@@ -132,7 +148,7 @@ namespace Txgy.RBS.Server.WebApi.Controllers
                 var rec = JsonConvert.DeserializeObject<RecvMqttModel>(str);
                 if (rec != null)
                 {
-                    rec.savepath = Path.Combine(CommonData.BaseProjectPath, curProject.project_name, curProject.save_waves_path);
+                    rec.savepath = Path.Combine(globalConfig.base_path, curProject.project_name, curProject.save_waves_path);
                     rec.send2server = (curProject.send_redis == 1) ? "YES" : "NO";
                     rec.Server = curProject.mqtt_server;
                     List< StationNumVpnDTO> vpnList=new List< StationNumVpnDTO>();
@@ -152,24 +168,33 @@ namespace Txgy.RBS.Server.WebApi.Controllers
                 }
                 _processConfig.FilesWatcherService = new Framework.FileWatcherHelper.FilesWatcherService(curProject.project_id,curProject.project_name,apm.savepath);
                 res= _projectInfoService.StartProject(curProject.project_name, _processConfig);
-                res.Data = curProject;
+                if(res.Success)
+                {
+                     res = _projectInfoService.UpdateCurrentProjectUsed(usedDTO);
+                     res.Data = curProject;
+                }
             }
-            return res;
+            else
+            {
+                res.Message = "没有查询到当前工程名称！";
+            }
+             return res;
         }
 
         [HttpPost]
         public ApiResult StopProject(ProjectUsedDTO usedDTO)
         {
             //  更新当前项目配置
-            var res = _projectInfoService.UpdateCurrentProjectUsed(usedDTO);
+            var res = _projectInfoService.DeleteCurrentProjectUsed(usedDTO.current_project_id);
             var curProject = this.GetProjectInfo(usedDTO.current_project_id);
             if (res.Success && curProject != null)
             {
                  res=  _projectInfoService.StopProject(curProject.project_name);  
-                res.Data = curProject;
+                 res.Data = curProject;
             }
             return res;
         }
+
         [HttpGet]
         public ApiResult GetProjectProcessState(string projectName, int id)
         {

Txgy.RBS.Services/GlobalConfigService.cs

@@ -51,9 +51,10 @@ namespace Txgy.RBS.Services
         }
 
 
-        public GlobalConfigDTO GetGlobalConfig(int id)
+        public GlobalConfigDTO GetGlobalConfig()
         {
-            return new GlobalConfigDTO();
+            var global_Config = _Client.Queryable<global_config>().First();
+            return _iMapper.Map<GlobalConfigDTO>(global_Config);
         }
 
         public ApiResult UpdateGlobalConfig(GlobalConfigDTO GlobalConfigDTO)

Txgy.RBS.Services/ProcessManagerService.cs

@@ -2,7 +2,8 @@
 using Microsoft.Extensions.Caching.Memory;
 using System.Collections.Concurrent;
 using System.Data;
- using Txgy.RBS.DTO;
+using System.Diagnostics;
+using Txgy.RBS.DTO;
 using Txgy.RBS.Framework;
 using Txgy.RBS.Framework.Api;
 using Txgy.RBS.Framework.FileWatcherHelper;
@@ -113,6 +114,20 @@ namespace Txgy.RBS.Services
 
         void WatcherChanged(MsEventModel msEvent, FileSystemEventArgs e)
         {
+
+            var path= Path.GetDirectoryName(e.FullPath);
+            var dir =  new DirectoryInfo(path);
+            var files= dir.GetFiles("*.json");
+            string name = $"HA.{msEvent.OriginTime.Year}{msEvent.OriginTime.Month:D2}{msEvent.OriginTime.Day:D2}T{msEvent.OriginTime.Hour:D2}{msEvent.OriginTime.Minute:D2}{msEvent.OriginTime.Second:D2}";
+            string jsonStr = string.Empty;
+            foreach (var item in files)
+            {
+                if (item.FullName.Contains(name))
+                {
+                    jsonStr= File.ReadAllText(item.FullName);
+                    break;
+                }
+            }
             _resultInfoService.AddResultInfo(new ResultDTO
             {
                 project_id = msEvent.ProjectId,
@@ -122,18 +137,17 @@ namespace Txgy.RBS.Services
                 depth = msEvent.Depth,
                 ml = msEvent.ML,
                 energy = msEvent.Energy,
-                // rms=msEvent.
+                json_str= jsonStr,
                 phases_count = msEvent.PhasesCount,
-                amps_count = msEvent.AmpsCount,              
+                amps_count = msEvent.AmpsCount,
             });
             _redisList.Publish($"{msEvent.ProjectName}result", Newtonsoft.Json.JsonConvert.SerializeObject(new
             {
                 projectName = msEvent.ProjectName,
                 otime = msEvent.OriginTime,
                 message = msEvent.ToString(),
-                jsonStr = ""
+                jsonStr = jsonStr
             }));
-
         }
 
 

Txgy.RBS.Services/ProjectInfoService.cs

@@ -65,19 +65,24 @@ namespace Txgy.RBS.Services
 
         public List<ProjectInfoDTO> GetAllProjectInfo()
         {
-            var projects = _Client.Queryable<project_info>().Includes(x => x.station_file, t=>t.stations)
+            var projects = _Client.Queryable<project_info>().Includes(x => x.station_file, t=>t.stations.OrderBy(n=>n.num).ToList())
                                                             .Includes(ti=>ti.time_tab).ToList();
             var projectDTOs= _iMapper.Map<List<ProjectInfoDTO>>(projects);
             return projectDTOs;
         }
 
-        public ProjectUsedDTO GetCurrentProjectUsed()
+        public ProjectUsedDTO GetCurrentProjectUsed(string clientName)
         {
-            var curProject = _Client.Queryable<project_used>().First();
+            var curProject = _Client.Queryable<project_used>().Where(c=>c.client_id== clientName).First();
             var projectUse=_iMapper.Map<ProjectUsedDTO>(curProject);
             return projectUse;
         }
-
+        public ProjectUsedDTO GetCurrentProjectUsed(int projectId)
+        {
+            var curProject = _Client.Queryable<project_used>().Where(c => c.current_project_id == projectId).First();
+            var projectUse = _iMapper.Map<ProjectUsedDTO>(curProject);
+            return projectUse;
+        }
         public ApiResult UpdateProjectInfo(ProjectInfoDTO project)
         {
             project_info projectInfo = _iMapper.Map<project_info>(project);
@@ -104,8 +109,19 @@ namespace Txgy.RBS.Services
 
         public ApiResult UpdateCurrentProjectUsed(ProjectUsedDTO projectUsed)
         {
-            var pro=_iMapper.Map<project_used>(projectUsed);
-            var res= _Client.Updateable<project_used>(pro).ExecuteCommand();
+            int res = 0;
+            var curUser=_iMapper.Map<project_used>(projectUsed);
+
+            var user= _Client.Queryable<project_used>().Where(u => u.client_id == curUser.client_id).First();
+            if (user != null)
+            {
+                 user.current_project_id = curUser.current_project_id;
+                 res = _Client.Updateable(user).ExecuteCommand();
+            }
+            else
+            {
+                res = _Client.Insertable(curUser).ExecuteCommand();
+            }
             if (res>0)
             {
                 return new ApiResult();
@@ -113,6 +129,21 @@ namespace Txgy.RBS.Services
             return new ApiResult() { Message = "更新失败" };
         }
 
+         public ApiResult DeleteCurrentProjectUsed(int projectId)
+        {
+            int res = 0;
+            var use = _Client.Queryable<project_used>().Where(u => u.current_project_id == projectId).First();
+            if (use != null)
+            {
+                res = _Client.Deleteable<project_used>().Where(u => u.id == use.id).ExecuteCommand();
+                if (res > 0)
+                {
+                    return new ApiResult();
+                }
+            }
+            return new ApiResult() { Message = "更新失败" };
+        }
+
         public ApiResult StartProject(string projectName, ProcessConfig processConfig)
         {
             var res = _processManager.StartProject(projectName, processConfig);

station_金5井_2.csv

@@ -0,0 +1,17 @@
+net,sta,x2000,y2000,z2000,sens,begin,stop,position
+YA,N021,37506783.63,4315231.833,964.31,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P001
+YA,N025,37506996.14,4315245.646,1021.623,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P002
+YA,N026,37507180.88,4315249.939,957.82,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P003
+YA,N038,37507395.86,4315245.449,957.09,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P004
+YA,N022,37506790.67,4315026.032,953.27,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P005
+YA,N023,37507005.76,4315015.073,1007.239,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P006
+YA,N024,37507189.42,4315066.236,938.42,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P007
+YA,N013,37507425.44,4315030.865,982.18,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P008
+YA,N040,37506793.68,4314787.025,966.41,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P009
+YA,N008,37506993.3,4314790.8,937.4,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P010
+YA,N009,37507264.72,4314711.779,936.39,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P011
+YA,N014,37507397.03,4314791.737,967.97,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P012
+YA,N007,37506794.36,4314557.729,964.37,3.20E+09,2023-11-17T00:00:00.001,2024-12-21T23:59:59.001,P013
+YA,N037,37506983.42,4314521.458,915.829,3.20E+09,2023-11-17T00:00:00.002,2024-12-21T23:59:59.002,P014
+YA,N030,37507193.88,4314568.531,965.042,3.20E+09,2023-11-17T00:00:00.003,2024-12-21T23:59:59.003,P015
+YA,N020,37507399.01,4314558.161,964.69,3.20E+09,2023-11-17T00:00:00.004,2024-12-21T23:59:59.004,P016

station_金6.csv

@@ -0,0 +1,17 @@
+net,sta,x2000,y2000,z2000,sens,begin,stop,position
+YA,N021,37506783.63,4315231.833,964.31,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P001
+YA,N025,37506996.14,4315245.646,1021.623,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P002
+YA,N026,37507180.88,4315249.939,957.82,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P003
+YA,N038,37507395.86,4315245.449,957.09,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P004
+YA,N022,37506790.67,4315026.032,953.27,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P005
+YA,N023,37507005.76,4315015.073,1007.239,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P006
+YA,N024,37507189.42,4315066.236,938.42,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P007
+YA,N013,37507425.44,4315030.865,982.18,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P008
+YA,N040,37506793.68,4314787.025,966.41,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P009
+YA,N008,37506993.3,4314790.8,937.4,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P010
+YA,N009,37507264.72,4314711.779,936.39,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P011
+YA,N014,37507397.03,4314791.737,967.97,3.20E+09,2023-11-17T00:00:00.000,2024-12-21T23:59:59.000,P012
+YA,N007,37506794.36,4314557.729,964.37,3.20E+09,2023-11-17T00:00:00.001,2024-12-21T23:59:59.001,P013
+YA,N037,37506983.42,4314521.458,915.829,3.20E+09,2023-11-17T00:00:00.002,2024-12-21T23:59:59.002,P014
+YA,N030,37507193.88,4314568.531,965.042,3.20E+09,2023-11-17T00:00:00.003,2024-12-21T23:59:59.003,P015
+YA,N020,37507399.01,4314558.161,964.69,3.20E+09,2023-11-17T00:00:00.004,2024-12-21T23:59:59.004,P016