From 8f7335819dda5b30b3e5e3978db3e834d57dc440 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 15 十一月 2024 16:46:43 +0800
Subject: [PATCH] 海康摄像头代码修改
---
iailab-module-report/iailab-module-report-biz/src/main/resources/application-dev.yaml | 6 +++---
/dev/null | 14 --------------
iailab-module-report/iailab-module-report-biz/src/main/resources/application.yaml | 2 +-
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/video/hikvision/utils/HIKDevice.java | 1 +
iailab-module-bpm/iailab-module-bpm-biz/src/main/resources/application-dev.yaml | 2 +-
5 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/iailab-module-bpm/iailab-module-bpm-biz/src/main/resources/application-dev.yaml b/iailab-module-bpm/iailab-module-bpm-biz/src/main/resources/application-dev.yaml
index b4d979c..c596066 100644
--- a/iailab-module-bpm/iailab-module-bpm-biz/src/main/resources/application-dev.yaml
+++ b/iailab-module-bpm/iailab-module-bpm-biz/src/main/resources/application-dev.yaml
@@ -39,7 +39,7 @@
primary: master
datasource:
master:
- url: jdbc:mysql://127.0.0.1:3306/iailab-plat?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+ url: jdbc:mysql://127.0.0.1:3306/iailab_plat_system?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
# url: jdbc:mysql://127.0.0.1:3306/iailab-plat?useSSL=true&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai # MySQL Connector/J 5.X 连接的示例
# url: jdbc:postgresql://127.0.0.1:5432/ruoyi-vue-pro # PostgreSQL 连接的示例
# url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/video/hikvision/utils/HIKDevice.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/video/hikvision/utils/HIKDevice.java
index df8e685..9741db1 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/video/hikvision/utils/HIKDevice.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/video/hikvision/utils/HIKDevice.java
@@ -180,6 +180,7 @@
String tPath = tDatePath + "/" + tImageName;
// 开始抓图
if (!hCNetSDK.NET_DVR_CaptureJPEGPicture(nlUserID, nChannel, lpJpegPara, tPath)) {
+ VideoConfiguration.staticCameraService.setStatus(camera.getId(), CameraStatusEnum.OFFLINE.getCode());
return "失败编码:" + hCNetSDK.NET_DVR_GetLastError();
} else {
Map<String, String> params = new HashMap<>();
diff --git a/iailab-module-report/iailab-module-report-biz/src/main/resources/application-dev.yaml b/iailab-module-report/iailab-module-report-biz/src/main/resources/application-dev.yaml
index 42e962a..4557792 100644
--- a/iailab-module-report/iailab-module-report-biz/src/main/resources/application-dev.yaml
+++ b/iailab-module-report/iailab-module-report-biz/src/main/resources/application-dev.yaml
@@ -39,7 +39,7 @@
primary: master
datasource:
master:
- url: jdbc:mysql://127.0.0.1:3306/iailab-plat?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+ url: jdbc:mysql://127.0.0.1:3306/iailab_plat_system?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
username: root
password: 123456
slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
@@ -50,10 +50,10 @@
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
- host: 400-infra.server.iocoder.cn # 地址
+ host: 127.0.0.1 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
-# password: 123456 # 密码，建议生产环境开启
+ password: 123456 # 密码，建议生产环境开启
--- #################### MQ 消息队列相关配置 ####################
diff --git a/iailab-module-report/iailab-module-report-biz/src/main/resources/application.yaml b/iailab-module-report/iailab-module-report-biz/src/main/resources/application.yaml
index c38a700..acac737 100644
--- a/iailab-module-report/iailab-module-report-biz/src/main/resources/application.yaml
+++ b/iailab-module-report/iailab-module-report-biz/src/main/resources/application.yaml
@@ -3,7 +3,7 @@
name: report-server
profiles:
- active: ${spring.profiles.active}
+ active: @profiles.active@
cloud:
nacos:
diff --git a/iailab-module-report/iailab-module-report-biz/src/main/resources/bootstrap-local.yaml b/iailab-module-report/iailab-module-report-biz/src/main/resources/bootstrap-local.yaml
deleted file mode 100644
index 07ea2f8..0000000
--- a/iailab-module-report/iailab-module-report-biz/src/main/resources/bootstrap-local.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
---- #################### 注册中心相关配置 ####################
-
-spring:
- cloud:
- nacos:
- server-addr: @nacos.server@
- username: @nacos.username@
- password: @nacos.password@
- discovery:
- namespace: @profiles.active@ # 命名空间。这里使用 dev 开发环境
- autoRegister: true
- metadata:
- version: @nacos.metadata.version@ # 服务实例的版本号，可用于灰度发布
-
---- #################### 配置中心相关配置 ####################
-
-spring:
- cloud:
- nacos:
- # Nacos Config 配置项，对应 NacosConfigProperties 配置属性类
- config:
- server-addr: @nacos.server@ # Nacos 服务器地址
- namespace: dev # 命名空间 dev 的ID，不能直接使用 dev 名称。创建命名空间的时候需要指定ID为 dev，这里使用 dev 开发环境
- group: DEFAULT_GROUP # 使用的 Nacos 配置分组，默认为 DEFAULT_GROUP
- name: ${spring.application.name} # 使用的 Nacos 配置集的 dataId，默认为 spring.application.name
- file-extension: yaml # 使用的 Nacos 配置集的 dataId 的文件拓展名，同时也是 Nacos 配置集的配置格式，默认为 properties
diff --git a/iailab-module-report/iailab-module-report-biz/src/main/resources/bootstrap.yaml b/iailab-module-report/iailab-module-report-biz/src/main/resources/bootstrap.yaml
deleted file mode 100644
index dddb22e..0000000
--- a/iailab-module-report/iailab-module-report-biz/src/main/resources/bootstrap.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-spring:
- application:
- name: report-server
-
- profiles:
- active: local
-
-server:
- port: 48084
-
-# 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件
-logging:
- file:
- name: @log.path@/logs/${spring.application.name}.log # 日志文件名，全路径
--
Gitblit v1.9.3