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
be08e5d8
authored
Sep 27, 2023
by
杨伟程
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
修改bug
parent
95573178
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
2 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/elder/impl/PlatElderChildrenInfoServiceImpl.java
server-service/src/main/java/com/makeit/vo/platform/elder/report/day/PlatElderHeartRespiratoryEvaluationRecordVO.java
server-common/src/main/java/com/makeit/enums/CodeMessageEnum.java
View file @
be08e5d8
...
...
@@ -100,6 +100,8 @@ public enum CodeMessageEnum {
PLATFORM_ERROR_ELDER_CERTIFICATENUMBER_DUPLICATE
(
500
,
"PLATFORM.ERROR.ELDER.CERTIFICATENUMBER.DUPLICATE"
),
PLATFORM_ERROR_CHILDREN_ELDER_ID_BIND_DUPLICATE
(
500
,
"PLATFORM.ERROR.CHILDREN.ELDER.ID.BIND.DUPLICATE"
),
PLATFORM_ERROR_SPACE_NAME_DUPLICATE
(
500
,
"PLATFORM.ERROR.SPACE.NAME.DUPLICATE"
),
PLATFORM_ERROR_SPACE_NOT_DEL
(
500
,
"PLATFORM.ERROR.SPACE.NOT.DEL"
),
...
...
server-common/src/main/resources/locale/business_messages.properties
View file @
be08e5d8
...
...
@@ -94,6 +94,7 @@ SYSTEM.ERROR.SMS.CODE.NOT.CORRECT=验证码不正确
PLATFORM.ERROR.ELDER.CERTIFICATENUMBER.DUPLICATE
=
证件号不能重复
PLATFORM.ERROR.CHILDREN.ELDER.ID.BIND.DUPLICATE
=
不能重复绑定该老人
PLATFORM.ERROR.SPACE.NAME.DUPLICATE
=
同一层级,空间名称不能重复
PLATFORM.ERROR.SPACE.NOT.DEL
=
该空间下存在下级或者房间,不可删除
...
...
@@ -108,7 +109,6 @@ PLATFORM.ERROR.BAD.NOT.DEL=床位已绑定长者或设备,不可删除
PLATFORM.ERROR.ROOM.OTHER.USED.NOT.DEL
=
该房间下有床位有其他长者入住
PLATFORM.ERROR.BED.BIND_DEVICE_NOT_AUTH
=
该床位已绑定设备,请重新选择床位
SYSTEM.ERROR.ROLE.ADMIN.CANT.ADD
=
不能在该节点下新增非管理员角色
SYSTEM.ERROR.ROLE.ADMIN.CANT.EDIT
=
管理员角色不能修改
...
...
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
View file @
be08e5d8
...
...
@@ -164,6 +164,11 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
public
void
bind
(
String
elderId
)
{
PlatElderChildrenInfo
childrenInfo
=
getById
(
WechatUserUtil
.
getUserId
());
if
(
StringUtils
.
isNotBlank
(
childrenInfo
.
getElderId
())
&&
childrenInfo
.
getElderId
().
contains
(
elderId
))
{
throw
new
BusinessException
(
CodeMessageEnum
.
PLATFORM_ERROR_CHILDREN_ELDER_ID_BIND_DUPLICATE
);
}
List
<
String
>
list
=
new
ArrayList
<>(
10
);
if
(
StringUtils
.
isNotBlank
(
childrenInfo
.
getElderId
()))
{
list
=
Arrays
.
asList
(
childrenInfo
.
getElderId
().
split
(
","
));
...
...
server-service/src/main/java/com/makeit/vo/platform/elder/report/day/PlatElderHeartRespiratoryEvaluationRecordVO.java
View file @
be08e5d8
...
...
@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
@Data
public
class
PlatElderHeartRespiratoryEvaluationRecordVO
{
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:
:
ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@ApiModelProperty
(
"时间"
)
private
LocalDateTime
time
;
...
...
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