小修改

ningshuxia

2024-05-31 cd611604d8f59414e7d29f5521b4a81d3a84122c

小修改

 IStation.Application/01-ch/02-schedule/Schedule_Controller.cs

@@ -399,6 +399,35 @@
                    Log.Info(request_id, log_title, "schedule_request 插入异常");
                    Log.Debug(request_id, log_title, JsonHelper.Object2Json(schedule_request));
                }

                if (schedule_config1!=null)
                {
                    var schedule_rule1 = new Model.ScheduleRule();
                    schedule_rule1.RequestID = request_id;
                    schedule_rule1.Station = eDockingStation.Ch1s;
                    schedule_rule1.Config=JsonHelper.Object2Json(schedule_config1);
                    bol = _service_schedule_rule.Insert(schedule_rule1)<1;
                    if (!bol)
                    {
                        Log.Info(request_id, log_title, "schedule_rule1 插入异常");
                        Log.Debug(request_id, log_title, JsonHelper.Object2Json(schedule_rule1));
                    }
                }

                if (schedule_config2 != null)
                {
                    var schedule_rule2 = new Model.ScheduleRule();
                    schedule_rule2.RequestID = request_id;
                    schedule_rule2.Station = eDockingStation.Ch2s;
                    schedule_rule2.Config = JsonHelper.Object2Json(schedule_config2); 
                    bol = _service_schedule_rule.Insert(schedule_rule2) < 1;
                    if (!bol)
                    {
                        Log.Info(request_id, log_title, "schedule_rule2 插入异常");
                        Log.Debug(request_id, log_title, JsonHelper.Object2Json(schedule_rule2));
                    }
                }

                if (scada_list.Any())
                {
                    bol = _service_schedule_scada.Inserts(scada_list);

 IStation.Service/01-entity/02-schedule/ScheduleRule.cs

@@ -18,9 +18,7 @@
        {
            this.RequestID = rhs.RequestID;
            this.Station = rhs.Station;
            this.CurrentOpenFlags = rhs.CurrentOpenFlags;
            this.MustOpenFlags = rhs.MustOpenFlags;
            this.MustCloseFlags = rhs.MustCloseFlags;
            this.Config = rhs.Config;
        }

        /// <summary>
@@ -30,10 +28,8 @@
        public void Reset(ScheduleRule rhs)
        {
            this.RequestID = rhs.RequestID;
            this.Station = rhs.Station;
            this.CurrentOpenFlags = rhs.CurrentOpenFlags;
            this.MustOpenFlags = rhs.MustOpenFlags;
            this.MustCloseFlags = rhs.MustCloseFlags;
            this.Station = rhs.Station; 
            this.Config= rhs.Config;
        }

        /// <summary>
@@ -47,19 +43,9 @@
        public int Station { get; set; }

        /// <summary>
        /// 当前开启标签列表
        /// </summary>	
        public string CurrentOpenFlags { get; set; }

        /// <summary>
        /// 必须开启标签列表
        /// </summary>	
        public string MustOpenFlags { get; set; }

        /// <summary>
        /// 必须关闭标签列表 
        /// </summary>	
        public string MustCloseFlags { get; set; }
        /// 配置Json 
        /// </summary>
        public string Config { get; set; }


        /// <summary>

 IStation.Service/02-model/02-schedule/ScheduleRule.cs

@@ -18,9 +18,7 @@
        {
            this.RequestID = rhs.RequestID;
            this.Station = rhs.Station;
            this.CurrentOpenFlags = rhs.CurrentOpenFlags;
            this.MustOpenFlags = rhs.MustOpenFlags;
            this.MustCloseFlags = rhs.MustCloseFlags;
            this.Config = rhs.Config;
        }

        /// <summary>
@@ -31,9 +29,7 @@
        {
            this.RequestID = rhs.RequestID;
            this.Station = rhs.Station;
            this.CurrentOpenFlags = rhs.CurrentOpenFlags;
            this.MustOpenFlags = rhs.MustOpenFlags;
            this.MustCloseFlags = rhs.MustCloseFlags;
            this.Config = rhs.Config;
        }


@@ -48,19 +44,9 @@
        public eDockingStation Station { get; set; }

        /// <summary>
        /// 当前开启标签列表
        /// </summary>	
        public string CurrentOpenFlags { get; set; }

        /// <summary>
        /// 必须开启标签列表
        /// </summary>	
        public string MustOpenFlags { get; set; }

        /// <summary>
        /// 必须关闭标签列表 
        /// </summary>	
        public string MustCloseFlags { get; set; }
        /// 配置Json 
        /// </summary>
        public string Config { get; set; }


        /// <summary>