区分能源与其他数据时间

energy/dayTask/py_mysql.sh

@@ -9,16 +9,26 @@ if [ -n "$2" ] ;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 "-2 day $current_day" +%Y%m%d`160000
-    end_time=`date -d "-1 day $current_day" +%Y%m%d`160000
+
+    start_time=`date -d "-1 day $current_day" +%Y%m%d`000000
+    end_time=`date -d "0 day $current_day" +%Y%m%d`000000
+
+    energy_start_time=`date -d "-2 day $current_day" +%Y%m%d`160000
+    energy_end_time=`date -d "-1 day $current_day" +%Y%m%d`160000
 else
     echo "====没有输入数据的日期，取当前时间的前一天===="
-    start_time=`date -d "-2 day" +"%Y%m%d"`160000
-    end_time=`date -d "-1 day" +"%Y%m%d"`160000
+
+    start_time=`date -d "-1 day" +"%Y%m%d"`000000
+    end_time=`date -d "0 day" +"%Y%m%d"`000000
+
+    energy_start_time=`date -d "-2 day" +"%Y%m%d"`160000
+    energy_end_time=`date -d "-1 day" +"%Y%m%d"`160000
 fi
 
-echo $start_time
-echo $end_time
+echo "start_time:" $start_time
+echo "end_time:"  $end_time
+echo "energy_start_time:" $energy_start_time
+echo "energy_end_time:"  $energy_end_time
 
 #
 # 11301  CO2
@@ -29,7 +39,7 @@ echo $end_time
 
 ## 能源数据
 energy_hbase_to_mysql(){
-  /usr/local/bin/python3 /opt/app/python_transfer/start_mysql.py 10101 --start_time $start_time --end_time $end_time
+  /usr/local/bin/python3 /opt/app/python_transfer/start_mysql.py 10101 --start_time $energy_start_time --end_time $energy_end_time
 }
 
 ## CO2