Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
db8c08c9
authored
Sep 08, 2023
by
lzy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
区域设置
parent
72b10a61
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
212 additions
and
15 deletions
db/space.sql
server-module/src/main/java/com/makeit/module/controller/space/PlatRegionSettingController.java
server-service/src/main/java/com/makeit/dto/platform/space/PlatRegionSettingDTO.java
server-service/src/main/java/com/makeit/dto/platform/space/PlatRegionSettingQueryDTO.java
server-service/src/main/java/com/makeit/dto/platform/space/PlatRoomBindDeviceDTO.java
server-service/src/main/java/com/makeit/entity/platform/space/PlatRegionSetting.java
server-service/src/main/java/com/makeit/entity/platform/space/PlatRoomBedDevice.java
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/space/PlatRegionSettingService.java
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRegionSettingServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomBedDeviceServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomServiceImpl.java
db/space.sql
View file @
db8c08c9
...
@@ -64,7 +64,7 @@ CREATE TABLE `plat_bed`
...
@@ -64,7 +64,7 @@ CREATE TABLE `plat_bed`
`name`
varchar
(
128
)
NOT
NULL
COMMENT
'床位名称 床位1,床位2'
,
`name`
varchar
(
128
)
NOT
NULL
COMMENT
'床位名称 床位1,床位2'
,
`room_id`
varchar
(
64
)
NOT
NULL
COMMENT
'房间id'
,
`room_id`
varchar
(
64
)
NOT
NULL
COMMENT
'房间id'
,
`bed_id`
varchar
(
64
)
NOT
NULL
COMMENT
'空间id'
,
`bed_id`
varchar
(
64
)
NOT
NULL
COMMENT
'空间id'
,
`
equipment
_id`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'设备id'
,
`
device
_id`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'设备id'
,
`create_by`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'创建者'
,
`create_by`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'创建者'
,
`create_date`
datetime
DEFAULT
NULL
COMMENT
'创建时间'
,
`create_date`
datetime
DEFAULT
NULL
COMMENT
'创建时间'
,
`update_by`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'更新者'
,
`update_by`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'更新者'
,
...
@@ -87,7 +87,7 @@ CREATE TABLE `plat_region_setting`
...
@@ -87,7 +87,7 @@ CREATE TABLE `plat_region_setting`
`region_range`
varchar
(
128
)
DEFAULT
NULL
COMMENT
'区域定位'
,
`region_range`
varchar
(
128
)
DEFAULT
NULL
COMMENT
'区域定位'
,
`room_range`
varchar
(
128
)
DEFAULT
NULL
COMMENT
'房间门定位'
,
`room_range`
varchar
(
128
)
DEFAULT
NULL
COMMENT
'房间门定位'
,
`equipment_range`
varchar
(
128
)
DEFAULT
NULL
COMMENT
'设备定位'
,
`equipment_range`
varchar
(
128
)
DEFAULT
NULL
COMMENT
'设备定位'
,
`
equipment
_id`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'设备Id'
,
`
device
_id`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'设备Id'
,
`create_by`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'创建者'
,
`create_by`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'创建者'
,
`create_date`
datetime
DEFAULT
NULL
COMMENT
'创建时间'
,
`create_date`
datetime
DEFAULT
NULL
COMMENT
'创建时间'
,
`update_by`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'更新者'
,
`update_by`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'更新者'
,
...
...
server-module/src/main/java/com/makeit/module/controller/space/PlatRegionSettingController.java
0 → 100644
View file @
db8c08c9
package
com
.
makeit
.
module
.
controller
.
space
;
import
com.makeit.common.response.ApiResponseEntity
;
import
com.makeit.common.response.ApiResponseUtils
;
import
com.makeit.dto.platform.space.PlatRegionSettingDTO
;
import
com.makeit.dto.platform.space.PlatRegionSettingQueryDTO
;
import
com.makeit.service.platform.space.PlatRegionSettingService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
/**
* @Author:lzy
* @Date:2023/9/8 16:03
* @Describe:
*/
@Api
(
tags
=
"区域设置"
)
@RestController
@RequestMapping
(
"/plat/region/setting"
)
public
class
PlatRegionSettingController
{
@Autowired
private
PlatRegionSettingService
platRegionSettingService
;
@ApiOperation
(
"列表"
)
@PostMapping
(
"list"
)
public
ApiResponseEntity
<
List
<
PlatRegionSettingDTO
>>
list
(
@RequestBody
PlatRegionSettingQueryDTO
dto
)
{
List
<
PlatRegionSettingDTO
>
data
=
platRegionSettingService
.
list
(
dto
);
return
ApiResponseUtils
.
success
(
data
);
}
@ApiOperation
(
"编辑"
)
@PostMapping
(
"edit"
)
public
ApiResponseEntity
<?>
edit
(
@RequestBody
PlatRegionSettingDTO
dto
)
{
platRegionSettingService
.
edit
(
dto
);
return
ApiResponseUtils
.
success
();
}
}
server-service/src/main/java/com/makeit/dto/platform/space/PlatRegionSettingDTO.java
View file @
db8c08c9
...
@@ -30,8 +30,11 @@ public class PlatRegionSettingDTO extends BaseIdDTO {
...
@@ -30,8 +30,11 @@ public class PlatRegionSettingDTO extends BaseIdDTO {
private
String
roomRange
;
private
String
roomRange
;
@ApiModelProperty
(
"设备ID"
)
@ApiModelProperty
(
"设备ID"
)
private
String
equipment
Id
;
private
String
device
Id
;
@ApiModelProperty
(
"房间ID"
)
@ApiModelProperty
(
"房间ID"
)
private
String
roomId
;
private
String
roomId
;
@ApiModelProperty
(
"设备名称"
)
private
String
deviceName
;
}
}
server-service/src/main/java/com/makeit/dto/platform/space/PlatRegionSettingQueryDTO.java
0 → 100644
View file @
db8c08c9
package
com
.
makeit
.
dto
.
platform
.
space
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
/**
* @Author:lzy
* @Date:2023/9/8 15:16
* @Describe:
*/
@Data
@ApiModel
(
"PlatRegionSettingQueryDTO"
)
public
class
PlatRegionSettingQueryDTO
{
@ApiModelProperty
(
"房间ID"
)
private
String
roomId
;
}
server-service/src/main/java/com/makeit/dto/platform/space/PlatRoomBindDeviceDTO.java
View file @
db8c08c9
...
@@ -19,7 +19,7 @@ public class PlatRoomBindDeviceDTO {
...
@@ -19,7 +19,7 @@ public class PlatRoomBindDeviceDTO {
private
String
roomId
;
private
String
roomId
;
@ApiModelProperty
(
value
=
"设备Id"
,
required
=
true
)
@ApiModelProperty
(
value
=
"设备Id"
,
required
=
true
)
private
List
<
String
>
list
Equipment
Id
;
private
List
<
String
>
list
Device
Id
;
@ApiModelProperty
(
value
=
"床位Id"
)
@ApiModelProperty
(
value
=
"床位Id"
)
private
String
bedId
;
private
String
bedId
;
...
...
server-service/src/main/java/com/makeit/entity/platform/space/PlatRegionSetting.java
View file @
db8c08c9
...
@@ -38,7 +38,7 @@ public class PlatRegionSetting extends BaseBusEntity {
...
@@ -38,7 +38,7 @@ public class PlatRegionSetting extends BaseBusEntity {
private
String
roomRange
;
private
String
roomRange
;
@ApiModelProperty
(
"设备ID"
)
@ApiModelProperty
(
"设备ID"
)
private
String
equipment
Id
;
private
String
device
Id
;
@ApiModelProperty
(
"房间ID"
)
@ApiModelProperty
(
"房间ID"
)
private
String
roomId
;
private
String
roomId
;
...
...
server-service/src/main/java/com/makeit/entity/platform/space/PlatRoomBedDevice.java
View file @
db8c08c9
...
@@ -22,7 +22,7 @@ public class PlatRoomBedDevice extends BaseBusEntity {
...
@@ -22,7 +22,7 @@ public class PlatRoomBedDevice extends BaseBusEntity {
private
String
roomId
;
private
String
roomId
;
@ApiModelProperty
(
value
=
"设备Id"
,
required
=
true
)
@ApiModelProperty
(
value
=
"设备Id"
,
required
=
true
)
private
String
equipment
Id
;
private
String
device
Id
;
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@TableField
(
updateStrategy
=
FieldStrategy
.
IGNORED
)
@ApiModelProperty
(
value
=
"床位Id"
)
@ApiModelProperty
(
value
=
"床位Id"
)
...
...
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
View file @
db8c08c9
...
@@ -125,7 +125,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
...
@@ -125,7 +125,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
String
deviceId
=
platAlarmRecord
.
getDeviceId
();
String
deviceId
=
platAlarmRecord
.
getDeviceId
();
LambdaQueryWrapper
<
PlatRoomBedDevice
>
roomBedDeviceLambdaQueryWrapper
=
new
LambdaQueryWrapper
<
PlatRoomBedDevice
>()
LambdaQueryWrapper
<
PlatRoomBedDevice
>
roomBedDeviceLambdaQueryWrapper
=
new
LambdaQueryWrapper
<
PlatRoomBedDevice
>()
.
eq
(
PlatRoomBedDevice:
:
get
Equipment
Id
,
deviceId
).
orderByDesc
(
BaseEntity:
:
getUpdateDate
);
.
eq
(
PlatRoomBedDevice:
:
get
Device
Id
,
deviceId
).
orderByDesc
(
BaseEntity:
:
getUpdateDate
);
PlatRoomBedDevice
platRoomBedDevice
=
platRoomBedDeviceService
.
getOne
(
roomBedDeviceLambdaQueryWrapper
,
false
);
PlatRoomBedDevice
platRoomBedDevice
=
platRoomBedDeviceService
.
getOne
(
roomBedDeviceLambdaQueryWrapper
,
false
);
//绑定房间的设备要通知 全部长者的家属
//绑定房间的设备要通知 全部长者的家属
...
...
server-service/src/main/java/com/makeit/service/platform/space/PlatRegionSettingService.java
View file @
db8c08c9
package
com
.
makeit
.
service
.
platform
.
space
;
package
com
.
makeit
.
service
.
platform
.
space
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.makeit.dto.platform.space.PlatRegionSettingDTO
;
import
com.makeit.dto.platform.space.PlatRegionSettingQueryDTO
;
import
com.makeit.entity.platform.space.PlatRegionSetting
;
import
com.makeit.entity.platform.space.PlatRegionSetting
;
import
java.util.List
;
/**
/**
* @Author:lzy
* @Author:lzy
* @Date:2023/8/31 16:13
* @Date:2023/8/31 16:13
* @Describe:
* @Describe:
*/
*/
public
interface
PlatRegionSettingService
extends
IService
<
PlatRegionSetting
>
{
public
interface
PlatRegionSettingService
extends
IService
<
PlatRegionSetting
>
{
/**
*
* @param roomId
* @param listDeviceId
*/
void
add
(
String
roomId
,
List
<
String
>
listDeviceId
);
/**
* 设备解绑时删除
* @param roomId
* @param deviceId
*/
void
del
(
String
roomId
,
String
deviceId
);
/**
*
* @param dto
* @return
*/
List
<
PlatRegionSettingDTO
>
list
(
PlatRegionSettingQueryDTO
dto
);
/**
* 编辑
* @param dto
*/
void
edit
(
PlatRegionSettingDTO
dto
);
}
}
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRegionSettingServiceImpl.java
View file @
db8c08c9
package
com
.
makeit
.
service
.
platform
.
space
.
impl
;
package
com
.
makeit
.
service
.
platform
.
space
.
impl
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.makeit.dto.platform.space.PlatRegionSettingDTO
;
import
com.makeit.dto.platform.space.PlatRegionSettingQueryDTO
;
import
com.makeit.entity.platform.device.PlatDevice
;
import
com.makeit.entity.platform.space.PlatRegionSetting
;
import
com.makeit.entity.platform.space.PlatRegionSetting
;
import
com.makeit.enums.platform.device.PlatDeviceEnum
;
import
com.makeit.mapper.platform.space.PlatRegionSettingMapper
;
import
com.makeit.mapper.platform.space.PlatRegionSettingMapper
;
import
com.makeit.service.platform.device.PlatDeviceService
;
import
com.makeit.service.platform.space.PlatRegionSettingService
;
import
com.makeit.service.platform.space.PlatRegionSettingService
;
import
com.makeit.utils.data.convert.BeanDtoVoUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
/**
* @Author:lzy
* @Author:lzy
...
@@ -13,4 +27,82 @@ import org.springframework.stereotype.Service;
...
@@ -13,4 +27,82 @@ import org.springframework.stereotype.Service;
*/
*/
@Service
@Service
public
class
PlatRegionSettingServiceImpl
extends
ServiceImpl
<
PlatRegionSettingMapper
,
PlatRegionSetting
>
implements
PlatRegionSettingService
{
public
class
PlatRegionSettingServiceImpl
extends
ServiceImpl
<
PlatRegionSettingMapper
,
PlatRegionSetting
>
implements
PlatRegionSettingService
{
@Autowired
private
PlatDeviceService
platDeviceService
;
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
add
(
String
roomId
,
List
<
String
>
listDeviceId
)
{
if
(!
listDeviceId
.
isEmpty
()){
LambdaQueryWrapper
<
PlatDevice
>
queryWrapper1
=
new
LambdaQueryWrapper
<>();
queryWrapper1
.
in
(
PlatDevice:
:
getId
,
listDeviceId
);
queryWrapper1
.
select
(
PlatDevice:
:
getId
);
queryWrapper1
.
ne
(
PlatDevice:
:
getCategory
,
PlatDeviceEnum
.
CategoryEnum
.
HEART
);
List
<
PlatDevice
>
devices
=
platDeviceService
.
list
(
queryWrapper1
);
listDeviceId
=
devices
.
stream
().
map
(
item
->
item
.
getId
()).
collect
(
Collectors
.
toList
());
List
<
PlatRegionSetting
>
list
=
new
ArrayList
<>();
listDeviceId
.
forEach
(
item
->{
PlatRegionSetting
platRegionSetting
=
new
PlatRegionSetting
();
platRegionSetting
.
setDeviceId
(
item
);
platRegionSetting
.
setRoomId
(
roomId
);
list
.
add
(
platRegionSetting
);
});
if
(!
list
.
isEmpty
()){
saveBatch
(
list
);
}
}
}
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
del
(
String
roomId
,
String
deviceId
)
{
LambdaQueryWrapper
<
PlatRegionSetting
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
queryWrapper
.
eq
(
PlatRegionSetting:
:
getRoomId
,
roomId
);
queryWrapper
.
eq
(
PlatRegionSetting:
:
getDeviceId
,
deviceId
);
remove
(
queryWrapper
);
}
@Override
public
List
<
PlatRegionSettingDTO
>
list
(
PlatRegionSettingQueryDTO
dto
)
{
LambdaQueryWrapper
<
PlatRegionSetting
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
queryWrapper
.
eq
(
PlatRegionSetting:
:
getRoomId
,
dto
.
getRoomId
());
List
<
PlatRegionSetting
>
list
=
list
(
queryWrapper
);
List
<
PlatRegionSettingDTO
>
data
=
BeanDtoVoUtils
.
listVo
(
list
,
PlatRegionSettingDTO
.
class
);
if
(!
list
.
isEmpty
()){
List
<
String
>
listDeviceIds
=
data
.
stream
().
map
(
item
->
item
.
getDeviceId
()).
collect
(
Collectors
.
toList
());
LambdaQueryWrapper
<
PlatDevice
>
queryWrapper1
=
new
LambdaQueryWrapper
<>();
queryWrapper1
.
in
(
PlatDevice:
:
getId
,
listDeviceIds
);
queryWrapper1
.
select
(
PlatDevice:
:
getId
,
PlatDevice:
:
getName
);
List
<
PlatDevice
>
devices
=
platDeviceService
.
list
(
queryWrapper1
);
Map
<
String
,
String
>
map
=
devices
.
stream
().
collect
(
Collectors
.
toMap
(
PlatDevice:
:
getId
,
PlatDevice:
:
getName
,(
k1
,
k2
)->
k1
));
data
.
forEach
(
item
->{
item
.
setDeviceName
(
map
.
get
(
item
.
getDeviceId
()));
});
}
return
data
;
}
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
edit
(
PlatRegionSettingDTO
dto
)
{
PlatRegionSetting
platRegionSetting
=
getById
(
dto
.
getId
());
platRegionSetting
.
setInstallType
(
dto
.
getInstallType
());
platRegionSetting
.
setToward
(
dto
.
getToward
());
platRegionSetting
.
setRegionName
(
dto
.
getRegionName
());
platRegionSetting
.
setRegionRange
(
dto
.
getRegionRange
());
platRegionSetting
.
setDeviceId
(
dto
.
getDeviceId
());
platRegionSetting
.
setRoomId
(
dto
.
getRoomId
());
updateById
(
platRegionSetting
);
}
}
}
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomBedDeviceServiceImpl.java
View file @
db8c08c9
...
@@ -18,6 +18,7 @@ import com.makeit.enums.platform.device.PlatDeviceEnum;
...
@@ -18,6 +18,7 @@ import com.makeit.enums.platform.device.PlatDeviceEnum;
import
com.makeit.mapper.platform.space.PlatRoomBedDeviceMapper
;
import
com.makeit.mapper.platform.space.PlatRoomBedDeviceMapper
;
import
com.makeit.service.platform.device.PlatDeviceService
;
import
com.makeit.service.platform.device.PlatDeviceService
;
import
com.makeit.service.platform.space.PlatBedService
;
import
com.makeit.service.platform.space.PlatBedService
;
import
com.makeit.service.platform.space.PlatRegionSettingService
;
import
com.makeit.service.platform.space.PlatRoomBedDeviceService
;
import
com.makeit.service.platform.space.PlatRoomBedDeviceService
;
import
com.makeit.utils.data.convert.BeanDtoVoUtils
;
import
com.makeit.utils.data.convert.BeanDtoVoUtils
;
import
com.makeit.utils.data.convert.PageUtil
;
import
com.makeit.utils.data.convert.PageUtil
;
...
@@ -45,24 +46,29 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
...
@@ -45,24 +46,29 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
@Autowired
@Autowired
private
PlatBedService
platBedService
;
private
PlatBedService
platBedService
;
@Autowired
private
PlatRegionSettingService
platRegionSettingService
;
@Override
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
bindingDevice
(
PlatRoomBindDeviceDTO
dto
)
{
public
void
bindingDevice
(
PlatRoomBindDeviceDTO
dto
)
{
List
<
String
>
listEquipmentIds
=
dto
.
getList
Equipment
Id
();
List
<
String
>
listEquipmentIds
=
dto
.
getList
Device
Id
();
List
<
PlatRoomBedDevice
>
list
=
new
ArrayList
<>();
List
<
PlatRoomBedDevice
>
list
=
new
ArrayList
<>();
listEquipmentIds
.
forEach
(
item
->{
listEquipmentIds
.
forEach
(
item
->{
PlatRoomBedDevice
data
=
new
PlatRoomBedDevice
();
PlatRoomBedDevice
data
=
new
PlatRoomBedDevice
();
data
.
set
Equipment
Id
(
item
);
data
.
set
Device
Id
(
item
);
data
.
setRoomId
(
dto
.
getRoomId
());
data
.
setRoomId
(
dto
.
getRoomId
());
data
.
setBedId
(
dto
.
getBedId
());
data
.
setBedId
(
dto
.
getBedId
());
list
.
add
(
data
);
list
.
add
(
data
);
});
});
if
(!
list
.
isEmpty
()){
if
(!
list
.
isEmpty
()){
saveBatch
(
list
);
saveBatch
(
list
);
//区域设备
platRegionSettingService
.
add
(
dto
.
getRoomId
(),
dto
.
getListDeviceId
());
}
}
}
}
...
@@ -72,7 +78,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
...
@@ -72,7 +78,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
PlatSpaceDeviceQueryDTO
dto
=
pageReqDTO
.
getData
();
PlatSpaceDeviceQueryDTO
dto
=
pageReqDTO
.
getData
();
LambdaQueryWrapper
<
PlatRoomBedDevice
>
queryWrapper1
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
PlatRoomBedDevice
>
queryWrapper1
=
new
LambdaQueryWrapper
<>();
queryWrapper1
.
select
(
PlatRoomBedDevice:
:
get
Equipment
Id
);
queryWrapper1
.
select
(
PlatRoomBedDevice:
:
get
Device
Id
);
if
(
StringUtil
.
isNotEmpty
(
dto
.
getRoomId
())){
if
(
StringUtil
.
isNotEmpty
(
dto
.
getRoomId
())){
queryWrapper1
.
ne
(
PlatRoomBedDevice:
:
getRoomId
,
dto
.
getRoomId
());
queryWrapper1
.
ne
(
PlatRoomBedDevice:
:
getRoomId
,
dto
.
getRoomId
());
}
}
...
@@ -80,7 +86,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
...
@@ -80,7 +86,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
queryWrapper1
.
isNull
(
PlatRoomBedDevice:
:
getBedId
);
queryWrapper1
.
isNull
(
PlatRoomBedDevice:
:
getBedId
);
}
}
List
<
PlatRoomBedDevice
>
list
=
list
(
queryWrapper1
);
List
<
PlatRoomBedDevice
>
list
=
list
(
queryWrapper1
);
List
<
String
>
listEquipmentIds
=
list
.
stream
().
map
(
item
->
item
.
get
Equipment
Id
()).
collect
(
Collectors
.
toList
());
List
<
String
>
listEquipmentIds
=
list
.
stream
().
map
(
item
->
item
.
get
Device
Id
()).
collect
(
Collectors
.
toList
());
Page
<
PlatDevice
>
p
=
PageUtil
.
toMpPage
(
pageReqDTO
);
Page
<
PlatDevice
>
p
=
PageUtil
.
toMpPage
(
pageReqDTO
);
...
@@ -104,7 +110,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
...
@@ -104,7 +110,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
queryWrapper1
.
eq
(
PlatRoomBedDevice:
:
getRoomId
,
dto
.
getRoomId
());
queryWrapper1
.
eq
(
PlatRoomBedDevice:
:
getRoomId
,
dto
.
getRoomId
());
queryWrapper1
.
eq
(
StringUtil
.
isNotEmpty
(
dto
.
getBedId
()),
PlatRoomBedDevice:
:
getBedId
,
dto
.
getBedId
());
queryWrapper1
.
eq
(
StringUtil
.
isNotEmpty
(
dto
.
getBedId
()),
PlatRoomBedDevice:
:
getBedId
,
dto
.
getBedId
());
List
<
PlatRoomBedDevice
>
list
=
list
(
queryWrapper1
);
List
<
PlatRoomBedDevice
>
list
=
list
(
queryWrapper1
);
List
<
String
>
listEquipmentIds
=
list
.
stream
().
map
(
item
->
item
.
get
Equipment
Id
()).
collect
(
Collectors
.
toList
());
List
<
String
>
listEquipmentIds
=
list
.
stream
().
map
(
item
->
item
.
get
Device
Id
()).
collect
(
Collectors
.
toList
());
List
<
String
>
listBedIds
=
list
.
stream
().
map
(
item
->
item
.
getBedId
()).
collect
(
Collectors
.
toList
());
List
<
String
>
listBedIds
=
list
.
stream
().
map
(
item
->
item
.
getBedId
()).
collect
(
Collectors
.
toList
());
LambdaQueryWrapper
<
PlatBed
>
queryWrapper2
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
PlatBed
>
queryWrapper2
=
new
LambdaQueryWrapper
<>();
...
@@ -114,7 +120,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
...
@@ -114,7 +120,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
Map
<
String
,
String
>
mapName
=
new
HashMap
<>();
Map
<
String
,
String
>
mapName
=
new
HashMap
<>();
list
.
forEach
(
item
->{
list
.
forEach
(
item
->{
if
(
map
.
containsKey
(
item
.
getBedId
())){
if
(
map
.
containsKey
(
item
.
getBedId
())){
mapName
.
put
(
item
.
get
Equipment
Id
(),
map
.
get
(
item
.
getBedId
()));
mapName
.
put
(
item
.
get
Device
Id
(),
map
.
get
(
item
.
getBedId
()));
}
}
});
});
...
@@ -138,7 +144,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
...
@@ -138,7 +144,7 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
public
void
unbindingDevice
(
PlatUnbindingDeviceDTO
dto
)
{
public
void
unbindingDevice
(
PlatUnbindingDeviceDTO
dto
)
{
LambdaQueryWrapper
<
PlatRoomBedDevice
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
PlatRoomBedDevice
>
queryWrapper
=
new
LambdaQueryWrapper
<>();
queryWrapper
.
eq
(
PlatRoomBedDevice:
:
get
Equipment
Id
,
dto
.
getEquipmentId
());
queryWrapper
.
eq
(
PlatRoomBedDevice:
:
get
Device
Id
,
dto
.
getEquipmentId
());
queryWrapper
.
eq
(
PlatRoomBedDevice:
:
getRoomId
,
dto
.
getRoomId
());
queryWrapper
.
eq
(
PlatRoomBedDevice:
:
getRoomId
,
dto
.
getRoomId
());
queryWrapper
.
eq
(
StringUtil
.
isNotEmpty
(
dto
.
getBedId
()),
PlatRoomBedDevice:
:
getBedId
,
dto
.
getBedId
());
queryWrapper
.
eq
(
StringUtil
.
isNotEmpty
(
dto
.
getBedId
()),
PlatRoomBedDevice:
:
getBedId
,
dto
.
getBedId
());
List
<
PlatRoomBedDevice
>
list
=
list
(
queryWrapper
);
List
<
PlatRoomBedDevice
>
list
=
list
(
queryWrapper
);
...
@@ -153,6 +159,8 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
...
@@ -153,6 +159,8 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
List
<
String
>
ids
=
list
.
stream
().
map
(
item
->
item
.
getId
()).
collect
(
Collectors
.
toList
());
List
<
String
>
ids
=
list
.
stream
().
map
(
item
->
item
.
getId
()).
collect
(
Collectors
.
toList
());
removeByIds
(
ids
);
removeByIds
(
ids
);
platRegionSettingService
.
del
(
dto
.
getRoomId
(),
dto
.
getEquipmentId
());
}
}
}
}
}
}
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomServiceImpl.java
View file @
db8c08c9
...
@@ -82,7 +82,7 @@ public class PlatRoomServiceImpl extends ServiceImpl<PlatRoomMapper, PlatRoom> i
...
@@ -82,7 +82,7 @@ public class PlatRoomServiceImpl extends ServiceImpl<PlatRoomMapper, PlatRoom> i
removeByIds
(
ids
);
removeByIds
(
ids
);
}
}
@Transactional
@Transactional
(
rollbackFor
=
Exception
.
class
)
@Override
@Override
public
void
delCascade
(
List
<
String
>
ids
)
{
public
void
delCascade
(
List
<
String
>
ids
)
{
removeByIds
(
ids
);
removeByIds
(
ids
);
...
...
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