Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
5bf11b28
Commit
5bf11b28
authored
Feb 08, 2022
by
maoying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加视频返回类型
parent
4846056a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
0 deletions
+12
-0
VideoVO.java
...ava/com/yeejoin/equipmanage/common/entity/vo/VideoVO.java
+4
-0
EquipmentSpecificAlarmServiceImpl.java
...anage/service/impl/EquipmentSpecificAlarmServiceImpl.java
+4
-0
EquipmentSpecificSerivceImpl.java
...quipmanage/service/impl/EquipmentSpecificSerivceImpl.java
+4
-0
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/VideoVO.java
View file @
5bf11b28
package
com
.
yeejoin
.
equipmanage
.
common
.
entity
.
vo
;
package
com
.
yeejoin
.
equipmanage
.
common
.
entity
.
vo
;
import
org.springframework.beans.factory.annotation.Value
;
import
lombok.Data
;
import
lombok.Data
;
/**
/**
...
@@ -23,4 +25,6 @@ public class VideoVO {
...
@@ -23,4 +25,6 @@ public class VideoVO {
private
String
code
;
private
String
code
;
private
String
presetPosition
;
private
String
presetPosition
;
private
String
vedioFormat
;
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java
View file @
5bf11b28
...
@@ -90,6 +90,9 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
...
@@ -90,6 +90,9 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
@Autowired
@Autowired
private
IVideoService
videoService
;
private
IVideoService
videoService
;
@Value
(
"${window.vedioFormat}"
)
String
vedioFormat
;
@Override
@Override
public
void
handleExport
(
HttpServletResponse
response
,
List
<
Long
>
ids
,
String
alarmType
)
{
public
void
handleExport
(
HttpServletResponse
response
,
List
<
Long
>
ids
,
String
alarmType
)
{
...
@@ -267,6 +270,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
...
@@ -267,6 +270,7 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
video
.
setName
(
x
.
getName
());
video
.
setName
(
x
.
getName
());
video
.
setTokens
(
x
.
getToken
());
video
.
setTokens
(
x
.
getToken
());
video
.
setUrl
(
x
.
getUrl
());
video
.
setUrl
(
x
.
getUrl
());
video
.
setVedioFormat
(
vedioFormat
);
video
.
setUrl
(
videoService
.
getVideoUrl
(
x
.
getName
(),
x
.
getPresetPosition
(),
x
.
getUrl
(),
x
.
getCode
()));
video
.
setUrl
(
videoService
.
getVideoUrl
(
x
.
getName
(),
x
.
getPresetPosition
(),
x
.
getUrl
(),
x
.
getCode
()));
video
.
setIp
(
x
.
getIp
());
video
.
setIp
(
x
.
getIp
());
video
.
setPort
(
x
.
getPort
());
video
.
setPort
(
x
.
getPort
());
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @
5bf11b28
...
@@ -137,6 +137,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
...
@@ -137,6 +137,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Value
(
"${systemctl.sync.switch}"
)
@Value
(
"${systemctl.sync.switch}"
)
private
Boolean
syncSwitch
;
private
Boolean
syncSwitch
;
@Value
(
"${window.vedioFormat}"
)
String
vedioFormat
;
private
final
String
injection
=
"{\n"
+
private
final
String
injection
=
"{\n"
+
...
@@ -993,6 +996,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
...
@@ -993,6 +996,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
if
(!
ObjectUtils
.
isEmpty
(
video
))
{
if
(!
ObjectUtils
.
isEmpty
(
video
))
{
video
.
setUrl
(
videoService
.
getVideoUrl
(
video
.
getName
().
toString
(),
video
.
getPresetPosition
(),
video
.
getUrl
(),
video
.
getCode
()));
video
.
setUrl
(
videoService
.
getVideoUrl
(
video
.
getName
().
toString
(),
video
.
getPresetPosition
(),
video
.
getUrl
(),
video
.
getCode
()));
video
.
setId
(
id
);
video
.
setId
(
id
);
video
.
setVedioFormat
(
vedioFormat
);
}
}
return
video
;
return
video
;
}
else
{
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment