diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 7039478..0cbb418 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -9,10 +9,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; import java.util.List; @Component @@ -23,15 +27,24 @@ private IDeviceService deviceService; @Autowired private IRecognitionRecordsService recordsService; + @Value("${casic.iris.sync.interval}") + private Integer interval; @Scheduled(cron = "${casic.iris.sync.cron}") public void job(){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Calendar calendar = Calendar.getInstance(); + String endTime = sdf.format(calendar.getTime()); + calendar.add(Calendar.MINUTE,0-interval); + String startTime = sdf.format(calendar.getTime()); + System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); + List deviceList = deviceService.selectList(null); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); } - List errorCode = recordsService.syncRecords(deviceIds,null,null); + List errorCode = recordsService.syncRecords(deviceIds,startTime,endTime); if(ToolUtil.isNotEmpty(errorCode)){ logger.info("scheuled job, error:" + StringUtils.join(errorCode,",")); }else { diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java index 7039478..0cbb418 100644 --- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java +++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/task/RecordTask.java @@ -9,10 +9,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; import java.util.List; @Component @@ -23,15 +27,24 @@ private IDeviceService deviceService; @Autowired private IRecognitionRecordsService recordsService; + @Value("${casic.iris.sync.interval}") + private Integer interval; @Scheduled(cron = "${casic.iris.sync.cron}") public void job(){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Calendar calendar = Calendar.getInstance(); + String endTime = sdf.format(calendar.getTime()); + calendar.add(Calendar.MINUTE,0-interval); + String startTime = sdf.format(calendar.getTime()); + System.out.println(sdf.format(new Date()) + ":" + startTime + " " + endTime); + List deviceList = deviceService.selectList(null); List deviceIds = new ArrayList<>(); for (Device device : deviceList) { deviceIds.add(Long.valueOf(device.getId())); } - List errorCode = recordsService.syncRecords(deviceIds,null,null); + List errorCode = recordsService.syncRecords(deviceIds,startTime,endTime); if(ToolUtil.isNotEmpty(errorCode)){ logger.info("scheuled job, error:" + StringUtils.join(errorCode,",")); }else { diff --git a/casic-web/src/main/resources/config/application-prod.yml b/casic-web/src/main/resources/config/application-prod.yml index 9ac8dda..3feb877 100644 --- a/casic-web/src/main/resources/config/application-prod.yml +++ b/casic-web/src/main/resources/config/application-prod.yml @@ -11,13 +11,14 @@ #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram + nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/dept/listAll,/device/receiveMsg export-temp-path: D:\java\boot\casic-web-1.0.0-SNAPSHOT\export\ iris: recServiceHost: localhost recServicePort: 20004 sync: - cron: "0 0 1 * * ?" #每天凌晨1点执行一次 + cron: "0 0/10 * * * ?" #每10分钟执行一次 + interval: 10 generate: cron: "0 08 18 * * ?" #每天凌晨4点执行一次 jdbc: