田爽 před 4 měsíci
rodič
revize
e975772b26
3 změnil soubory, kde provedl 12 přidání a 12 odebrání
  1. 4 4
      App.config
  2. 2 2
      Execute.cs
  3. 6 6
      Joint/Knowledge.cs

+ 4 - 4
App.config

@@ -4,14 +4,14 @@
     <!--<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_dev;"/>-->
     <!--宜宾-->
-    <!--<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=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=172.20.200.11,4433;database=CityHotline_Ver3;uid=HotlineUser_Ver3;pwd=lzs12345aA!@#;"/>
-    <add key ="PGSQLDB" value="Server=110.188.24.182;Port=5432;UserId=dev;Password=fengwo11!!;Database=hotline_lz;"/>
+    <!--<add key ="SQLServerDB" value="server=172.20.200.11,4433;database=CityHotline_Ver3;uid=HotlineUser_Ver3;pwd=lzs12345aA!@#;"/>
+    <add key ="PGSQLDB" value="Server=110.188.24.182;Port=5432;UserId=dev;Password=fengwo11!!;Database=hotline_lz;"/>-->
     <!--日志-->
     <add key ="LogLevel" value="10"/>
   </appSettings>

+ 2 - 2
Execute.cs

@@ -64,8 +64,8 @@ namespace DataTransmission
         {
             var pgConn = tool.GetConPgSql();
             var pgSql = knowledge.GetKnowledgeTypeSql();
-            //tool.SaveLog("KnowledgeTypeSQL :" + pgSql + "  ;", 1);
-            tool.Execute(pgSql, pgConn);
+            tool.SaveLog("KnowledgeTypeSQL :" + pgSql + "  ;", 1);
+            //tool.Execute(pgSql, pgConn);
         }
 
         public void ExecuteOrganizeSql()

+ 6 - 6
Joint/Knowledge.cs

@@ -57,7 +57,7 @@ namespace DataTransmission.Joint
 			knowledgeSql += $@"('{KnowledgeId}', '', '{code}', '{item["SHR_Title"]}', NULL, '{Content}', 0, '{IsPublic}',
 						3, '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',NULL, NULL, 0, '', NULL, '[]',
 						NULL, NULL, '2024-03-08 16:38:10.896183', 'f', NULL, '2024-03-07 16:18:28.240546', '001', '08dbba85-02b4-4c0d-83e9-a6e35977c105',
-						'001','市民热线服务系统', '', '[]', '[]', 1, '中心知识库', 0, 
+						'001','热线中心', '', '[]', '[]', 1, '中心知识库', 0, 
 						'0', 0, '001', '[]', NULL, 'f', '[]', '[]')
 					";
 				//	num++;
@@ -90,7 +90,7 @@ namespace DataTransmission.Joint
 				var typeId = pgTypeNew.Rows.Count > 0 ? pgTypeNew.Rows[0]["Id"].ToString() : "";
 				var sql = $@"INSERT INTO ""public"".""knowledge_relation_type"" (""Id"", ""KnowledgeId"", ""KnowledgeTypeId"", ""KnowledgeTypeName"", ""KnowledgeTypeSpliceName"", ""LastModificationTime"", ""IsDeleted"", ""DeletionTime"", ""CreationTime"", ""CreatorId"", ""CreatorName"", ""CreatorOrgId"", ""CreatorOrgName"", ""CreatorOrgLevel"", ""AreaId"") 
 					VALUES
-			('{KnowledgeTypeId}', '{KnowledgeId}', '{typeId}', '{typeName}', '{spliceName}', NULL, 'f', NULL, '2024-06-19 21:59:59', NULL, NULL, '001', '市民热线服务中心', 1, '001')";
+			('{KnowledgeTypeId}', '{KnowledgeId}', '{typeId}', '{typeName}', '{spliceName}', NULL, 'f', NULL, '2024-06-19 21:59:59', NULL, NULL, '001', '热线中心', 1, '001')";
 				knowledgeSql += sql;
 			}
 		
@@ -134,15 +134,15 @@ namespace DataTransmission.Joint
 				{
 					//sql += $@"('{item["NewTypeId"]}', '{item["SDICT_Name"]}', '{spliceName}', 't', 0, {pid}, NULL, 'f', NULL, '2023-11-14 11:14:51.320991', '001', '08daa5f2-1878-4cfa-8764-1244f0229994',
 					//	'001', '12345政务服务便民热线', '初始系统管理账号', 1)";
-					sql += $@"('{item["NewTypeId"]}', '{item["SDICT_Name"]}', '{spliceName}', 't', 0, {pid}, NULL, 'f', NULL, '2023-11-14 11:14:51.320991', '001', '08daa5f2-1878-4cfa-8764-1244f0229994',
-						'001', '12345政务服务便民热线', '初始系统管理账号', 1,'{item["SDICT_ID"]}')";
+					sql += $@"('{item["NewTypeId"]}', '{item["SDICT_Name"]}', '{spliceName}', 't', {item["SDICT_OrderID"]}, {pid}, NULL, 'f', NULL, '2023-11-14 11:14:51.320991', '001', '08daa5f2-1878-4cfa-8764-1244f0229994',
+						'001', '热线中心', '初始系统管理账号', 1,'{item["SDICT_ID"]}')";
 					num++;
 					continue;
 				}
 				//sql += $@",('{item["NewTypeId"]}', '{item["SDICT_Name"]}', '{spliceName}', 't', 0, {pid}, NULL, 'f', NULL, '2023-11-14 11:14:51.320991', '001', '08daa5f2-1878-4cfa-8764-1244f0229994',
 				//		'001', '12345政务服务便民热线', '初始系统管理账号', 1)";
-				sql += $@",('{item["NewTypeId"]}', '{item["SDICT_Name"]}', '{spliceName}', 't', 0, {pid}, NULL, 'f', NULL, '2023-11-14 11:14:51.320991', '001', '08daa5f2-1878-4cfa-8764-1244f0229994',
-						'001', '12345政务服务便民热线', '初始系统管理账号', 1,'{item["SDICT_ID"]}')";
+				sql += $@",('{item["NewTypeId"]}', '{item["SDICT_Name"]}', '{spliceName}', 't', {item["SDICT_OrderID"]}, {pid}, NULL, 'f', NULL, '2023-11-14 11:14:51.320991', '001', '08daa5f2-1878-4cfa-8764-1244f0229994',
+						'001', '热线中心', '初始系统管理账号', 1,'{item["SDICT_ID"]}')";
 				num++;
 			}