diff --git a/start/src/main/resources/application.yml b/start/src/main/resources/application.yml index 2fb5cb0..94c9a75 100644 --- a/start/src/main/resources/application.yml +++ b/start/src/main/resources/application.yml @@ -1,14 +1 @@ -dahua: - resource: - sync-enabled: true - sync-page-size: 200 - subsystem: evo-accesscontrol - auto-match-by-name: true - oauth: - host: 123.183.159.35 - client-id: 123.183.159.35 - client-secret: 4edfdcd2-67e6-41db-a1ae-b98d47a70266 - username: system - password: zcloud88888 - http: false - port: 4443 +# Application-level overrides are defined in dahua.yml. diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml index c0bc004..d274967 100644 --- a/start/src/main/resources/bootstrap.yml +++ b/start/src/main/resources/bootstrap.yml @@ -4,5 +4,6 @@ spring: # - classpath:nacos.yml - classpath:prodnacos.yml - classpath:sdk.yml + - classpath:dahua.yml - classpath:swagger.yml # - classpath:ds.yml diff --git a/start/src/main/resources/dahua.yml b/start/src/main/resources/dahua.yml new file mode 100644 index 0000000..ad7c7d2 --- /dev/null +++ b/start/src/main/resources/dahua.yml @@ -0,0 +1,27 @@ +# Dahua platform integration configuration +dahua: + vehicle-access-record: + sync-enabled: true + sync-page-size: 1000 + sync-delay-minutes: 5 + sync-overlap-minutes: 10 + initial-lookback-minutes: 1440 + access-record: + sync-enabled: true + sync-page-size: 1000 + sync-delay-minutes: 5 + sync-overlap-minutes: 10 + initial-lookback-minutes: 1440 + resource: + sync-enabled: true + sync-page-size: 200 + subsystem: evo-accesscontrol + auto-match-by-name: true + oauth: + host: 123.183.159.35 + client-id: 123.183.159.35 + client-secret: 4edfdcd2-67e6-41db-a1ae-b98d47a70266 + username: system + password: zcloud88888 + http: false + port: 4443 diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index bef0ea4..1a00c01 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -83,24 +83,3 @@ message: closedAreaApplyReceiveCarAuditReject: MS000159 closedAreaPersonReceiveAudit: MS000160 closedAreaPersonReceiveAuditReject: MS000161 -# 大华平台配置 -dahua: - access-record: - sync-enabled: true - sync-page-size: 1000 - sync-delay-minutes: 5 - sync-overlap-minutes: 10 - initial-lookback-minutes: 1440 - resource: - sync-enabled: true - sync-page-size: 200 - subsystem: evo-accesscontrol - auto-match-by-name: true - oauth: - host: 123.183.159.35 - client-id: 123.183.159.35 - client-secret: 4edfdcd2-67e6-41db-a1ae-b98d47a70266 - username: system - password: zcloud88888 - http: false - port: 4443 diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/plan/DaHuaAccessRecordSyncXxlJob.java b/web-infrastructure/src/main/java/com/zcloud/primeport/plan/DaHuaAccessRecordSyncXxlJob.java index 0a6f0b8..00c1c97 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/plan/DaHuaAccessRecordSyncXxlJob.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/plan/DaHuaAccessRecordSyncXxlJob.java @@ -11,7 +11,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -// @Component +@Component @RequiredArgsConstructor @Slf4j public class DaHuaAccessRecordSyncXxlJob implements Job { @@ -40,4 +40,4 @@ public class DaHuaAccessRecordSyncXxlJob implements Job { return ReturnT.FAIL; } } -} \ No newline at end of file +}