pom文件部门id修改；kettle配置修改；kettle作业调整；

epdc-cloud-analysis/doc/kettle/kettle.properties

@@ -1,33 +1,33 @@
 #####---dev
-#
-#KETTLE_EMPTY_STRING_DIFFERS_FROM_NULL=Y
-#
-## db-source
-#db.mysql.epdc.source.host=47.104.224.45
-#db.mysql.epdc.source.port=3308
-#db.mysql.epdc.source.username=epdcyushan
-#db.mysql.epdc.source.password=Encrypted 2be98afc86ac29e8da512f6238dc2f98c
-#
-## db-target
-#db.mysql.epdc.target.host=47.104.224.45
-#db.mysql.epdc.target.port=3308
-#db.mysql.epdc.target.username=epdcyushan
-#db.mysql.epdc.target.password=Encrypted 2be98afc86ac29e8da512f6238dc2f98c
-#
-## databases
-#esua.epdc.analysis.database=esua_epdc_analysis
-#esua.epdc.events.database=esua_epdc_events
-#esua.epdc.user.database=esua_epdc_user
-#esua.epdc.admin.database=esua_epdc_admin
-#esua.epdc.group.database=esua_epdc_group
-#esua.epdc.api.database=esua_epdc_api
-#esua.epdc.custom.database=esua_epdc_custom
-#esua.epdc.job.database=esua_epdc_job
-#esua.epdc.kpi.database=esua_epdc_kpi
-#esua.epdc.mutuality.database=esua_epdc_mutuality
-#esua.epdc.points.database=esua_epdc_points
-#esua.epdc.news.database=esua_epdc_news
-#esua.epdc.workrecord.database=esua_epdc_workrecord
+
+KETTLE_EMPTY_STRING_DIFFERS_FROM_NULL=Y
+
+# db-source
+db.mysql.epdc.source.host=47.104.224.45
+db.mysql.epdc.source.port=3308
+db.mysql.epdc.source.username=epdcyushan
+db.mysql.epdc.source.password=Encrypted 2be98afc86ac29e8da512f6238dc2f98c
+
+# db-target
+db.mysql.epdc.target.host=47.104.224.45
+db.mysql.epdc.target.port=3308
+db.mysql.epdc.target.username=epdcyushan
+db.mysql.epdc.target.password=Encrypted 2be98afc86ac29e8da512f6238dc2f98c
+
+# databases
+esua.epdc.analysis.database=yushan_esua_epdc_analysis
+esua.epdc.events.database=yushan_esua_epdc_events
+esua.epdc.user.database=yushan_esua_epdc_user
+esua.epdc.admin.database=yushan_esua_epdc_admin
+esua.epdc.group.database=yushan_esua_epdc_group
+esua.epdc.api.database=yushan_esua_epdc_api
+esua.epdc.custom.database=yushan_esua_epdc_custom
+esua.epdc.job.database=yushan_esua_epdc_job
+esua.epdc.kpi.database=yushan_esua_epdc_kpi
+esua.epdc.mutuality.database=yushan_esua_epdc_mutuality
+esua.epdc.points.database=yushan_esua_epdc_points
+esua.epdc.news.database=yushan_esua_epdc_news
+esua.epdc.workrecord.database=yushan_esua_epdc_workrecord
 
 
 ######---prod

epdc-cloud-analysis/doc/kettle/yushan-analysis/analysis_synchronize/esua_analysis_synchronize.kjb

@@ -1336,7 +1336,7 @@
       <to>epdc_enterprise_info</to>
       <from_nr>0</from_nr>
       <to_nr>0</to_nr>
-      <enabled>N</enabled>
+      <enabled>Y</enabled>
       <evaluation>Y</evaluation>
       <unconditional>Y</unconditional>
     </hop>

epdc-cloud-analysis/pom.xml

@@ -112,7 +112,6 @@
         </resources>
     </build>
 
-
     <profiles>
         <profile>
             <id>dev</id>
@@ -141,7 +140,7 @@
                 <nacos.ip></nacos.ip>
                 <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
 
-                <deptconfig.disdeptid>1175270520603930625</deptconfig.disdeptid>
+                <deptconfig.disdeptid>1263002886258843649</deptconfig.disdeptid>
 
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
@@ -171,7 +170,7 @@
                 <nacos.ip></nacos.ip>
                 <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
 
-                <deptconfig.disdeptid>1175270520603930625</deptconfig.disdeptid>
+                <deptconfig.disdeptid>1263002886258843649</deptconfig.disdeptid>
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>
@@ -201,7 +200,9 @@
                 <nacos.server-addr>172.16.1.243:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
                 <nacos.namespace></nacos.namespace>
-                <deptconfig.disdeptid>1175270520603930625</deptconfig.disdeptid>
+
+                <!--顶级机构的ID-->
+                <deptconfig.disdeptid>1258587136866476033</deptconfig.disdeptid>
                 <spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
             </properties>
         </profile>