hj

calc_result/IndexGet.py

@@ -24,7 +24,7 @@ class IndexGet:
                 # indexItem.Id = row[0]
                 indexItem.Name = row[1]
                 indexItem.IndexName = row[2]
-                funs=str(row[3]).replace("\n","").replace("；",";").replace(")]","))").replace("[(","((").split(";")
+                funs=str(row[3]).replace("\n","").replace("；",";").replace(")]","))").replace("AND","and").replace("OR","or").replace("[(","((").split(";")
                 funsGrp=[]
                 for fun in funs:
                     funsGrp.append(fun)

calc_result/main.py

@@ -110,12 +110,13 @@ def fun(str):
 
 redisPool = redis.ConnectionPool(host='43.247.184.32', port=8967, password='Gongsibao2018',db=2)
 client = redis.Redis(connection_pool=redisPool)
-# value=client.rpop('notifyRule')
-a = client.lrange('notifyRule',0,-1)
+a = client.lrange('notifyRule',-1,-1)
+print(a,"aaa")
 if len(a)==0:
     print("notifyRule数据为空")
     quit()
 value =a[-1]
+# print(value,"pp")
 if client is None:
     client.rpop('notifyRule')
     quit()
@@ -123,9 +124,11 @@ if value is None:
     client.rpop('notifyRule')
     quit()
 result=json.loads(value)
+print(result,"result")
 content=result["content"]
-taxTypeCode=content['taxTypeCode']#企业性质
-accountTypeCode=content['accountTypeCode']#会计准则
+print(content,"content")
+taxTypeCode=content["taxTypeCode"]#企业性质
+accountTypeCode=content["accountTypeCode"]#会计准则
 BatchNo=content["batchCode"]
 
 if taxTypeCode=="ST":