解决scada数据完整度 实现时间粒度值获取问题

wtoaamapi/apps/viewDemo/viewDataAnalysis.py

@@ -52,11 +52,12 @@ class DataAnalysis(ViewSet):
             logger.info(f"client IP: {clientIP} get_body {request.body}")
             try:
                 dataAnalysisService = ServiceOfDataAnalysis(logger, databasesUtil, minioClient, conf)
-            except Exception as exception:
+            except (CustomError, Exception) as exception:
                 # 使用 traceback 模块获取完整的异常信息
                 error_message =''.join(traceback.format_exception(exception))
-                code = exception.code
-                message = exception.message
+                ex=e if isinstance(exception, CustomError) else CustomError(-1)
+                code = ex.code
+                message = ex.message
                 with foundationDB.session_scope() as session:
                         outputProcessor.analysisState(session, conf.dataContract.dataFilter.dataBatchNum,
                                               AnalysisState.Analyzed.value, ErrorState.Err.value, code, message)