调整监控报警，特殊情况增加@所有人

BaseDataMaintenance/dataMonitor/data_monitor.py

@@ -367,6 +367,7 @@ class BaseDataMonitor():
 
         total_count = total_count_doc+total_count_sp
         _msg = "拟在建生成报警：当天生成的拟在建数量为:%d，其中公告生成：%d，审批项目生成：%d"%(total_count,total_count_doc,total_count_sp)
+        atAll=False
         if total_count==0:
             atAll=True
             _msg += "\n疑似流程出现问题，请相关负责人尽快处理"
@@ -583,7 +584,7 @@ class BaseDataMonitor():
 
         # scheduler.add_job(self.monitor_attachment,"cron",minute="*/10")
         scheduler.add_job(self.monitor_extract,"cron",minute="*/10")
-        scheduler.add_job(self.monitor_proposedBuilding,"cron",hour="*/2")
+        scheduler.add_job(self.monitor_proposedBuilding,"cron",hour="*/3")
         scheduler.add_job(self.monitor_dumplicate,"cron",minute="*/10")
         scheduler.add_job(self.monitor_sychr,"cron",minute="*/10")
         scheduler.add_job(self.monitor_preproject,"cron",hour="8")

BaseDataMaintenance/dataSource/setttings.py

@@ -39,8 +39,8 @@ neo4j_pass = "bxkc_web"
 
 oracle_host = "121.46.18.113"
 oracle_port = 10522
-oracle_host = "192.168.0.150"
-oracle_port = 1522
+# oracle_host = "192.168.0.150"
+# oracle_port = 1522
 # oracle_user = "bxkc_data_readonly"
 # oracle_pass = "P7WUrgcz0@#j8pjg"
 # oracle_user = "bxkc_data"

BaseDataMaintenance/maintenance/dataflow_mq.py

@@ -1485,8 +1485,8 @@ def fixDoc_to_queue_init(filename=""):
     conn = getConnection_oracle()
     cursor = conn.cursor()
     _count = 0
-    for uuid,tablename,_exists in zip(df["uuid"],df["tablename"],df["exists"]):
-        if _exists==0:
+    for uuid,tablename,_exists,_toolong in zip(df["uuid"],df["tablename"],df["exists"],df["tolong"]):
+        if _exists==0 and _toolong==0:
             _count += 1
             _source = str(tablename).replace("_TEMP","")
             sql = " insert into %s(%s) select %s from %s where id='%s' "%(tablename,row_name,row_name,_source,uuid)
@@ -1503,4 +1503,4 @@ if __name__ == '__main__':
     # de.start_flow_extract()
     # fixDoc_to_queue_extract()
     # check_data_synchronization()
-    fixDoc_to_queue_init(filename="C:\\Users\\Administrator\\Desktop\\flow_init_2023-02-03.log_check.xlsx")
+    fixDoc_to_queue_init(filename="C:\\Users\\Administrator\\Desktop\\flow_init_2023-02-07.xlsx")

BaseDataMaintenance/maxcompute/documentMerge.py

@@ -2108,7 +2108,7 @@ def update_projects_by_project(project_dict,projects):
     _dict = {}
     #更新公共属性
     for k,v in project_dict.items():
-        if k in (project_project_dynamics,project_product,project_project_codes,project_docids,project_uuid,project_nlp_enterprise,project_nlp_enterprise_attachment):
+        if k in (project_project_dynamics,project_page_time,project_product,project_project_codes,project_docids,project_uuid,project_nlp_enterprise,project_nlp_enterprise_attachment):
             continue
         for _proj in projects:
             if k not in _proj:
@@ -2124,6 +2124,8 @@ def update_projects_by_project(project_dict,projects):
                             _dict[k] = v
     for _proj in projects:
         _proj.update(_dict)
+        if _proj.get(project_page_time,"")<project_dict.get(project_page_time,""):
+            _proj[project_page_time] = project_dict.get(project_page_time,"")
 
     #拼接属性
     append_dict = {}