Kaynağa Gözat

能源时间+8小时处理

wudianlong 2 yıl önce
ebeveyn
işleme
ad3c0e37af

+ 4 - 4
energy/dayTask/clean_mysql.sh

@@ -17,10 +17,10 @@ username=$MYSQL_USER
 password=$MYSQL_PASSWORD
 database=saga_dev
 
-del_energy_15_min="delete from energy_15_min where dt = '$do_date';"
-del_energy_15_min_fjd="delete from energy_15_min_fjd where dt = '$do_date';"
+#del_energy_15_min="delete from energy_15_min where 1 = 1;"
+#del_energy_15_min_fjd="delete from energy_15_min_fjd where 1 = 1;"
 
-#del_energy_15_min="truncate table energy_15_min;"
+del_energy_15_min="truncate table energy_15_min;"
 #del_energy_5_min="truncate table energy_5_min;"
 #del_energy_15_min_fjd="truncate table energy_15_min_fjd;"
 #del_energy_5_min_fjd="truncate table energy_5_min_fjd;"
@@ -51,7 +51,7 @@ case $1 in
   ;;
 "clean_15")
     clean_energy_15
-    clean_energy_15_fjd
+#    clean_energy_15_fjd
   ;;
 "clean_5")
     clean_energy_5

+ 1 - 0
energy/dayTask/energy_hive.sql

@@ -24,6 +24,7 @@ create table ods_energy_15_min_tmp
     data_time  string,
     data_value decimal(30, 15)
 ) COMMENT '能源原始数据15min差值临时表'
+    PARTITIONED BY (`dt` string)
 ROW FORMAT DELIMITED FIELDS TERMINATED BY '\001'
 STORED AS TEXTFILE
 LOCATION

+ 1 - 1
energy/dayTask/mysql_to_hdfs.sh

@@ -40,7 +40,7 @@ mysql_to_hdfs_lzo() {
 }
 
 ods_energy_15_min(){
-  mysql_to_hdfs_lzo $url $username $password /warehouse/saga_dw/ods/tmp/ "building, func_id, meter, data_time, data_value" "select building, func_id, meter, data_time, data_value from energy_15_min where dt = '$do_date'" ods_energy_15_min
+  mysql_to_hdfs_lzo $url $username $password /warehouse/saga_dw/ods/tmp/ "building, func_id, meter, data_time, data_value" "select building, func_id, meter, from_unixtime(unix_timestamp(data_time) + 28800) as data_time, data_value from energy_15_min where 1 = 1 " ods_energy_15_min
 }
 
 ods_energy_5_min(){

+ 5 - 5
energy/dayTask/py_mysql.sh

@@ -9,15 +9,15 @@ if [ -n "$1" ] ;then
     echo $startSec
     current_day=`date -d "@$startSec" "+%Y-%m-%d"`
     one_day_ago=`date -d "$current_day yesterday" +%Y%m%d`
-    start_time=`date -d "0 day $current_day" +%Y%m%d`000000
-    end_time=`date -d "1 day $current_day" +%Y%m%d`000000
+    start_time=`date -d "-1 day $current_day" +%Y%m%d`160000
+    end_time=`date -d "-2 day $current_day" +%Y%m%d`160000
 else
     echo "====没有输入数据的日期,取当前时间的前一天===="
-    start_time=`date -d "-1 day" +"%Y%m%d"`140000
-    end_time=`date -d "-2 day" +"%Y%m%d"`140000
+    start_time=`date -d "-1 day" +"%Y%m%d"`160000
+    end_time=`date -d "-2 day" +"%Y%m%d"`160000
 fi
 
 echo $start_time
 echo $end_time
 
-#/usr/local/bin/python3 /opt/app/python_transfer/start_mysql.py --start_time $start_time --end_time $end_time
+/usr/local/bin/python3 /opt/app/python_transfer/start_mysql.py 10101 --start_time $start_time --end_time $end_time