wudianlong 2 anos atrás
pai
commit
334ed5bcb2

+ 17 - 0
energy/dayTask/py_mysql.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. ./config.sh
+
+if [ -n "$2" ] ;then
+    echo "如果是输入的日期按照取输入日期"
+    do_date=$2
+else
+    echo "====没有输入数据的日期,取当前时间的前一天===="
+    start_time=`date -d yesterday +"%Y%m%d"`000000
+    end_time=`date +"%Y%m%d"`000000
+fi
+
+echo $start_time
+echo $end_time
+
+python3 start_mysql.py --start_time 20220101000000 --end_time 20220201000000

+ 5 - 5
energy/history/mysql_to_hdfs.sh

@@ -13,7 +13,7 @@ import_no_partition() {
   --connect $1 \
   --username $2 \
   --password $3 \
-  --target-dir $4   \
+  --target-dir $4$7   \
   --delete-target-dir \
   --columns "$5"  \
   --query "$6  and  \$CONDITIONS" \
@@ -31,19 +31,19 @@ import_no_partition() {
 }
 
 ods_energy_15_min_history(){
-  import_no_partition $url $username $password /warehouse/saga_dw/ods/ods_energy_15_min_history "building, func_id, meter, data_time, data_value, dt" "select building, func_id, meter, data_time, data_value, dt from energy_15_min_history where 1 = 1" ods_energy_15_min_history
+  import_no_partition $url $username $password /warehouse/saga_dw/ods/tmp/ "building, func_id, meter, data_time, data_value, dt" "select building, func_id, meter, data_time, data_value, dt from energy_15_min_history where 1 = 1" ods_energy_15_min_history
 }
 
 ods_energy_5_min_history(){
-  import_no_partition $url $username $password /warehouse/saga_dw/ods/ods_energy_5_min_history "building, func_id, meter, data_time, data_value, dt" "select building, func_id, meter, data_time, data_value, dt from energy_5_min_history where 1 = 1" ods_energy_5_min_history
+  import_no_partition $url $username $password /warehouse/saga_dw/ods/tmp/ "building, func_id, meter, data_time, data_value, dt" "select building, func_id, meter, data_time, data_value, dt from energy_5_min_history where 1 = 1" ods_energy_5_min_history
 }
 
 ods_energy_15_min_fjd_history(){
-  import_no_partition $url $username $password /warehouse/saga_dw/ods/ods_energy_15_min_fjd_history "building, func_id, meter, data_time, data_value, dt" "select building, func_id, meter, data_time, data_value, dt from energy_15_min_fjd_history where 1 = 1" ods_energy_15_min_fjd_history
+  import_no_partition $url $username $password /warehouse/saga_dw/ods/tmp/ "building, func_id, meter, data_time, data_value, dt" "select building, func_id, meter, data_time, data_value, dt from energy_15_min_fjd_history where 1 = 1" ods_energy_15_min_fjd_history
 }
 
 ods_energy_5_min_fjd_history(){
-  import_no_partition $url $username $password /warehouse/saga_dw/ods/ods_energy_5_min_fjd_history "building, func_id, meter, data_time, data_value, dt" "select building, func_id, meter, data_time, data_value, dt from energy_5_min_fjd_history where 1 = 1" ods_energy_5_min_fjd_history
+  import_no_partition $url $username $password /warehouse/saga_dw/ods/tmp/ "building, func_id, meter, data_time, data_value, dt" "select building, func_id, meter, data_time, data_value, dt from energy_5_min_fjd_history where 1 = 1" ods_energy_5_min_fjd_history
 }
 
 case $1 in

+ 11 - 0
energy/history/py_kafka.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+. ./config.sh
+
+if [ -n "$2" ] ;then
+    echo "如果是输入的日期按照取输入日期"
+    do_date=$2
+else
+    echo "====没有输入数据的日期,取当前时间的前一天===="
+    do_date=`date -d yesterday +"%Y-%m-%d"`
+fi