11

Service/CgDbScan/CgDbScan.csproj

@@ -39,12 +39,6 @@
     <ApplicationIcon>..\..\Service.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
-    </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Serilog.3.1.1\lib\net471\Serilog.dll</HintPath>
     </Reference>
@@ -148,13 +142,15 @@
   <PropertyGroup>
     <PostBuildEvent>del DevExpress*.xml,EntityFramework*.xml,Serilog*.xml,Newtonsoft*.xml
 del System*.xml,Microsoft*.xml,autofac*.xml,MySql*.xml,K4os*.xml,google*.xml
-del BouncyCastle*.xml
+del BouncyCastle*.xml,Serilog.Sinks.File.pdb
+del System.Text.Encodings.Web.dll
+del System.ValueTuple.dll
+del *.dll.config
 
 if not exist "AddIns" md AddIns
 move /Y *.dll AddIns
 move /Y *.pdb AddIns
 move AddIns\$(TargetName).pdb .
-copy $(SolutionDir)Service.svg Service.svg
 rmdir logs /S/Q
 rmdir wwwroot /S/Q
 

Service/CgDbScan/MainForm.cs

@@ -145,5 +145,15 @@ namespace CheckServer
             }
         }
 
+        private void Do()
+        {
+            //List<Data> list = new List<Data>();
+            //var clusters = Dbscan.Dbscan.CalculateClusters(
+            //    list,
+            //    epsilon: 1.0,
+            //    minimumPointsPerCluster: 4);
+
+        }
+
     }
 }

Service/ClearServiceData/Program.cs

@@ -12,21 +12,30 @@ namespace ClearServiceData
         static void Main(string[] args)
         {
             Console.WriteLine("程序将删除平台及服务的日志文件、wwwroot中上传的临时文件,按Y继续");
-           var str= Console.ReadLine();
-            if (str.Trim().ToLower() != "y") return; 
+            var str= Console.ReadLine();
+            if (str.Trim().ToLower() != "y") return;
+            try
+            {
+                File.Delete("Log.db");
+                Console.WriteLine("deleted Log.db");
+            }
+            catch
+            { 
+            }
             var dir1 = Directory.GetDirectories(".\\Service\\", "*Logs", SearchOption.AllDirectories);
             var dir2 = Directory.GetDirectories(".\\Service\\", "*wwwroot", SearchOption.AllDirectories);
             var dir3 = Directory.GetDirectories(".\\Service\\", "*tmp", SearchOption.AllDirectories);
             var dir4 = Directory.GetDirectories(".\\", "*tmp", SearchOption.AllDirectories);
             var dir5 = Directory.GetDirectories(".\\", "*Logs", SearchOption.AllDirectories);
             var dir6 = Directory.GetDirectories(".\\", "*wwwroot", SearchOption.AllDirectories);
-            var dirs = dir1.Concat(dir2).Concat(dir3).Concat(dir4).Concat(dir5).Concat(dir6);
+            var dir7 = Directory.GetDirectories(".\\", "*信号仿真", SearchOption.AllDirectories);
+            var dirs = dir1.Concat(dir2).Concat(dir3).Concat(dir4).Concat(dir5).Concat(dir6).Concat(dir7);
             foreach (var dir in dirs)
             {
                 try
                 {
                     Directory.Delete(dir,true);
-                    Console.WriteLine(dir);
+                    Console.WriteLine($"deleted {dir}");
                 }
                 catch
                 { }

XdCxRhDW.App/Model/ModelPosRes.cs

@@ -25,7 +25,7 @@ namespace XdCxRhDW.App.Model
         public string CheckType => CheckRes?.PosCheckType?.GetEnumDisplayName();
         public override int GetHashCode()
         {
-            return $"ModelPosRes_{ID}".GetHashCode();
+            return $"ModelPosRes_{TaskInfoID}_{ID}".GetHashCode();
         }
     }
 }

XdCxRhDw.Dto/SvrStateDto.cs

@@ -12,10 +12,23 @@ namespace XdCxRhDW.Dto
     /// </summary>
     public class SvrStateReportDto
     {
+
         /// <summary>
-        /// 1
+        /// 设备ID
         /// </summary>
-        public TimeSpan DD { get; set; }
+        public string DevId { get; set; }
+
+        /// <summary>
+        /// 服务状态
+        /// </summary>
+        public EnumSvrState SvrState { get; set; }
+
+        /// <summary>
+        /// 状态类型
+        /// </summary>
+        public EnumStateType StateType { get; set; }
+
+
         /// <summary>
         /// 服务类型
         /// </summary> 
@@ -43,6 +56,77 @@ namespace XdCxRhDW.Dto
 
     }
 
+    /// <summary>
+    /// 服务状态枚举
+    /// </summary>
+    public enum EnumSvrState
+    {
+        /// <summary>
+        /// 故障
+        /// </summary>
+        [Display(Name = "故障")]
+        Error = 0,
+
+        /// <summary>
+        /// 正常
+        /// </summary>
+        [Display(Name = "正常")]
+        正常 = 1,
+
+        /// <summary>
+        /// 空闲
+        /// </summary>
+        [Display(Name = "空闲")]
+        空闲 = 2,
+
+        /// <summary>
+        /// 工作
+        /// </summary>
+        [Display(Name = "工作")]
+        工作 = 3
+    }
+
+
+    /// <summary>
+    /// 状态类型枚举
+    /// </summary>
+    public enum EnumStateType
+    {
+        /// <summary>
+        /// IP
+        /// </summary>
+        Ip = 1,
+
+        /// <summary>
+        /// 端口
+        /// </summary>
+        Port = 2,
+
+        /// <summary>
+        /// 程序
+        /// </summary>
+        Soft = 3,
+
+        /// <summary>
+        /// 文件
+        /// </summary>
+        File = 4,
+
+        /// <summary>
+        /// 星历
+        /// </summary>
+        Xl = 5,
+
+        /// <summary>
+        /// 内存
+        /// </summary>
+        Memory = 6,
+
+        /// <summary>
+        /// 磁盘
+        /// </summary>
+        Disk = 7,
+    }
     /// <summary>
     /// 服务类型枚举
     /// </summary>