采集优化

src/main/java/com/imcs/admin/common/collection/DeviceCollectionTaskJob.java

@@ -367,7 +367,7 @@ public class DeviceCollectionTaskJob {
 
     public void saveOrUpdateDeviceReportInfo(Object deviceId,String deviceWorkState){
 
-        Map<String, Object> deviceReport = jdbcService.findOne("select * from device_report where device_id = ? order by create_time desc LIMIT 1 ", deviceId);
+        Map<String, Object> deviceReport = jdbcService.findOne("select id,device_id,DATE_FORMAT(start_time, '%Y-%m-%d %H:%i:%s') as start_time,create_time,end_time,keep_time,device_state from device_report where device_id = ? order by create_time desc LIMIT 1 ", deviceId);
 
         Date date = new Date();
         if(CollectionUtil.isNotEmpty(deviceReport)){
@@ -381,7 +381,7 @@ public class DeviceCollectionTaskJob {
                 String startTimeStr = deviceReport.get("startTime").toString().replace("T"," ");
                 DateTime startTime = DateUtil.parse(startTimeStr, "yyyy-MM-dd HH:mm:ss");
 
-                long keepTime = DateUtil.between(startTime, date, DateUnit.MINUTE);
+                long keepTime = DateUtil.between(startTime, date, DateUnit.SECOND);
 
                 //更新
                 String updateSql = "update device_report set  end_time = ?,keep_time = ? ,create_time = ?  where id = ? ";