dev

plot/app.py

@@ -32,17 +32,11 @@ from refill import ChannelPainter,MerchantPainter
 from refill import filter_chname,filter_cardtype,filter_mchids
 
 def parse_parmeter():
-    logger.debug('start chratio')
-    cur_time = int(time.time())
-
-    start_time = request.args.get('start_time')
-    start_time = cur_time - 7200 if start_time is None else int(start_time.strip())
-
     end_time = request.args.get('end_time')
-    end_time = cur_time if end_time is None else int(end_time.strip())
+    end_time = None if end_time is None else int(end_time.strip())
 
-    stime = lambda t: time.strftime('%d-%H:%M:%S', time.localtime(t))
-    logger.debug("start_time=%s end_time=%s",stime(start_time) ,stime(end_time))
+    start_time = request.args.get('start_time')
+    start_time = None if start_time is None else int(start_time.strip())
 
     card_types = request.args.get('card_types')
     card_types = filter_cardtype(card_types)
@@ -66,6 +60,7 @@ def onError(ex):
 @app.route('/plot/ch_ratio')
 def ch_ratio():
     try:
+        logger.debug('start chratio')
         start_time, end_time, card_types, spec, filter_wave = parse_parmeter()
         chnames = request.args.get('chnames')
         chnames = filter_chname(chnames)
@@ -81,6 +76,7 @@ def ch_ratio():
 @app.route('/plot/mch_ratio')
 def mch_ratio():
     try:
+        logger.debug('start mchratio')
         start_time, end_time, card_types, spec, filter_wave = parse_parmeter()
         mchids = request.args.get('mchids')
         mchids = filter_mchids(mchids)
@@ -93,6 +89,22 @@ def mch_ratio():
     except Exception as ex:
         return onError(ex)
 
+@app.route('/plot/mch_order_send')
+def mch_order_send():
+    try:
+        logger.debug('start mch_order_send')
+        start_time, end_time, card_types, spec, filter_wave = parse_parmeter()
+        mchids = request.args.get('mchids')
+        mchids = filter_mchids(mchids)
+
+        painter = MerchantPainter(start_time=start_time, end_time=end_time, mchids=mchids, card_types=card_types, spec=spec, filter_wave=filter_wave)
+        buf = painter.paint_refilling()
+        data = base64.b64encode(buf.getbuffer()).decode("ascii")
+
+        return f"<img src='data:image/png;base64,{data}'/>"
+    except Exception as ex:
+        return onError(ex)
+
 @app.route('/plot/index')
 def index():
     app.logger.debug('start')