浏览代码

修复数据推送bug

pengdi@zoniot.com 4 年之前
父节点
当前提交
a6b58d1ea4

+ 7 - 78
gydatasync/log.log

@@ -1,78 +1,7 @@
-2020-07-22 14:34:40.455  INFO 7804 --- [main] c.h.gydatasync.GydatasyncApplication     : Starting GydatasyncApplication on ZJY-PC with PID 7804 (E:\Work\对外接口\桂阳\code\gydatasync\target\classes started by ZJY in E:\Work\对外接口\桂阳\code\gydatasync)
-2020-07-22 14:34:40.490  INFO 7804 --- [main] c.h.gydatasync.GydatasyncApplication     : The following profiles are active: dev
-2020-07-22 14:34:42.879  INFO 7804 --- [main] o.s.s.c.ThreadPoolTaskScheduler          : Initializing ExecutorService 'taskScheduler'
-2020-07-22 14:35:06.987  INFO 7804 --- [main] c.h.gydatasync.GydatasyncApplication     : Started GydatasyncApplication in 27.194 seconds (JVM running for 28.189)
-2020-07-22 14:35:07.048  INFO 7804 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
-2020-07-22 14:35:15.065  INFO 7804 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
-2020-07-22 14:35:15.122 DEBUG 7804 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : ==>  Preparing: select COUNT(*) from WaterData where CONVERT(varchar(10),UpLoadDateTime,120) = CONVERT(varchar(10),GETDATE(),120)
-2020-07-22 14:35:15.887 DEBUG 7804 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : ==> Parameters: 
-2020-07-22 14:35:16.376 DEBUG 7804 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : <==      Total: 1
-2020-07-22 14:40:09.330  WARN 7804 --- [HikariPool-1 housekeeper] com.zaxxer.hikari.pool.HikariPool        : HikariPool-1 - Thread starvation or clock leap detected (housekeeper delta=4m54s159ms653µs980ns).
-2020-07-22 14:40:09.333  INFO 7804 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-2 - Starting...
-2020-07-22 14:40:09.899  INFO 7804 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-2 - Start completed.
-2020-07-22 14:40:09.901 DEBUG 7804 --- [scheduling-1] c.h.g.dao.mysql.ReadMeterDao.getAllList  : ==>  Preparing: SELECT sd.water_meter_file_no as customerID, a.device_id as deviceID, a.read_data as cbz, a.read_time as cbsj, now() as upLoadDateTime, CONCAT(sd.water_meter_file_no,'1') as customerMeterID FROM sc_meter_read_record a left JOIN sc_device sd on a.device_id = sd.id WHERE a.read_date = DATE_FORMAT( DATE_SUB( now(), INTERVAL 1 DAY ), '%Y%m%d' ) AND a.device_id IN ( SELECT id FROM sc_device WHERE building_id IN ( 6675, 6676, 6677, 6678, 6679, 6680 ) AND STATUS = 1 )
-2020-07-22 14:40:09.938 DEBUG 7804 --- [scheduling-1] c.h.g.dao.mysql.ReadMeterDao.getAllList  : ==> Parameters: 
-2020-07-22 14:40:10.479 DEBUG 7804 --- [scheduling-1] c.h.g.dao.mysql.ReadMeterDao.getAllList  : <==      Total: 476
-2020-07-22 14:40:56.786  WARN 7804 --- [HikariPool-1 housekeeper] com.zaxxer.hikari.pool.HikariPool        : HikariPool-1 - Thread starvation or clock leap detected (housekeeper delta=47s455ms360µs350ns).
-2020-07-22 14:40:56.788  WARN 7804 --- [HikariPool-2 housekeeper] com.zaxxer.hikari.pool.HikariPool        : HikariPool-2 - Thread starvation or clock leap detected (housekeeper delta=46s787ms862µs479ns).
-2020-07-22 14:40:56.856  INFO 7804 --- [SpringContextShutdownHook] o.s.s.c.ThreadPoolTaskScheduler          : Shutting down ExecutorService 'taskScheduler'
-2020-07-22 14:40:56.857  INFO 7804 --- [SpringContextShutdownHook] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Shutdown initiated...
-2020-07-22 14:40:56.862  INFO 7804 --- [SpringContextShutdownHook] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Shutdown completed.
-2020-07-22 14:40:56.864  INFO 7804 --- [SpringContextShutdownHook] com.zaxxer.hikari.HikariDataSource       : HikariPool-2 - Shutdown initiated...
-2020-07-22 14:40:56.872  INFO 7804 --- [SpringContextShutdownHook] com.zaxxer.hikari.HikariDataSource       : HikariPool-2 - Shutdown completed.
-2020-07-22 14:45:16.734  INFO 10816 --- [main] c.h.gydatasync.GydatasyncApplication     : Starting GydatasyncApplication on ZJY-PC with PID 10816 (E:\Work\对外接口\桂阳\code\gydatasync\target\classes started by ZJY in E:\Work\对外接口\桂阳\code\gydatasync)
-2020-07-22 14:45:16.739  INFO 10816 --- [main] c.h.gydatasync.GydatasyncApplication     : The following profiles are active: dev
-2020-07-22 14:45:17.751  INFO 10816 --- [main] o.s.s.c.ThreadPoolTaskScheduler          : Initializing ExecutorService 'taskScheduler'
-2020-07-22 14:45:22.081  INFO 10816 --- [main] c.h.gydatasync.GydatasyncApplication     : Started GydatasyncApplication in 5.737 seconds (JVM running for 6.374)
-2020-07-22 14:45:22.132  INFO 10816 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
-2020-07-22 14:45:29.890  INFO 10816 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
-2020-07-22 14:45:29.946 DEBUG 10816 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : ==>  Preparing: select COUNT(*) from WaterData where CONVERT(varchar(10),UpLoadDateTime,120) = CONVERT(varchar(10),GETDATE(),120)
-2020-07-22 14:45:30.688 DEBUG 10816 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : ==> Parameters: 
-2020-07-22 14:45:31.089 DEBUG 10816 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : <==      Total: 1
-2020-07-22 14:46:41.936  WARN 10816 --- [HikariPool-1 housekeeper] com.zaxxer.hikari.pool.HikariPool        : HikariPool-1 - Thread starvation or clock leap detected (housekeeper delta=1m11s944ms422µs457ns).
-2020-07-22 14:46:41.937  INFO 10816 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-2 - Starting...
-2020-07-22 14:46:41.997  INFO 10816 --- [SpringContextShutdownHook] o.s.s.c.ThreadPoolTaskScheduler          : Shutting down ExecutorService 'taskScheduler'
-2020-07-22 14:46:41.999  INFO 10816 --- [SpringContextShutdownHook] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Shutdown initiated...
-2020-07-22 14:46:42.005  INFO 10816 --- [SpringContextShutdownHook] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Shutdown completed.
-2020-07-22 14:52:03.682  INFO 11176 --- [main] c.h.gydatasync.GydatasyncApplication     : Starting GydatasyncApplication on ZJY-PC with PID 11176 (E:\Work\对外接口\桂阳\code\gydatasync\target\classes started by ZJY in E:\Work\对外接口\桂阳\code\gydatasync)
-2020-07-22 14:52:03.684  INFO 11176 --- [main] c.h.gydatasync.GydatasyncApplication     : The following profiles are active: dev
-2020-07-22 14:52:04.720  INFO 11176 --- [main] o.s.s.c.ThreadPoolTaskScheduler          : Initializing ExecutorService 'taskScheduler'
-2020-07-22 14:52:08.049  INFO 11176 --- [main] c.h.gydatasync.GydatasyncApplication     : Started GydatasyncApplication in 4.734 seconds (JVM running for 5.359)
-2020-07-22 14:52:08.100  INFO 11176 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
-2020-07-22 14:52:16.759  INFO 11176 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
-2020-07-22 14:52:16.817 DEBUG 11176 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : ==>  Preparing: select COUNT(*) from WaterData where CONVERT(varchar(10),UpLoadDateTime,120) = CONVERT(varchar(10),GETDATE(),120)
-2020-07-22 14:52:17.627 DEBUG 11176 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : ==> Parameters: 
-2020-07-22 14:52:18.056 DEBUG 11176 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : <==      Total: 1
-2020-07-22 14:53:08.573  WARN 11176 --- [HikariPool-1 housekeeper] com.zaxxer.hikari.pool.HikariPool        : HikariPool-1 - Thread starvation or clock leap detected (housekeeper delta=51s711ms984µs857ns).
-2020-07-22 14:53:08.575  INFO 11176 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-2 - Starting...
-2020-07-22 14:53:08.624  INFO 11176 --- [SpringContextShutdownHook] o.s.s.c.ThreadPoolTaskScheduler          : Shutting down ExecutorService 'taskScheduler'
-2020-07-22 14:53:08.625  INFO 11176 --- [SpringContextShutdownHook] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Shutdown initiated...
-2020-07-22 14:53:08.631  INFO 11176 --- [SpringContextShutdownHook] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Shutdown completed.
-2020-07-22 14:56:00.743  INFO 9644 --- [main] c.h.gydatasync.GydatasyncApplication     : Starting GydatasyncApplication on ZJY-PC with PID 9644 (E:\Work\对外接口\桂阳\code\gydatasync\target\classes started by ZJY in E:\Work\对外接口\桂阳\code\gydatasync)
-2020-07-22 14:56:00.746  INFO 9644 --- [main] c.h.gydatasync.GydatasyncApplication     : The following profiles are active: dev
-2020-07-22 14:56:01.851  INFO 9644 --- [main] o.s.s.c.ThreadPoolTaskScheduler          : Initializing ExecutorService 'taskScheduler'
-2020-07-22 14:56:01.886  INFO 9644 --- [main] c.h.gydatasync.GydatasyncApplication     : Started GydatasyncApplication in 1.492 seconds (JVM running for 2.129)
-2020-07-22 14:56:01.898  INFO 9644 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
-2020-07-22 14:56:02.104  INFO 9644 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
-2020-07-22 14:56:02.111 DEBUG 9644 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : ==>  Preparing: select COUNT(*) from WaterData where CONVERT(varchar(10),UpLoadDateTime,120) = CONVERT(varchar(10),GETDATE(),120)
-2020-07-22 14:56:02.141 DEBUG 9644 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : ==> Parameters: 
-2020-07-22 14:56:02.169 DEBUG 9644 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : <==      Total: 1
-2020-07-22 15:01:41.411  INFO 9644 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-2 - Starting...
-2020-07-22 15:01:41.413  WARN 9644 --- [HikariPool-1 housekeeper] com.zaxxer.hikari.pool.HikariPool        : HikariPool-1 - Thread starvation or clock leap detected (housekeeper delta=6m9s302ms961µs737ns).
-2020-07-22 15:01:41.469  INFO 9644 --- [SpringContextShutdownHook] o.s.s.c.ThreadPoolTaskScheduler          : Shutting down ExecutorService 'taskScheduler'
-2020-07-22 15:01:41.470  INFO 9644 --- [SpringContextShutdownHook] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Shutdown initiated...
-2020-07-22 15:01:41.482  INFO 9644 --- [SpringContextShutdownHook] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Shutdown completed.
-2020-07-22 15:01:54.872  INFO 4348 --- [main] c.h.gydatasync.GydatasyncApplication     : Starting GydatasyncApplication on ZJY-PC with PID 4348 (E:\Work\对外接口\桂阳\code\gydatasync\target\classes started by ZJY in E:\Work\对外接口\桂阳\code\gydatasync)
-2020-07-22 15:01:54.875  INFO 4348 --- [main] c.h.gydatasync.GydatasyncApplication     : The following profiles are active: dev
-2020-07-22 15:01:55.927  INFO 4348 --- [main] o.s.s.c.ThreadPoolTaskScheduler          : Initializing ExecutorService 'taskScheduler'
-2020-07-22 15:01:55.964  INFO 4348 --- [main] c.h.gydatasync.GydatasyncApplication     : Started GydatasyncApplication in 1.484 seconds (JVM running for 2.102)
-2020-07-22 15:01:55.976  INFO 4348 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Starting...
-2020-07-22 15:01:56.176  INFO 4348 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Start completed.
-2020-07-22 15:01:56.184 DEBUG 4348 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : ==>  Preparing: select COUNT(*) from WaterData where CONVERT(varchar(10),UpLoadDateTime,120) = CONVERT(varchar(10),GETDATE(),120)
-2020-07-22 15:01:56.205 DEBUG 4348 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : ==> Parameters: 
-2020-07-22 15:01:56.233 DEBUG 4348 --- [scheduling-1] c.h.g.d.mssql.SaveMeterDataDao.IsExist   : <==      Total: 1
-2020-07-22 15:02:24.323  WARN 4348 --- [HikariPool-1 housekeeper] com.zaxxer.hikari.pool.HikariPool        : HikariPool-1 - Thread starvation or clock leap detected (housekeeper delta=58s146ms293µs997ns).
-2020-07-22 15:02:24.325  INFO 4348 --- [scheduling-1] com.zaxxer.hikari.HikariDataSource       : HikariPool-2 - Starting...
-2020-07-22 15:02:24.401  INFO 4348 --- [SpringContextShutdownHook] o.s.s.c.ThreadPoolTaskScheduler          : Shutting down ExecutorService 'taskScheduler'
-2020-07-22 15:02:24.403  INFO 4348 --- [SpringContextShutdownHook] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Shutdown initiated...
-2020-07-22 15:02:24.410  INFO 4348 --- [SpringContextShutdownHook] com.zaxxer.hikari.HikariDataSource       : HikariPool-1 - Shutdown completed.
+2020-07-28 09:18:15.703  INFO 59676 --- [main] c.h.g.GydatasyncApplicationTests         : Starting GydatasyncApplicationTests on pengdi with PID 59676 (started by pengdi in C:\Users\86159\git_repos\water-iot\gydatasync)
+2020-07-28 09:18:15.711  INFO 59676 --- [main] c.h.g.GydatasyncApplicationTests         : The following profiles are active: prd
+2020-07-28 09:18:18.513  INFO 59676 --- [main] o.s.s.c.ThreadPoolTaskScheduler          : Initializing ExecutorService 'taskScheduler'
+2020-07-28 09:18:18.647  INFO 59676 --- [main] c.h.g.GydatasyncApplicationTests         : Started GydatasyncApplicationTests in 3.552 seconds (JVM running for 5.549)
+2020-07-28 09:18:19.283  INFO 59676 --- [SpringContextShutdownHook] o.s.s.c.ThreadPoolTaskScheduler          : Shutting down ExecutorService 'taskScheduler'
+2020-07-28 09:18:19.286  INFO 59676 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-0} closing ...
+2020-07-28 09:18:19.288  INFO 59676 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-0} closing ...

+ 1 - 1
gydatasync/src/main/resources/application-prd.properties

@@ -17,7 +17,7 @@ spring.datasource.second.type=com.alibaba.druid.pool.DruidDataSource
 #日志
 logging.level.root=info
 logging.file.name=log.log
-logging.level.com.huaxu.gydatasync.dao.*=debug
+logging.level.com.huaxu.gydatasync.dao.*=info
 mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
 

+ 1 - 1
gydatasync/src/main/resources/application.properties

@@ -1,4 +1,4 @@
 #开发环境:dev  测试环境:sit  线上环境:prd  演示环境:uat
-spring.profiles.active=dev
+spring.profiles.active=prd