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
ebb4c768
Commit
ebb4c768
authored
Aug 19, 2022
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加点位视频绑定,删除接口
parent
62591c56
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
78 additions
and
5 deletions
+78
-5
VideoOnEquipmentSpecificVo.java
...oin/equipmanage/common/vo/VideoOnEquipmentSpecificVo.java
+1
-1
EquipmentSpecificController.java
...n/equipmanage/controller/EquipmentSpecificController.java
+20
-0
IEquipmentSpecificSerivce.java
...eejoin/equipmanage/service/IEquipmentSpecificSerivce.java
+2
-1
EquipmentSpecificSerivceImpl.java
...quipmanage/service/impl/EquipmentSpecificSerivceImpl.java
+55
-3
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/VideoOnEquipmentSpecificVo.java
View file @
ebb4c768
...
...
@@ -19,7 +19,7 @@ public class VideoOnEquipmentSpecificVo {
/**
* 设备ID
*/
private
L
ist
<
Long
>
equipmentSpecificId
;
private
L
ong
equipmentSpecificId
;
/**
* 摄像头Id集合
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java
View file @
ebb4c768
...
...
@@ -347,6 +347,26 @@ public class EquipmentSpecificController extends AbstractBaseController {
return
CommonResponseUtil
.
success
(
equipmentSpecificSerivce
.
delVideoOnEquipmentSpecific
(
equipmentSpecificId
,
videoId
));
}
@RequestMapping
(
value
=
"/delVideoOnEquipment/jb"
,
method
=
RequestMethod
.
POST
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"摄像头解绑设备"
,
notes
=
"摄像头绑定设备"
)
public
ResponseModel
delVideoOnEquipmentjb
(
@RequestBody
List
<
String
>
ids
)
{
return
CommonResponseUtil
.
success
(
equipmentSpecificSerivce
.
delVideoOnEquipmentjb
(
ids
));
}
@RequestMapping
(
value
=
"/videoOnEquipmentSpecific/bj"
,
method
=
RequestMethod
.
POST
)
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@ApiOperation
(
httpMethod
=
"POST"
,
value
=
"摄像头绑定设备"
,
notes
=
"摄像头绑定设备"
)
public
ResponseModel
videoOnEquipmentSpecificbj
(
@RequestBody
Map
<
String
,
List
<
String
>>
date
)
{
return
CommonResponseUtil
.
success
(
equipmentSpecificSerivce
.
videoOnEquipmentSpecificbj
(
date
));
}
@TycloudOperation
(
ApiLevel
=
UserType
.
AGENCY
)
@GetMapping
(
value
=
"/{buildingId}/list"
)
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"查询指定建筑下的装备列表"
,
notes
=
"查询指定建筑下的装备列表"
)
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificSerivce.java
View file @
ebb4c768
...
...
@@ -219,7 +219,8 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
*/
Boolean
videoOnEquipmentSpecific
(
VideoOnEquipmentSpecificVo
videoOnEquipmentSpecificVo
);
Boolean
delVideoOnEquipmentSpecific
(
Long
equipmentSpecificId
,
Long
videoId
);
Boolean
delVideoOnEquipmentjb
(
List
<
String
>
ids
);
Boolean
videoOnEquipmentSpecificbj
(
Map
<
String
,
List
<
String
>>
date
);
/**
* 根据装备分类code获取装备列表
* @param code 装备分类逗号隔开
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java
View file @
ebb4c768
...
...
@@ -1712,10 +1712,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Override
public
Boolean
videoOnEquipmentSpecific
(
VideoOnEquipmentSpecificVo
videoOnEquipmentSpecificVo
)
{
L
ist
<
Long
>
equipmentSpecificIds
=
videoOnEquipmentSpecificVo
.
getEquipmentSpecificId
();
L
ong
equipmentSpecificId
=
videoOnEquipmentSpecificVo
.
getEquipmentSpecificId
();
List
<
Long
>
videoIdList
=
videoOnEquipmentSpecificVo
.
getVideoIdList
();
if
(
equipmentSpecificId
s
!=
null
)
{
for
(
Long
equipmentSpecificId
:
equipmentSpecificIds
)
{
if
(
equipmentSpecificId
!=
null
)
{
EquipmentSpecific
equipmentSpecific
=
this
.
baseMapper
.
selectById
(
equipmentSpecificId
);
if
(!
ObjectUtils
.
isEmpty
(
equipmentSpecific
))
{
QueryWrapper
<
VideoEquipmentSpecific
>
queryWrapper
=
new
QueryWrapper
<>();
...
...
@@ -1737,6 +1737,46 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
}
else
{
throw
new
RuntimeException
(
"未获取到此设备!"
);
}
}
else
{
throw
new
RuntimeException
(
"设备ID为空!"
);
}
}
@Override
public
Boolean
videoOnEquipmentSpecificbj
(
Map
<
String
,
List
<
String
>>
date
)
{
List
<
String
>
equipmentSpecificIds
=
date
.
get
(
"eqid"
);
List
<
String
>
videoIdList
=
date
.
get
(
"videoid"
);
if
(
equipmentSpecificIds
!=
null
)
{
for
(
String
equipmentSpecificId
:
equipmentSpecificIds
)
{
EquipmentSpecific
equipmentSpecific
=
this
.
baseMapper
.
selectById
(
equipmentSpecificId
);
if
(!
ObjectUtils
.
isEmpty
(
equipmentSpecific
))
{
QueryWrapper
<
VideoEquipmentSpecific
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
eq
(
"equipment_specific_id"
,
equipmentSpecificId
);
List
<
VideoEquipmentSpecific
>
list
=
videoEquipmentSpecificService
.
getBaseMapper
().
selectList
(
queryWrapper
);
if
(
list
!=
null
&&
list
.
size
()>
0
){
for
(
VideoEquipmentSpecific
videoEquipmentSpecific
:
list
)
{
if
(
videoIdList
.
contains
(
String
.
valueOf
(
videoEquipmentSpecific
.
getVideoId
()))){
videoIdList
.
remove
(
String
.
valueOf
(
videoEquipmentSpecific
.
getVideoId
()));
}
}
}
List
<
VideoEquipmentSpecific
>
videoSpecificList1
=
new
ArrayList
<>();
videoIdList
.
parallelStream
().
forEach
(
x
->
{
VideoEquipmentSpecific
videoEquipmentSpecific
=
new
VideoEquipmentSpecific
();
videoEquipmentSpecific
.
setVideoId
(
Long
.
valueOf
(
x
));
videoEquipmentSpecific
.
setEquipmentSpecificId
(
Long
.
valueOf
(
equipmentSpecificId
));
videoSpecificList1
.
add
(
videoEquipmentSpecific
);
});
videoEquipmentSpecificService
.
saveBatch
(
videoSpecificList1
);
return
Boolean
.
TRUE
;
}
else
{
throw
new
RuntimeException
(
"未获取到此设备!"
);
}
}
}
else
{
throw
new
RuntimeException
(
"设备ID为空!"
);
...
...
@@ -1744,6 +1784,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
return
Boolean
.
TRUE
;
}
@Override
public
Boolean
delVideoOnEquipmentSpecific
(
Long
equipmentSpecificId
,
Long
videoId
)
{
QueryWrapper
<
VideoEquipmentSpecific
>
queryWrapper
=
new
QueryWrapper
<>();
...
...
@@ -1753,6 +1796,15 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
return
true
;
}
@Override
public
Boolean
delVideoOnEquipmentjb
(
List
<
String
>
ids
)
{
QueryWrapper
<
VideoEquipmentSpecific
>
queryWrapper
=
new
QueryWrapper
<>();
queryWrapper
.
in
(
"equipment_specific_id"
,
ids
);
videoEquipmentSpecificService
.
remove
(
queryWrapper
);
return
true
;
}
private
Boolean
bingEquipmentRelationshipToVideo
(
List
<
Long
>
videoIdList
,
Long
equipmentSpecificId
)
{
List
<
VideoEquipmentSpecific
>
videoSpecificList
=
new
ArrayList
<>();
videoIdList
.
parallelStream
().
forEach
(
x
->
{
...
...
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