Skip to content

Z
zhichan
Commit 1e4f0f5c by 黄静
Options

hj

parent add28d53
Showing with 31 additions and 15 deletions
entprofile/.idea/workspace.xml
...@@ -175,6 +175,7 @@ ...@@ -175,6 +175,7 @@
<workItem from="1587437264430" duration="2651000" /> <workItem from="1587437264430" duration="2651000" />
<workItem from="1588754339665" duration="838000" /> <workItem from="1588754339665" duration="838000" />
<workItem from="1589429479087" duration="1372000" /> <workItem from="1589429479087" duration="1372000" />
<workItem from="1589768009451" duration="397000" />
</task> </task>
<servers /> <servers />
</component> </component>
...@@ -186,41 +187,41 @@ ...@@ -186,41 +187,41 @@
<screen x="0" y="23" width="1680" height="972" /> <screen x="0" y="23" width="1680" height="972" />
</state> </state>
<state width="562" height="466" key="DebuggerActiveHint/0.23.1680.972@0.23.1680.972" timestamp="1587029725739" /> <state width="562" height="466" key="DebuggerActiveHint/0.23.1680.972@0.23.1680.972" timestamp="1587029725739" />
<state width="914" height="282" key="GridCell.Tab.0.bottom" timestamp="1588755181972"> <state width="914" height="284" key="GridCell.Tab.0.bottom" timestamp="1589768413489">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1638" height="229" key="GridCell.Tab.0.bottom/0.0.1680.993@0.0.1680.993" timestamp="1587364538708" /> <state width="1638" height="229" key="GridCell.Tab.0.bottom/0.0.1680.993@0.0.1680.993" timestamp="1587364538708" />
<state width="914" height="282" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1588755181972" /> <state width="914" height="284" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1589768413489" />
<state width="1345" height="260" key="GridCell.Tab.0.bottom/0.23.1680.967@0.23.1680.967" timestamp="1587114865120" /> <state width="1345" height="260" key="GridCell.Tab.0.bottom/0.23.1680.967@0.23.1680.967" timestamp="1587114865120" />
<state width="1638" height="229" key="GridCell.Tab.0.bottom/0.23.1680.970@0.23.1680.970" timestamp="1587456914197" /> <state width="1638" height="229" key="GridCell.Tab.0.bottom/0.23.1680.970@0.23.1680.970" timestamp="1587456914197" />
<state width="1345" height="321" key="GridCell.Tab.0.bottom/0.23.1680.971@0.23.1680.971" timestamp="1587028755730" /> <state width="1345" height="321" key="GridCell.Tab.0.bottom/0.23.1680.971@0.23.1680.971" timestamp="1587028755730" />
<state width="1345" height="321" key="GridCell.Tab.0.bottom/0.23.1680.972@0.23.1680.972" timestamp="1587029936244" /> <state width="1345" height="321" key="GridCell.Tab.0.bottom/0.23.1680.972@0.23.1680.972" timestamp="1587029936244" />
<state width="1345" height="321" key="GridCell.Tab.0.bottom/0.23.1680.975@0.23.1680.975" timestamp="1587040846953" /> <state width="1345" height="321" key="GridCell.Tab.0.bottom/0.23.1680.975@0.23.1680.975" timestamp="1587040846953" />
<state width="914" height="282" key="GridCell.Tab.0.center" timestamp="1588755181972"> <state width="914" height="284" key="GridCell.Tab.0.center" timestamp="1589768413489">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1638" height="229" key="GridCell.Tab.0.center/0.0.1680.993@0.0.1680.993" timestamp="1587364538707" /> <state width="1638" height="229" key="GridCell.Tab.0.center/0.0.1680.993@0.0.1680.993" timestamp="1587364538707" />
<state width="914" height="282" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1588755181972" /> <state width="914" height="284" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1589768413489" />
<state width="1345" height="260" key="GridCell.Tab.0.center/0.23.1680.967@0.23.1680.967" timestamp="1587114865119" /> <state width="1345" height="260" key="GridCell.Tab.0.center/0.23.1680.967@0.23.1680.967" timestamp="1587114865119" />
<state width="1638" height="229" key="GridCell.Tab.0.center/0.23.1680.970@0.23.1680.970" timestamp="1587456914196" /> <state width="1638" height="229" key="GridCell.Tab.0.center/0.23.1680.970@0.23.1680.970" timestamp="1587456914196" />
<state width="1345" height="321" key="GridCell.Tab.0.center/0.23.1680.971@0.23.1680.971" timestamp="1587028755729" /> <state width="1345" height="321" key="GridCell.Tab.0.center/0.23.1680.971@0.23.1680.971" timestamp="1587028755729" />
<state width="1345" height="321" key="GridCell.Tab.0.center/0.23.1680.972@0.23.1680.972" timestamp="1587029936243" /> <state width="1345" height="321" key="GridCell.Tab.0.center/0.23.1680.972@0.23.1680.972" timestamp="1587029936243" />
<state width="1345" height="321" key="GridCell.Tab.0.center/0.23.1680.975@0.23.1680.975" timestamp="1587040846953" /> <state width="1345" height="321" key="GridCell.Tab.0.center/0.23.1680.975@0.23.1680.975" timestamp="1587040846953" />
<state width="914" height="282" key="GridCell.Tab.0.left" timestamp="1588755181972"> <state width="914" height="284" key="GridCell.Tab.0.left" timestamp="1589768413488">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1638" height="229" key="GridCell.Tab.0.left/0.0.1680.993@0.0.1680.993" timestamp="1587364538706" /> <state width="1638" height="229" key="GridCell.Tab.0.left/0.0.1680.993@0.0.1680.993" timestamp="1587364538706" />
<state width="914" height="282" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1588755181972" /> <state width="914" height="284" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1589768413488" />
<state width="1345" height="260" key="GridCell.Tab.0.left/0.23.1680.967@0.23.1680.967" timestamp="1587114865119" /> <state width="1345" height="260" key="GridCell.Tab.0.left/0.23.1680.967@0.23.1680.967" timestamp="1587114865119" />
<state width="1638" height="229" key="GridCell.Tab.0.left/0.23.1680.970@0.23.1680.970" timestamp="1587456914195" /> <state width="1638" height="229" key="GridCell.Tab.0.left/0.23.1680.970@0.23.1680.970" timestamp="1587456914195" />
<state width="1345" height="321" key="GridCell.Tab.0.left/0.23.1680.971@0.23.1680.971" timestamp="1587028755729" /> <state width="1345" height="321" key="GridCell.Tab.0.left/0.23.1680.971@0.23.1680.971" timestamp="1587028755729" />
<state width="1345" height="321" key="GridCell.Tab.0.left/0.23.1680.972@0.23.1680.972" timestamp="1587029936243" /> <state width="1345" height="321" key="GridCell.Tab.0.left/0.23.1680.972@0.23.1680.972" timestamp="1587029936243" />
<state width="1345" height="321" key="GridCell.Tab.0.left/0.23.1680.975@0.23.1680.975" timestamp="1587040846952" /> <state width="1345" height="321" key="GridCell.Tab.0.left/0.23.1680.975@0.23.1680.975" timestamp="1587040846952" />
<state width="914" height="282" key="GridCell.Tab.0.right" timestamp="1588755181972"> <state width="914" height="284" key="GridCell.Tab.0.right" timestamp="1589768413489">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1638" height="229" key="GridCell.Tab.0.right/0.0.1680.993@0.0.1680.993" timestamp="1587364538707" /> <state width="1638" height="229" key="GridCell.Tab.0.right/0.0.1680.993@0.0.1680.993" timestamp="1587364538707" />
<state width="914" height="282" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1588755181972" /> <state width="914" height="284" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1589768413489" />
<state width="1345" height="260" key="GridCell.Tab.0.right/0.23.1680.967@0.23.1680.967" timestamp="1587114865120" /> <state width="1345" height="260" key="GridCell.Tab.0.right/0.23.1680.967@0.23.1680.967" timestamp="1587114865120" />
<state width="1638" height="229" key="GridCell.Tab.0.right/0.23.1680.970@0.23.1680.970" timestamp="1587456914196" /> <state width="1638" height="229" key="GridCell.Tab.0.right/0.23.1680.970@0.23.1680.970" timestamp="1587456914196" />
<state width="1345" height="321" key="GridCell.Tab.0.right/0.23.1680.971@0.23.1680.971" timestamp="1587028755730" /> <state width="1345" height="321" key="GridCell.Tab.0.right/0.23.1680.971@0.23.1680.971" timestamp="1587028755730" />
...@@ -300,7 +301,7 @@ ...@@ -300,7 +301,7 @@
</breakpoint-manager> </breakpoint-manager>
</component> </component>
<component name="com.intellij.coverage.CoverageDataManagerImpl"> <component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/entprofile$main.coverage" NAME="main Coverage Results" MODIFIED="1588755009484" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> <SUITE FILE_PATH="coverage/entprofile$main.coverage" NAME="main Coverage Results" MODIFIED="1589768108423" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/recommendation$mod_db.coverage" NAME="mod_db Coverage Results" MODIFIED="1587358120537" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/db" /> <SUITE FILE_PATH="coverage/recommendation$mod_db.coverage" NAME="mod_db Coverage Results" MODIFIED="1587358120537" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/db" />
<SUITE FILE_PATH="coverage/recommendation$company_es.coverage" NAME="company_es Coverage Results" MODIFIED="1587358210574" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/dao" /> <SUITE FILE_PATH="coverage/recommendation$company_es.coverage" NAME="company_es Coverage Results" MODIFIED="1587358210574" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/dao" />
<SUITE FILE_PATH="coverage/recommendation$company_basic.coverage" NAME="company_basic Coverage Results" MODIFIED="1587363152092" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/service" /> <SUITE FILE_PATH="coverage/recommendation$company_basic.coverage" NAME="company_basic Coverage Results" MODIFIED="1587363152092" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/service" />
......
entprofile/service/user_behavior.py
...@@ -198,8 +198,8 @@ class Recom: ...@@ -198,8 +198,8 @@ class Recom:
product_result = product.select(company_name) product_result = product.select(company_name)
for data in product_result: for data in product_result:
print(data,"======推荐产品") print(data,"======推荐产品")
if data['relational_product']: if data['relational_product_old']:
relational = eval(data['relational_product']) relational = eval(data['relational_product_old'])
for item in relational: for item in relational:
print(item,"====业务产品item") print(item,"====业务产品item")
item['productName'] = item['commodityName'] item['productName'] = item['commodityName']
...@@ -208,20 +208,27 @@ class Recom: ...@@ -208,20 +208,27 @@ class Recom:
item['typeName'] = "关联推荐" item['typeName'] = "关联推荐"
product_list.append(item) product_list.append(item)
print(product_list,"===========业务产品list") print(product_list,"===========业务产品list")
if data['similar_product']: if data['similar_product_old']:
similar = eval(data['similar_product']) similar = eval(data['similar_product_old'])
for similaritem in similar: for similaritem in similar:
similaritem['typeCate'] = similaritem['typeName'] similaritem['typeCate'] = similaritem['typeName']
similaritem['productName'] = similaritem['commodityName'] similaritem['productName'] = similaritem['commodityName']
similaritem['typeName'] = "同类推荐" similaritem['typeName'] = "同类推荐"
product_list.append(similaritem) product_list.append(similaritem)
if data['cross_product']: if data['cross_product_old']:
cross = eval(data['cross_product']) cross = eval(data['cross_product_old'])
for crossitem in cross: for crossitem in cross:
crossitem['typeCate'] = crossitem['typeName'] crossitem['typeCate'] = crossitem['typeName']
crossitem['productName'] = crossitem['commodityName'] crossitem['productName'] = crossitem['commodityName']
crossitem['typeName'] = "交叉推荐" crossitem['typeName'] = "交叉推荐"
product_list.append(crossitem) product_list.append(crossitem)
if data['survey_product_old']:
survey = eval(data['survey_product_old'])
for surveyitem in survey:
surveyitem['typeCate'] = surveyitem['typeName']
surveyitem['productName'] = surveyitem['commodityName']
surveyitem['typeName'] = "监测推荐"
product_list.append(surveyitem)
print(product_list, "===========业务产品list1") print(product_list, "===========业务产品list1")
return product_list return product_list
...@@ -259,6 +266,14 @@ class Recom: ...@@ -259,6 +266,14 @@ class Recom:
crossitem['productName'] = crossitem['commodityName'] crossitem['productName'] = crossitem['commodityName']
crossitem['typeName'] = "交叉推荐" crossitem['typeName'] = "交叉推荐"
product_list.append(crossitem) product_list.append(crossitem)
if data['survey_product']:
survey = eval(data['survey_product'])
for surveyitem in survey:
surveyitem['typeCate'] = surveyitem['typeName']
surveyitem['productName'] = surveyitem['commodityName']
surveyitem['typeName'] = "监测推荐"
product_list.append(surveyitem)
print(product_list, "===========业务产品list1") print(product_list, "===========业务产品list1")
return product_list return product_list
......
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