Browse Source

xinzeng xinxi

tangjiang 8 months ago
parent
commit
0edfae4dcf
5 changed files with 401 additions and 280 deletions
  1. 4 4
      App.config
  2. 122 98
      Execute.cs
  3. 136 123
      Form1.Designer.cs
  4. 59 55
      Form1.cs
  5. 80 0
      Joint/Notice.cs

+ 4 - 4
App.config

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
   <appSettings>
-    <!--<add key ="SQLServerDB" value="server=192.168.100.195;database=CityHotline_Ver3;uid=CityHotlineUser_V3;pwd=F123456aA;"/>
-    <add key ="PGSQLDB" value="Server=110.188.24.182;Port=5432;UserId=dev;Password=fengwo11!!;Database=hotline;"/>-->
+    <add key ="SQLServerDB" value="server=10.10.110.195;database=CityHotline_Web;uid=CityHotlineUser_V3;pwd=F123456aA;"/>
+    <add key ="PGSQLDB" value="Server=110.188.24.182;Port=5432;UserId=dev;Password=fengwo11!!;Database=hotline;"/>
     <!--宜宾
     <add key ="SQLServerDB" value="server=172.15.28.10,4666;database=CityHotline_Ver3;uid=CityHotlineUser;pwd=yb12345#@!;"/>
     <add key ="PGSQLDB" value="Server=100.122.1.9;Port=5432;UserId=fwkjyibin;Password=Fwkj2023##!!**;Database=hotline;"/>-->
     <!--自贡-->
-    <add key ="SQLServerDB" value="server=61.157.186.3,4368;database=ZG_CityHotline_Ver3;uid=ZGCityHotlineUser;pwd=fway09!@ZG_15;"/>
-    <add key ="PGSQLDB" value="Server=110.188.24.182;Port=5432;UserId=dev;Password=fengwo11!!;Database=hotline_zg;"/>
+    <!--<add key ="SQLServerDB" value="server=61.157.186.3,4368;database=ZG_CityHotline_Ver3;uid=ZGCityHotlineUser;pwd=fway09!@ZG_15;"/>
+    <add key ="PGSQLDB" value="Server=110.188.24.182;Port=5432;UserId=dev;Password=fengwo11!!;Database=hotline_zg;"/>-->
     <add key ="LogLevel" value="10"/>
   </appSettings>
 </configuration>

+ 122 - 98
Execute.cs

@@ -9,111 +9,135 @@ using System.Threading.Tasks;
 
 namespace DataTransmission
 {
-	public class Execute
-	{
-		private readonly CommonTool tool = new CommonTool();
-		private readonly Order order = new Order();
-		private readonly Visit visit = new Visit();
-		private readonly Delay delay = new Delay();
-		private readonly Knowledge knowledge = new Knowledge();
-		private readonly Organize organize = new Organize();	
-		private readonly User user = new User();
+    public class Execute
+    {
+        private readonly CommonTool tool = new CommonTool();
+        private readonly Order order = new Order();
+        private readonly Visit visit = new Visit();
+        private readonly Delay delay = new Delay();
+        private readonly Knowledge knowledge = new Knowledge();
+        private readonly Organize organize = new Organize();
+        private readonly User user = new User();
+        private readonly Notice notice = new Notice();
 
-		public void ExecuteSql(DataTable orderTable)
-		{
-			try
-			{
-				DataTable org = GetPgOrganize();
-				DataTable user = GetPgUser();
-				foreach (DataRow row in orderTable.Rows)
-				{
-					var pgConn = tool.GetConPgSql();
-					var pgOrder = tool.GetDataTable($@" SELECT * from ""order"" where ""No"" ='{row["FSH_Code"]}'; ", pgConn);
-					if (pgOrder != null && pgOrder.Rows.Count > 0)
-					{
-						continue;
-					}
-					var orderId = SequentialGuidGenerator.Instance.Create().ToString("D");
-					var VisitId = SequentialGuidGenerator.Instance.Create().ToString("D");
+        public void ExecuteSql(DataTable orderTable)
+        {
+            try
+            {
+                DataTable org = GetPgOrganize();
+                DataTable user = GetPgUser();
+                foreach (DataRow row in orderTable.Rows)
+                {
+                    var pgConn = tool.GetConPgSql();
+                    var pgOrder = tool.GetDataTable($@" SELECT * from ""order"" where ""No"" ='{row["FSH_Code"]}'; ", pgConn);
+                    if (pgOrder != null && pgOrder.Rows.Count > 0)
+                    {
+                        continue;
+                    }
+                    var orderId = SequentialGuidGenerator.Instance.Create().ToString("D");
+                    var VisitId = SequentialGuidGenerator.Instance.Create().ToString("D");
 
-					//工单
-					var pgOrderSql = order.GetOrderISql(row, orderId, org, user);
-					//回访
-					var appraiseTable = visit.GetVisit(row["FSH_FlowID"].ToString());
-					var visitSql = visit.GetVisitSql(appraiseTable, row, VisitId, orderId, org, user);
-					//延期
-					var delayTable = delay.GetDelay(row["FSH_FlowID"].ToString());
-					var delaySql = delay.GetDelaySql(delayTable, row, orderId, org, user);
-					var pgSql = pgOrderSql;
-					pgSql = visitSql.Length > 0 ? pgSql + visitSql : pgSql;
-					pgSql = delaySql.Length > 0 ? pgSql + delaySql : pgOrderSql;
-					tool.SaveLog("SQL :" + pgSql+"  ;", 1);
-					tool.Execute(pgSql, pgConn);
-				}
-			}
-			catch (Exception e)
-			{
-				tool.SaveLog(e.ToString(), 1);
-				throw;
-			}
-		}
+                    //工单
+                    var pgOrderSql = order.GetOrderISql(row, orderId, org, user);
+                    //回访
+                    var appraiseTable = visit.GetVisit(row["FSH_FlowID"].ToString());
+                    var visitSql = visit.GetVisitSql(appraiseTable, row, VisitId, orderId, org, user);
+                    //延期
+                    var delayTable = delay.GetDelay(row["FSH_FlowID"].ToString());
+                    var delaySql = delay.GetDelaySql(delayTable, row, orderId, org, user);
+                    var pgSql = pgOrderSql;
+                    pgSql = visitSql.Length > 0 ? pgSql + visitSql : pgSql;
+                    pgSql = delaySql.Length > 0 ? pgSql + delaySql : pgOrderSql;
+                    tool.SaveLog("SQL :" + pgSql + "  ;", 1);
+                    tool.Execute(pgSql, pgConn);
+                }
+            }
+            catch (Exception e)
+            {
+                tool.SaveLog(e.ToString(), 1);
+                throw;
+            }
+        }
 
-		public void ExecuteTypeSql() {
-			var pgConn = tool.GetConPgSql();
-			var pgSql = knowledge.GetKnowledgeTypeSql();
-			//tool.SaveLog("KnowledgeTypeSQL :" + pgSql + "  ;", 1);
-			tool.Execute(pgSql, pgConn);
-		}
+        public void ExecuteTypeSql()
+        {
+            var pgConn = tool.GetConPgSql();
+            var pgSql = knowledge.GetKnowledgeTypeSql();
+            //tool.SaveLog("KnowledgeTypeSQL :" + pgSql + "  ;", 1);
+            tool.Execute(pgSql, pgConn);
+        }
 
-		public void ExecuteOrganizeSql() {
-			var pgConn = tool.GetConPgSql();
-			var pgSql = organize.GetOrganize();
-			tool.SaveLog("OrganizeSQL :" + pgSql + "  ;", 1);
-			//tool.Execute(pgSql, pgConn);
-		}
+        public void ExecuteOrganizeSql()
+        {
+            var pgConn = tool.GetConPgSql();
+            var pgSql = organize.GetOrganize();
+            tool.SaveLog("OrganizeSQL :" + pgSql + "  ;", 1);
+            //tool.Execute(pgSql, pgConn);
+        }
 
-		public void ExecuteUserSql()
-		{
-			var pgConn = tool.GetConPgSql();
-			var pgSql = user.GetUserSql();
-			tool.SaveLog("UserSQL :" + pgSql + "  ;", 1);
-			//tool.Execute(pgSql, pgConn);
-		}
+        public void ExecuteUserSql()
+        {
+            var pgConn = tool.GetConPgSql();
+            var pgSql = user.GetUserSql();
+            tool.SaveLog("UserSQL :" + pgSql + "  ;", 1);
+            //tool.Execute(pgSql, pgConn);
+        }
 
-		public void ExecuteStaffSql()
-		{
-			var pgConn = tool.GetConPgSql();
-			var pgSql = user.GetStaffNoSql();
-			tool.SaveLog("StaffSQL :" + pgSql + "  ;", 1);
-			//tool.Execute(pgSql, pgConn);
-		}
+        public void ExecuteStaffSql()
+        {
+            var pgConn = tool.GetConPgSql();
+            var pgSql = user.GetStaffNoSql();
+            tool.SaveLog("StaffSQL :" + pgSql + "  ;", 1);
+            //tool.Execute(pgSql, pgConn);
+        }
 
-		public void ExecuteInsertKnowledge(string stTime,string endTime )
-		{
-			var know = knowledge.GetKnowledge(stTime , endTime);
-			foreach (DataRow item in know.Rows) {
-				var insert = knowledge.GetKnowledgeSql(item);
-				if (!string.IsNullOrEmpty(insert))
-				{
-					var pgConn = tool.GetConPgSql();
-					//tool.SaveLog("KnowledgeSQL :" + insert + "  ;", 1);
-					tool.Execute(insert, pgConn);
-				}
-			}
-		}
+        /// <summary>
+        /// 消息通知
+        /// </summary>
+        /// <param name="stTime"></param>
+        /// <param name="endTime"></param>
+        public void ExecuteInsertNotice(string stTime, string endTime)
+        {
+            var know = notice.GetOldNotice(stTime, endTime);
+            foreach (DataRow item in know.Rows)
+            {
+                var insert = notice.GetNoticeSql(item);
+                if (!string.IsNullOrEmpty(insert))
+                {
+                    var pgConn = tool.GetConPgSql();
+                    tool.SaveLog("KnowledgeSQL :" + insert + "  ;", 1);
+                    //    tool.Execute(insert, pgConn);
+                }
+            }
+        }
 
-		public DataTable GetPgOrganize()
-		{
-			var conn = tool.GetConPgSql();
-			var sql = $@"  SELECT * FROM  system_organize  ";
-			return tool.GetDataTable(sql, conn);
-		}
+        public void ExecuteInsertKnowledge(string stTime, string endTime)
+        {
+            var know = knowledge.GetKnowledge(stTime, endTime);
+            foreach (DataRow item in know.Rows)
+            {
+                var insert = knowledge.GetKnowledgeSql(item);
+                if (!string.IsNullOrEmpty(insert))
+                {
+                    var pgConn = tool.GetConPgSql();
+                    //tool.SaveLog("KnowledgeSQL :" + insert + "  ;", 1);
+                    tool.Execute(insert, pgConn);
+                }
+            }
+        }
 
-		public DataTable GetPgUser()
-		{
-			var conn = tool.GetConPgSql();
-			var sql = $@"  SELECT * FROM  ""user""   ";
-			return tool.GetDataTable(sql, conn);
-		}
-	}
+        public DataTable GetPgOrganize()
+        {
+            var conn = tool.GetConPgSql();
+            var sql = $@"  SELECT * FROM  system_organize  ";
+            return tool.GetDataTable(sql, conn);
+        }
+
+        public DataTable GetPgUser()
+        {
+            var conn = tool.GetConPgSql();
+            var sql = $@"  SELECT * FROM  ""user""   ";
+            return tool.GetDataTable(sql, conn);
+        }
+    }
 }

+ 136 - 123
Form1.Designer.cs

@@ -20,131 +20,143 @@
 			base.Dispose(disposing);
 		}
 
-		#region Windows Form Designer generated code
+        #region Windows Form Designer generated code
 
-		/// <summary>
-		///  Required method for Designer support - do not modify
-		///  the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			st_time = new DateTimePicker();
-			end_time = new DateTimePicker();
-			label1 = new Label();
-			label2 = new Label();
-			btn_tb = new Button();
-			cb_order = new CheckBox();
-			cb_zsk = new CheckBox();
-			cb_user = new CheckBox();
-			cb_jg = new CheckBox();
-			SuspendLayout();
-			// 
-			// st_time
-			// 
-			st_time.CustomFormat = "yyyy-MM-dd hh:mm:ss";
-			st_time.Location = new Point(141, 56);
-			st_time.Name = "st_time";
-			st_time.Size = new Size(200, 23);
-			st_time.TabIndex = 0;
-			// 
-			// end_time
-			// 
-			end_time.Location = new Point(141, 110);
-			end_time.Name = "end_time";
-			end_time.Size = new Size(200, 23);
-			end_time.TabIndex = 1;
-			// 
-			// label1
-			// 
-			label1.AutoSize = true;
-			label1.Location = new Point(67, 59);
-			label1.Name = "label1";
-			label1.Size = new Size(68, 17);
-			label1.TabIndex = 2;
-			label1.Text = "开始时间:";
-			// 
-			// label2
-			// 
-			label2.AutoSize = true;
-			label2.Location = new Point(67, 113);
-			label2.Name = "label2";
-			label2.Size = new Size(68, 17);
-			label2.TabIndex = 3;
-			label2.Text = "结束时间:";
-			// 
-			// btn_tb
-			// 
-			btn_tb.Location = new Point(161, 246);
-			btn_tb.Name = "btn_tb";
-			btn_tb.Size = new Size(75, 23);
-			btn_tb.TabIndex = 4;
-			btn_tb.Text = "同步数据";
-			btn_tb.UseVisualStyleBackColor = true;
-			btn_tb.Click += btn_tb_Click;
-			// 
-			// cb_order
-			// 
-			cb_order.AutoSize = true;
-			cb_order.Location = new Point(94, 163);
-			cb_order.Name = "cb_order";
-			cb_order.Size = new Size(75, 21);
-			cb_order.TabIndex = 5;
-			cb_order.Text = "同步工单";
-			cb_order.UseVisualStyleBackColor = true;
-			// 
-			// cb_zsk
-			// 
-			cb_zsk.AutoSize = true;
-			cb_zsk.Location = new Point(236, 163);
-			cb_zsk.Name = "cb_zsk";
-			cb_zsk.Size = new Size(87, 21);
-			cb_zsk.TabIndex = 6;
-			cb_zsk.Text = "同步知识库";
-			cb_zsk.UseVisualStyleBackColor = true;
-			// 
-			// cb_user
-			// 
-			cb_user.AutoSize = true;
-			cb_user.Location = new Point(93, 201);
-			cb_user.Name = "cb_user";
-			cb_user.Size = new Size(75, 21);
-			cb_user.TabIndex = 7;
-			cb_user.Text = "同步用户";
-			cb_user.UseVisualStyleBackColor = true;
-			// 
-			// cb_jg
-			// 
-			cb_jg.AutoSize = true;
-			cb_jg.Location = new Point(236, 201);
-			cb_jg.Name = "cb_jg";
-			cb_jg.Size = new Size(75, 21);
-			cb_jg.TabIndex = 8;
-			cb_jg.Text = "同步机构";
-			cb_jg.UseVisualStyleBackColor = true;
-			// 
-			// Form1
-			// 
-			AutoScaleDimensions = new SizeF(7F, 17F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(403, 301);
-			Controls.Add(cb_jg);
-			Controls.Add(cb_user);
-			Controls.Add(cb_zsk);
-			Controls.Add(cb_order);
-			Controls.Add(btn_tb);
-			Controls.Add(label2);
-			Controls.Add(label1);
-			Controls.Add(end_time);
-			Controls.Add(st_time);
-			Name = "Form1";
-			Text = "同步程序";
-			ResumeLayout(false);
-			PerformLayout();
-		}
+        /// <summary>
+        ///  Required method for Designer support - do not modify
+        ///  the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            st_time = new DateTimePicker();
+            end_time = new DateTimePicker();
+            label1 = new Label();
+            label2 = new Label();
+            btn_tb = new Button();
+            cb_order = new CheckBox();
+            cb_zsk = new CheckBox();
+            cb_user = new CheckBox();
+            cb_jg = new CheckBox();
+            cb_tz = new CheckBox();
+            SuspendLayout();
+            // 
+            // st_time
+            // 
+            st_time.CustomFormat = "yyyy-MM-dd hh:mm:ss";
+            st_time.Location = new Point(141, 56);
+            st_time.Name = "st_time";
+            st_time.Size = new Size(200, 23);
+            st_time.TabIndex = 0;
+            // 
+            // end_time
+            // 
+            end_time.Location = new Point(141, 110);
+            end_time.Name = "end_time";
+            end_time.Size = new Size(200, 23);
+            end_time.TabIndex = 1;
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(67, 59);
+            label1.Name = "label1";
+            label1.Size = new Size(68, 17);
+            label1.TabIndex = 2;
+            label1.Text = "开始时间:";
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(67, 113);
+            label2.Name = "label2";
+            label2.Size = new Size(68, 17);
+            label2.TabIndex = 3;
+            label2.Text = "结束时间:";
+            // 
+            // btn_tb
+            // 
+            btn_tb.Location = new Point(160, 266);
+            btn_tb.Name = "btn_tb";
+            btn_tb.Size = new Size(75, 23);
+            btn_tb.TabIndex = 4;
+            btn_tb.Text = "同步数据";
+            btn_tb.UseVisualStyleBackColor = true;
+            btn_tb.Click += btn_tb_Click;
+            // 
+            // cb_order
+            // 
+            cb_order.AutoSize = true;
+            cb_order.Location = new Point(94, 163);
+            cb_order.Name = "cb_order";
+            cb_order.Size = new Size(75, 21);
+            cb_order.TabIndex = 5;
+            cb_order.Text = "同步工单";
+            cb_order.UseVisualStyleBackColor = true;
+            // 
+            // cb_zsk
+            // 
+            cb_zsk.AutoSize = true;
+            cb_zsk.Location = new Point(236, 163);
+            cb_zsk.Name = "cb_zsk";
+            cb_zsk.Size = new Size(87, 21);
+            cb_zsk.TabIndex = 6;
+            cb_zsk.Text = "同步知识库";
+            cb_zsk.UseVisualStyleBackColor = true;
+            // 
+            // cb_user
+            // 
+            cb_user.AutoSize = true;
+            cb_user.Location = new Point(93, 201);
+            cb_user.Name = "cb_user";
+            cb_user.Size = new Size(75, 21);
+            cb_user.TabIndex = 7;
+            cb_user.Text = "同步用户";
+            cb_user.UseVisualStyleBackColor = true;
+            // 
+            // cb_jg
+            // 
+            cb_jg.AutoSize = true;
+            cb_jg.Location = new Point(236, 201);
+            cb_jg.Name = "cb_jg";
+            cb_jg.Size = new Size(75, 21);
+            cb_jg.TabIndex = 8;
+            cb_jg.Text = "同步机构";
+            cb_jg.UseVisualStyleBackColor = true;
+            // 
+            // cb_tz
+            // 
+            cb_tz.AutoSize = true;
+            cb_tz.Location = new Point(93, 239);
+            cb_tz.Name = "cb_tz";
+            cb_tz.Size = new Size(75, 21);
+            cb_tz.TabIndex = 9;
+            cb_tz.Text = "同步通知";
+            cb_tz.UseVisualStyleBackColor = true;
+            // 
+            // Form1
+            // 
+            AutoScaleDimensions = new SizeF(7F, 17F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(403, 301);
+            Controls.Add(cb_tz);
+            Controls.Add(cb_jg);
+            Controls.Add(cb_user);
+            Controls.Add(cb_zsk);
+            Controls.Add(cb_order);
+            Controls.Add(btn_tb);
+            Controls.Add(label2);
+            Controls.Add(label1);
+            Controls.Add(end_time);
+            Controls.Add(st_time);
+            Name = "Form1";
+            Text = "同步程序";
+            ResumeLayout(false);
+            PerformLayout();
+        }
 
-		#endregion
+        #endregion
 
-		private DateTimePicker st_time;
+        private DateTimePicker st_time;
 		private DateTimePicker end_time;
 		private Label label1;
 		private Label label2;
@@ -153,5 +165,6 @@
 		private CheckBox cb_zsk;
 		private CheckBox cb_user;
 		private CheckBox cb_jg;
-	}
+        private CheckBox cb_tz;
+    }
 }

+ 59 - 55
Form1.cs

@@ -5,73 +5,77 @@ using System.Data;
 
 namespace DataTransmission
 {
-	public partial class Form1 : Form
-	{
-		private readonly Order order = new Order();
-		private readonly Execute execute = new Execute();
-		private readonly CommonTool tool = new CommonTool();
-		private readonly Knowledge knowledge = new Knowledge();
+    public partial class Form1 : Form
+    {
+        private readonly Order order = new Order();
+        private readonly Execute execute = new Execute();
+        private readonly CommonTool tool = new CommonTool();
+        private readonly Knowledge knowledge = new Knowledge();
 
-		public Form1()
-		{
-			InitializeComponent();
-		}
+        public Form1()
+        {
+            InitializeComponent();
+        }
 
-		private void btn_tb_Click(object sender, EventArgs e)
-		{
-			btn_tb.Enabled = false;
-			if (cb_zsk.Checked)
-			{
-				execute.ExecuteInsertKnowledge(st_time.Value.ToString("yyyy-MM-dd") + " 00:00:00", end_time.Value.ToString("yyyy-MM-dd") + " 23:59:59");
-				//知识库类型
-				//execute.ExecuteTypeSql();
-			}
-			if (cb_order.Checked) {
-				ExecuteInsert();
-			}
+        private void btn_tb_Click(object sender, EventArgs e)
+        {
+            btn_tb.Enabled = false;
+            if (cb_tz.Checked)
+            {
+                execute.ExecuteInsertNotice(st_time.Value.ToString("yyyy-MM-dd") + " 00:00:00", end_time.Value.ToString("yyyy-MM-dd") + " 23:59:59");
+            }
+            if (cb_zsk.Checked)
+            {
+                execute.ExecuteInsertKnowledge(st_time.Value.ToString("yyyy-MM-dd") + " 00:00:00", end_time.Value.ToString("yyyy-MM-dd") + " 23:59:59");
+                //知识库类型
+                //execute.ExecuteTypeSql();
+            }
+            if (cb_order.Checked)
+            {
+                ExecuteInsert();
+            }
             if (cb_jg.Checked)
             {
-				execute.ExecuteOrganizeSql();
-			}
+                execute.ExecuteOrganizeSql();
+            }
             if (cb_user.Checked)
             {
-				execute.ExecuteUserSql();
-				//工号
-				//execute.ExecuteStaffSql();
-			}
+                execute.ExecuteUserSql();
+                //工号
+                //execute.ExecuteStaffSql();
+            }
             MessageBox.Show("同步完成!请先别关闭程序!");
-			btn_tb.Enabled = true;
-		}
+            btn_tb.Enabled = true;
+        }
 
-		private void ExecuteInsert()
-		{
-			var orderTable = order.GetOrder(st_time.Value.ToString("yyyy-MM-dd") + " 00:00:00", end_time.Value.ToString("yyyy-MM-dd") + " 23:59:59");
+        private void ExecuteInsert()
+        {
+            var orderTable = order.GetOrder(st_time.Value.ToString("yyyy-MM-dd") + " 00:00:00", end_time.Value.ToString("yyyy-MM-dd") + " 23:59:59");
 
-			var count = orderTable.Rows.Count;
+            var count = orderTable.Rows.Count;
 
-			var exNum = 0;
-			var threadNum = 100;
+            var exNum = 0;
+            var threadNum = 100;
 
-			var divisor = count / threadNum;
-			var remainder = count % threadNum;
-			for (int i = 0; i < divisor; i++)
-			{
-				var stNum = exNum;
-				var enNum = exNum + threadNum;
+            var divisor = count / threadNum;
+            var remainder = count % threadNum;
+            for (int i = 0; i < divisor; i++)
+            {
+                var stNum = exNum;
+                var enNum = exNum + threadNum;
 
-				var data = orderTable.AsEnumerable().Where(x => ((int)x.Field<long>("Serial")) > stNum && ((int)x.Field<long>("Serial")) <= enNum).CopyToDataTable();
-				execute.ExecuteSql(data);
-				exNum += threadNum;
-			}
+                var data = orderTable.AsEnumerable().Where(x => ((int)x.Field<long>("Serial")) > stNum && ((int)x.Field<long>("Serial")) <= enNum).CopyToDataTable();
+                execute.ExecuteSql(data);
+                exNum += threadNum;
+            }
 
-			if (remainder > 0)
-			{
-				var stNum = divisor * threadNum;
-				var data = orderTable.AsEnumerable().Where(x => ((int)x.Field<long>("Serial")) >= stNum).CopyToDataTable();
-				execute.ExecuteSql(data);
-			}
-		}
+            if (remainder > 0)
+            {
+                var stNum = divisor * threadNum;
+                var data = orderTable.AsEnumerable().Where(x => ((int)x.Field<long>("Serial")) >= stNum).CopyToDataTable();
+                execute.ExecuteSql(data);
+            }
+        }
 
-	
-	}
+    }
 }

+ 80 - 0
Joint/Notice.cs

@@ -0,0 +1,80 @@
+using Abp;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataTransmission.Joint
+{
+    public class Notice
+    {
+        private readonly CommonTool tool = new CommonTool();
+
+        public DataTable GetOldNotice(string st_time, string end_time)
+        {
+            var conn = tool.GetConSqlServer();
+            var sql = $@"select WNLT_Title AS  Title,WNCT_Content AS Content,WNLT_TypeID AS BulletinTypeId,WNT_TypeName AS BulletinTypeName,
+                    WNED_ReadCount AS ReadedNum,WNLT_CreateDate AS BulletinTime ,2 AS BulletinState,WNED_WebPubFlag AS WebPub,WNED_WeChat AS WeChat,
+                    '001' AS SourceOrgId,'市民热线服务系统' AS SourceOrgName,WNLT_CreateDate AS CommitTime,WNLT_AuditUserID AS AuditUserID,WNLT_AuditDate AS AuditDate
+,WNLT_UserID as UserID,
+WNLT_UserName as UserName                      
+from Web04_NoticeList nl
+                    left join Web05_NoticeExpand ne on nl.WNLT_NoticeID=ne.WNED_NoticeID
+                    left join Web06_NoticeContent nc on nc.WNCT_NoticeID=nl.WNLT_NoticeID
+                    left join Web03_NoticeType nt on nl.WNLT_TypeID=nt.WNT_TypeID
+                    where WNLT_CreateDate>='{st_time}' and WNLT_CreateDate<='{end_time}'";
+            //HR.SHR_Date >= '{st_time}' AND HR.SHR_Date <= '{end_time}' AND
+            return tool.GetDataTable(sql, conn);
+        }
+
+        public string GetNoticeSql(DataRow item)
+        {
+            var noticeSql = $@"INSERT INTO ""public"".""bulletin"" (""Id"", ""Title"", ""Content"", ""BulletinTypeId"", ""BulletinTypeName"", ""ReadedNum"", ""BulletinTime"", 
+""LoseEfficacyTime"", ""BulletinState"", ""PushRanges"", ""SourceOrgId"", ""SourceOrgName"", ""CreationTime"", ""CreatorId"", ""CreatorName"",
+""CreatorOrgId"", ""CreatorOrgName"", ""CreatorOrgLevel"", ""AreaId"", ""CommitTime"", ""ExaminOpinion"", ""ExaminManId"", ""ExaminTime"", 
+""IsArrive"")  VALUES";
+
+            var PushRanges = "[";
+            if (item["WebPub"].ToString() == "1")
+            {
+                PushRanges += $@"{{""Key"":""2"",""Value"":""门户网站""}}";
+            }
+            if (item["WeChat"].ToString() == "1")
+            {
+                PushRanges += $@",{{""Key"":""1"",""Value"":""微信小程序""}}";
+            }
+            PushRanges += "]";
+            var noticeId = SequentialGuidGenerator.Instance.Create().ToString("D");
+            var cretuser = GetPgUser(item["UserID"].ToString());
+            string cretuserid = "";
+            if (cretuser != null && cretuser.Rows.Count > 0)
+            {
+                cretuserid = cretuser.Rows[0]["Id"].ToString();
+            }
+
+            var aduuser = GetPgUser(item["AuditUserID"].ToString());
+            string caduuserid = "";
+            if (aduuser != null && aduuser.Rows.Count > 0)
+            {
+                caduuserid = aduuser.Rows[0]["Id"].ToString();
+            }
+
+            noticeSql += $@"('{noticeId}', '{item["Title"]}', '{item["Content"]}', '{item["BulletinTypeId"]}', '{item["BulletinTypeName"]}', 
+                {item["ReadedNum"]}, '{item["BulletinTime"]}', '2050-06-07 00:00:00', 2, '{PushRanges}', '001', '市民热线服务中心',
+                '{item["BulletinTime"]}', '{cretuserid}', '{item["UserName"]}', '001', '市民热线服务中心', 1, '001', '{item["CommitTime"]}', 
+                '同意', '{caduuserid}', '{item["AuditDate"]}', 't')";
+
+            return noticeSql;
+
+        }
+
+        public DataTable GetPgUser(string userid)
+        {
+            var conn = tool.GetConPgSql();
+            var sql = $@"select ""Id"",""Name"" from ""user"" where ""OldUserId""='{userid}' ";
+            return tool.GetDataTable(sql, conn);
+        }
+    }
+}