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
419ff10d
authored
Oct 17, 2023
by
lzy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
空间添加
parent
32b99882
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
0 deletions
server-common/src/main/java/com/makeit/enums/CodeMessageEnum.java
server-common/src/main/resources/locale/business_messages.properties
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java
server-common/src/main/java/com/makeit/enums/CodeMessageEnum.java
View file @
419ff10d
...
...
@@ -107,6 +107,7 @@ public enum CodeMessageEnum {
PLATFORM_ERROR_SPACE_NOT_DEL
(
500
,
"PLATFORM.ERROR.SPACE.NOT.DEL"
),
PLATFORM_ERROR_SPACE_NOT_AUTH_PARENT
(
500
,
"PLATFORM.ERROR.SPACE.NOT.AUTH.PARENT"
),
PLATFORM_ERROR_SPACE_USER_NOT_ADD
(
500
,
"PLATFORM.ERROR.SPACE.USER.NOT.ADD"
),
PLATFORM_ERROR_SPACE_ROOM_NOT_ADD
(
500
,
"PLATFORM.ERROR.SPACE.ROOM.NOT.ADD"
),
PLATFORM_ERROR_ROOM_EXIT_BAD
(
500
,
"PLATFORM.ERROR.ROOM.EXIT.BED"
),
PLATFORM_ERROR_ROOM_BAD_NUMBER_NOT_AUTH
(
500
,
"PLATFORM.ERROR.ROOM.BED.NUMBER.NOT.AUTH"
),
PLATFORM_ERROR_ROOM_NAME_EXIT
(
500
,
"PLATFORM.ERROR.ROOM.NAME.EXIT"
),
...
...
server-common/src/main/resources/locale/business_messages.properties
View file @
419ff10d
...
...
@@ -100,6 +100,7 @@ PLATFORM.ERROR.SPACE.NAME.DUPLICATE=同一层级,空间名称不能重复
PLATFORM.ERROR.SPACE.NOT.DEL
=
该空间下存在下级或者房间,不可删除
PLATFORM.ERROR.SPACE.NOT.AUTH.PARENT
=
上级空间不能是自己的下级空间
PLATFORM.ERROR.SPACE.USER.NOT.ADD
=
当前用户没有所属组织,请先分配组织
PLATFORM.ERROR.SPACE.ROOM.NOT.ADD
=
该空间下已创建房间,不可当做上级空间
PLATFORM.ERROR.ROOM.EXIT.BED
=
房间中存在已入住的床位,不可删除
PLATFORM.ERROR.ROOM.NAME.EXIT
=
该房间名称已存在
PLATFORM.ERROR.ROOM.BED.NUMBER.NOT.AUTH
=
床位数量不能改小
...
...
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java
View file @
419ff10d
...
...
@@ -82,6 +82,7 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
public
void
add
(
PlatSpaceAddDTO
dto
)
{
check
(
dto
);
PlatSpace
space
=
BeanDtoVoUtils
.
convert
(
dto
,
PlatSpace
.
class
);
if
(
StringUtil
.
isEmpty
(
dto
.
getParentId
()))
{
PlatUserVO
userVO
=
PlatUserUtil
.
getUserVOCanNull
();
if
(
StringUtil
.
isEmpty
(
userVO
.
getOrgId
()))
{
...
...
@@ -93,6 +94,14 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
space
.
setAttribute
(
org
.
getType
());
}
}
else
{
//判断该空间下是否有房间
LambdaQueryWrapper
<
PlatRoom
>
queryRoom
=
new
LambdaQueryWrapper
<>();
queryRoom
.
eq
(
PlatRoom:
:
getSpaceId
,
dto
.
getParentId
());
if
(
platRoomService
.
count
(
queryRoom
)
>
0
){
throw
new
BusinessException
(
CodeMessageEnum
.
PLATFORM_ERROR_SPACE_ROOM_NOT_ADD
);
}
//上级空间
PlatSpace
parentSpace
=
getById
(
dto
.
getParentId
());
space
.
setOrgId
(
parentSpace
.
getOrgId
());
...
...
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