Commit 0e28af8c authored by 桂秋月's avatar 桂秋月

1

parent ee8e2ac1
No preview for this file type
...@@ -6,7 +6,10 @@ ...@@ -6,7 +6,10 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="65ec9bc1-9334-4fb0-a73d-621c8e760de6" name="Default Changelist" comment=""> <list default="true" id="65ec9bc1-9334-4fb0-a73d-621c8e760de6" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/model_data_api/model/base_model.py" beforeDir="false" afterPath="$PROJECT_DIR$/model_data_api/model/base_model.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/logs/2022-02-08.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/2022-02-08.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/model_data_api/handler/Automatic_Handler.py" beforeDir="false" afterPath="$PROJECT_DIR$/model_data_api/handler/Automatic_Handler.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/model_data_api/handler/logic.py" beforeDir="false" afterPath="$PROJECT_DIR$/model_data_api/handler/logic.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/startup.py" beforeDir="false" afterPath="$PROJECT_DIR$/startup.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
......
user_id,uuid
61534721,67c2934c-67ea-4547-a7fc-699b9d844687
539839,d3893fd2-9b06-4eba-a9d4-579a5a544f34
68338179,f2f63bd7-bc29-4d13-8047-3d9987afdf49
68324078,3b7f5fe0-8b4b-433a-9d5e-80919a6bc9e4
61595833,5a5fc22f-f69f-49bf-bb6d-46a7eaa033d0
64879867,88b3aac0-a8ad-489d-9100-af12a109e6f5
69285872,3b41653a-88d1-48c3-9e95-5fcd75576f57
69246211,7bf04099-733f-4a64-87af-f28eeb4e32db
68436963,b3fdee4f-7ce0-4e36-9e88-700df068733c
9440153,def962d3-97bb-45f1-815a-f855a6a26d4b
25016698,3e098293-6248-4f5f-b874-b74ffb8177d4
69103555,21ac1beb-f106-4d46-9170-a1528c1de25b
48729319,0aa9af4a-1b0a-4a65-ae4b-ed93f3f70064
69327828,79a84401-73f4-4716-9801-58ea5b10abf1
69629951,dd24612c-5551-49bd-9c5f-34324c1a30fd
68486452,8da3b27f-4152-4357-affe-fb86552f6b4d
12598963,07769d5b-febb-4bc5-bc93-c154e92a792a
69001027,831730c9-440c-4fa4-9a0e-a375dbb7a4ec
69951805,e4ad5405-df83-47bf-9ef4-77d054d494c1
69257352,82f4a6da-c0e3-49c9-9a7f-3287203044ca
65209434,928d0464-55d7-46dd-9e8b-c4f747c64aa7
61473446,839caa31-a8bd-4e84-bfaf-72f92223bc95
63671295,0667294d-becc-4c61-bba1-c0292398c904
66300275,b8372af2-b49c-4f39-86f8-35b9ccc7b808
59523314,b141bc8d-d1c0-428d-b765-0e3b7f57c5b4
65776246,07d31ba0-5ea7-4ab1-a99f-42417e5bd65f
57771402,6143c6dd-05c2-43e8-aa62-d81dc37a2d28
63586474,9f8d04fd-2705-42e7-9daf-9df55d37c08c
63955882,7b4b7d3a-8ddb-49a3-bcf0-648ad84b7263
67823145,a2cc647f-528f-4061-b680-d3649b496dfa
63475029,ae4a52a0-992b-4260-aeb3-cf1f9e35946d
60233644,f133ffc6-2d06-4579-81c6-a99fca47b0e1
65884208,b58bf710-9f53-4787-8bc1-1e2501eb4e80
30754074,a66060c7-bbfc-4e69-b5a2-665ab70b0647
65581399,c7519a4b-8a5e-4dd0-b8c2-1ca202c20b27
68508028,ac70e949-d7df-4a58-a913-826e276b2e30
57771040,57fc47f9-e25d-4a73-9ec5-50783b6fc7cb
69730557,e78e894a-ee00-4bd7-b999-2605ae73a30b
67477686,f3329dc8-1bb2-4d18-b7c5-abe9a74582c3
9129109,36f3bb99-ea89-462e-85d3-8ef5155b3fc5
67929470,63695d21-ae29-49e1-9dd5-001df9a49cea
66575569,28156661-b5e6-452d-9317-7aa714649789
69076785,286a065d-34e7-4299-95b7-a45a6ba95da3
59271185,54ad92ae-d1f1-4dad-a001-38904248fba5
69394873,c0c27ffb-f2da-4650-8855-2da2191ce772
1959931,617fddd760414d7da271db85319f882c
69095054,0bdc2362-79f8-4907-9e46-3a03029adacd
69098886,f4f62326-5afd-4da2-bbd4-04b69578d42c
69099290,1eb1985a-bb81-43f8-ac47-726560e107fe
59789069,6a396de7-3054-45c9-9046-fb017dbffeab
62790790,79482514-0dc7-42fc-9842-a1b6cdc87292
59932482,927690e7-0ceb-4182-9e76-56fe896f583e
66303795,bdd43029-fd87-415b-90c0-c450d7268c1a
69414356,5b3fe7fb-ce82-4af2-a7e8-260032b0aeea
30471470,8861d469-8446-4af4-bd71-8c8031ad4122
64471492,37f8b1eb-6218-4353-a64c-5ab2605911b1
68349610,5081d54e-9ef4-482f-9cb3-36fc030573cc
46785483,b758aa1d-9aaa-4c37-a9bd-1de4cac13ea9
68501012,143172e0-92a3-4afb-98c4-6c2f7c676c3e
65461023,dab43a99-1db0-4a0d-b2e9-444c6c74d052
69639743,3e686a3b-41e1-4a09-a3dc-88474ec06e5a
48333067,ae937afa-13d5-4f24-a0e9-f0a9d28b043d
65345341,7b557000-bc32-4010-ac9f-1358305f2871
68169674,a4b640e5-a4b3-4ca8-8e6f-d9e5774f5223
25786678,ab552348-978e-4495-8ab7-509d77213487
59780471,6221240d-d64b-4be2-9bcb-de1b0bff3628
62261040,68295141-e22b-4da5-9bec-a531a6fad0d8
68583691,a7d45363-ff5b-4a60-950b-ef9244d90ab1
65581517,04458526-4f01-4505-bd74-c9665424fdd8
45857459,32852fe9-bddc-4df2-bba3-e745d1d05bfa
66350315,c7cb74a2-eadd-49a6-b323-62cf85e5a8c1
68017000,22d1e25b-a8cd-4582-bf74-4f521ee115c3
62937760,a275ae93-f3b2-462c-8bc1-d8d7b47b4f4b
67951411,1c3a7411-3353-4ce6-82b4-3078324044d2
66516778,8a3d4936-8068-4701-80ca-1a4178e4a9e4
68044950,f74ac756-0e8e-4091-bb4f-6a5b34e76dcb
64447378,596bdbc0-a6a5-45a3-99ac-cece7ad770c2
27355922,80312b15-6dab-4752-9795-eb47db5c0b65
69388769,96ad9c01-3d16-4ffd-86cc-444f439ab169
68232978,acf60933-cbef-4564-9cdd-1e838f905fb3
68753817,8a75ff42-38d0-4af9-ae14-17b2eb61d524
59958412,2762fe00-aae0-48b8-8e74-4288afe7c074
48057,5dae2b74-df83-493c-a158-9db05699452d
69398781,be9b27ed-ec10-4294-b514-0e879b9888f8
65479222,ebcfbbf5-9e33-40cf-9d58-a6effe6c5533
59788154,68e7dc41-10d5-43e6-9fd1-9da222d9323d
67151642,50dbbcbd-56d5-4916-a926-5e5d8bf5a31d
64296493,3ec41c3a-0d4a-4a5f-922c-ace362a06e6e
66564797,e8371a24-8217-4638-b0cc-98268a76154f
68279022,9b8f329c-3069-44eb-bedd-8abec36dc190
65833781,fa9d8083-4772-4406-990f-2a012de4e778
68431899,baf0006e-52fc-4612-bcd9-c016394992c9
59789650,eb2510d5-46b3-470c-806a-df5519408f99
69674654,fefbca99-77f6-4aef-b5af-0e49c8821ac3
68057017,235d1398-ff20-47e3-ba87-dfd34226e422
69255392,5324cd46-45d7-4566-9af5-31a2060e0b96
55899496,f2c47470-66e3-426f-8d74-4d5c30e3661f
65789994,74f0d49b-fd4f-4a96-9f14-0ead5bb70eef
68872859,157948b1-8e45-448e-804a-e312944c3810
69309118,1c1f1194-4436-4268-8904-8e59690fe183
68415568,c1d7ff4e-ee78-48de-8b8d-50c2af29c3ff
68763545,707f4bde-b19b-4496-b958-00006713e0b4
56596210,c1d77134-a0c9-4d9b-994b-2a0e77e704af
65888746,a0514dba-878f-45fb-bbca-ffc5ec7164b4
64523061,f011f8a8-2175-485f-9a81-2209750e91b2
68995002,42118968-5d07-4575-9e0a-7e221ea5cb3e
64023357,050a8fa1-53a7-4aca-917d-d38f1fa248ea
65390475,ff983aaf-88d7-4ef3-b53f-1cedebdc119c
69315153,7727d68c-bbae-4c80-bcb8-e8da1ae9d3df
68738312,82614477-0862-4c76-b3c1-c51ba019adff
23725250,99e9af63-cd4a-4251-8709-2fa793cfa694
69315083,9c103902-041f-4566-a506-c20205d23d1a
69326611,c63ae59f-ac88-4bb7-9576-f8985790b7ac
69099249,48c34f8c-1a04-4500-bdf2-c627e8b6cd80
68786201,52c19ff4-79b6-4535-a026-42da696d9a96
539763,c44b2bfa-b859-4255-829c-6dff94a76be3
61538112,c0074ef9-07f5-4033-9147-9657b749d416
58293510,ca20b6b2-49bb-43d0-9520-cb85f77c14f4
69812247,422c53ce-dd3d-4a8a-a879-0673bbc6d0f5
66473095,ee327cb4-75a7-488d-a176-ad5107666fe0
60709185,8308e296-801c-45b0-958c-93efce1b4fde
59836758,67599037-6905-48b3-adf8-90334f06d337
68474653,acb28447-9f33-47d7-8ea7-4353feb3dd8f
25351816,51492853-00ce-43c7-bfcf-c429108a3659
62939804,2966d56e-5cfd-419a-9fa7-df7fd8ee444c
68958829,4b27f1fb-2ee4-4097-b660-4a40caf818f8
68166953,62d6e230-0fc3-4080-8ba0-b6ab90f27db7
12193661,75a3e891-06f1-4991-8ba9-f667ddffab71
64472408,17c9accc-4133-404d-811e-3a07d8501972
68585110,d0feea63-c0fd-4225-94a7-0d3cec8ee128
68377758,61497d33-8b23-44b2-8c2b-0ae6e5d44cb5
62189426,1fc037f6-2ef0-45b7-81f2-dcca66530b64
56685022,0da255e4-cf03-4335-9c83-3f90a634c4f9
66471432,b7421fec-aea9-4b72-803b-8d1781306517
69325416,cc423c1e-e763-4c3e-8701-e6281984472f
69076098,9fe53312-7453-4105-87fb-ebdcde4af90c
62189849,a9c0f3a1-2343-483c-9f38-b49dca4fe213
69098542,651c6ebb-5dc3-468d-a42a-3f7777d293dd
65461209,1b8f003f-69b4-4d36-a763-c04cb7878f66
67075672,abdb006a-1a07-4462-88ee-c739973d6b21
52084503,1ef6f76b-6000-4d20-aa6c-2d615969126b
9834065,849944eb-7455-463b-ba98-bbc7fb772a85
65836355,87a55eea-c46d-4086-a542-ff810334224f
69327147,5c25e3df-6b8e-4a66-be4b-baaf2d38600c
69933750,7ccbc944-068d-4998-84f9-76dac0ab78bf
65830553,643f9f16-fe8d-4588-a9cf-539f5e2d8b2b
65525665,fa88096a-81d0-4d0e-ac47-f09d99cd3f70
69729057,7af0d6f0-f8d2-4323-b290-a3fcab5a3456
63950266,bb7f71ff-0d54-44ea-96af-38315e0914a7
68591565,f9b24e1a-a678-478f-8ef4-7e76cfea7202
69099263,a6da4af8-09d4-4ca4-9768-a6a959470287
68924957,6f7ecd30-767a-4245-95b3-8c1a5959c503
67253651,08707c50-1fe5-4c28-8a01-9cb6b0768d7b
69327052,252e16e9-dd90-4d4b-a51c-f236ba754435
66039024,5f5f91a6-2303-41ec-8672-83189dd4c08e
66340897,a92aa379-944e-487e-a292-2e9263f0765f
67211379,6677ccc9-444c-4a27-a2b7-dbb238668d38
68229685,327de441-5897-4241-8dd8-f6f856189b64
540027,00fdaf62-ae14-456e-b98a-2dea708977d6
61239789,a8ee195c-f73e-452a-8ea5-1830060f92f9
66293810,b7220caa-33f2-40ca-ba3e-5afbac490921
62330094,d002428d-0e94-4a26-bb37-0c124f242280
68404897,3e632459-3d92-47ac-b8da-82af5524168e
58780520,87f491d2-527f-4386-9bb1-3d67017cb6d8
69409733,b7a51ddf-639e-4569-b849-5685d8aa25e7
68481271,33bd79cf-30e4-40c0-a781-17d0e6fc18e5
1277589,da2b27a9-a1fd-4fe0-81f9-3d456c120e92
69257654,28606b0d-2093-4819-ae9b-96a3800d3747
69730225,48061e2e-6a8d-4f70-864c-6f7f42758cd0
50852822,0047c595-6b0a-49c4-8c41-d83f2f707608
69415819,05d15a6d-c8e0-4535-9d1b-14f9287b2c0b
68564929,729ae6d2-cc98-4d74-a4e6-5b682830790c
69086526,74284af7-50f7-4535-910b-3b39e0eb1b08
68108741,313ab78e-07f2-4a43-b7bf-20059af27c92
69575396,a3df49b2-0d01-4741-9e84-44b1ff725eb9
68213744,42f87072-2ab6-4f62-aeba-4edaea18162f
69556855,cb760031-ba86-4b07-8fd3-e7f677ef2158
69314849,4c5337fa-ce81-4942-978c-a0f545c1a665
69730143,7d768278-14ec-4321-8411-3078b5f6b43c
68447405,ceabee43-4fdf-41ef-9d33-9bd178e8d8bc
705467,4f7fc5c802684a479b6db48fd69a9ef3
64967427,1eb4e4b7-4db8-42d6-9897-201520c1cc22
57045569,b094c3ad-5727-4284-8f48-4667baec182c
69743147,bfcba7f6-3037-4517-8ce2-1f038f730906
59839737,5daa8f3e-edf5-4de1-9f58-740b72ed7097
65853810,02efadd7-5395-4642-8090-743edc7d65bf
58914282,f99ed81d-a2ea-4209-84a0-8df54bdaac63
67824395,5c4ab554-4cd4-4adc-a81c-10f509cc3ada
64036087,5da43762-b997-4999-89ef-145823c7a5f1
68423713,78ece1ad-03ee-4d37-8ac7-53004fe2e651
69500198,ef694bbb-bfbf-452f-b413-35864951f955
68947911,ff8ad028-85fa-44bf-88e9-e453e7b91b98
69036703,f512a842-e019-4b70-839b-42d9fb0590b9
68717886,1bfd0d53-8d8f-4f23-9682-e463f3125f6b
60327161,7b39b341-eb36-4be4-b014-f1119705e499
69322910,c4368f74-279e-46e7-8716-7f1aa6dd8a27
63267618,8489694a-2f50-42e9-ab3a-59bbcd73041e
60335182,5c46e012-54fb-4216-aabf-935f31b34662
6625521,7b00e574-d567-4af6-b87d-ac22fec400f0
66110395,edd6aaab-8156-4c07-ab74-0d519432a98a
This diff is collapsed.
...@@ -77,7 +77,7 @@ class AutomaticHandler(BaseHandler): ...@@ -77,7 +77,7 @@ class AutomaticHandler(BaseHandler):
print("创建测试数据目录备份测试数据文件:",result_datasetdetail) print("创建测试数据目录备份测试数据文件:",result_datasetdetail)
result_add_userTest = None result_add_userTest = None
if result_datasetdetail['code'] == 200: if result_datasetdetail['code'] == 200:
result_add_userTest = add_userTest_logic(userTestData,result_datasetdetail['result']['detail_path'],common,isTrue=common.get('ISTRUE')) result_add_userTest = add_userTest_logic(userTestData,result_datasetdetail['result']['detail_path'],common,count=self.user_count,isTrue=common.get('ISTRUE'))
result_userTest = None result_userTest = None
if result_add_userTest['code'] == 200: if result_add_userTest['code'] == 200:
......
...@@ -165,7 +165,7 @@ def create_dataSet_logic(session,model_name,common): ...@@ -165,7 +165,7 @@ def create_dataSet_logic(session,model_name,common):
'code':JsonUtil.Constants.Code_Success,'message':JsonUtil.Constants.Msg_Success} 'code':JsonUtil.Constants.Code_Success,'message':JsonUtil.Constants.Msg_Success}
def add_userTest_logic(session,file_path,common,isTrue=True): def add_userTest_logic(session,file_path,common,count,isTrue=True):
result = {} result = {}
if file_path: if file_path:
with open(get_path(common,'suite',file_path), 'r',encoding='utf8') as f: with open(get_path(common,'suite',file_path), 'r',encoding='utf8') as f:
...@@ -178,8 +178,12 @@ def add_userTest_logic(session,file_path,common,isTrue=True): ...@@ -178,8 +178,12 @@ def add_userTest_logic(session,file_path,common,isTrue=True):
if not isTrue: if not isTrue:
_df_result['batch_uuid'] = _df_result['batch_uuid'] .apply(lambda x : hashlib.md5(str(datetime.datetime.now()).encode(encoding='UTF-8')).hexdigest()) _df_result['batch_uuid'] = _df_result['batch_uuid'] .apply(lambda x : hashlib.md5(str(datetime.datetime.now()).encode(encoding='UTF-8')).hexdigest())
else: else:
uuid_path=get_path(common,'DATA','uuid.csv') uuid_path=get_path(common,'DATA','uuid1.csv')
_df_result['batch_uuid']=pd.read_csv(uuid_path,encoding='utf-8')['uuid'][:len(result)] temp_uuid=pd.read_csv(uuid_path,encoding='utf-8')['uuid']
_df_result['batch_uuid']=temp_uuid[:int(count)]
# print('uuid==',_df_result['batch_uuid'])
# print(len(result))
# print(len(result))
batch_uuid = _df_result['batch_uuid'].tolist() batch_uuid = _df_result['batch_uuid'].tolist()
data_detail = _df_result['result'].tolist() data_detail = _df_result['result'].tolist()
......
...@@ -21,6 +21,7 @@ if __name__ == "__main__": ...@@ -21,6 +21,7 @@ if __name__ == "__main__":
if DEBUG: if DEBUG:
app = views.app() app = views.app()
server = HTTPServer(app) server = HTTPServer(app)
logging.getLogger().setLevel(logging.DEBUG)
[i.setFormatter(LogFormatter()) for i in logging.getLogger().handlers] [i.setFormatter(LogFormatter()) for i in logging.getLogger().handlers]
# #== 本地调试 # #== 本地调试
......
{
"offline_base_feature#purchased_addr_ambi_num": [
73
],
"offline_base_feature#stored_addr_num": [
67
],
"offline_behavior_feature#purchased_orderno": [
70
],
"offline_behavior_feature#user_clk_all_sku_max_price_7d": [
41
],
"offline_behavior_feature#user_clk_rc_sku_max_price_7d": [
2
],
"offline_behavior_feature#user_clk_sc_sku_max_frequence_price_7d": [
14
],
"third_data_source#union_pay_advisors_UPPA009": [
85
],
"third_data_source#union_pay_advisors_UPPC071": [
3
],
"third_data_source#union_pay_advisors_UPPC073": [
16
],
"third_data_source#union_pay_advisors_UPPC075": [
53
],
"third_data_source#union_pay_advisors_UPPC094": [
87
],
"third_data_source#union_pay_advisors_UPPC146": [
46
],
"third_data_source#union_pay_advisors_UPPC174": [
75
],
"third_data_source#union_pay_advisors_UPPC189": [
94
],
"third_data_source#union_pay_advisors_UPPC191": [
72
],
"third_data_source#union_pay_advisors_UPPC242": [
94
],
"third_data_source#union_pay_advisors_UPPC244": [
43
],
"third_data_source#union_pay_advisors_UPPD001": [
72
],
"third_data_source#union_pay_advisors_UPPD005": [
22
],
"third_data_source#union_pay_advisors_UPPD010": [
55
],
"third_data_source#union_pay_advisors_UPPD025": [
67
],
"third_data_source#union_pay_advisors_UPPD029": [
20
],
"third_data_source#union_pay_advisors_UPPE015": [
81
],
"third_data_source#union_pay_advisors_UPPE016": [
87
],
"third_data_source#union_pay_advisors_UPPE031": [
58
],
"third_data_source#union_pay_advisors_UPPE047": [
88
],
"third_data_source#union_pay_advisors_UPPE050": [
71
],
"third_data_source#union_pay_advisors_UPPE070": [
61
],
"third_data_source#union_pay_advisors_UPPE071": [
7
],
"third_data_source#union_pay_advisors_UPPE073": [
19
],
"third_data_source#union_pay_advisors_UPPE075": [
25
],
"third_data_source#union_pay_advisors_UPPE079": [
34
],
"third_data_source#union_pay_advisors_UPPE080": [
77
],
"third_data_source#union_pay_advisors_UPPE125": [
55
]
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment