Skip to content

B
bi-report
Commit 511b06ed authored by 赵建伟's avatar 赵建伟
Browse files
Options

update codes

parents b0776c98 9913a05f
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 8 deletions
.gitignore 0 → 100644
View file @ 511b06ed
.idea/dataSources/
lib/java/bi-report-service/.idea/workspace.xml
.idea/workspace.xml
View file @ 511b06ed
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<<<<<<< HEAD
<list default="true" id="d5f48aa6-efd5-46e7-8592-d3409cf68c59" name="Default Changelist" comment="add database name pm" />
=======
<list default="true" id="d5f48aa6-efd5-46e7-8592-d3409cf68c59" name="Default Changelist" comment="" />
>>>>>>> 9913a05f6f5dd64cb019c7c02bf4851ed2fce190
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
......@@ -96,9 +100,30 @@
<workItem from="1591668557485" duration="1164000" />
<workItem from="1591757105976" duration="605000" />
<workItem from="1591843790575" duration="598000" />
<<<<<<< HEAD
<workItem from="1592568360803" duration="5142000" />
</task>
<option name="localTasksCounter" value="2" />
=======
<workItem from="1592568360803" duration="8422000" />
<workItem from="1592812785070" duration="21000" />
</task>
<task id="LOCAL-00002" summary="add deploy shell">
<created>1592810237164</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1592810237166</updated>
</task>
<task id="LOCAL-00003" summary="update codes">
<created>1592811752618</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1592811752618</updated>
</task>
<option name="localTasksCounter" value="4" />
>>>>>>> 9913a05f6f5dd64cb019c7c02bf4851ed2fce190
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -106,6 +131,7 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="add database name pm" />
<<<<<<< HEAD
<option name="LAST_COMMIT_MESSAGE" value="add database name pm" />
</component>
<component name="WindowStateProjectService">
......@@ -119,6 +145,27 @@
</state>
<state x="560" y="331" key="Vcs.Push.Dialog.v2/0.22.1920.1129/-981.-1200.1920.1200/939.-1080.1920.1080@0.22.1920.1129" timestamp="1592809150983" />
<state x="2312" y="1515" key="Vcs.Push.Dialog.v2/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1590736921013" />
=======
<MESSAGE value="add deploy shell" />
<MESSAGE value="update codes" />
<option name="LAST_COMMIT_MESSAGE" value="update codes" />
</component>
<component name="WindowStateProjectService">
<state x="554" y="197" key="CommitChangelistDialog2" timestamp="1592811752437">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="554" y="197" key="CommitChangelistDialog2/0.22.1920.1129/-981.-1200.1920.1200/939.-1080.1920.1080@0.22.1920.1129" timestamp="1592811752437" />
<state x="2306" y="1378" key="CommitChangelistDialog2/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1590736919071" />
<state x="560" y="331" key="Vcs.Push.Dialog.v2" timestamp="1592811754411">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="560" y="331" key="Vcs.Push.Dialog.v2/0.22.1920.1129/-981.-1200.1920.1200/939.-1080.1920.1080@0.22.1920.1129" timestamp="1592811754411" />
<state x="2312" y="1515" key="Vcs.Push.Dialog.v2/1752.1200.1920.1151/0.22.1920.1178/1920.120.1920.1080@1752.1200.1920.1151" timestamp="1590736921013" />
<state x="715" y="306" key="git4idea.branch.GitSmartOperationDialog" timestamp="1592812682806">
<screen x="0" y="22" width="1920" height="1129" />
</state>
<state x="715" y="306" key="git4idea.branch.GitSmartOperationDialog/0.22.1920.1129/-981.-1200.1920.1200/939.-1080.1920.1080@0.22.1920.1129" timestamp="1592812682806" />
>>>>>>> 9913a05f6f5dd64cb019c7c02bf4851ed2fce190
<state x="625" y="385" key="git4idea.merge.GitPullDialog" timestamp="1591588719752">
<screen x="0" y="22" width="1920" height="1129" />
</state>
......
jobs/.DS_Store
View file @ 511b06ed
No preview for this file type
jobs/daily_content_data/step4.job
View file @ 511b06ed
#step4.job
type=command
dependencies=step3
command=curl -X GET http://localhost:8553/api/report/sendEmail/weiyimin@igengmei.com/zhaojianwei@igengmei.com,mazhimo@igengmei.com/daily_content_data
\ No newline at end of file
command=curl -X GET http://localhost:8553/api/report/sendEmail/liudi@igengmei.com,wangxin@igengmei.com,malinxi@igengmei.com,dengguangyu@igengmei.com/weiyimin@igengmei.com,zhaojianwei@igengmei.com,mazhimo@igengmei.com,zhaofei@igengmei.com,yindanlei@igengmei.com/daily_content_data
\ No newline at end of file
sqls/daily_content_data/daily_content_data.sql
View file @ 511b06ed
......@@ -45,8 +45,6 @@ SELECT
,per_my_diary_pv AS `我的日记页进入内容PV/UV`
,ai_rate AS `AI报告页进入内容UV/内容UV`
,per_ai_pv AS `AI报告页进入内容PV/UV`
,create_topic_num AS `真实发帖数`
,create_reply_num AS `真实评论数`
,diary_uv AS `日记UV`
,diary_pv AS `日记PV`
,diary_rate AS `日记UV/内容UV`
......
sqls/daily_content_data_insert/daily_content_data_insert.sql
View file @ 511b06ed
......@@ -46,8 +46,8 @@ SELECT
,COALESCE(ROUND(T6.my_diary_pv/T6.my_diary_uv,4),0) AS per_my_diary_pv
,COALESCE(ROUND(T6.ai_uv/T2.neirong_uv,4),0) AS ai_rate
,COALESCE(ROUND(T6.ai_pv/T6.ai_uv,4),0) AS per_ai_pv
,COALESCE(T7.num,0) AS create_topic_num
,COALESCE(T8.num,0) AS create_reply_num
,null AS create_topic_num
,null AS create_reply_num
,COALESCE(T2.diary_uv,0) AS diary_uv
,COALESCE(T2.diary_pv,0) AS diary_pv
,COALESCE(ROUND(T2.diary_uv/T2.neirong_uv,4),0) AS diary_rate
......
sqls/hive_insert/exec_sql.sql
View file @ 511b06ed
INSERT INTO TABLE pm.tl_pm_zjw select * from offline.tmp_zhx_20191227 where time = 'AI'
\ 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