数据采集优化

src/main/java/com/imcs/admin/business/service/impl/BigScreenDetailServiceImpl.java

@@ -85,10 +85,10 @@ public class BigScreenDetailServiceImpl implements BigScreenDetailService {
                 "\t\tdr.device_state,\n" +
                 "\t\tROUND(SUM( IFNULL( TIMESTAMPDIFF( SECOND, dr.start_time, IFNULL( dr.end_time, CURRENT_TIMESTAMP )), 0 ) ) / 60.0, 1) AS keep_time\n" +
                 "\tFROM\n" +
-                "\t\tdevice_report dr where device_id = ? and dr.device_state='加工'\n" +
+                "\t\tdevice_report dr where device_id = ? and dr.device_state='加工' and DATE_FORMAT( create_time, '%Y-%m-%d' )=DATE_FORMAT( now(), '%Y-%m-%d' )\n" +
                 "\tGROUP BY\n" +
                 "\t\tdevice_id,\n" +
-                "\t\tDATE_FORMAT( dr.create_time, '%Y-%m-%d' ),\n" +
+                "\t\tDATE_FORMAT( dr.create_time, '%Y-%m-%d' ) ,\n" +
                 "\t\tdr.device_state ");
 
         Map<String, Object> device = jdbcService.findOne(todayWorkTimeBuffer.toString(), pageParam.getStr("id"));

src/main/java/com/imcs/admin/common/config/RestTemplateConfig.java

@@ -20,8 +20,8 @@ public class RestTemplateConfig {
     @Bean
     public ClientHttpRequestFactory simpleClientHttpRequestFactory() {
         SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
-        factory.setReadTimeout(6000000);//单位为ms
-        factory.setConnectTimeout(6000000);//单位为ms
+        factory.setConnectTimeout(60 * 1000);
+        factory.setReadTimeout(60 * 1000);
         return factory;
     }