update codes

83c0e278 · 赵建伟 · a1ab8686 · 83c0e278 · 83c0e278 · a1ab8686
Commit 83c0e278 authored May 05, 2020 by 赵建伟
29 changed files
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$/sqls/demo_param/demo_param.sql" dialect="SQL92" />
+    <file url="file://$PROJECT_DIR$/sqls/demo_spark_param/demo_spark_param.sql" dialect="SQL92" />
  </component>
 </project>
\ No newline at end of file
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,34 @@
 <project version="4">
  <component name="ChangeListManager">
    <list default="true" id="18c38e3b-9b7f-4a3f-b141-edcb320b1d24" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/conf/en-cn.properties" beforeDir="false" afterPath="$PROJECT_DIR$/conf/en-cn.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jobs/demo_hive/step2.job" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/jobs/demo_spark_param/demo_param.zip" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/sqls/demo_hive/demo_hive.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/demo/demo.zip" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/demo/step1.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_hive/step1.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/demo/step2.job" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/demo_param/demo.zip" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/demo_param/step1_1.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step1_1.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/demo_param/step1_2.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step1_2.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/demo_param/step1_3.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step1_3.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/demo_param/step1_4.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step1_4.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/demo_param/step1_5.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step1_5.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/demo_param/step1_6.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step1_6.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/demo_param/step2.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_spark_param/step2.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/report_service/report_service.zip" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_java/report_service.zip" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/report_service/step1_1.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_java/step1_1.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/report_service/step1_2.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_java/step1_2.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/report_service/step1_3.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_java/step1_3.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/report_service/step1_4.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_java/step1_4.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/jobs/report_service/step2.job" beforeDir="false" afterPath="$PROJECT_DIR$/jobs/demo_java/step2.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/shell/hive2csv.sh" beforeDir="false" afterPath="$PROJECT_DIR$/lib/shell/hive2csv.sh" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/shell/hive2hive.sh" beforeDir="false" afterPath="$PROJECT_DIR$/lib/shell/hive2hive.sh" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/shell/sparksql2email.sh" beforeDir="false" afterPath="$PROJECT_DIR$/lib/shell/sparksql2email.sh" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqls/demo/demo.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sqls/demo_java/demo.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqls/demo/demo_bak.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sqls/demo_java/demo_bak.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqls/demo_param/demo_param.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sqls/bak/demo_param.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqls/shell/demo.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sqls/bak/demo.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/sqls/shell/demo_param.sql" beforeDir="false" afterPath="$PROJECT_DIR$/sqls/demo_spark_param/demo_spark_param.sql" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -60,7 +87,7 @@
    <property name="WebServerToolWindowFactoryState" value="false" />
    <property name="aspect.path.notification.shown" value="true" />
    <property name="ignore_missing_gitignore" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/jobs/meigou-detail-page" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/sqls" />
    <property name="project.structure.last.edited" value="Global Libraries" />
    <property name="project.structure.proportion" value="0.0" />
    <property name="project.structure.side.proportion" value="0.2" />
@@ -75,11 +102,11 @@
      <recent name="$PROJECT_DIR$/lib/shell" />
    </key>
    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/sqls" />
      <recent name="$PROJECT_DIR$/jobs/meigou-detail-page" />
      <recent name="$PROJECT_DIR$/jobs" />
      <recent name="$PROJECT_DIR$/sqls/meigou-detail-page" />
      <recent name="$PROJECT_DIR$/sqls/shell" />
-      <recent name="$PROJECT_DIR$/jobs/report_service" />
    </key>
  </component>
  <component name="RunManager">
@@ -125,7 +152,7 @@
      <workItem from="1588154352798" duration="195000" />
      <workItem from="1588220085338" duration="7993000" />
      <workItem from="1588248522289" duration="2820000" />
-      <workItem from="1588344251422" duration="9678000" />
+      <workItem from="1588344251422" duration="11641000" />
    </task>
    <task id="LOCAL-00001" summary="add init codes.">
      <created>1587723565207</created>

--- a/jobs/demo/demo.zip
+++ b/jobs/demo/demo.zip
--- a/jobs/demo/step1.job
+++ b/jobs/demo/step1.job
--- a/jobs/demo/step2.job
+++ b/jobs/demo/step2.job
 #step2.job
 type=command
 dependencies=step1
-command=sh /home/bi/bi-report/lib/shell/hive2csv.sh demo
\ No newline at end of file
+command=sh /home/bi/bi-report/lib/shell/hive2csv.sh demo_hive
\ No newline at end of file
--- a/jobs/report_service/report_service.zip
+++ b/jobs/report_service/report_service.zip
--- a/jobs/report_service/step1_1.job
+++ b/jobs/report_service/step1_1.job
--- a/jobs/report_service/step1_2.job
+++ b/jobs/report_service/step1_2.job
--- a/jobs/report_service/step1_3.job
+++ b/jobs/report_service/step1_3.job
--- a/jobs/report_service/step1_4.job
+++ b/jobs/report_service/step1_4.job
--- a/jobs/report_service/step2.job
+++ b/jobs/report_service/step2.job
 #step2.job
 type=command
 dependencies=step1_1,step1_2,step1_3,step1_4
-command=curl -X GET http://localhost:8553/api/report/sendEmail/zhaojianwei@igengmei.com/jianweizhao@yeah.net/demo
\ No newline at end of file
+command=curl -X GET http://localhost:8553/api/report/sendEmail/zhaojianwei@igengmei.com/jianweizhao@yeah.net/demo_java
\ No newline at end of file
--- a/jobs/demo_param/demo.zip
+++ b/jobs/demo_param/demo.zip
--- a/jobs/demo_param/step1_1.job
+++ b/jobs/demo_param/step1_1.job
--- a/jobs/demo_param/step1_2.job
+++ b/jobs/demo_param/step1_2.job
--- a/jobs/demo_param/step1_3.job
+++ b/jobs/demo_param/step1_3.job
--- a/jobs/demo_param/step1_4.job
+++ b/jobs/demo_param/step1_4.job
--- a/jobs/demo_param/step1_5.job
+++ b/jobs/demo_param/step1_5.job
--- a/jobs/demo_param/step1_6.job
+++ b/jobs/demo_param/step1_6.job
--- a/jobs/demo_param/step2.job
+++ b/jobs/demo_param/step2.job
 #step2.job
 type=command
 dependencies=step1_1,step1_2,step1_3,step1_4,step1_5,step1_6
-command=sh /home/bi/bi-report/lib/shell/sparksql2email.sh demo_param zhaojianwei zhaojianwei
\ No newline at end of file
+command=sh /home/bi/bi-report/lib/shell/sparksql2email.sh demo_spark_param zhaojianwei zhaojianwei
\ No newline at end of file
--- a/lib/java/bi-report-service/.idea/workspace.xml
+++ b/lib/java/bi-report-service/.idea/workspace.xml
@@ -2,7 +2,34 @@
 <project version="4">
  <component name="ChangeListManager">
    <list default="true" id="73604af3-3cbc-41f8-9a5f-e6a14a2ada76" name="Default Changelist" comment="add">
-      <change beforePath="$PROJECT_DIR$/../../../conf/en-cn.properties" beforeDir="false" afterPath="$PROJECT_DIR$/../../../conf/en-cn.properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../../jobs/demo_hive/step2.job" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/demo_param.zip" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/../../../sqls/demo_hive/demo_hive.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/demo/demo.zip" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/demo/step1.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_hive/step1.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/demo/step2.job" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/demo.zip" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step1_1.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step1_1.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step1_2.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step1_2.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step1_3.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step1_3.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step1_4.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step1_4.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step1_5.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step1_5.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step1_6.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step1_6.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/demo_param/step2.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_spark_param/step2.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/report_service/report_service.zip" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_java/report_service.zip" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/report_service/step1_1.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_java/step1_1.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/report_service/step1_2.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_java/step1_2.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/report_service/step1_3.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_java/step1_3.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/report_service/step1_4.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_java/step1_4.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../jobs/report_service/step2.job" beforeDir="false" afterPath="$PROJECT_DIR$/../../../jobs/demo_java/step2.job" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../shell/hive2csv.sh" beforeDir="false" afterPath="$PROJECT_DIR$/../../shell/hive2csv.sh" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../shell/hive2hive.sh" beforeDir="false" afterPath="$PROJECT_DIR$/../../shell/hive2hive.sh" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../shell/sparksql2email.sh" beforeDir="false" afterPath="$PROJECT_DIR$/../../shell/sparksql2email.sh" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../sqls/demo/demo.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/demo_java/demo.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../sqls/demo/demo_bak.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/demo_java/demo_bak.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../sqls/demo_param/demo_param.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/bak/demo_param.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../sqls/shell/demo.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/bak/demo.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../../sqls/shell/demo_param.sql" beforeDir="false" afterPath="$PROJECT_DIR$/../../../sqls/demo_spark_param/demo_spark_param.sql" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -218,7 +245,7 @@
      <workItem from="1588148891822" duration="2318000" />
      <workItem from="1588152718016" duration="1463000" />
      <workItem from="1588154601852" duration="28557000" />
-      <workItem from="1588344252163" duration="8400000" />
+      <workItem from="1588344252163" duration="8630000" />
    </task>
    <servers />
  </component>

--- a/lib/shell/hive2csv.sh
+++ b/lib/shell/hive2csv.sh
@@ -47,7 +47,7 @@ echo "V_7DAY_M_D_AGO: "$V_7DAY_M_D_AGO
 echo "************************************"
 echo ""

-cp "/home/bi/bi-report/sqls/shell/"$1".sql" $tmp_file_name
+cp "/home/bi/bi-report/sqls/"$1"/"$1".sql" $tmp_file_name
 sed -i "s/\$V_PARYMD/$V_PARYMD/g" $tmp_file_name
 sed -i "s/\$V_PARY_M_D/$V_PARY_M_D/g" $tmp_file_name
 sed -i "s/\$V_1DAYMD_AGO/$V_1DAYMD_AGO/g" $tmp_file_name

--- a/lib/shell/hive2hive.sh
+++ b/lib/shell/hive2hive.sh
@@ -45,7 +45,7 @@ echo "V_7DAY_M_D_AGO: "$V_7DAY_M_D_AGO
 echo "************************************"
 echo ""

-cp "/home/bi/bi-report/sqls/shell/"$1".sql" $tmp_file_name
+cp "/home/bi/bi-report/sqls/"$1"/"$1".sql" $tmp_file_name
 sed -i "s/\$V_PARYMD/$V_PARYMD/g" $tmp_file_name
 sed -i "s/\$V_PARY_M_D/$V_PARY_M_D/g" $tmp_file_name
 sed -i "s/\$V_1DAYMD_AGO/$V_1DAYMD_AGO/g" $tmp_file_name

--- a/lib/shell/sparksql2email.sh
+++ b/lib/shell/sparksql2email.sh
@@ -47,7 +47,7 @@ echo "V_7DAY_M_D_AGO: "$V_7DAY_M_D_AGO
 echo "************************************"
 echo ""

-cp "/home/bi/bi-report/sqls/shell/"$1".sql" $tmp_file_name
+cp "/home/bi/bi-report/sqls/"$1"/"$1".sql" $tmp_file_name
 sed -i "s/\$V_PARYMD/$V_PARYMD/g" $tmp_file_name
 sed -i "s/\$V_PARY_M_D/$V_PARY_M_D/g" $tmp_file_name
 sed -i "s/\$V_1DAYMD_AGO/$V_1DAYMD_AGO/g" $tmp_file_name

--- a/sqls/shell/demo.sql
+++ b/sqls/shell/demo.sql
--- a/sqls/demo_param/demo_param.sql
+++ b/sqls/demo_param/demo_param.sql
--- a/sqls/demo_hive/demo_hive.sql
+++ b/sqls/demo_hive/demo_hive.sql
--- a/sqls/demo/demo.sql
+++ b/sqls/demo/demo.sql
--- a/sqls/demo/demo_bak.sql
+++ b/sqls/demo/demo_bak.sql
--- a/sqls/shell/demo_param.sql
+++ b/sqls/shell/demo_param.sql