diff --git a/ETL/Mars/Model/HuiJiModel.py b/ETL/Mars/Model/HuiJiModel.py index a80bebe..5f0faf2 100644 --- a/ETL/Mars/Model/HuiJiModel.py +++ b/ETL/Mars/Model/HuiJiModel.py @@ -488,10 +488,10 @@ class HuiJiModel(object): sql = sql % params Db.execute(sql) - def getBureauInfoByName(self, bureau_name): - sql = "select regiona,regionb,regionc as area_name,organizationid as school_id,organizationname as school_name from schoolbusinessrelation where organizationname='%s' and recordyear=2020" % ( - bureau_name) - return Db.findFirst(sql) + def getBureauInfoByOrganizationNo(self, organizationno): + sql = "select regiona,regionb,regionc as area_name,organizationno as school_id,organizationname as school_name from schoolbusinessrelation where organizationno='%s' and recordyear=2020" % ( + organizationno) + return Db.find(sql) if __name__ == '__main__': diff --git a/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc b/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc index d810644..a7954c1 100644 Binary files a/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc and b/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc differ diff --git a/ETL/Mars/MySQLHelper.py b/ETL/Mars/MySQLHelper.py index 692a0d1..156851e 100644 --- a/ETL/Mars/MySQLHelper.py +++ b/ETL/Mars/MySQLHelper.py @@ -7,7 +7,7 @@ class MySQLHelper: password = 'DsideaL147258369' host = '10.10.14.230' port = 22066 - db = 'huanghai' + db = 'k3_wms' def __init__(self, host=host, port=port, db=db, user=user, password=password, charset="utf8"): self.host = host diff --git a/ETL/Mars/Start.py b/ETL/Mars/Start.py index 38a57cd..86891d8 100644 --- a/ETL/Mars/Start.py +++ b/ETL/Mars/Start.py @@ -360,11 +360,11 @@ def delFormType(): return jsonify(success=True, message='保存成功') # 显示某条任务的填报情况 -# http://127.0.0.1:8888/Mars/getBureauInfoByName?bureau_name=花石镇盐埠中心小学 -@app.route('/Mars/getBureauInfoByName', methods=['GET']) +# http://127.0.0.1:8888/Mars/getBureauInfoByOrganizationNo?organizationno=1143014532 +@app.route('/Mars/getBureauInfoByOrganizationNo', methods=['GET']) def getBureauInfoByName(): - bureau_name = request.args.get("bureau_name") - data = hm.getBureauInfoByName(bureau_name) + organizationno = request.args.get("organizationno") + data = hm.getBureauInfoByOrganizationNo(organizationno) return jsonify(data) diff --git a/ETL/Mars/fake.py b/ETL/Mars/fake.py index 88828bd..0f6cd3e 100644 --- a/ETL/Mars/fake.py +++ b/ETL/Mars/fake.py @@ -7,8 +7,7 @@ from faker import Faker import datetime from MySQLHelper import MySQLHelper -maxN = 1000000 - +maxN = 2000 # 黄海定义的输出信息的办法,带当前时间 def logInfo(msg): @@ -24,7 +23,7 @@ db = MySQLHelper() sql = 'truncate table t_base_person' db.execute(sql) -sql = "insert into t_base_person(person_name) values(%s)" +sql = "insert into t_base_person(person_name,dt) values(%s,'1977-10-11 00:00:00')" data = [] for i in range(maxN): obj = [shuju.name()] @@ -59,19 +58,19 @@ db.executemany(sql, data) logInfo("成功完成作业与人员关系信息填充,共%s条!" % len(data)) # 不存在的关系A(作业不存在,人员存在) -data = [] -for x in range(1 + maxN, 301 + maxN): # 作业 - for y in range(1, 301): # 人员 - obj = [uuid.uuid1(), x, y, random.randint(1, 100)] - data.append(obj) -db.executemany(sql, data) -logInfo("成功完成作业不存在,人员存在的关系A填充,共%s条!" % len(data)) - -# 不存在的关系B(作业存在,人员不存在) -data = [] -for x in range(1, 301): # 作业 - for y in range(1 + maxN, 301 + maxN): # 人员 - obj = [uuid.uuid1(), x, y, random.randint(1, 100)] - data.append(obj) -db.executemany(sql, data) +# data = [] +# for x in range(1 + maxN, 301 + maxN): # 作业 +# for y in range(1, 301): # 人员 +# obj = [uuid.uuid1(), x, y, random.randint(1, 100)] +# data.append(obj) +# db.executemany(sql, data) +# logInfo("成功完成作业不存在,人员存在的关系A填充,共%s条!" % len(data)) +# +# # 不存在的关系B(作业存在,人员不存在) +# data = [] +# for x in range(1, 301): # 作业 +# for y in range(1 + maxN, 301 + maxN): # 人员 +# obj = [uuid.uuid1(), x, y, random.randint(1, 100)] +# data.append(obj) +# db.executemany(sql, data) logInfo("成功完成作业存在,人员不存在的关系B填充,共%s条!" % len(data))