dev

plot/ProfitCenter.py

@@ -13,8 +13,10 @@ from matplotlib import ticker
 from io import BytesIO
 import logging
 
-class ProfitCenter(object):
-    queue_name = 'REFILL_MONITOR_QUEUE';
+from refill import ProfitHandler
+
+class QueueListener(object):
+    queue_name = 'REFILL_MONITOR_QUEUE'
     latest_delta = 10
     pos_map = {
         'commit': 0, 'success': 1, 'fail': 2
@@ -27,7 +29,7 @@ class ProfitCenter(object):
         self._file_names = {
             'profit': {
                 'name': '/var/www/html/data/stdata/profit.hdf5',
-                'hfive': None
+                'handler': None
             }
         }
 
@@ -53,7 +55,9 @@ class ProfitCenter(object):
                 r = redis.Redis(connection_pool=pool)
 
                 for _key,val in self._file_names.items():
-                    val['hfive'] = open(val['name'])
+                    hfive = open(val['name'])
+                    if _key == 'profit':
+                        val['handler'] = ProfitHandler(hfive)
 
                 self.read(self.queue_name,r)
             except Exception as ex:
@@ -668,4 +672,4 @@ class ProfitCenter(object):
             finally:
                 stime.sleep(2)
 
-profitCenter = ProfitCenter()
+queueListener = QueueListener()

plot/profit_reader.py

@@ -1,4 +1,4 @@
-from ProfitCenter import profitCenter
+from QueueListener import profitCenter
 import signal as sig
 import sys,getopt
 

plot/refill/DataHandler.py

@@ -1,10 +1,21 @@
-# from abc import ABCMeta, abstractmethod
+from abc import ABCMeta, abstractmethod
 
-# class DataHandler(metaclass=ABCMeta):
-#     @abstractmethod
-#     def read(self):
-#         pass
+__all__ = ['DataHandler']
 
-class DataHandler:
+class DataHandler(metaclass=ABCMeta):
+    def __init__(self,hfive):
+        self._hfive = hfive
+
+    # Getter function
+    @property
+    def file(self):
+        return self._hfive
+
+    # Setter function
+    @file.setter
+    def file(self, value):
+        self._hfive = value
+
+    @abstractmethod
     def read(self):
         pass

plot/refill/ProfitHandler.py

@@ -1,8 +1,8 @@
-from . import DataHandler
+# from . import DataHandler #此时是导入文件
+from . DataHandler import DataHandler
 
 __all__ = ['ProfitHandler']
 
 class ProfitHandler(DataHandler):
     def read(self):
         pass
-    pass

plot/refill/__init__.py

@@ -1,2 +1,5 @@
 
-__all__ = []
+from .DataHandler import DataHandler
+from .ProfitHandler import ProfitHandler
+
+__all__ = ['DataHandler','ProfitHandler']

plot/testModule.py

@@ -1,13 +1,14 @@
 import unittest
 from refill import *
-from refill.DataHandler import DataHandler
-from refill.ProfitHandler import ProfitHandler
+# from refill.DataHandler import DataHandler
+# from refill.ProfitHandler import ProfitHandler
 
 class MyTestCase(unittest.TestCase):
     def test_something(self):
         self.assertEqual(True, False)  # add assertion here
 
     def test_handler(self):
+        handler = ProfitHandler(None)
         pass
 
 

plot/thdf5.py

@@ -10,7 +10,7 @@ import numpy as np
 from DataCenter import dataCenter
 from MchDataCenter import mchDataCenter
 from SpeedDataCenter import speedDataCenter
-from ProfitCenter import profitCenter
+from QueueListener import queueListener
 
 from matplotlib.figure import Figure
 from PIL import Image
@@ -165,8 +165,8 @@ class DataTest(unittest.TestCase):
         speedDataCenter.channl_speed()
 
     def test_profitPrepare(self):
-        profitCenter.set_redis(self.__redis_host,'6379')
-        profitCenter.prepare_data()
+        queueListener.set_redis(self.__redis_host,'6379')
+        queueListener.prepare_data()
 
 
     def test_json(self):