update codes

jobs/demo/step2.job

 #step2.job
 type=command
 dependencies=step1_1,step1_2,step1_3,step1_4,step1_5,step1_6
-command=sh /srv/apps/bi-report/lib/shell/sparksql2email.sh /srv/apps/bi-report/sqls/demo_param.sql /data/bi-report/result/demo_param_`date +"%Y-%m-%d"`.csv zhaojianwei zhaojianwei
\ No newline at end of file
+command=sh /srv/apps/bi-report/lib/shell/sparksql2email.sh demo zhaojianwei zhaojianwei
\ No newline at end of file

lib/shell/sparksql2email.sh

@@ -3,13 +3,15 @@
 source ~/.bashrc
 source /etc/profile
 
-if [ $# -lt 4 ]; then
+if [ $# -lt 3 ]; then
   echo "Param error, please check again!"
   exit 0
 fi
 
 #默认取输入的账期
-V_DATE=$5
+V_DATE=$4
+timestamp=`date +"%Y%m%d%H%M%S"`
+tmp_file_name="/data/bi-report/tmp/tmp_"$timestamp".sql"
 
 #输入的账期为空，则取T+1默认账期
 if [ -z ${V_DATE} ];then
@@ -41,25 +43,24 @@ echo "V_7DAY_M_D_AGO: "$V_7DAY_M_D_AGO
 echo "************************************"
 echo ""
 
-#cp sqls/$1".sql" tmp.sql
-cp $1 tmp.sql
-sed -i "s/\$V_PARYMD/$V_PARYMD/g" tmp.sql
-sed -i "s/\$V_PARY_M_D/$V_PARY_M_D/g" tmp.sql
-sed -i "s/\$V_1DAYMD_AGO/$V_1DAYMD_AGO/g" tmp.sql
-sed -i "s/\$V_7DAYMD_AGO/$V_7DAYMD_AGO/g" tmp.sql
-sed -i "s/\$V_1DAY_M_D_AGO/$V_1DAY_M_D_AGO/g" tmp.sql
-sed -i "s/\$V_7DAY_M_D_AGO/$V_7DAY_M_D_AGO/g" tmp.sql
+cp $1 $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
+sed -i "s/\$V_7DAYMD_AGO/$V_7DAYMD_AGO/g" $tmp_file_name
+sed -i "s/\$V_1DAY_M_D_AGO/$V_1DAY_M_D_AGO/g" $tmp_file_name
+sed -i "s/\$V_7DAY_M_D_AGO/$V_7DAY_M_D_AGO/g" $tmp_file_name
 
 # 新标签与新标签对应集合类型 的对应关系
-/opt/spark/spark-2.4.5-bin-hadoop2.7/bin/beeline -u jdbc:hive2://bj-gm-prod-cos-datacenter003:10010/online -n data --outputformat=csv2 --showHeader=true -e "`cat tmp.sql`">$2
-rm -rf tmp.sql
+/opt/spark/spark-2.4.5-bin-hadoop2.7/bin/beeline -u jdbc:hive2://bj-gm-prod-cos-datacenter003:10010/online -n data --outputformat=csv2 --showHeader=true -e "`cat $tmp_file_name`"> "/data/bi-report/result/"$2".csv"
+rm -rf $tmp_file_name
 
-to=$3
-cc=$4
+to=$2
+cc=$3
 
 echo "to: "$to
 echo "cc: "$cc
 
-python2.7 /srv/apps/bi-report/lib/python/sendmail.py -t $to -s 自动发送 -m $cc -a $2
+python2.7 /srv/apps/bi-report/lib/python/sendmail.py -t $to -s 自动发送 -m $cc -a "/data/bi-report/result/"$2".csv"
 
 exit 0
\ No newline at end of file