Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1

ningshuxia

2023-06-27 d5a533d045422407c1b7edfdde9fd19740e478d1

Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1

 Application/IStation.Application.OpenApi/shys/dispatch/DispatchAna_ShysController.cs

@@ -185,7 +185,7 @@
            }
            else
            {
                water_level = scada_water.value;
                water_level = Math.Round( scada_water.value,2);
            }

            complex_request_paras.InletPipePara = new List<IStation.Calculation.DispatchAna.Model.InletPipePara>();
@@ -246,7 +246,7 @@
            }
            else
            {
                pipe1.TargetFlow = flow1.value;
                pipe1.TargetFlow = Math.Round(flow1.value,0);
            }
            var press1 = result_sg.result.Find(x => x.key == "stationCX_1#_pressure");
            if (press1 == null)
@@ -256,7 +256,7 @@
            }
            else
            {
                pipe1.TargetPress = press1.value;
                pipe1.TargetPress = Math.Round(press1.value,4);
            }
            var pipe1_val = result_sg.scada.Find(t => t.tagname == "_0402010403150101003");
            if (pipe1_val != null)
@@ -277,7 +277,7 @@
            }
            else
            {
                pipe2.TargetFlow = flow2.value;
                pipe2.TargetFlow = Math.Round(flow2.value,0);
            }

            var press2 = result_sg.result.Find(x => x.key == "stationCX_2#_pressure");
@@ -288,7 +288,7 @@
            }
            else
            {
                pipe2.TargetPress = press2.value;
                pipe2.TargetPress = Math.Round(press2.value,4);
            }
            var pipe2_val = result_sg.scada.Find(t => t.tagname == "_0402010403150102003");
            if (pipe2_val != null)
@@ -316,14 +316,14 @@
            var pipe1_val_flow_real = result_sg.scada.Find(t => t.tagname == "_0402010403030002001");
            if (pipe1_val_flow_real != null && pipe1_val_flow_real.value > 100)
            {//实时量,  stationCX_2#_flow" ä¸‰é«˜ç»™çš„目标量
                real_total_flow_pipe1 = pipe1_val_flow_real.value;
                real_total_flow_pipe1 = Math.Round( pipe1_val_flow_real.value,0);
            }

            double real_oulet_press_pipe1 = 0;
            var pipe1_val_press_real = result_sg.scada.Find(t => t.tagname == "_0402010403030002005");
            if (pipe1_val_press_real != null)
            {//实时量,  "stationCX_2#_flow" æ˜¯ ä¸‰é«˜ç»™çš„目标量
                real_oulet_press_pipe1 = pipe1_val_press_real.value;
                real_oulet_press_pipe1 = Math.Round(pipe1_val_press_real.value,5);
            }


@@ -331,19 +331,17 @@
            var pipe2_val_flow_real = result_sg.scada.Find(t => t.tagname == "_0402010403030002002");
            if (pipe2_val_flow_real != null && pipe2_val_flow_real.value > 100)
            {
                real_total_flow_pipe2 = pipe2_val_flow_real.value;
                real_total_flow_pipe2 = Math.Round(pipe2_val_flow_real.value,0);
            }

            double real_oulet_press_pipe2 = 0;
            var pipe2_val_press_real = result_sg.scada.Find(t => t.tagname == "_0402010403030002006");
            if (pipe2_val_press_real != null)
            {//实时量,  stationCX_2#_flow" ä¸‰é«˜ç»™çš„目标量
                real_oulet_press_pipe2 = pipe2_val_press_real.value;
                real_oulet_press_pipe2 = Math.Round(pipe2_val_press_real.value,5);
            }

            #endregion


 
            //出方案 
            var scheme = calulator.Calc(out error_info);
            if (scheme == null)
@@ -439,45 +437,10 @@
                result.Pumps.Add(pump_item);
            }

            #endregion

            #region ä¿®æ­£
            if (machine_run_status.Count == 1)
            {//保证开一台泵时, æµé‡å¤§ é¢‘率也大, æµé‡å° , é¢‘率也小
                if (pipe1.TargetFlow + pipe2.TargetFlow > 100)
                {
                    double current_total_flow = 0;
                    if (pipe1.TargetFlow > 100)
                        current_total_flow = pipe1.TargetFlow;
                    else
                        current_total_flow = pipe2.TargetFlow;


                    var open_pump = result.Pumps.First();
                    var fr_hz_tag_name = machine_frq_hz_target_name[open_pump.Index];
                    var current_val_fr_hz = result_sg.scada.Find(t => t.tagname == fr_hz_tag_name);
                    if (current_val_fr_hz != null && current_val_fr_hz.value > 10)
                    {
                        if (current_total_flow < scheme.TotalWrkQ && current_val_fr_hz.value > open_pump.Frequency)
                        {//保证趋势正确
                            open_pump.Frequency = Math.Round(current_val_fr_hz.value * scheme.TotalWrkQ / current_total_flow, 1);
                        }
                        else if (current_total_flow > scheme.TotalWrkQ && current_val_fr_hz.value < open_pump.Frequency)
                        {//保证趋势正确
                            open_pump.Frequency = Math.Round(current_val_fr_hz.value * scheme.TotalWrkQ / current_total_flow, 1);
                        }
                        else
                        {//原水反馈 , ç”¨æ›²çº¿è®¡ç®—, é¢‘率偏低, äººä¸ºå¢žåŠ 0.5HZ
                            if (open_pump.Frequency < 49.5)
                            {
                                //open_pump.Speed = Math.Round
                                //    (open_pump.Speed * (open_pump.Frequency + 0.5) / (open_pump.Frequency),0);
                                open_pump.Frequency = open_pump.Frequency + 0.5;
                                open_pump.Speed = Math.Round(740 * open_pump.Frequency / 50, 1);
                            }
                        }
                    }
                }
            }
            else
            {
                result.Pumps.ForEach(x =>
                {//原水反馈 , ç”¨æ›²çº¿è®¡ç®—, é¢‘率偏低, äººä¸ºå¢žåŠ 0.5HZ
@@ -492,8 +455,52 @@
                        }
                    }
                });

                //if (pipe1.TargetFlow + pipe2.TargetFlow > 100)
                //{
                //    double current_total_flow = 0;
                //    if (pipe1.TargetFlow > 100)
                //        current_total_flow = pipe1.TargetFlow;
                //    else
                //        current_total_flow = pipe2.TargetFlow;
                //    var open_pump = result.Pumps.First();
                //    var fr_hz_tag_name = machine_frq_hz_target_name[open_pump.Index];
                //    var current_val_fr_hz = result_sg.scada.Find(t => t.tagname == fr_hz_tag_name);
                //    if (current_val_fr_hz != null && current_val_fr_hz.value > 10)
                //    {
                //        bool isCor = false;
                //        if (current_total_flow < scheme.TotalWrkQ && current_val_fr_hz.value > open_pump.Frequency)
                //        {//保证趋势正确
                //            isCor = true;
                //            open_pump.Note = string.Format("ORI_{0}", open_pump.Frequency);
                //            open_pump.Frequency = Math.Round(current_val_fr_hz.value * scheme.TotalWrkQ / current_total_flow, 1);
                //        }
                //        else if (current_total_flow > scheme.TotalWrkQ && current_val_fr_hz.value < open_pump.Frequency)
                //        {//保证趋势正确
                //            isCor = true;
                //            open_pump.Note = string.Format("ORI_{0}", open_pump.Frequency);
                //            open_pump.Frequency = Math.Round(current_val_fr_hz.value * scheme.TotalWrkQ / current_total_flow, 1);
                //        }

                //    }
                //}
            }
            else
            {
                result.Pumps.ForEach(x =>
                {//原水反馈 , ç”¨æ›²çº¿è®¡ç®—, é¢‘率偏低, äººä¸ºå¢žåŠ 0.3HZ
                    if (x.Frequency > 10)
                    {
                        if (x.Frequency < 49.7)
                        {
                            x.Frequency = x.Frequency + 0.3;
                            x.Speed = Math.Round(740 * x.Frequency / 50, 1);
                        }
                    }
                });
            }

            #endregion

            result.Pumps.ForEach(x =>
            {//再检查一下转速

 Application/IStation.Application.OpenApi/shys/dispatch/dto/DispatchAnaSchemeItemOutput.cs

@@ -76,7 +76,12 @@
        /// è½¬é€Ÿ r/min
        /// </summary>
        public double CurrentSpeed { get; set; }
 

        /// <summary>
        /// 
        /// </summary>
        public string Note { get; set; }

    }



 Calculation/IStation.Calculation.Dispatch/custom/shys/station/³¤Ð˵º/KeepStatus.cs

@@ -112,7 +112,7 @@
                    new Common.DispatchAnaGeneralHelper压力();
                calc_pipe_helper.InitialParas(
                    pipe1_TargetFlow + pipe2_TargetFlow,
                    water_level,true ,
                    water_level, true,
                    press, false,
                    null, null,
                    allMachineList, null, out error_info);

 Calculation/IStation.Calculation.Dispatch/helper/DispatchAnaGeneralHelperѹÁ¦.cs

@@ -1062,7 +1062,8 @@
          

            double targetH = this.CalcHeadByPress(this._targetInletPress,
                this._targetOutletPress, Machine.InletCaliber, Machine.OutletCaliber,  this._targetQ);
                this._targetOutletPress, Machine.InletCaliber, Machine.OutletCaliber,
                this._targetQ);
            //CalcHeadByPress(this._targetInletPress, this._targetOutletPress);



 Settings/IStation.Settings/paras_settings.json

@@ -7,23 +7,23 @@
  },

  "MemoryCache": {
    "KeepTime": 30, //����
    "RandomTime": 300, //��
    "Level1": 600, //��
    "Level2": 300, //��
    "Level3": 160, //��
    "Level4": 120, //��
    "Level5": 60 //��
    "KeepTime": 30, //分钟
    "RandomTime": 300, //秒
    "Level1": 600, //秒
    "Level2": 300, //秒
    "Level3": 160, //秒
    "Level4": 120, //秒
    "Level5": 60 //秒
  },

  "RabbitMq": {
    "HostName": "47.116.64.138",
    "HostName": "172.19.69.10",
    "UserName": "admin",
    "Password": "admin"
  },

  "Redis": {
    "Url": "47.116.97.43:6379"
    "Url": "172.19.29.54:6379"
  },

  "SqlSugar": {
@@ -31,26 +31,26 @@
  },

  "RedisCache": {
    "RunKeyPrefix": "istation-run-core-test",
    "EtaKeyPrefix": "istation-eta-core-test",
    "VibrationKeyPrefix": "istation-vibration-core-test"
    "RunKeyPrefix": "istation-run-core",
    "EtaKeyPrefix": "istation-eta-core",
    "VibrationKeyPrefix": "istation-vibration-core"
  },

  "Queue": {
    "DataDockingQueueName": "data_docking_queue_test",
    "StoreQueueName": "store_queue_test",
    "RunExChangeName": "run_exchange_test"
    "DataDockingQueueName": "data_docking_queue",
    "StoreQueueName": "store_queue",
    "RunExChangeName": "run_exchange"
  },

  "Basic": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_basic_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Basic;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Bimface": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_bimface_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Bimface;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    },
    "Account": {
      "AppKey": "GPg7TMfOJxF10QHm2PirACyI21nv0qJX",
@@ -60,60 +60,60 @@

  "Dma": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_dma_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Dma;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Main": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_main_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Main;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Map": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_map_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Map;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Monitor": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_monitor_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Monitor;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    },
    "Flag": "monitor"
  },

  "Organize": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_organize_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Organize;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Product": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_product_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Product;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "User": {
    "DefaultLoginPwd": "123456",
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_user_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "UserLoginConnectString": "PORT=5432;DATABASE=istation_user_login_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4User;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "UserLoginConnectString": "PORT=5432;DATABASE=IStation4UserLogin;HOST=172.19.4.118;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Run": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_run_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "MonitorRecordConnectString": "PORT=5432;DATABASE=istation_monitor_record_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Run;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "MonitorRecordConnectString": "PORT=5432;DATABASE=IStation4MonitorRecord;HOST=172.19.4.118;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Eta": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_eta_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "RecordConnectString": "PORT=5432;DATABASE=istation_eta_record_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Eta;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "RecordConnectString": "PORT=5432;DATABASE=IStation4EtaRecord;HOST=172.19.4.118;PASSWORD=Eventech2010;USER ID=postgres;"
    },
    "Debug": {
      "IsDebug": true,
@@ -128,25 +128,25 @@
        "ResetFrequency": 60
      },
      "Sum": {
        "HourCron": "0 20 00 * * ?", //ÿ�� 20��ִ��
        "DayCron": "0 40 00 * * ?", // Ã¿ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ 00��40 Ö´ï¿½ï¿½
        "WeekCron": "0 40 1 ? * MON", //ÿ��һ���� 1��40 ï¿½ï¿½Ö´ï¿½ï¿½
        "MonthCron": "0 40 2 1 * ?", //ÿ��1������ 2��40 Ö´ï¿½ï¿½
        "YearCron": "0 40 3 1 1 ?" //ÿ��1������3��40ִ��
        "HourCron": "0 20 * * * ?", //每时 20分执行
        "DayCron": "0 40 00 * * ?", // æ¯å¤©ä¸Šåˆ 00：40 æ‰§è¡Œ
        "WeekCron": "0 40 1 ? * MON", //每周一上午 1点40 åˆ†æ‰§è¡Œ
        "MonthCron": "0 40 2 1 * ?", //每月1号上午 2：40 æ‰§è¡Œ
        "YearCron": "0 40 3 1 1 ?" //每年1月上午3：40执行
      },
      "Accord": {
        "HourCron": "0 25 00 * * ?", //ÿ�� 25��ִ��
        "DayCron": "0 45 00 * * ?", // Ã¿ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ 00��45 Ö´ï¿½ï¿½
        "WeekCron": "0 45 1 ? * MON", //ÿ��һ���� 1��45 ï¿½ï¿½Ö´ï¿½ï¿½
        "MonthCron": "0 45 2 1 * ?", //ÿ��1������ 2��45 Ö´ï¿½ï¿½
        "YearCron": "0 45 3 1 1 ?" //ÿ��1������3��45ִ��
        "HourCron": "0 25 * * * ?", //每时 25分执行
        "DayCron": "0 45 00 * * ?", // æ¯å¤©ä¸Šåˆ 00：45 æ‰§è¡Œ
        "WeekCron": "0 45 1 ? * MON", //每周一上午 1点45 åˆ†æ‰§è¡Œ
        "MonthCron": "0 45 2 1 * ?", //每月1号上午 2：45 æ‰§è¡Œ
        "YearCron": "0 45 3 1 1 ?" //每年1月上午3：45执行
      },
      "Standard": {
        "HourCron": "0 30 00 * * ?", //ÿ�� 30��ִ��
        "DayCron": "0 50 00 * * ?", // Ã¿ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ 00��50 Ö´ï¿½ï¿½
        "WeekCron": "0 50 1 ? * MON", //ÿ��һ���� 1��50 ï¿½ï¿½Ö´ï¿½ï¿½
        "MonthCron": "0 50 2 1 * ?", //ÿ��1������ 2��50 Ö´ï¿½ï¿½
        "YearCron": "0 50 3 1 1 ?" //ÿ��1������3��50ִ��
        "HourCron": "0 30 * * * ?", //每时 30分执行
        "DayCron": "0 50 00 * * ?", // æ¯å¤©ä¸Šåˆ 00：50 æ‰§è¡Œ
        "WeekCron": "0 50 1 ? * MON", //每周一上午 1点50 åˆ†æ‰§è¡Œ
        "MonthCron": "0 50 2 1 * ?", //每月1号上午 2：50 æ‰§è¡Œ
        "YearCron": "0 50 3 1 1 ?" //每年1月上午3：50执行
      }
    },
    "Analy": {
@@ -156,30 +156,26 @@

  "Repair": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_repair_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Job": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_job_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    },
    "Execution": {
      "CustomRealResetThreshold": 60,
      "CustomCronResetThreshold": 1440
    }
  },

  "Epanet": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_epanet_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Repair;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Inspect": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_inspect_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "RecordConnectString": "PORT=5432;DATABASE=istation_inspect_record_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Inspect;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "RecordConnectString": "PORT=5432;DATABASE=IStation4InspectRecord;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Job": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=IStation4Job;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Epanet": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=IStation4Epanet;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

@@ -188,8 +184,8 @@
      "ResetFrequency": 60
    },
    "Target": {
      "CorpIds": [ 3 ],
      "ContainsChildren": false
      "CorpIds": [ 1 ],
      "ContainsChildren": true
    }
  },

@@ -207,19 +203,19 @@

  "Analy": {
    "Target": {
      "CorpIds": [ 4 ],
      "ContainsChildren": false
      "CorpIds": [ 1 ],
      "ContainsChildren": true
    },
    "Fluct": {
      "Cron": "0 00 02 * * ?" //ÿ�� 02��00 Ö´ï¿½ï¿½
      "Cron": "0 00 02 * * ?" //每日 02：00 æ‰§è¡Œ
    },
    "General": {
      "RealResetFrequency": 60,
      "HourCron": "0 20 * * * ?", //ÿʱ 00:20 Ö´ï¿½ï¿½
      "DayCron": "0 00 01 * * ?", //ÿ�� 01��00 Ö´ï¿½ï¿½
      "WeekCron": "0 30 1 ? * MON", //ÿ��һ���� 1��30 ï¿½ï¿½Ö´ï¿½ï¿½
      "MonthCron": "0 00 2 1 * ?", //ÿ��1��2��00ִ��
      "YearCron": "0 0 6 1 1 ? *" //ÿ�� 1��1�� 6��00ִ��
      "HourCron": "0 20 * * * ?", //每时 00:20 æ‰§è¡Œ
      "DayCron": "0 00 01 * * ?", //每日 01：00 æ‰§è¡Œ
      "WeekCron": "0 30 1 ? * MON", //每周一上午 1点30 åˆ†æ‰§è¡Œ
      "MonthCron": "0 00 2 1 * ?", //每月1号2点00执行
      "YearCron": "0 0 6 1 1 ? *" //每年 1月1日 6：00执行
    },
    "Alarm": {
      "InterruptAnalyFrequency": 120
@@ -227,10 +223,9 @@
  },

  "WebApi": {
    "EnableJwt": false,
    "EnableJwt": true,
    "OpenApi": {
      "SanGaoDispatchUrl": "http://192.168.60.228:8821/Api/wsmp/v1/Chengtou/factoryCalc",
      "SanGaoPlanUrl": "http://192.168.60.228:8821/Api/wsmp/v1/Chengtou/factoryCalc_New"
      "SanGaoDispatchUrl": "http://192.168.60.228:8821/Api/wsmp/v1/Chengtou/factoryCalc"
    }

  },
@@ -241,15 +236,6 @@
        "ServerPort": 9988,
        "TransferUrl": "http://172.100.17.23:8081/smi/vibration/zept"
      }
    },
    "HangTian801": {
      "TransferUrl": "http://172.100.17.23:8081/smi/vibration/hangtian"
    },
    "SZJTKT": {
      "Prefix": "AT+Data=",
      "ProductId": "10001313",
      "ServerPort": 8805,
      "TransferUrl": "http://172.100.17.23:8081/smi/vibration/hangtian"
    }
  },

@@ -258,7 +244,7 @@
      "Expert": {
        "IsWriteLog": true,
        "CorpID": 5,
        "ConfigureID": 1532223215940800512
        "ConfigureID": 0
      },
      "HangTian": {
        "IsWriteLog": true,
@@ -268,27 +254,11 @@
    }
  },

  "LinuxTest": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_linux_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    },
    "Queue": {
      "StoreQueueName": "linux_text_queue_name"
    }

  },
  
  "Operating": { 
  "Operating": {
    "NT": {
      "Password": "666666", 
      "Password": "666666"
    }
  },

   "DataFile": { 
      "SaveFileUrl": "http://101.133.133.173:9019/",
      "PdfFolder":"Report" 
   }
   
  }


}

 Settings/IStation.Settings/paras_settings_debug.json

@@ -7,23 +7,23 @@
  },

  "MemoryCache": {
    "KeepTime": 30, //����
    "RandomTime": 300, //��
    "Level1": 600, //��
    "Level2": 300, //��
    "Level3": 160, //��
    "Level4": 120, //��
    "Level5": 60 //��
    "KeepTime": 30, //分钟
    "RandomTime": 300, //秒
    "Level1": 600, //秒
    "Level2": 300, //秒
    "Level3": 160, //秒
    "Level4": 120, //秒
    "Level5": 60 //秒
  },

  "RabbitMq": {
    "HostName": "47.116.64.138",
    "HostName": "172.19.69.10",
    "UserName": "admin",
    "Password": "admin"
  },

  "Redis": {
    "Url": "47.116.97.43:6379"
    "Url": "172.19.29.54:6379"
  },

  "SqlSugar": {
@@ -31,26 +31,26 @@
  },

  "RedisCache": {
    "RunKeyPrefix": "istation-run-core-test",
    "EtaKeyPrefix": "istation-eta-core-test",
    "VibrationKeyPrefix": "istation-vibration-core-test"
    "RunKeyPrefix": "istation-run-core",
    "EtaKeyPrefix": "istation-eta-core",
    "VibrationKeyPrefix": "istation-vibration-core"
  },

  "Queue": {
    "DataDockingQueueName": "data_docking_queue_test",
    "StoreQueueName": "store_queue_test",
    "RunExChangeName": "run_exchange_test"
    "DataDockingQueueName": "data_docking_queue",
    "StoreQueueName": "store_queue",
    "RunExChangeName": "run_exchange"
  },

  "Basic": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_basic_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Basic;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Bimface": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_bimface_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Bimface;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    },
    "Account": {
      "AppKey": "GPg7TMfOJxF10QHm2PirACyI21nv0qJX",
@@ -60,60 +60,60 @@

  "Dma": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_dma_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Dma;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Main": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_main_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Main;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Map": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_map_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Map;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Monitor": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_monitor_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Monitor;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    },
    "Flag": "monitor"
  },

  "Organize": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_organize_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Organize;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Product": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_product_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Product;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "User": {
    "DefaultLoginPwd": "123456",
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_user_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "UserLoginConnectString": "PORT=5432;DATABASE=istation_user_login_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4User;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "UserLoginConnectString": "PORT=5432;DATABASE=IStation4UserLogin;HOST=172.19.4.118;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Run": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_run_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "MonitorRecordConnectString": "PORT=5432;DATABASE=istation_monitor_record_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Run;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "MonitorRecordConnectString": "PORT=5432;DATABASE=IStation4MonitorRecord;HOST=172.19.4.118;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Eta": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_eta_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "RecordConnectString": "PORT=5432;DATABASE=istation_eta_record_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Eta;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "RecordConnectString": "PORT=5432;DATABASE=IStation4EtaRecord;HOST=172.19.4.118;PASSWORD=Eventech2010;USER ID=postgres;"
    },
    "Debug": {
      "IsDebug": true,
@@ -128,25 +128,25 @@
        "ResetFrequency": 60
      },
      "Sum": {
        "HourCron": "0 20 00 * * ?", //ÿ�� 20��ִ��
        "DayCron": "0 40 00 * * ?", // Ã¿ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ 00��40 Ö´ï¿½ï¿½
        "WeekCron": "0 40 1 ? * MON", //ÿ��һ���� 1��40 ï¿½ï¿½Ö´ï¿½ï¿½
        "MonthCron": "0 40 2 1 * ?", //ÿ��1������ 2��40 Ö´ï¿½ï¿½
        "YearCron": "0 40 3 1 1 ?" //ÿ��1������3��40ִ��
        "HourCron": "0 20 * * * ?", //每时 20分执行
        "DayCron": "0 40 00 * * ?", // æ¯å¤©ä¸Šåˆ 00：40 æ‰§è¡Œ
        "WeekCron": "0 40 1 ? * MON", //每周一上午 1点40 åˆ†æ‰§è¡Œ
        "MonthCron": "0 40 2 1 * ?", //每月1号上午 2：40 æ‰§è¡Œ
        "YearCron": "0 40 3 1 1 ?" //每年1月上午3：40执行
      },
      "Accord": {
        "HourCron": "0 25 00 * * ?", //ÿ�� 25��ִ��
        "DayCron": "0 45 00 * * ?", // Ã¿ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ 00��45 Ö´ï¿½ï¿½
        "WeekCron": "0 45 1 ? * MON", //ÿ��һ���� 1��45 ï¿½ï¿½Ö´ï¿½ï¿½
        "MonthCron": "0 45 2 1 * ?", //ÿ��1������ 2��45 Ö´ï¿½ï¿½
        "YearCron": "0 45 3 1 1 ?" //ÿ��1������3��45ִ��
        "HourCron": "0 25 * * * ?", //每时 25分执行
        "DayCron": "0 45 00 * * ?", // æ¯å¤©ä¸Šåˆ 00：45 æ‰§è¡Œ
        "WeekCron": "0 45 1 ? * MON", //每周一上午 1点45 åˆ†æ‰§è¡Œ
        "MonthCron": "0 45 2 1 * ?", //每月1号上午 2：45 æ‰§è¡Œ
        "YearCron": "0 45 3 1 1 ?" //每年1月上午3：45执行
      },
      "Standard": {
        "HourCron": "0 30 00 * * ?", //ÿ�� 30��ִ��
        "DayCron": "0 50 00 * * ?", // Ã¿ï¿½ï¿½ï¿½ï¿½ï¿½ï¿½ 00��50 Ö´ï¿½ï¿½
        "WeekCron": "0 50 1 ? * MON", //ÿ��һ���� 1��50 ï¿½ï¿½Ö´ï¿½ï¿½
        "MonthCron": "0 50 2 1 * ?", //ÿ��1������ 2��50 Ö´ï¿½ï¿½
        "YearCron": "0 50 3 1 1 ?" //ÿ��1������3��50ִ��
        "HourCron": "0 30 * * * ?", //每时 30分执行
        "DayCron": "0 50 00 * * ?", // æ¯å¤©ä¸Šåˆ 00：50 æ‰§è¡Œ
        "WeekCron": "0 50 1 ? * MON", //每周一上午 1点50 åˆ†æ‰§è¡Œ
        "MonthCron": "0 50 2 1 * ?", //每月1号上午 2：50 æ‰§è¡Œ
        "YearCron": "0 50 3 1 1 ?" //每年1月上午3：50执行
      }
    },
    "Analy": {
@@ -156,30 +156,26 @@

  "Repair": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_repair_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Job": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_job_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    },
    "Execution": {
      "CustomRealResetThreshold": 60,
      "CustomCronResetThreshold": 1440
    }
  },

  "Epanet": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_epanet_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Repair;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Inspect": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_inspect_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "RecordConnectString": "PORT=5432;DATABASE=istation_inspect_record_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
      "ConnectString": "PORT=5432;DATABASE=IStation4Inspect;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;",
      "RecordConnectString": "PORT=5432;DATABASE=IStation4InspectRecord;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Job": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=IStation4Job;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

  "Epanet": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=IStation4Epanet;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    }
  },

@@ -188,8 +184,8 @@
      "ResetFrequency": 60
    },
    "Target": {
      "CorpIds": [ 3 ],
      "ContainsChildren": false
      "CorpIds": [ 1 ],
      "ContainsChildren": true
    }
  },

@@ -207,19 +203,19 @@

  "Analy": {
    "Target": {
      "CorpIds": [ 4 ],
      "ContainsChildren": false
      "CorpIds": [ 1 ],
      "ContainsChildren": true
    },
    "Fluct": {
      "Cron": "0 00 02 * * ?" //ÿ�� 02��00 Ö´ï¿½ï¿½
      "Cron": "0 00 02 * * ?" //每日 02：00 æ‰§è¡Œ
    },
    "General": {
      "RealResetFrequency": 60,
      "HourCron": "0 20 * * * ?", //ÿʱ 00:20 Ö´ï¿½ï¿½
      "DayCron": "0 00 01 * * ?", //ÿ�� 01��00 Ö´ï¿½ï¿½
      "WeekCron": "0 30 1 ? * MON", //ÿ��һ���� 1��30 ï¿½ï¿½Ö´ï¿½ï¿½
      "MonthCron": "0 00 2 1 * ?", //ÿ��1��2��00ִ��
      "YearCron": "0 0 6 1 1 ? *" //ÿ�� 1��1�� 6��00ִ��
      "HourCron": "0 20 * * * ?", //每时 00:20 æ‰§è¡Œ
      "DayCron": "0 00 01 * * ?", //每日 01：00 æ‰§è¡Œ
      "WeekCron": "0 30 1 ? * MON", //每周一上午 1点30 åˆ†æ‰§è¡Œ
      "MonthCron": "0 00 2 1 * ?", //每月1号2点00执行
      "YearCron": "0 0 6 1 1 ? *" //每年 1月1日 6：00执行
    },
    "Alarm": {
      "InterruptAnalyFrequency": 120
@@ -227,10 +223,9 @@
  },

  "WebApi": {
    "EnableJwt": false,
    "EnableJwt": true,
    "OpenApi": {
      "SanGaoDispatchUrl": "http://192.168.60.228:8821/Api/wsmp/v1/Chengtou/factoryCalc",
      "SanGaoPlanUrl": "http://192.168.60.228:8821/Api/wsmp/v1/Chengtou/factoryCalc_New"
      "SanGaoDispatchUrl": "http://192.168.60.228:8821/Api/wsmp/v1/Chengtou/factoryCalc"
    }

  },
@@ -241,9 +236,6 @@
        "ServerPort": 9988,
        "TransferUrl": "http://172.100.17.23:8081/smi/vibration/zept"
      }
    },
    "HangTian801": {
      "TransferUrl": "http://172.100.17.23:8081/smi/vibration/hangtian"
    }
  },

@@ -252,7 +244,7 @@
      "Expert": {
        "IsWriteLog": true,
        "CorpID": 5,
        "ConfigureID": 1532223215940800512
        "ConfigureID": 0
      },
      "HangTian": {
        "IsWriteLog": true,
@@ -262,25 +254,11 @@
    }
  },

  "LinuxTest": {
    "DataBase": {
      "ConnectString": "PORT=5432;DATABASE=istation_linux_test;HOST=101.133.223.111;PASSWORD=Eventech2010;USER ID=postgres;"
    },
    "Queue": {
      "StoreQueueName": "linux_text_queue_name"
    }

  },

  "Operating": {
    "NT": {
      "Password": "666666"
    }
  },

  "DataFile": {
    "SaveFileUrl": "http://101.133.133.173:9019/",
    "PdfFolder": "Report"
  }


}