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
9bd8fb8c
Commit
9bd8fb8c
authored
May 13, 2022
by
lisong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改查询监控视频接收参数格式
parent
015f0ce2
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
10 deletions
+10
-10
BuildingVideoController.java
...ejoin/equipmanage/controller/BuildingVideoController.java
+3
-3
VideoMapper.java
...main/java/com/yeejoin/equipmanage/mapper/VideoMapper.java
+1
-1
IBuilldService.java
.../java/com/yeejoin/equipmanage/service/IBuilldService.java
+1
-1
IVideoService.java
...n/java/com/yeejoin/equipmanage/service/IVideoService.java
+1
-1
BuildingServiceImpl.java
...yeejoin/equipmanage/service/impl/BuildingServiceImpl.java
+2
-2
VideoServiceImpl.java
...om/yeejoin/equipmanage/service/impl/VideoServiceImpl.java
+2
-2
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BuildingVideoController.java
View file @
9bd8fb8c
...
@@ -47,9 +47,9 @@ public class BuildingVideoController extends AbstractBaseController {
...
@@ -47,9 +47,9 @@ public class BuildingVideoController extends AbstractBaseController {
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
"消防建筑视屏监控分页列表"
)
@ApiOperation
(
"消防建筑视屏监控分页列表"
)
@
Pos
tMapping
(
value
=
"/page"
)
@
Ge
tMapping
(
value
=
"/page"
)
public
Page
<
BuildingVideoVO
>
buildingList
(
@RequestParam
(
required
=
false
)
Page
page
,
@RequestParam
(
required
=
false
)
BuildingVideoListVO
dto
,
@RequestParam
(
required
=
false
)
List
<
String
>
ids
)
{
public
Page
<
BuildingVideoVO
>
buildingList
(
Page
page
,
BuildingVideoListVO
dto
)
{
return
buildService
.
buildingVideoList
(
page
,
dto
,
ids
);
return
buildService
.
buildingVideoList
(
page
,
dto
);
}
}
@GetMapping
(
value
=
"/fire/equip"
)
@GetMapping
(
value
=
"/fire/equip"
)
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/VideoMapper.java
View file @
9bd8fb8c
...
@@ -21,7 +21,7 @@ import java.util.Map;
...
@@ -21,7 +21,7 @@ import java.util.Map;
public
interface
VideoMapper
extends
BaseMapper
<
Video
>
{
public
interface
VideoMapper
extends
BaseMapper
<
Video
>
{
Page
<
PageVideoVO
>
pageVideo
(
@Param
(
"page"
)
IPage
<
Video
>
page
,
@Param
(
"video"
)
Video
video
);
Page
<
PageVideoVO
>
pageVideo
(
@Param
(
"page"
)
IPage
<
Video
>
page
,
@Param
(
"video"
)
Video
video
);
Page
<
BuildingVideoVO
>
pageBuildingVideo
(
@Param
(
"page"
)
Page
page
,
@Param
(
"dto"
)
BuildingVideoListVO
dto
,
@Param
(
"ids"
)
List
<
String
>
ids
);
Page
<
BuildingVideoVO
>
pageBuildingVideo
(
@Param
(
"page"
)
Page
page
,
@Param
(
"dto"
)
BuildingVideoListVO
dto
);
/**
/**
* 视屏监控绑定的消防设备查询
* 视屏监控绑定的消防设备查询
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IBuilldService.java
View file @
9bd8fb8c
...
@@ -207,7 +207,7 @@ public interface IBuilldService extends IService<Building> {
...
@@ -207,7 +207,7 @@ public interface IBuilldService extends IService<Building> {
* @param dto
* @param dto
* @return
* @return
*/
*/
Page
<
BuildingVideoVO
>
buildingVideoList
(
Page
page
,
BuildingVideoListVO
dto
,
List
<
String
>
ids
);
Page
<
BuildingVideoVO
>
buildingVideoList
(
Page
page
,
BuildingVideoListVO
dto
);
/**
/**
* 通过监控视频 查看 绑定的 消防设备
* 通过监控视频 查看 绑定的 消防设备
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IVideoService.java
View file @
9bd8fb8c
...
@@ -27,7 +27,7 @@ public interface IVideoService extends IService<Video> {
...
@@ -27,7 +27,7 @@ public interface IVideoService extends IService<Video> {
VideoSaveDto
detail
(
Long
id
);
VideoSaveDto
detail
(
Long
id
);
Page
<
BuildingVideoVO
>
pageBuildingVideo
(
Page
page
,
BuildingVideoListVO
dto
,
List
<
String
>
ids
);
Page
<
BuildingVideoVO
>
pageBuildingVideo
(
Page
page
,
BuildingVideoListVO
dto
);
/**
/**
* 视屏监控绑定的消防设备查询
* 视屏监控绑定的消防设备查询
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java
View file @
9bd8fb8c
...
@@ -867,8 +867,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
...
@@ -867,8 +867,8 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
}
}
@Override
@Override
public
Page
<
BuildingVideoVO
>
buildingVideoList
(
Page
page
,
BuildingVideoListVO
dto
,
List
<
String
>
ids
)
{
public
Page
<
BuildingVideoVO
>
buildingVideoList
(
Page
page
,
BuildingVideoListVO
dto
)
{
Page
<
BuildingVideoVO
>
pages
=
videoService
.
pageBuildingVideo
(
page
,
dto
,
ids
);
Page
<
BuildingVideoVO
>
pages
=
videoService
.
pageBuildingVideo
(
page
,
dto
);
pages
.
getRecords
().
forEach
(
x
->
{
pages
.
getRecords
().
forEach
(
x
->
{
if
(
StringUtil
.
isNotEmpty
(
x
.
getLocation
())
&&
StringUtil
.
isNotEmpty
(
x
.
getAddress
()))
{
if
(
StringUtil
.
isNotEmpty
(
x
.
getLocation
())
&&
StringUtil
.
isNotEmpty
(
x
.
getAddress
()))
{
x
.
setLocation
(
x
.
getLocation
()
+
'-'
+
x
.
getAddress
());
x
.
setLocation
(
x
.
getLocation
()
+
'-'
+
x
.
getAddress
());
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoServiceImpl.java
View file @
9bd8fb8c
...
@@ -252,8 +252,8 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
...
@@ -252,8 +252,8 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
}
}
@Override
@Override
public
Page
<
BuildingVideoVO
>
pageBuildingVideo
(
Page
page
,
BuildingVideoListVO
dto
,
List
<
String
>
ids
)
{
public
Page
<
BuildingVideoVO
>
pageBuildingVideo
(
Page
page
,
BuildingVideoListVO
dto
)
{
return
this
.
baseMapper
.
pageBuildingVideo
(
page
,
dto
,
ids
);
return
this
.
baseMapper
.
pageBuildingVideo
(
page
,
dto
);
}
}
@Override
@Override
...
...
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