From d243080d5fc9e11db878decf54a5bac9175f6fef Mon Sep 17 00:00:00 2001
From: pengtao <pengtao@kingsome.cn>
Date: Tue, 9 Jul 2019 11:14:51 +0800
Subject: [PATCH] add ad

---
 handler/company.py | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/handler/company.py b/handler/company.py
index a689700..1cc47a3 100644
--- a/handler/company.py
+++ b/handler/company.py
@@ -20,35 +20,30 @@ parser.add_argument('appid')
 parser.add_argument('appkey')
 parser.add_argument('status')
 
+
 # # 操作（put / get / delete）单一资源Todo
 # shows a single todo item and lets you delete a todo item
 class Company(Resource):
   def get(self, comp_id):
     try:
-      data = company_redis.hmget(comp_id, ['id', 'name', 'contact', 'appid', 'appkey'])
-      log.info(f"get data from redis was {data}")
-      _,name,_,_,_=data
-      if not name:
-        sql = f"select id,name,contact,appid,appkey from company where id={comp_id};"
-        data = mydb.query(sql)
+      sql = f"select id,name,contact,appid,appkey,status from company where id={comp_id};"
+      data = mydb.query(sql)
 
-        log.info(f"get data from db was {data}")
-        if data:
-          company = {}
-          company['id'], company['name'], company['contact'], company['appid'], company['appkey'] = data[0]
-          company_redis.hmset(company['id'], company)
-          company_redis.expire(company['id'], expire_time)
-        else:
-          log.error(f"{comp_id} not found in mysql !")
-          return jsonify({'code': 404})
+      log.info(f"get data from db was {data}")
+      if data:
+        company = {}
+        company['id'], company['name'], company['contact'], company['appid'], company['appkey'],company['status'] = \
+          data[0]
+      else:
+        log.error(f"{comp_id} not found in mysql !")
+        return jsonify({'code': 404})
     except Exception:
       log.error(f"get company id {comp_id} failed! ", exc_info=True)
       return jsonify({'code': 500})
-    return jsonify({'code': 200, 'body': data})
+    return jsonify({'code': 200, 'body': company})
 
   def delete(self, comp_id):
     try:
-      company_redis.expire(comp_id, 0)
       del_sql = f'delete from company where id={comp_id};'
       mydb.query(del_sql)
     except Exception:
@@ -68,8 +63,8 @@ class Company(Resource):
       # insert to mysql
       mydb.insert("company", company)
       # insert to redsi
-      company_redis.hmset(company['id'], company)
-      company_redis.expire(company['id'], expire_time)
+      # company_redis.hmset(company['id'], company)
+      # company_redis.expire(company['id'], expire_time)
     except Exception:
       log.error("set values to company mysql/redis failed!", exc_info=True)
       return jsonify({'code': 500})
@@ -93,8 +88,8 @@ class Company(Resource):
       mydb.update("company", company, condition)
 
       # update  redsi
-      company_redis.hmset(company['id'], company)
-      company_redis.expire(company['id'], expire_time)
+      # company_redis.hmset(company['id'], company)
+      # company_redis.expire(company['id'], expire_time)
     except Exception:
       log.error("update values to company redis,mysql failed!", exc_info=True)
       return jsonify({'code': 500})