Merge remote-tracking branch 'origin/master'

k94314517

2024-03-21 68ae0e6a2dc077d8b85187ee3dbee4b87a6c9b90

 server/admin_timer/src/main/java/com/doumee/task/ScheduleTaskProgressTool.java

@@ -18,15 +18,17 @@
@Component
@EnableScheduling
public class ScheduleTaskProgressTool {

    public static Integer endId = 0;
    @Autowired
    private HkSyncEmpowerServiceImpl hkSyncEmpowerService;
    /**
     * 定时查询人员下发海康结果（任务是否已下载结束）
     * @throws Exception
     */
    @Scheduled(fixedDelay=60*1000)
    @Scheduled(fixedDelay=20*1000)
    public void syncEmpowerResultData()  {
        hkSyncEmpowerService.syncEmpowerResultData();
       hkSyncEmpowerService.syncEmpowerResultData(endId);
    }

}