From 38f29e38fcc668171dc05c53d40a36b895c86102 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期四, 10 十月 2024 13:34:28 +0800
Subject: [PATCH] init
---
server/redis/dump.rdb | 0
ruoyi-admin/src/main/resources/application-prod.yml | 10 +-
ruoyi-admin/src/main/resources/application-dev-druid.yml | 2
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml | 162 ++++++++++++++++++++++++++--------------
ruoyi-admin/src/main/resources/application.yml | 6
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java | 9 ++
ruoyi-admin/src/main/resources/application-dev.yml | 20 +++-
7 files changed, 137 insertions(+), 72 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
index eb5dc2a..bb92799 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
@@ -635,6 +635,15 @@
GlobalVariable.previewMap.remove(cameraId);
}
log.debug("褰曞儚鍋滄");
+ //瀛樺叆minio
+ String BucketName = "record";
+ String ObjectName = IdUtils.fastSimpleUUID() + ".mp4";
+ FileInputStream stream = new FileInputStream(path);
+ boolean b = MinioUtil.uploadObject(BucketName, ObjectName, stream, stream.available(), "video/MP4");
+ if (b) {
+ url = MinioUtil.getBucketObjectUrl(BucketName, ObjectName);
+ log.debug("涓婁紶鏂囦欢鎴愬姛!" + url);
+ }
}
return url;
} catch (Exception ex) {
diff --git a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
index d6498b6..6b29e3e 100644
--- a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml
@@ -1,67 +1,110 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.inspect.mapper.ArdVideoInspectTaskMapper">
-
+
<resultMap type="ArdVideoInspectTask" id="ArdVideoInspectTaskResult">
- <result property="id" column="id" />
- <result property="taskName" column="task_name" />
- <result property="startTime" column="start_time" />
- <result property="endTime" column="end_time" />
- <result property="repeatPeriod" column="repeat_period" />
- <result property="inspectMode" column="inspect_mode" />
- <result property="menualSwitch" column="menual_switch" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="cameraId" column="camera_id" />
- <result property="channel" column="channel" />
- <result property="deptId" column="dept_id" />
- <result property="userId" column="user_id" />
- <result property="currentStepId" column="current_step_id" />
- <result property="currentStepStartTime" column="current_step_start_time" />
+ <result property="id" column="id"/>
+ <result property="taskName" column="task_name"/>
+ <result property="startTime" column="start_time"/>
+ <result property="endTime" column="end_time"/>
+ <result property="repeatPeriod" column="repeat_period"/>
+ <result property="inspectMode" column="inspect_mode"/>
+ <result property="menualSwitch" column="menual_switch"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="cameraId" column="camera_id"/>
+ <result property="channel" column="channel"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="userId" column="user_id"/>
+ <result property="currentStepId" column="current_step_id"/>
+ <result property="currentStepStartTime" column="current_step_start_time"/>
</resultMap>
- <resultMap id="ArdVideoInspectTaskArdVideoInspectTaskStepResult" type="ArdVideoInspectTask" extends="ArdVideoInspectTaskResult">
- <collection property="ardVideoInspectTaskStepList" notNullColumn="sub_task_id" javaType="java.util.List" resultMap="ArdVideoInspectTaskStepResult" />
+ <resultMap id="ArdVideoInspectTaskArdVideoInspectTaskStepResult" type="ArdVideoInspectTask"
+ extends="ArdVideoInspectTaskResult">
+ <collection property="ardVideoInspectTaskStepList" notNullColumn="sub_task_id" javaType="java.util.List"
+ resultMap="ArdVideoInspectTaskStepResult"/>
</resultMap>
<resultMap type="ArdVideoInspectTaskStep" id="ArdVideoInspectTaskStepResult">
- <result property="taskId" column="sub_task_id" />
- <result property="deptId" column="sub_dept_id" />
- <result property="userId" column="sub_user_id" />
- <result property="id" column="sub_id" />
- <result property="orderNumber" column="sub_order_number" />
- <result property="recordingTime" column="sub_recording_time" />
- <result property="wellId" column="sub_well_id" />
+ <result property="taskId" column="sub_task_id"/>
+ <result property="deptId" column="sub_dept_id"/>
+ <result property="userId" column="sub_user_id"/>
+ <result property="id" column="sub_id"/>
+ <result property="orderNumber" column="sub_order_number"/>
+ <result property="recordingTime" column="sub_recording_time"/>
+ <result property="wellId" column="sub_well_id"/>
</resultMap>
<sql id="selectArdVideoInspectTaskVo">
- select id, task_name, start_time, end_time, repeat_period, inspect_mode, menual_switch, create_by, create_time, update_by, update_time, camera_id, channel, dept_id, user_id, current_step_id, current_step_start_time from ard_video_inspect_task
+ select id,
+ task_name,
+ start_time,
+ end_time,
+ repeat_period,
+ inspect_mode,
+ menual_switch,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ camera_id,
+ channel,
+ dept_id,
+ user_id,
+ current_step_id,
+ current_step_start_time
+ from ard_video_inspect_task
</sql>
- <select id="selectArdVideoInspectTaskList" parameterType="ArdVideoInspectTask" resultMap="ArdVideoInspectTaskResult">
+ <select id="selectArdVideoInspectTaskList" parameterType="ArdVideoInspectTask"
+ resultMap="ArdVideoInspectTaskResult">
<include refid="selectArdVideoInspectTaskVo"/>
- <where>
- <if test="taskName != null and taskName != ''"> and task_name like '%'||#{taskName}||'%'</if>
- <if test="inspectMode != null and inspectMode != ''"> and inspect_mode = #{inspectMode}</if>
+ <where>
+ <if test="taskName != null and taskName != ''">and task_name like '%'||#{taskName}||'%'</if>
+ <if test="inspectMode != null and inspectMode != ''">and inspect_mode = #{inspectMode}</if>
<if test="menualSwitch != null and inspectMode != ''">and menual_switch= #{menualSwitch}</if>
- <if test="cameraId != null and cameraId != ''"> and camera_id = #{cameraId}</if>
- <if test="channel != null "> and channel = #{channel}</if>
+ <if test="cameraId != null and cameraId != ''">and camera_id = #{cameraId}</if>
+ <if test="channel != null ">and channel = #{channel}</if>
</where>
order by start_time
</select>
-
- <select id="selectArdVideoInspectTaskById" parameterType="String" resultMap="ArdVideoInspectTaskArdVideoInspectTaskStepResult">
- select a.id, a.task_name, a.start_time, a.end_time, a.repeat_period, a.inspect_mode, a.menual_switch, a.create_by, a.create_time, a.update_by, a.update_time, a.camera_id, a.channel, a.dept_id, a.user_id, a.current_step_id, a.current_step_start_time,
- b.task_id as sub_task_id, b.dept_id as sub_dept_id, b.user_id as sub_user_id, b.id as sub_id, b.order_number as sub_order_number, b.recording_time as sub_recording_time, b.well_id as sub_well_id
+
+ <select id="selectArdVideoInspectTaskById" parameterType="String"
+ resultMap="ArdVideoInspectTaskArdVideoInspectTaskStepResult">
+ select a.id,
+ a.task_name,
+ a.start_time,
+ a.end_time,
+ a.repeat_period,
+ a.inspect_mode,
+ a.menual_switch,
+ a.create_by,
+ a.create_time,
+ a.update_by,
+ a.update_time,
+ a.camera_id,
+ a.channel,
+ a.dept_id,
+ a.user_id,
+ a.current_step_id,
+ a.current_step_start_time,
+ b.task_id as sub_task_id,
+ b.dept_id as sub_dept_id,
+ b.user_id as sub_user_id,
+ b.id as sub_id,
+ b.order_number as sub_order_number,
+ b.recording_time as sub_recording_time,
+ b.well_id as sub_well_id
from ard_video_inspect_task a
- left join ard_video_inspect_task_step b on b.task_id = a.id
+ left join ard_video_inspect_task_step b on b.task_id = a.id
where a.id = #{id}
</select>
-
+
<insert id="insertArdVideoInspectTask" parameterType="ArdVideoInspectTask">
insert into ard_video_inspect_task
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -82,7 +125,7 @@
<if test="userId != null">user_id,</if>
<if test="currentStepId != null">current_step_id,</if>
<if test="currentStepStartTime != null">current_step_start_time,</if>
- </trim>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="taskName != null">#{taskName},</if>
@@ -101,7 +144,7 @@
<if test="userId != null">#{userId},</if>
<if test="currentStepId != null">#{currentStepId},</if>
<if test="currentStepStartTime != null">#{currentStepStartTime},</if>
- </trim>
+ </trim>
</insert>
<update id="updateArdVideoInspectTask" parameterType="ArdVideoInspectTask">
@@ -121,8 +164,8 @@
<if test="channel != null">channel = #{channel},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="userId != null">user_id = #{userId},</if>
-<!-- <if test="currentStepId != null">current_step_id = #{currentStepId},</if>-->
-<!-- <if test="currentStepStartTime != null">current_step_start_time = #{currentStepStartTime},</if>-->
+ <!-- <if test="currentStepId != null">current_step_id = #{currentStepId},</if>-->
+ <!-- <if test="currentStepStartTime != null">current_step_start_time = #{currentStepStartTime},</if>-->
</trim>
where id = #{id}
</update>
@@ -149,38 +192,45 @@
where id = #{id}
</update>
<delete id="deleteArdVideoInspectTaskById" parameterType="String">
- delete from ard_video_inspect_task where id = #{id}
+ delete
+ from ard_video_inspect_task
+ where id = #{id}
</delete>
<delete id="deleteArdVideoInspectTaskByIds" parameterType="String">
- delete from ard_video_inspect_task where id in
+ delete from ard_video_inspect_task where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
-
+
<delete id="deleteArdVideoInspectTaskStepByTaskIds" parameterType="String">
- delete from ard_video_inspect_task_step where task_id in
+ delete from ard_video_inspect_task_step where task_id in
<foreach item="taskId" collection="array" open="(" separator="," close=")">
#{taskId}
</foreach>
</delete>
<delete id="deleteArdVideoInspectTaskStepByTaskId" parameterType="String">
- delete from ard_video_inspect_task_step where task_id = #{taskId}
+ delete
+ from ard_video_inspect_task_step
+ where task_id = #{taskId}
</delete>
<insert id="batchArdVideoInspectTaskStep">
- insert into ard_video_inspect_task_step( task_id, dept_id, user_id, order_number, recording_time, well_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- ( #{item.taskId}, #{item.deptId}, #{item.userId}, #{item.orderNumber}, #{item.recordingTime}, #{item.wellId})
+ insert into ard_video_inspect_task_step( task_id, dept_id, user_id, order_number, recording_time, well_id)
+ values
+ <foreach item="item" index="index" collection="list" separator=",">
+ ( #{item.taskId}, #{item.deptId}, #{item.userId}, #{item.orderNumber}, #{item.recordingTime},
+ #{item.wellId})
</foreach>
</insert>
<!--鏌ヨ浠诲姟涓浉鏈哄凡浣跨敤鏃舵-->
<select id="getTaskUsedCameraPeriods" parameterType="String" resultType="java.util.HashMap">
- select t.start_time,t.end_time from ard_video_inspect_task t
- where t.camera_id=#{cameraId}
+ select t.start_time, t.end_time
+ from ard_video_inspect_task t
+ where t.camera_id = #{cameraId}
ORDER BY t.start_time
</select>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-dev-druid.yml b/ruoyi-admin/src/main/resources/application-dev-druid.yml
index 351d50e..d702a9a 100644
--- a/ruoyi-admin/src/main/resources/application-dev-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-dev-druid.yml
@@ -6,7 +6,7 @@
# 涓诲簱鏁版嵁婧�
master:
driverClassName: org.postgresql.Driver
- url: jdbc:postgresql://192.168.1.14:5432/ry-vue?stringtype=unspecified
+ url: jdbc:postgresql://192.168.2.15:5432/ry-vue?stringtype=unspecified
username: postgres
password: postgres
# 浠庡簱鏁版嵁婧�
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 97be1dc..7ac2846 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -4,7 +4,7 @@
port: 8080
ssl:
# 寮�鍚疕TTPS锛屽苟閰嶇疆鑷鍚嶈瘉涔�
- enabled: true
+ enabled: false
#绉橀挜搴撴枃浠跺悕绉帮紝鍗充笂闈㈢敓鎴愮殑鑷鍚嶈瘉涔�
key-store: classpath:keystore
# 鐢熸垚绉橀挜搴撴枃浠剁殑瀵嗙爜
@@ -32,8 +32,8 @@
com.ruoyi.common.filter.MyI18nInterceptor: info
authorize: info
minio: info
- hikSdk: info
- dhSdk: info
+ hikSdk: debug
+ dhSdk: debug
sdk: info
vtdu: info
stealAlarm: info
@@ -47,6 +47,7 @@
uav: info
sy: info
mqttCar: info
+ msgListener: debug
## knife4j閰嶇疆
knife4j:
# knife4j澧炲己鍔熻兘,寮�鍚悗涓嬮潰鍙傛暟鎵嶇敓鏁�
@@ -67,13 +68,13 @@
path: D:/DATA
#娴佸獟浣撹浆鐮佹湇鍔″櫒
mediamtx:
- enabled: true
- host: 192.168.1.227
+ enabled: false
+ host: 192.168.1.27
#mqtt
#鍏ㄩ儴涓婚锛歮inioEvent,radar,stealelec,tube,camera,external,accessControl,apponekey,digitization3
mqtt:
host: tcp://192.168.2.15:1883
- clientId: Server
+ clientId: Server27
username: admin
password: admin
topic: minioEvent,radar,stealelec,tube,camera,external,accessControl,apponekey,digitization3,radarForceGuide
@@ -82,4 +83,9 @@
enabled: true
#涓変竴杞﹁締寮�鍏�
syCar:
- enabled: true
+ enabled: false
+ userId: admin
+ password: 654321
+#鏃犱汉鏈哄紑鍏�
+uav:
+ enabled: false
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 40d1e2b..35f7f5e 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -52,18 +52,18 @@
cmd: info
uav: info
sy: info
+ msgListener: debug
# minio閰嶇疆
minio:
- enabled: true
+ enabled: false
endpoint: http://192.168.1.14:9001
accessKey: admin
secretKey: xzx12345
path: G:/DATA
#娴佸獟浣撹浆鐮佹湇鍔″櫒
mediamtx:
- enabled: true
+ enabled: false
host: 192.168.1.14
- software_decoding: true
#mqtt
mqtt:
host: tcp://192.168.1.14:1883
@@ -76,9 +76,9 @@
enabled: true
#涓変竴杞﹁締寮�鍏�
syCar:
- enabled: true
+ enabled: false
userId: admin
password: 654321
#鏃犱汉鏈哄紑鍏�
uav:
- enabled: true
+ enabled: false
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index cad5d35..c8527c8 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -90,10 +90,10 @@
urlPatterns: /system/*,/monitor/*,/tool/*
#寮傛绾跨▼姹犻厤缃�
ThreadPoolTask:
- corePoolSize: 10
- maxPoolSize: 10
+ corePoolSize: 16
+ maxPoolSize: 32
keepAliveSeconds: 300
- queueCapacity: 500
+ queueCapacity: 50
# Spring閰嶇疆
spring:
# 璧勬簮淇℃伅
diff --git a/server/redis/dump.rdb b/server/redis/dump.rdb
index e051739..dd5be97 100644
--- a/server/redis/dump.rdb
+++ b/server/redis/dump.rdb
Binary files differ
--
Gitblit v1.9.3