diff --git a/src/main/java/com/zhgd/xmgl/call/Mcs8Call.java b/src/main/java/com/zhgd/xmgl/call/Mcs8Call.java index 8760cd3a0..bb7f4c80d 100644 --- a/src/main/java/com/zhgd/xmgl/call/Mcs8Call.java +++ b/src/main/java/com/zhgd/xmgl/call/Mcs8Call.java @@ -26,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Scope; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import java.io.File; @@ -101,14 +100,13 @@ public class Mcs8Call implements PoliceCameraManufacturer { JSONObject jsonObject = Mcs8Util.getRecordFileList(config, page, pageSize, begin, end); bos = BeanUtil.copyToList(jsonObject.getJSONArray("data"), Mcs8FileBo.class); for (Mcs8FileBo bo : bos) { - mcs8Call.downloadFileAndSaveAsync(bo, cameraItemMap); + downloadFileAndSave(bo, cameraItemMap); } page++; } while (CollUtil.isNotEmpty(bos) && bos.size() == pageSize); } - @Async("policeCameraManufacturerDownLoadExecutor") - public void downloadFileAndSaveAsync(Mcs8FileBo bo, Map cameraItemMap) { + public void downloadFileAndSave(Mcs8FileBo bo, Map cameraItemMap) { int count = policeCameraItemFileService.count(new LambdaQueryWrapper() .eq(PoliceCameraItemFile::getExternalId, bo.getId())); if (count > 0) { diff --git a/src/main/java/com/zhgd/xmgl/call/factory/PoliceCameraManufacturerFactory.java b/src/main/java/com/zhgd/xmgl/call/factory/PoliceCameraManufacturerFactory.java index 398c0be09..c1a405d6c 100644 --- a/src/main/java/com/zhgd/xmgl/call/factory/PoliceCameraManufacturerFactory.java +++ b/src/main/java/com/zhgd/xmgl/call/factory/PoliceCameraManufacturerFactory.java @@ -32,9 +32,6 @@ public class PoliceCameraManufacturerFactory { * @return */ public PoliceCameraManufacturer getPoliceCameraManufacturer(String projectSn) { - if (!workTicketService.enableBindCamera(projectSn)) { - return null; - } ProjectPoliceCameraConfig config = projectPoliceCameraConfigService.getUseProjectPoliceCameraConfig(new MapBuilder() .put("projectSn", projectSn) .build()); diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java index a301eca9f..d628fd825 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java @@ -82,6 +82,9 @@ public class WorkTicketServiceImpl extends ServiceImpl queryPageList(HashMap param) { @@ -241,7 +244,7 @@ public class WorkTicketServiceImpl extends ServiceImpl() .eq(WorkTicketHistory::getWorkTicketId, ticketId) .orderByDesc(WorkTicketHistory::getBegin) @@ -249,12 +252,14 @@ public class WorkTicketServiceImpl extends ServiceImpl { + manufacturer.pullFile(DateUtil.offsetDay(now, -7), now); + }, threadPoolTaskExecutor); } } catch (Exception e) { log.error("定时从Mcs8获取执法记录仪文件err,{}", project.getProjectName(), e);