Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit ba675772 by 汪志阳
Options

fix:bug修复

parent ca400239
Inline Side-by-side
Showing with 150 additions and 100 deletions
server-common/src/main/java/com/makeit/enums/CodeMessageEnum.java
...@@ -106,6 +106,7 @@ public enum CodeMessageEnum { ...@@ -106,6 +106,7 @@ public enum CodeMessageEnum {
PLATFORM_ERROR_SPACE_NAME_DUPLICATE(500, "PLATFORM.ERROR.SPACE.NAME.DUPLICATE"), PLATFORM_ERROR_SPACE_NAME_DUPLICATE(500, "PLATFORM.ERROR.SPACE.NAME.DUPLICATE"),
PLATFORM_ERROR_SPACE_NOT_DEL(500, "PLATFORM.ERROR.SPACE.NOT.DEL"), 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_NOT_AUTH_PARENT(500, "PLATFORM.ERROR.SPACE.NOT.AUTH.PARENT"),
PLATFORM_ERROR_SPACE_OVER_LEVEL(500, "PLATFORM.ERROR.SPACE.OVER.LEVEL"),
PLATFORM_ERROR_SPACE_USER_NOT_ADD(500, "PLATFORM.ERROR.SPACE.USER.NOT.ADD"), 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_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_EXIT_BAD(500, "PLATFORM.ERROR.ROOM.EXIT.BED"),
......
server-common/src/main/resources/locale/business_messages.properties
# 业务信息 # \u4E1A\u52A1\u4FE1\u606F
# 信息类型: info, error, warning, notice # \u4FE1\u606F\u7C7B\u578B: info, error, warning, notice
# 格式: business + 信息类型 +\u3000模块\u3000+ 功能 +信息 # \u683C\u5F0F: business + \u4FE1\u606F\u7C7B\u578B +\u3000\u6A21\u5757\u3000+ \u529F\u80FD +\u4FE1\u606F
# 请按模块区分\u3000例如business=error=auth=not=found, business=info=system # \u8BF7\u6309\u6A21\u5757\u533A\u5206\u3000\u4F8B\u5982business=error=auth=not=found, business=info=system
# 业务错误 # \u4E1A\u52A1\u9519\u8BEF
TEST1=%ste%sst1 TEST1=%ste%sst1
TEST2={0}te{1}st2 TEST2={0}te{1}st2
SYSTEM.ERROR.PARAMETER.ILLEGAL=参数不合法 SYSTEM.ERROR.PARAMETER.ILLEGAL=\u53C2\u6570\u4E0D\u5408\u6CD5
SYSTEM.ERROR.SIGN.NOT.BLANK=签名不能为空 SYSTEM.ERROR.SIGN.NOT.BLANK=\u7B7E\u540D\u4E0D\u80FD\u4E3A\u7A7A
SYSTEM.ERROR.SIGN.ERROR=签名错误 SYSTEM.ERROR.SIGN.ERROR=\u7B7E\u540D\u9519\u8BEF
SYSTEM.ERROR.PHONE.DUPLICATE=该手机号已存在 SYSTEM.ERROR.PHONE.DUPLICATE=\u8BE5\u624B\u673A\u53F7\u5DF2\u5B58\u5728
SYSTEM.ERROR.NAME.DUPLICATE=该名称已存在 SYSTEM.ERROR.NAME.DUPLICATE=\u8BE5\u540D\u79F0\u5DF2\u5B58\u5728
SYSTEM.ERROR.NAME.ENG.DUPLICATE=该英文名称已存在 SYSTEM.ERROR.NAME.ENG.DUPLICATE=\u8BE5\u82F1\u6587\u540D\u79F0\u5DF2\u5B58\u5728
SYSTEM.ERROR.CODE.DUPLICATE=该编码已存在 SYSTEM.ERROR.CODE.DUPLICATE=\u8BE5\u7F16\u7801\u5DF2\u5B58\u5728
SYSTEM.ERROR.TENANT.CODE.DUPLICATE=该标识已存在 SYSTEM.ERROR.TENANT.CODE.DUPLICATE=\u8BE5\u6807\u8BC6\u5DF2\u5B58\u5728
SYSTEM.ERROR.DICT.VALUE.DUPLICATE=该字典值已存在 SYSTEM.ERROR.DICT.VALUE.DUPLICATE=\u8BE5\u5B57\u5178\u503C\u5DF2\u5B58\u5728
SYSTEM.ERROR.DICT.NOT.EXIST=该字典值不存在 SYSTEM.ERROR.DICT.NOT.EXIST=\u8BE5\u5B57\u5178\u503C\u4E0D\u5B58\u5728
SYSTEM.ERROR.USER.JOB.NO.DUPLICATE=该登录名已存在 SYSTEM.ERROR.USER.JOB.NO.DUPLICATE=\u8BE5\u767B\u5F55\u540D\u5DF2\u5B58\u5728
SYSTEM.ERROR.USER.ACCOUNT.DUPLICATE=该账号已存在 SYSTEM.ERROR.USER.ACCOUNT.DUPLICATE=\u8BE5\u8D26\u53F7\u5DF2\u5B58\u5728
SYSTEM.ERROR.USER.NAME.DUPLICATE=该姓名已存在 SYSTEM.ERROR.USER.NAME.DUPLICATE=\u8BE5\u59D3\u540D\u5DF2\u5B58\u5728
SYSTEM.ERROR.USER.MOBILE.DUPLICATE=该手机号已存在 SYSTEM.ERROR.USER.MOBILE.DUPLICATE=\u8BE5\u624B\u673A\u53F7\u5DF2\u5B58\u5728
SYSTEM.ERROR.USER.MAIL.DUPLICATE=该邮箱已存在 SYSTEM.ERROR.USER.MAIL.DUPLICATE=\u8BE5\u90AE\u7BB1\u5DF2\u5B58\u5728
SYSTEM.ERROR.CODE.RATE.LIMIT=验证码发送过于频繁，请稍后在发送 SYSTEM.ERROR.CODE.RATE.LIMIT=\u9A8C\u8BC1\u7801\u53D1\u9001\u8FC7\u4E8E\u9891\u7E41\uFF0C\u8BF7\u7A0D\u540E\u5728\u53D1\u9001
SYSTEM.ERROR.USER.PASSWORD.NOT.BLANK=密码不能为空 SYSTEM.ERROR.USER.PASSWORD.NOT.BLANK=\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A
#SYSTEM.ERROR.USER.PASSWORD.FORMAT.ERROR=密码必须是包含大写字母、小写字母、数字、特殊符号(不含空格)的6~18位组合 #SYSTEM.ERROR.USER.PASSWORD.FORMAT.ERROR=\u5BC6\u7801\u5FC5\u987B\u662F\u5305\u542B\u5927\u5199\u5B57\u6BCD\u3001\u5C0F\u5199\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u7279\u6B8A\u7B26\u53F7(\u4E0D\u542B\u7A7A\u683C)\u76846~18\u4F4D\u7EC4\u5408
SYSTEM.ERROR.USER.PASSWORD.FORMAT.ERROR=含字母和数字的6-20位密码 SYSTEM.ERROR.USER.PASSWORD.FORMAT.ERROR=\u542B\u5B57\u6BCD\u548C\u6570\u5B57\u76846-20\u4F4D\u5BC6\u7801
SYSTEM.ERROR.USER.PASSWORD.SAME=支付密码不能与登录密码一致 SYSTEM.ERROR.USER.PASSWORD.SAME=\u652F\u4ED8\u5BC6\u7801\u4E0D\u80FD\u4E0E\u767B\u5F55\u5BC6\u7801\u4E00\u81F4
SYSTEM.ERROR.USER.SUPER.ADMIN.CANT.DO=超级管理员或超级管理员角色不支持该操作 SYSTEM.ERROR.USER.SUPER.ADMIN.CANT.DO=\u8D85\u7EA7\u7BA1\u7406\u5458\u6216\u8D85\u7EA7\u7BA1\u7406\u5458\u89D2\u8272\u4E0D\u652F\u6301\u8BE5\u64CD\u4F5C
SYSTEM.ERROR.USER.SUPER.ADMIN.CANT.EDIT=不能修改超级管理员或者超级管理员角色 SYSTEM.ERROR.USER.SUPER.ADMIN.CANT.EDIT=\u4E0D\u80FD\u4FEE\u6539\u8D85\u7EA7\u7BA1\u7406\u5458\u6216\u8005\u8D85\u7EA7\u7BA1\u7406\u5458\u89D2\u8272
SYSTEM.ERROR.ROLE.CANT.DELETE=存在员工绑定该角色，则不可删除 SYSTEM.ERROR.ROLE.CANT.DELETE=\u5B58\u5728\u5458\u5DE5\u7ED1\u5B9A\u8BE5\u89D2\u8272\uFF0C\u5219\u4E0D\u53EF\u5220\u9664
SYSTEM.ERROR.START.END.TIME.NOT.NULL=开始时间和结束时间不能为空 SYSTEM.ERROR.START.END.TIME.NOT.NULL=\u5F00\u59CB\u65F6\u95F4\u548C\u7ED3\u675F\u65F6\u95F4\u4E0D\u80FD\u4E3A\u7A7A
SYSTEM.ERROR.START.LE.END=开始时间要小于等于结束时间 SYSTEM.ERROR.START.LE.END=\u5F00\u59CB\u65F6\u95F4\u8981\u5C0F\u4E8E\u7B49\u4E8E\u7ED3\u675F\u65F6\u95F4
SYSTEM.ERROR.CANT.CHANGE.TENANT.STATUS=当前时间要在开始时间和结束时间之间才能设置为启用 SYSTEM.ERROR.CANT.CHANGE.TENANT.STATUS=\u5F53\u524D\u65F6\u95F4\u8981\u5728\u5F00\u59CB\u65F6\u95F4\u548C\u7ED3\u675F\u65F6\u95F4\u4E4B\u95F4\u624D\u80FD\u8BBE\u7F6E\u4E3A\u542F\u7528
SYSTEM.ERROR.CANT.REMOVE.TENANT.USER.LINK=已经关联了租户的管理员账号不允许删除 SYSTEM.ERROR.CANT.REMOVE.TENANT.USER.LINK=\u5DF2\u7ECF\u5173\u8054\u4E86\u79DF\u6237\u7684\u7BA1\u7406\u5458\u8D26\u53F7\u4E0D\u5141\u8BB8\u5220\u9664
SYSTEM.ERROR.TMP.CODE.BLANK=验证码不能为空 SYSTEM.ERROR.TMP.CODE.BLANK=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A
#SYSTEM.ERROR.TMP.TOKEN.BLANK=token不能为空 #SYSTEM.ERROR.TMP.TOKEN.BLANK=token\u4E0D\u80FD\u4E3A\u7A7A
SYSTEM.ERROR.TMP.TOKEN.BLANK=验证码不匹配 SYSTEM.ERROR.TMP.TOKEN.BLANK=\u9A8C\u8BC1\u7801\u4E0D\u5339\u914D
SYSTEM.ERROR.TOKEN.BLANK.OR.NOT.EXIST=token失效或不存在 SYSTEM.ERROR.TOKEN.BLANK.OR.NOT.EXIST=token\u5931\u6548\u6216\u4E0D\u5B58\u5728
SYSTEM.ERROR.NO.PERMISSION=无权限访问 SYSTEM.ERROR.NO.PERMISSION=\u65E0\u6743\u9650\u8BBF\u95EE
SYSTEM.ERROR.TENANT.ID.NOT.BLANK=租户id不能为空 SYSTEM.ERROR.TENANT.ID.NOT.BLANK=\u79DF\u6237id\u4E0D\u80FD\u4E3A\u7A7A
SYSTEM.ERROR.TENANT.NOT.EXIST=该租户不存在或者被禁用 SYSTEM.ERROR.TENANT.NOT.EXIST=\u8BE5\u79DF\u6237\u4E0D\u5B58\u5728\u6216\u8005\u88AB\u7981\u7528
SYSTEM.ERROR.DUPLICATE.REQUEST=请勿重复请求 SYSTEM.ERROR.DUPLICATE.REQUEST=\u8BF7\u52FF\u91CD\u590D\u8BF7\u6C42
#SYSTEM.ERROR.AUTH.USER.HAS.DISABLED=该用户已经离职/冻结 #SYSTEM.ERROR.AUTH.USER.HAS.DISABLED=\u8BE5\u7528\u6237\u5DF2\u7ECF\u79BB\u804C/\u51BB\u7ED3
SYSTEM.ERROR.AUTH.USER.HAS.DISABLED=用户不存在 SYSTEM.ERROR.AUTH.USER.HAS.DISABLED=\u7528\u6237\u4E0D\u5B58\u5728
SYSTEM.ERROR.AUTH.USER.ACCOUNT.PASSWORD=账号或者密码错误! SYSTEM.ERROR.AUTH.USER.ACCOUNT.PASSWORD=\u8D26\u53F7\u6216\u8005\u5BC6\u7801\u9519\u8BEF!
SYSTEM.ERROR.AUTH.USER.PASSWORD=密码错误 SYSTEM.ERROR.AUTH.USER.PASSWORD=\u5BC6\u7801\u9519\u8BEF
SYSTEM.ERROR.AUTH.USER.OLD.PASSWORD=旧密码错误 SYSTEM.ERROR.AUTH.USER.OLD.PASSWORD=\u65E7\u5BC6\u7801\u9519\u8BEF
SYSTEM.ERROR.AUTH.USER.PAY.PASSWORD.BLANK=支付密码未设置 SYSTEM.ERROR.AUTH.USER.PAY.PASSWORD.BLANK=\u652F\u4ED8\u5BC6\u7801\u672A\u8BBE\u7F6E
SYSTEM.ERROR.AUTH.USER.MAIL.NOT.SET=邮箱未设置 SYSTEM.ERROR.AUTH.USER.MAIL.NOT.SET=\u90AE\u7BB1\u672A\u8BBE\u7F6E
SYSTEM.ERROR.AUTH.USER.PASSWORD.NOT.EQUALS=新密码与确认密码不一致 SYSTEM.ERROR.AUTH.USER.PASSWORD.NOT.EQUALS=\u65B0\u5BC6\u7801\u4E0E\u786E\u8BA4\u5BC6\u7801\u4E0D\u4E00\u81F4
SYSTEM.ERROR.WECHAT.USER.NOT.EXIST=该企微账号对应的用户不存在 SYSTEM.ERROR.WECHAT.USER.NOT.EXIST=\u8BE5\u4F01\u5FAE\u8D26\u53F7\u5BF9\u5E94\u7684\u7528\u6237\u4E0D\u5B58\u5728
SYSTEM.ERROR.WECHAT.OPENID.NOT.EXIST=openid获取失败，请重试 SYSTEM.ERROR.WECHAT.OPENID.NOT.EXIST=openid\u83B7\u53D6\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5
SYSTEM.ERROR.EXCEL.UPLOAD.EXIT=请上传excel SYSTEM.ERROR.EXCEL.UPLOAD.EXIT=\u8BF7\u4E0A\u4F20excel
SYSTEM.ERROR.EXCEL.NOT.DATA=请至少上传一条数据 SYSTEM.ERROR.EXCEL.NOT.DATA=\u8BF7\u81F3\u5C11\u4E0A\u4F20\u4E00\u6761\u6570\u636E
SYSTEM.ERROR.EXCEL.MAX.LIMIT=最大上传%s条数据 SYSTEM.ERROR.EXCEL.MAX.LIMIT=\u6700\u5927\u4E0A\u4F20%s\u6761\u6570\u636E
SYSTEM.ERROR.NO.EXCEL.FILE=请导入excel文件 SYSTEM.ERROR.NO.EXCEL.FILE=\u8BF7\u5BFC\u5165excel\u6587\u4EF6
SYSTEM.ERROR.CONFIG.NOT.EXIST=相关配置(数据字典不存在) SYSTEM.ERROR.CONFIG.NOT.EXIST=\u76F8\u5173\u914D\u7F6E(\u6570\u636E\u5B57\u5178\u4E0D\u5B58\u5728)
SYSTEM.ERROR.COMPANY.LEVEL.EXCEED=公司最多两级，集团——子公司 SYSTEM.ERROR.COMPANY.LEVEL.EXCEED=\u516C\u53F8\u6700\u591A\u4E24\u7EA7\uFF0C\u96C6\u56E2\u2014\u2014\u5B50\u516C\u53F8
SYSTEM.ERROR.COMPANY.NOT.EXIST=公司不存在或者被禁用 SYSTEM.ERROR.COMPANY.NOT.EXIST=\u516C\u53F8\u4E0D\u5B58\u5728\u6216\u8005\u88AB\u7981\u7528
SYSTEM.ERROR.DEPT.NAME.DUPLICATE=同一个公司下的部门不可重名 SYSTEM.ERROR.DEPT.NAME.DUPLICATE=\u540C\u4E00\u4E2A\u516C\u53F8\u4E0B\u7684\u90E8\u95E8\u4E0D\u53EF\u91CD\u540D
SYSTEM.ERROR.DEPT.LEVEL.EXCEED=同一个公司下的部门最多5级 SYSTEM.ERROR.DEPT.LEVEL.EXCEED=\u540C\u4E00\u4E2A\u516C\u53F8\u4E0B\u7684\u90E8\u95E8\u6700\u591A5\u7EA7
SYSTEM.ERROR.DEPT.DELETE=当前部门有员工或当前部门有下级部门,不可删除 SYSTEM.ERROR.DEPT.DELETE=\u5F53\u524D\u90E8\u95E8\u6709\u5458\u5DE5\u6216\u5F53\u524D\u90E8\u95E8\u6709\u4E0B\u7EA7\u90E8\u95E8,\u4E0D\u53EF\u5220\u9664
SYSTEM.ERROR.COMPANY.GROUP.CANT.EDIT=不能修改或删除集团 SYSTEM.ERROR.COMPANY.GROUP.CANT.EDIT=\u4E0D\u80FD\u4FEE\u6539\u6216\u5220\u9664\u96C6\u56E2
SYSTEM.ERROR.SMS.SEND=短信发送错误，错误信息%s SYSTEM.ERROR.SMS.SEND=\u77ED\u4FE1\u53D1\u9001\u9519\u8BEF\uFF0C\u9519\u8BEF\u4FE1\u606F%s
SYSTEM.ERROR.SMS.CODE.NOT.EXIST=验证码已过期 SYSTEM.ERROR.SMS.CODE.NOT.EXIST=\u9A8C\u8BC1\u7801\u5DF2\u8FC7\u671F
SYSTEM.ERROR.SMS.CODE.NOT.CORRECT=验证码不正确 SYSTEM.ERROR.SMS.CODE.NOT.CORRECT=\u9A8C\u8BC1\u7801\u4E0D\u6B63\u786E
PLATFORM.ERROR.ELDER.CERTIFICATENUMBER.DUPLICATE=证件号不能重复 PLATFORM.ERROR.ELDER.CERTIFICATENUMBER.DUPLICATE=\u8BC1\u4EF6\u53F7\u4E0D\u80FD\u91CD\u590D
PLATFORM.ERROR.CHILDREN.ELDER.ID.BIND.DUPLICATE=不能重复绑定该老人 PLATFORM.ERROR.CHILDREN.ELDER.ID.BIND.DUPLICATE=\u4E0D\u80FD\u91CD\u590D\u7ED1\u5B9A\u8BE5\u8001\u4EBA
PLATFORM.ERROR.SPACE.NAME.DUPLICATE=同一层级,空间名称不能重复 PLATFORM.ERROR.SPACE.NAME.DUPLICATE=\u540C\u4E00\u5C42\u7EA7,\u7A7A\u95F4\u540D\u79F0\u4E0D\u80FD\u91CD\u590D
PLATFORM.ERROR.SPACE.NOT.DEL=该空间下存在下级或者房间，不可删除 PLATFORM.ERROR.SPACE.NOT.DEL=\u8BE5\u7A7A\u95F4\u4E0B\u5B58\u5728\u4E0B\u7EA7\u6216\u8005\u623F\u95F4\uFF0C\u4E0D\u53EF\u5220\u9664
PLATFORM.ERROR.SPACE.NOT.AUTH.PARENT=上级空间不能是自己的下级空间 PLATFORM.ERROR.SPACE.NOT.AUTH.PARENT=\u4E0A\u7EA7\u7A7A\u95F4\u4E0D\u80FD\u662F\u81EA\u5DF1\u7684\u4E0B\u7EA7\u7A7A\u95F4
PLATFORM.ERROR.SPACE.USER.NOT.ADD=当前用户没有所属组织，请先分配组织 PLATFORM.ERROR.SPACE.OVER.LEVEL=\u5C42\u7EA7\u8D85\u51FA\uFF0C\u4E0D\u53EF\u7F16\u8F91
PLATFORM.ERROR.SPACE.ROOM.NOT.ADD=该空间下已创建房间，不可当做上级空间 PLATFORM.ERROR.SPACE.USER.NOT.ADD=\u5F53\u524D\u7528\u6237\u6CA1\u6709\u6240\u5C5E\u7EC4\u7EC7\uFF0C\u8BF7\u5148\u5206\u914D\u7EC4\u7EC7
PLATFORM.ERROR.ROOM.EXIT.BED=房间中存在已入住的床位，不可删除 PLATFORM.ERROR.SPACE.ROOM.NOT.ADD=\u8BE5\u7A7A\u95F4\u4E0B\u5DF2\u521B\u5EFA\u623F\u95F4\uFF0C\u4E0D\u53EF\u5F53\u505A\u4E0A\u7EA7\u7A7A\u95F4
PLATFORM.ERROR.ROOM.NAME.EXIT=该房间名称已存在 PLATFORM.ERROR.ROOM.EXIT.BED=\u623F\u95F4\u4E2D\u5B58\u5728\u5DF2\u5165\u4F4F\u7684\u5E8A\u4F4D\uFF0C\u4E0D\u53EF\u5220\u9664
PLATFORM.ERROR.ROOM.BED.NUMBER.NOT.AUTH=床位数量不能改小 PLATFORM.ERROR.ROOM.NAME.EXIT=\u8BE5\u623F\u95F4\u540D\u79F0\u5DF2\u5B58\u5728
PLATFORM.ERROR.BED.NAME.EXIT=床位名称已存在 PLATFORM.ERROR.ROOM.BED.NUMBER.NOT.AUTH=\u5E8A\u4F4D\u6570\u91CF\u4E0D\u80FD\u6539\u5C0F
PLATFORM.ERROR.BED.NOT.DEL=床位已绑定长者或设备，不可删除 PLATFORM.ERROR.BED.NAME.EXIT=\u5E8A\u4F4D\u540D\u79F0\u5DF2\u5B58\u5728
PLATFORM.ERROR.BED.NOT.BIND.ELDER=床位已入住长者，不可再次入住 PLATFORM.ERROR.BED.NOT.DEL=\u5E8A\u4F4D\u5DF2\u7ED1\u5B9A\u957F\u8005\u6216\u8BBE\u5907\uFF0C\u4E0D\u53EF\u5220\u9664
PLATFORM.ERROR.BED.NOT.BIND.ELDER=\u5E8A\u4F4D\u5DF2\u5165\u4F4F\u957F\u8005\uFF0C\u4E0D\u53EF\u518D\u6B21\u5165\u4F4F
PLATFORM.ERROR.ROOM.OTHER.USED.NOT.DEL=该房间下有床位有其他长者入住 PLATFORM.ERROR.ROOM.OTHER.USED.NOT.DEL=\u8BE5\u623F\u95F4\u4E0B\u6709\u5E8A\u4F4D\u6709\u5176\u4ED6\u957F\u8005\u5165\u4F4F
PLATFORM.ERROR.BED.BIND.DEVICE.NOT.AUTH=该床位已绑定设备，请重新选择床位 PLATFORM.ERROR.BED.BIND.DEVICE.NOT.AUTH=\u8BE5\u5E8A\u4F4D\u5DF2\u7ED1\u5B9A\u8BBE\u5907\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9\u5E8A\u4F4D
PLATFORM.ERROR.ELDER.BED.CANT.DEL=含入住床位的老人，不可删除 PLATFORM.ERROR.ELDER.BED.CANT.DEL=\u542B\u5165\u4F4F\u5E8A\u4F4D\u7684\u8001\u4EBA\uFF0C\u4E0D\u53EF\u5220\u9664
SYSTEM.ERROR.ROLE.ADMIN.CANT.ADD=不能在该节点下新增非管理员角色 SYSTEM.ERROR.ROLE.ADMIN.CANT.ADD=\u4E0D\u80FD\u5728\u8BE5\u8282\u70B9\u4E0B\u65B0\u589E\u975E\u7BA1\u7406\u5458\u89D2\u8272
SYSTEM.ERROR.ROLE.ADMIN.CANT.EDIT=管理员角色不能修改 SYSTEM.ERROR.ROLE.ADMIN.CANT.EDIT=\u7BA1\u7406\u5458\u89D2\u8272\u4E0D\u80FD\u4FEE\u6539
PLATFORM.ERROR.ALARM.NOT.FOUND.SPACE=设备未绑定空间 PLATFORM.ERROR.ALARM.NOT.FOUND.SPACE=\u8BBE\u5907\u672A\u7ED1\u5B9A\u7A7A\u95F4
PLATFORM.ERROR.ALARM.NOT.FOUND.ELDER=设备空间下无长者 PLATFORM.ERROR.ALARM.NOT.FOUND.ELDER=\u8BBE\u5907\u7A7A\u95F4\u4E0B\u65E0\u957F\u8005
SYSTEM.ERROR.TENANT.FORBIDDEN=该租户被禁用 SYSTEM.ERROR.TENANT.FORBIDDEN=\u8BE5\u79DF\u6237\u88AB\u7981\u7528
SYSTEM.ERROR.ORG.FORBIDDEN=该组织被禁用 SYSTEM.ERROR.ORG.FORBIDDEN=\u8BE5\u7EC4\u7EC7\u88AB\u7981\u7528
SYSTEM.ERROR.MENU.CODE.DUPLICATE=跳转页面已存在 SYSTEM.ERROR.MENU.CODE.DUPLICATE=\u8DF3\u8F6C\u9875\u9762\u5DF2\u5B58\u5728
server-module/src/main/java/com/makeit/module/controller/wechat/alarm/PlatAlarmRecordWechatController.java
package com.makeit.module.controller.wechat.alarm; package com.makeit.module.controller.wechat.alarm;
import cn.hutool.core.collection.CollUtil;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.makeit.common.dto.BaseIdDTO; import com.makeit.common.dto.BaseIdDTO;
import com.makeit.common.page.PageReqDTO; import com.makeit.common.page.PageReqDTO;
...@@ -8,7 +9,6 @@ import com.makeit.common.page.PageVO; ...@@ -8,7 +9,6 @@ import com.makeit.common.page.PageVO;
import com.makeit.common.response.ApiResponseEntity; import com.makeit.common.response.ApiResponseEntity;
import com.makeit.common.response.ApiResponseUtils; import com.makeit.common.response.ApiResponseUtils;
import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO; import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
import com.makeit.enums.CommonEnum;
import com.makeit.enums.report.PlatformTypeEnum; import com.makeit.enums.report.PlatformTypeEnum;
import com.makeit.global.annotation.AuthIgnore; import com.makeit.global.annotation.AuthIgnore;
import com.makeit.service.platform.alarm.PlatAlarmRecordService; import com.makeit.service.platform.alarm.PlatAlarmRecordService;
...@@ -16,7 +16,6 @@ import com.makeit.utils.user.common.CommonUserUtil; ...@@ -16,7 +16,6 @@ import com.makeit.utils.user.common.CommonUserUtil;
import com.makeit.vo.platform.alarm.PlatAlarmRecordVO; import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -44,7 +43,8 @@ public class PlatAlarmRecordWechatController { ...@@ -44,7 +43,8 @@ public class PlatAlarmRecordWechatController {
Map<String,Object> resMap = Maps.newHashMap(); Map<String,Object> resMap = Maps.newHashMap();
PageVO<PlatAlarmRecordVO> page = platAlarmRecordService.page(dto); PageVO<PlatAlarmRecordVO> page = platAlarmRecordService.page(dto);
boolean b = page.getList().stream().anyMatch(platAlarmRecord -> StringUtils.equals(CommonEnum.NO.getValue(), platAlarmRecord.getStatus())); // boolean b = page.getList().stream().anyMatch(platAlarmRecord -> StringUtils.equals(CommonEnum.NO.getValue(), platAlarmRecord.getStatus()));
boolean b = CollUtil.isNotEmpty(page.getList()) && page.getList().get(0).getStatusFlag();
resMap.put("todoFlag",b); resMap.put("todoFlag",b);
resMap.put("page",page); resMap.put("page",page);
return ApiResponseUtils.success(resMap); return ApiResponseUtils.success(resMap);
......
server-service/src/main/java/com/makeit/service/platform/alarm/alarmStrategy/OffBedAlarm.java
...@@ -150,7 +150,12 @@ public class OffBedAlarm implements IAlarm { ...@@ -150,7 +150,12 @@ public class OffBedAlarm implements IAlarm {
LocalTime endTime = ruleConfig.getOffBedEnd(); LocalTime endTime = ruleConfig.getOffBedEnd();
Long firstOffBedLong = alarmRedisDTO.getStartLong(); Long firstOffBedLong = alarmRedisDTO.getStartLong();
boolean isOverTime = (System.currentTimeMillis() - firstOffBedLong) / 1000 >= duration * 60; long currentTimeMillis = System.currentTimeMillis();
LocalDateTime nowTest = LocalDateTime.now().plusHours(8)
.isAfter(LocalDateTime.of(2023, 12, 16, 0, 0, 0)) ? LocalDateTime.now().plusHours(7) : LocalDateTime.now().plusHours(8);
currentTimeMillis = nowTest.toInstant(ZoneOffset.of("+8")).toEpochMilli();
log.info("handleCrossDay，测试当前的时间：{},时间戳：{}", nowTest, currentTimeMillis);
boolean isOverTime = (currentTimeMillis - firstOffBedLong) / 1000 >= duration * 60;
LocalDateTime firstOffBedTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(firstOffBedLong), ZoneOffset.of("+8")); LocalDateTime firstOffBedTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(firstOffBedLong), ZoneOffset.of("+8"));
LocalTime firstTime = firstOffBedTime.toLocalTime(); LocalTime firstTime = firstOffBedTime.toLocalTime();
...@@ -163,19 +168,21 @@ public class OffBedAlarm implements IAlarm { ...@@ -163,19 +168,21 @@ public class OffBedAlarm implements IAlarm {
log.info("handleCrossDay 第一次离床时间,{}+持续时间:{}将超过范围,{}", firstTime, duration, endTime); log.info("handleCrossDay 第一次离床时间,{}+持续时间:{}将超过范围,{}", firstTime, duration, endTime);
return; return;
} }
platAlarmCheckDTO.setAbnormalValue(String.valueOf(System.currentTimeMillis() - firstOffBedLong)); platAlarmCheckDTO.setAbnormalValue(String.valueOf(currentTimeMillis - firstOffBedLong));
platAlarmCheckDTO.setPlatAlarmConfig(config); platAlarmCheckDTO.setPlatAlarmConfig(config);
log.info("cross离床告警离床时间在范围时间内,配置：{}", config.getRuleConfig()); log.info("cross离床告警离床时间在范围时间内,配置：{}", config.getRuleConfig());
noticeAlarm(alarmRedisDTO, platAlarmCheckDTO, deviceId); noticeAlarm(alarmRedisDTO, platAlarmCheckDTO, deviceId);
return; return;
} }
LocalDateTime now = LocalDateTime.now(); // LocalDateTime now = LocalDateTime.now();
LocalDateTime now = LocalDateTime.now().plusHours(8)
.isAfter(LocalDateTime.of(2023, 12, 16, 0, 0, 0)) ? LocalDateTime.now().plusHours(7) : LocalDateTime.now().plusHours(8);
LocalDateTime startLocalDteTime = LocalDateTime.of(LocalDate.now(), startTime); LocalDateTime startLocalDteTime = LocalDateTime.of(LocalDate.now(), startTime);
if (!isInTime) { if (!isInTime) {
long mills = Duration.between(startLocalDteTime, now).toMillis() / 1000; long mills = Duration.between(startLocalDteTime, now).toMillis() / 1000;
boolean noInOverTime = mills >= duration * 60; boolean noInOverTime = mills >= duration * 60;
if (noInOverTime) { if (noInOverTime) {
platAlarmCheckDTO.setAbnormalValue(String.valueOf(System.currentTimeMillis() - firstOffBedLong)); platAlarmCheckDTO.setAbnormalValue(String.valueOf(currentTimeMillis - firstOffBedLong));
platAlarmCheckDTO.setPlatAlarmConfig(config); platAlarmCheckDTO.setPlatAlarmConfig(config);
log.info("cross离床告警第一次离床时间在范围前,配置：{}", config.getRuleConfig()); log.info("cross离床告警第一次离床时间在范围前,配置：{}", config.getRuleConfig());
noticeAlarm(alarmRedisDTO, platAlarmCheckDTO, deviceId); noticeAlarm(alarmRedisDTO, platAlarmCheckDTO, deviceId);
......
server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java
...@@ -121,7 +121,9 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe ...@@ -121,7 +121,9 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
LambdaQueryWrapper<PlatAlarmRecord> lambdaQueryWrapper = getLambdaQueryWrapper(param); LambdaQueryWrapper<PlatAlarmRecord> lambdaQueryWrapper = getLambdaQueryWrapper(param);
List<PlatAlarmRecord> list = list(lambdaQueryWrapper); List<PlatAlarmRecord> list = list(lambdaQueryWrapper);
Boolean isUnWechatRead = CollUtil.isNotEmpty(list) && list.stream() Boolean isUnWechatRead = CollUtil.isNotEmpty(list) && list.stream()
.anyMatch(a -> CommonEnum.YES.getValue().equals(a.getWechatReadFlag())); .anyMatch(a -> CommonEnum.NO.getValue().equals(a.getWechatReadFlag()));
Boolean statusFlag = CollUtil.isNotEmpty(list) && list.stream()
.anyMatch(a -> CommonEnum.NO.getValue().equals(a.getStatus()));
Page<PlatAlarmRecord> page = page(mpPage, lambdaQueryWrapper); Page<PlatAlarmRecord> page = page(mpPage, lambdaQueryWrapper);
List<PlatAlarmRecord> records = page.getRecords(); List<PlatAlarmRecord> records = page.getRecords();
List<PlatAlarmRecordVO> dtos = BeanDtoVoUtils.listVo(records, PlatAlarmRecordVO.class); List<PlatAlarmRecordVO> dtos = BeanDtoVoUtils.listVo(records, PlatAlarmRecordVO.class);
...@@ -136,6 +138,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe ...@@ -136,6 +138,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
platAlarmRecordVO.setDevice(platDevice); platAlarmRecordVO.setDevice(platDevice);
} }
platAlarmRecordVO.setIsUnWechatRead(isUnWechatRead); platAlarmRecordVO.setIsUnWechatRead(isUnWechatRead);
platAlarmRecordVO.setStatusFlag(statusFlag);
} }
return PageUtil.toPageVO(dtos, page); return PageUtil.toPageVO(dtos, page);
} }
......
server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java
...@@ -35,6 +35,7 @@ import com.makeit.utils.user.plat.PlatUserVO; ...@@ -35,6 +35,7 @@ import com.makeit.utils.user.plat.PlatUserVO;
import com.makeit.vo.platform.space.PlatSpaceAndRoomVO; import com.makeit.vo.platform.space.PlatSpaceAndRoomVO;
import jodd.util.StringUtil; import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -147,6 +148,8 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace ...@@ -147,6 +148,8 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
if (parentSpace!=null && parentSpace.getParentPath()!=null && parentSpace.getParentPath().contains(dto.getId())) { if (parentSpace!=null && parentSpace.getParentPath()!=null && parentSpace.getParentPath().contains(dto.getId())) {
throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_SPACE_NOT_AUTH_PARENT); throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_SPACE_NOT_AUTH_PARENT);
} }
// 编辑后层级大于4，不允许编辑
checkMaxLevel(space);
this.updateById(space); this.updateById(space);
List<String> lastSpaceIds = recursionLastSpaceIds(space.getId(), new ArrayList<>()); List<String> lastSpaceIds = recursionLastSpaceIds(space.getId(), new ArrayList<>());
...@@ -169,11 +172,6 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace ...@@ -169,11 +172,6 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
log.info("房间id：{}，对应的空间id：{},parentId:{}", platRoom.getId(), join, dto.getParentPath()); log.info("房间id：{}，对应的空间id：{},parentId:{}", platRoom.getId(), join, dto.getParentPath());
String roomSpacePath = dto.getParentPath() + "," + join; String roomSpacePath = dto.getParentPath() + "," + join;
log.info("roomSpacePath" + roomSpacePath); log.info("roomSpacePath" + roomSpacePath);
// if (lastSpaceIds.get(0).equals(space.getId())) {
// roomSpacePath = dto.getParentPath() + "," + String.join(",", lastSpaceIds);
// } else {
// roomSpacePath = dto.getParentPath() + "," + space.getId() + "," + String.join(",", lastSpaceIds);
// }
platRoom.setSpacePath(roomSpacePath); platRoom.setSpacePath(roomSpacePath);
platRoomService.updateById(platRoom); platRoomService.updateById(platRoom);
} }
...@@ -220,6 +218,44 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace ...@@ -220,6 +218,44 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
return result; return result;
} }
private void checkMaxLevel(PlatSpace space) {
int level = StrUtil.isBlank(space.getParentPath()) ? 0 : space.getParentPath().split(",").length;
if (level > 3) {
throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_SPACE_OVER_LEVEL);
}
String spaceId = space.getId();
List<PlatSpace> platSpaceList = list(Wrappers.<PlatSpace>lambdaQuery()
.apply(StringUtils.isNotBlank(spaceId), "find_in_set('" + spaceId + "',parent_path)"));
int sonLevel = 0;
if (CollUtil.isNotEmpty(platSpaceList)) {
final int[] maxLength = {1};
platSpaceList.forEach(s -> {
if (StrUtil.isBlank(s.getParentPath())) {
return;
}
String[] parentSpaceIds = s.getParentPath().split(",");
if (parentSpaceIds.length > maxLength[0]) {
maxLength[0] = parentSpaceIds.length;
}
});
sonLevel = maxLength[0];
}
if (level + sonLevel > 3) {
throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_SPACE_OVER_LEVEL);
}
}
private List<String> recursionSpaceId(List<String> result, String spaceId) {
List<PlatSpace> platSpaces = this.list(Wrappers.<PlatSpace>lambdaQuery().eq(PlatSpace::getParentId, spaceId));
if (CollUtil.isNotEmpty(platSpaces)) {
platSpaces.forEach(p -> recursionLastSpaceIds(p.getId(), result));
} else {
result.add(spaceId);
return result;
}
return result;
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void del(String id) { public void del(String id) {
......
server-service/src/main/java/com/makeit/vo/platform/alarm/PlatAlarmRecordVO.java
...@@ -74,4 +74,6 @@ public class PlatAlarmRecordVO extends BaseTenantDTO { ...@@ -74,4 +74,6 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
@ApiModelProperty(value = "是否存在未读") @ApiModelProperty(value = "是否存在未读")
private Boolean isUnWechatRead; private Boolean isUnWechatRead;
@ApiModelProperty(value = "是否存在未处理")
private Boolean statusFlag;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment