no message

config.py

@@ -66,6 +66,8 @@ class DevConfig(Settings):
     YJXP_WEB_ROOT_PATH: Optional[str] = Field(..., env="DEV_YJXP_WEB_ROOT_PATH")
     YJXP_CALLBACK_WEB_PATH: Optional[str] = Field(..., env="DEV_YJXP_CALLBACK_WEB_PATH")
 
+    HOME_URL = "http://127.0.0.1:8086"
+
     # 粤政易
     YZY_PASS_ID: Optional[str] = Field(..., env="DEV_YZY_PASS_ID")
     YZY_PASS_TOKEN: Optional[str] = Field(..., env="DEV_YZY_PASS_TOKEN")
@@ -95,6 +97,8 @@ class ProdConfig(Settings):
     # YZY_HOST = "https://xtbg.digitalgd.com.cn"
     # YZY_API_ROOT = "http://19.15.0.128:8080"
 
+    HOME_URL = "http://19.155.220.228:8086"
+
     REDIS_DB_URL = {
         'host': '127.0.0.1',
         'port': 6379,

routers/api/Knowledge/__init__.py

@@ -132,13 +132,26 @@ async def select_knowledge(
     offset = (pageNum - 1) * pageSize
     data_query = data_query.offset(offset).limit(pageSize)
 
-    fields = ['reportId', 'reportName', 'eventType', 'publishDate', 'publishingUnit', 'summary', 'subject', 'notificationType']
+    fields = ['reportId', 'reportName', 'eventType', 'publishDate', 'publishingUnit', 'summary', 'subject', 'notificationType', 'base_code']
     entities = [getattr(KnowledgeBase, field) for field in fields if hasattr(KnowledgeBase, field)]
     data = data_query.with_entities(*entities).offset(offset).limit(pageSize).all()
 
     result_items = []
     for item in data:
         item_dict = {field: getattr(item, field) for field in fields}
+        print(item_dict)
+        base_code = item_dict['base_code']
+        kf_entries = db.query(KnowledgeFile).filter(KnowledgeFile.knowledge_base_code == base_code).filter(KnowledgeFile.is_deleted != '2').all()
+        item_dict['files'] = [
+            {
+                "fileIdentifier": file.file_identifier,
+                "fileName": file.file_name,
+                "url": file.storage_file_name,
+                "status":"success"
+            }
+            for file in kf_entries
+        ]
+            
         result_items.append(item_dict)
 
     total_count = data_query.count()
@@ -184,6 +197,18 @@ async def get_knowledge_detail(db: Session = Depends(get_db), reportID: Optional
         {"content": kf.file_name, "url": kf.storage_file_name,"file_identifier":kf.file_identifier}
         for kf in kf_entries
     ]
+    
+    '''
+    files = [
+        {
+            "fileIdentifier": file.file_identifier,
+            "fileName": file.file_name,
+            "url": file.storage_file_name,
+            "status":"success"
+        }
+        for file in kf_entries
+    ]
+    '''
 
     result = {
         "code": 200,
@@ -204,16 +229,7 @@ async def get_knowledge_detail(db: Session = Depends(get_db), reportID: Optional
     return result
 
 
-
-
-
-
-
-
-
-
-
-@router.delete  ('/delete')
+@router.post  ('/delete')
 async def delete_knowledge(request: Request, db: Session = Depends(get_db)):
     # 从请求的 JSON 数据中获取 reportID
     body = await request.json()
@@ -324,7 +340,7 @@ def delete_file_fun(knowledge_base_code,db: Session):
 
 
 
-@router.put('/update')
+@router.post('/update')
 async def update_knowledge(request: Request, db: Session = Depends(get_db)):
     body = await request.json()
     report_id_to_use = body.get('reportId')

routers/api/infoPublish/back.py

@@ -62,6 +62,15 @@ async def create_emergency_plan(
         dept_row = db.query(SysDept).filter(SysDept.dept_id == dept_id).first()
         dept_name = dept_row.dept_name
 
+        examine_user_row = db.query(SysUser).filter(SysUser.user_name == body['examine_user']).first()
+        if examine_user_row is None:
+             return {
+                "code": 500,
+                "msg": "审批人员账号不存在"
+            }
+        
+        examine_by = examine_user_row.user_id
+
         new_publish = InfoPublishBase(
             title = body['title'],
             publish_group = body['publish_group'],
@@ -74,14 +83,15 @@ async def create_emergency_plan(
             add_time = datetime.now(),
             response_type = body['response_type'],
             publish_time = body['publish_time'],
-            examine_by = body['examine_by'],
+            examine_by = examine_by,
             publish_status = 0,
             examine_status = 0,
             publish_channel = body['publish_channel'],
             user_count = body['user_count'],
             user_ok_count = 0,
             user_err_count = 0,
-            user_sending_count = 0
+            user_sending_count = 0,
+            info_type = body['info_type']
         )
         db.add(new_publish)
         db.commit()
@@ -264,8 +274,8 @@ async def get_publish_list(
                 "dept_name": dept_name,
 
                 "examine_user": examine_user,
-                "publish_status": db_dict.get_dict_label(db, "mm_publish_status", row.publish_status),
-                "examine_status": db_dict.get_dict_label(db, "mm_examine_status", row.examine_status),
+                "publish_status": row.publish_status, # db_dict.get_dict_label(db, "mm_publish_status", row.publish_status),
+                "examine_status": row.examine_status, # db_dict.get_dict_label(db, "mm_examine_status", row.examine_status),
 
                 "user_count": row.user_count,
                 "user_ok_count": row.user_ok_count,