Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 55ae6b3c by 杨伟程
Options

长者管理建表

parent 499c23f3
Inline Side-by-side
Showing with 943 additions and 226 deletions
db/inti-elder.sql
...@@ -31,10 +31,15 @@ CREATE TABLE `elder` ...@@ -31,10 +31,15 @@ CREATE TABLE `elder`
`home_district_name` varchar(64) DEFAULT NULL COMMENT '家庭区名称', `home_district_name` varchar(64) DEFAULT NULL COMMENT '家庭区名称',
`home_address_detail` varchar(64) DEFAULT NULL COMMENT '家庭地址详细', `home_address_detail` varchar(64) DEFAULT NULL COMMENT '家庭地址详细',
`space_id` varchar(64) DEFAULT NULL COMMENT '空间id', `space_id` varchar(64) DEFAULT NULL COMMENT '空间id',
street_space_id varchar(64) NULL COMMENT '小区/社区/街道空间id',
building_space_id varchar(64) NULL COMMENT '楼栋空间id',
unit_space_id varchar(64) NULL COMMENT '单元空间id',
floor_space_id varchar(64) NULL COMMENT '楼层id',
`room_id` varchar(64) DEFAULT NULL COMMENT '房间id', `room_id` varchar(64) DEFAULT NULL COMMENT '房间id',
`bed_id` varchar(64) DEFAULT NULL COMMENT '床位id', `bed_id` varchar(64) DEFAULT NULL COMMENT '床位id',
`space_path` varchar(64) DEFAULT NULL COMMENT '空间-房间-床位路径', `space_path` varchar(64) DEFAULT NULL COMMENT '空间-房间-床位路径',
`remark` varchar(1024) DEFAULT NULL COMMENT '备注', `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
avatar varchar(64) 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-common/src/main/java/com/makeit/enums/CodeMessageEnum.java
...@@ -88,160 +88,8 @@ public enum CodeMessageEnum { ...@@ -88,160 +88,8 @@ public enum CodeMessageEnum {
SYSTEM_ERROR_SMS_CODE_NOT_CORRECT(500, "SYSTEM.ERROR.SMS.CODE.NOT.CORRECT"), SYSTEM_ERROR_SMS_CODE_NOT_CORRECT(500, "SYSTEM.ERROR.SMS.CODE.NOT.CORRECT"),
CODE_EXISTS(500, "BASE.ERROR.CODE.EXISTS"), CODE_EXISTS(500, "BASE.ERROR.CODE.EXISTS"),
SYSTEM_ERROR_CONTRACT_TEMPLATE_ERROR(500, "SYSTEM.ERROR.CONTRACT.TEMPLATE.ERROR"),
PLATFORM_ERROR_ELDER_CERTIFICATENUMBER_DUPLICATE(500, "PLATFORM.ERROR.ELDER.CERTIFICATENUMBER.DUPLICATE"),
PRODUCT_ERROR_CATEGORY_LEVEL_MAX_FOUR(500, "PRODUCT.ERROR.CATEGORY.LEVEL.MAX.FOUR"),
PRODUCT_ERROR_PARAM_CATEGORY_LEVEL_NOT_CORRECT(500, "PRODUCT.ERROR.PARAM.CATEGORY.LEVEL.NOT.CORRECT"),
PRODUCT_ERROR_DETAIL_TEMPLATE_PRODUCT_ONLY_ONE(500, "PRODUCT.ERROR.DETAIL.TEMPLATE.PRODUCT.ONLY.ONE"),
PRODUCT_ERROR_DELETE_HAS_SUB_CHECK(500, "PRODUCT.ERROR.DELETE.HAS.SUB.CHECK"),
PRODUCT_BRAND(500, "PRODUCT.BRAND"),
PRODUCT_SERIES(500, "PRODUCT.SERIES"),
PRODUCT_PRODUCT(500, "PRODUCT.PRODUCT"),
PRODUCT_CATEGORY(500, "PRODUCT.CATEGORY"),
PRODUCT_CATEGORY_PARAM(500, "PRODUCT.CATEGORY.PARAM"),
PRODUCT_TEMPLATE(500, "PRODUCT.TEMPLATE"),
PRODUCT_MODEL(500, "PRODUCT.MODEL"),
// ----------------------------------------- 型号
PDT_ERROR_MODEL_ODDER_CODE_NOT_UNIQUE(500, "PDT.ERROR.MODEL.ORDER.CODE.NOT.UNIQUE"),
PDT_ERROR_MODEL_NOT_EXISTED(500, "PDT.ERROR.MODEL.ORDER.CODE.NOT.EXISTED"),
PDT_ERROR_MODEL_HAS_BLOCKED(500, "PDT.ERROR.MODEL.HAS.BLOCKED"),
PDT_ERROR_MODEL_SALE_VALUE(500, "PDT.ERROR.MODEL.SALE.VALUE"),
PDT_ERROR_MODEL_UNIT_VALUE_SYNC(500, "PDT.ERROR.MODEL.UNIT.VALUE.SYNC"),
PDT_ERROR_CATEGORY_NOT_EXISTED(500, "PRODUCT.ERROR.CATEGORY.NOT.EXISTED"),
PDT_ERROR_PRODUCT_NOT_EXISTED(500, "PRODUCT.ERROR.PRODUCT.NOT.EXISTED"),
// ----------------------------------------- 型号
// ----------------------------------------- 价格
PRICE_PERMISSION_NOT_EXISTED(500, "price.permission.not.existed"),
PRICE_PERMISSION_SYSTEM_NOT_AUTH(500, "price.permission.system.not.auth"),
PRICE_CUSTOMER_BELOW_AUTH(500, "price.customer.below.auth"),
PRICE_STRATEGY_NOT_EXISTED(500, "price.strategy.not.existed"),
PRICE_STRATEGY_PRICE_OR_RATE_ERR(500, "price.strategy.price.or.rate.err"),
PRICE_STRATEGY_MIN_RATE(500, "price.strategy.min.rate"),
// ----------------------------------------- 价格
// ----------------------------------------- 系统设置
TNT_PRODUCT_SETTING_NOT_INIT(500, "tnt.product.setting.not.init"),
TNT_PRODUCT_SETTING_HAS_INIT(500, "tnt.product.setting.has.init"),
TNT_INVOICE_SETTING_NOT_INIT(500, "tnt.invoice.setting.not.init"),
TNT_INVOICE_SETTING_HAS_INIT(500, "tnt.invoice.setting.has.init"),
// ----------------------------------------- 系统设置
//订单
OD_ORDER_ERROR_CONTRACT_NO_DUPLICATE(500, "OD.ORDER.ERROR.CONTRACT.NO.DUPLICATE"),
OD_ORDER_WAIT_PAY_CAN_CANCEL(500, "OD.ORDER.WAIT.PAY.CAN.CANCEL"),
OD_ORDER_CANCEL_CANT_DO(500, "OD.ORDER.CANCEL.CANT.DO"),
OD_STOCK_IN_ORDER_NOT_EMPTY(500, "OD.STOCK.IN.ORDER.NOT.EMPTY"),
OD_ORDER_ERROR_NO_EXISTED(500, "OD.ORDER.ERROR.NO.EXISTED"),
//
OD_DELIVERY_PART_SUCCESS(500, "OD_DELIVERY_PART_SUCCESS"),
// 库存相关-----start-----
// 仓库名称重复
WMS_WARE_NAME_DUPLICATE(500, "wms.ware.name.duplicate"),
// 库存采购单号不能为空
WMS_WARE_STOCK_PURCHASE_ORDER_NO_IS_NOT_EMPTY(500, "wms.ware.stock.purchase.order.no.is.not.empty"),
// 在途库存采购单号不能为空
WMS_WARE_STOCK_PASSAGE_AMOUNT_IS_NOT_EMPTY_OR_NE_ZERO(500, "wms.ware.stock.passage.amount.is.not.empty.or.ne.zero"),
// 在途库存类型不能为空
WMS_WARE_STOCK_PASSAGE_TYPE_IS_NOT_EMPTY(500, "wms.ware.stock.passage.type.is.not.empty"),
// 入库单明细不能为空
SYSTEM_ERROR_DETAIL_NOT_EMPTY(500, "system.error.detail.not.empty"),
WMS_WARE_STOCK_NO_STOCK(500, "wms.ware.stock.no.stock"),
NO_SUPPLIER_INVENTORY_DATA(500, "no.supplier.inventory.data"),
WMS_WARE_STOCK_TYPE_NOT_EMPTY(500, "wms.ware.stock.type.not.empty"),
WMS_WARE_STOCK_EVENT_TYPE_NOT_EMPTY(500, "wms.ware.stock.event.type.not.empty"),
WMS_WARE_STOCK_MODEL_DETAIL_NOT_EMPTY(500, "wms.ware.stock.model.detail.not.empty"),
// 库存相关-----end-----
// 采购
NO_PURCHASE_STATUS_OPERATE(500, "no.purchase.status.no.operate"),
QUANTITY_OVER_LIMIT(500, "quantity.over.limit"),
FIN_CREDIT_CUS_COMPANY_ID_NOT_EMPTY(500, "fin.credit.cus.company.id.not.empty"),
FIN_CREDIT_CUS_COMPANY_EXIST(500, "fin.credit.cus.company.exist"),
FIN_CREDIT_ID_NOT_EMPTY(500, "fin.credit.id.not.empty"),
FIN_CREDIT_ACCOUNT_NOT_FOUND(11002, "fin.credit.account.not.found"),
FIN_CREDIT_NOT_ENOUGH(11003, "fin.credit.not.enough"),
FIN_CREDIT_TRADE_NOT_FOUND(11004, "fin.credit.trade.not.found"),
// ------------------------------------- 财务
// 余额
FIN_CUSTOMER_BALANCE_NOT_ENOUGH(11000, "fin.customer.balance.not.enough"),
FIN_CUSTOMER_CREDIT_NOT_ENOUGH(11000, "fin.customer.credit.not.enough"),
FIN_CUSTOMER_PAY_OVER_REPAY(11001, "fin.customer.pay.over.repay"),
// ------------------------------------- 财务
//-----购物车
CART_STOCK_COUNT_ERROR(20000, "CART.STOCK.COUNT.ERROR"),
//-----购物车
//---前台售后
OD_ORDER_AFTER_SALE_ERROR_AFTER_SALE_VALIDITY(500, "OD.AFTER.SALE.ORDER.ERROR.AFTER.SALE.VALIDITY"),
OD_ORDER_AFTER_SALE_ERROR_NOT_SUPPORT(500, "OD.AFTER.SALE.ORDER.ERROR.AFTER.NOT.SUPPORT"),
//---前台售后
//-----------销售售后
OD_AFTER_SALE_ERROR_CANCEL_NOT_SUPPORT(500, "OD.AFTER.SALE.ERROR.CANCEL.NOT.SUPPORT"),
SYSTEM_ERROR_QUANTITY_INSUFFICIENT(500, "SYSTEM.ERROR.QUANTITY.INSUFFICIENT"),
//基础信息
BASE_PRODUCT_ERROR_CODE_EXISTS(500, "BASE.PRODUCT.ERROR.CODE.EXISTS"),
BASE_LINE_ERROR_CODE_EXISTS(500, "BASE.LINE.ERROR.CODE.EXISTS"),
BASE_LINE_ERROR_NAME_EXISTS(500, "BASE.LINE.ERROR.NAME.EXISTS"),
BASE_EQUIP_PARAM_ERROR_CODE_EXISTS(500, "BASE.EQUIP.PARAM.ERROR.CODE.EXISTS"),
BASE_EQUIP_PARAM_GROUP_ERROR_CODE_EXISTS(500, "BASE.EQUIP.PARAM.GROUP.ERROR.CODE.EXISTS"),
BASE_PROCESS_ERROR_CODE_EXISTS(500, "BASE.PROCESS.ERROR.CODE.EXISTS"),
BASE_PROCESS_ERROR_NAME_EXISTS(500, "BASE.PROCESS.ERROR.NAME.EXISTS"),
BASE_STATION_POST_ERROR_CODE_EXISTS(500, "BASE.STATION.POST.ERROR.CODE.EXISTS"),
BASE_STATION_POST_ERROR_NAME_EXISTS(500, "BASE.STATION.POST.ERROR.NAME.EXISTS"),
BASE_PROCESS_GRAPH_INFO_ERROR_EXISTS(500, "BASE.PROCESS.GRAPH.INFO.ERROR.EXISTS"),
//esop
ESOP_ERROR_PARAM_GROUP_CANT_DELETE(500, "ESOP.ERROR.PARAM.GROUP.CANT.DELETE"),
ESOP_ERROR_PARAM_FIRST_NAME_DUPLICATE(500, "ESOP.ERROR.PARAM.FIRST.NAME.DUPLICATE"),
ESOP_ERROR_PARAM_SECOND_NAME_DUPLICATE(500, "ESOP.ERROR.PARAM.SECOND.NAME.DUPLICATE"),
ESOP_ERROR_ING_MAKE_CANT_DO(500, "ESOP.ERROR.ING.MAKE.CANT.DO"),
//点检
INS_ITEM_GROUP_CANT_DELETE(500,"INS.ITEM.GROUP.CANT.DELETE"),
// 治具
FIXTURE_STATION_CATEG_EXISTS(500, "FIXTURE.STATION.CATEG.EXISTS"),
SYSTEM_ERROR_WAREHOUSE_CANT_DELETE(500, "SYSTEM.ERROR.WAREHOUSE.CANT.DELETE"),
SYSTEM_ERROR_GOODS_SHELVES_CANT_DELETE(500, "SYSTEM.ERROR.GOODS.SHELVES.CANT.DELETE"),
SYSTEM_ERROR_WAREHOUSE_LOCATION_CANT_DELETE(500, "SYSTEM.ERROR.WAREHOUSE.LOCATION.CANT.DELETE"),
SYSTEM_ERROR_WAREHOUSE_LOCATION_GENERATE_QRCODE(500, "SYSTEM.ERROR.WAREHOUSE.LOCATION.GENERATE.QRCODE"),
FIXTURE_TEST_SYSTEM_DELETE_FAIL(500, "FIXTURE.TEST.SYSTEM.DELETE.FAIL"),
FIXTURE_CATEGORY_DELETE_FAIL(500, "FIXTURE.CATEGORY.DELETE.FAIL"),
FIXTURE_LEDGER_SERIES_EXISTS(500, "FIXTURE.LEDGER.SERIES.EXISTS"),
FIXTURE_LEDGER_DELETE_FAIL(500, "FIXTURE.LEDGER.DELETE.FAIL"),
//治具单据
FIXTURE_BOUND_TYPE_NOT_NULL(500, "FIXTURE.BOUND.TYPE.NOT.NULL"),
FIXTURE_LEND_OUT_BOUND_CHECK(500, "FIXTURE.LEND.OUT.BOUND.CHECK"),
//材料管理
MATERIAL_NAME_ALREADY_EXISTS(500, "物料编号已存在"),
NO_MATERIALS_TO_COUNT(500, "没有可盘点的物料"),
CATEGORY_NAME_ALREADY_EXISTS(500, "此类型名称已存在"),
REASON_NAME_ALREADY_EXISTS(500, "此出库名称已存在"),
; ;
/** /**
......
server-common/src/main/resources/locale/business_messages.properties 0 → 100644
# 业务信息
# 信息类型: info, error, warning, notice
# 格式: business + 信息类型 +\u3000模块\u3000+ 功能 +信息
# 请按模块区分\u3000例如business=error=auth=not=found, business=info=system
# 业务错误
TEST1=%ste%sst1
TEST2={0}te{1}st2
SYSTEM.ERROR.PARAMETER.ILLEGAL=参数不合法
SYSTEM.ERROR.SIGN.NOT.BLANK=签名不能为空
SYSTEM.ERROR.SIGN.ERROR=签名错误
SYSTEM.ERROR.NAME.DUPLICATE=该名称已存在
SYSTEM.ERROR.NAME.ENG.DUPLICATE=该英文名称已存在
SYSTEM.ERROR.CODE.DUPLICATE=该编码已存在
SYSTEM.ERROR.DICT.VALUE.DUPLICATE=该字典值已存在
SYSTEM.ERROR.DICT.NOT.EXIST=该字典值不存在
SYSTEM.ERROR.USER.JOB.NO.DUPLICATE=该登录名已存在
SYSTEM.ERROR.USER.ACCOUNT.DUPLICATE=该账号已存在
SYSTEM.ERROR.USER.NAME.DUPLICATE=该姓名已存在
SYSTEM.ERROR.USER.MOBILE.DUPLICATE=该手机号已存在
SYSTEM.ERROR.USER.MAIL.DUPLICATE=该邮箱已存在
SYSTEM.ERROR.CODE.RATE.LIMIT=验证码发送过于频繁，请稍后在发送
SYSTEM.ERROR.USER.PASSWORD.NOT.BLANK=密码不能为空
#SYSTEM.ERROR.USER.PASSWORD.FORMAT.ERROR=密码必须是包含大写字母、小写字母、数字、特殊符号(不含空格)的6~18位组合
SYSTEM.ERROR.USER.PASSWORD.FORMAT.ERROR=含字母和数字的6-18位密码
SYSTEM.ERROR.USER.PASSWORD.SAME=支付密码不能与登录密码一致
SYSTEM.ERROR.USER.SUPER.ADMIN.CANT.DO=超级管理员或超级管理员角色不支持该操作
SYSTEM.ERROR.USER.SUPER.ADMIN.CANT.EDIT=不能修改超级管理员或者超级管理员角色
SYSTEM.ERROR.ROLE.CANT.DELETE=存在员工绑定该角色，则不可删除
SYSTEM.ERROR.START.END.TIME.NOT.NULL=开始时间和结束时间不能为空
SYSTEM.ERROR.START.LE.END=开始时间要小于等于结束时间
SYSTEM.ERROR.CANT.CHANGE.TENANT.STATUS=当前时间要在开始时间和结束时间之间才能设置为启用
SYSTEM.ERROR.CANT.REMOVE.TENANT.USER.LINK=已经关联了厂别的管理员账号不允许删除
SYSTEM.ERROR.TMP.CODE.BLANK=验证码不能为空
#SYSTEM.ERROR.TMP.TOKEN.BLANK=token不能为空
SYSTEM.ERROR.TMP.TOKEN.BLANK=验证码不匹配
SYSTEM.ERROR.TOKEN.BLANK.OR.NOT.EXIST=token失效或不存在
SYSTEM.ERROR.NO.PERMISSION=无权限访问
SYSTEM.ERROR.TENANT.ID.NOT.BLANK=厂别id不能为空
SYSTEM.ERROR.TENANT.NOT.EXIST=该厂别不存在或者被禁用
SYSTEM.ERROR.DUPLICATE.REQUEST=请勿重复请求
#SYSTEM.ERROR.AUTH.USER.HAS.DISABLED=该用户已经离职/冻结
SYSTEM.ERROR.AUTH.USER.HAS.DISABLED=用户不存在/已冻结
SYSTEM.ERROR.AUTH.USER.ACCOUNT.PASSWORD=账号或者密码错误!
SYSTEM.ERROR.AUTH.USER.PASSWORD=密码错误
SYSTEM.ERROR.AUTH.USER.PAY.PASSWORD.BLANK=支付密码未设置
SYSTEM.ERROR.AUTH.USER.MAIL.NOT.SET=邮箱未设置
SYSTEM.ERROR.WECHAT.USER.NOT.EXIST=该企微账号对应的用户不存在
SYSTEM.ERROR.EXCEL.UPLOAD.EXIT=请上传excel
SYSTEM.ERROR.EXCEL.NOT.DATA=请至少上传一条数据
SYSTEM.ERROR.EXCEL.MAX.LIMIT=最大上传%s条数据
SYSTEM.ERROR.NO.EXCEL.FILE=请导入excel文件
SYSTEM.ERROR.CONFIG.NOT.EXIST=相关配置(数据字典不存在)
SYSTEM.ERROR.COMPANY.LEVEL.EXCEED=公司最多两级，集团——子公司
SYSTEM.ERROR.COMPANY.NOT.EXIST=公司不存在或者被禁用
SYSTEM.ERROR.DEPT.NAME.DUPLICATE=同一个公司下的部门不可重名
SYSTEM.ERROR.DEPT.LEVEL.EXCEED=同一个公司下的部门最多5级
SYSTEM.ERROR.DEPT.DELETE=当前部门有员工或当前部门有下级部门,不可删除
SYSTEM.ERROR.COMPANY.GROUP.CANT.EDIT=不能修改或删除集团
SYSTEM.ERROR.SMS.SEND=短信发送错误，错误信息%s
SYSTEM.ERROR.SMS.CODE.NOT.EXIST=验证码已过期
SYSTEM.ERROR.SMS.CODE.NOT.CORRECT=验证码不正确
PLATFORM.ERROR.ELDER.CERTIFICATENUMBER.DUPLICATE=证件号不能重复
\ No newline at end of file
server-common/src/main/resources/locale/business_messages_en_US.properties 0 → 100644
SYSTEM.ERROR.PARAMETER.ILLEGAL=Illegal parameter
SYSTEM.ERROR.SIGN.NOT.BLANK=Signature cannot be empty
SYSTEM.ERROR.SIGN.ERROR=Signature error
SYSTEM.ERROR.NAME.DUPLICATE=The name already exists
SYSTEM.ERROR.NAME.ENG.DUPLICATE=The English name already exists
SYSTEM.ERROR.CODE.DUPLICATE=The code already exists
SYSTEM.ERROR.DICT.VALUE.DUPLICATE=The dictionary value already exists
SYSTEM.ERROR.DICT.NOT.EXIST=The dictionary value does not exist
SYSTEM.ERROR.USER.JOB.NO.DUPLICATE=The job number already exists
SYSTEM.ERROR.USER.ACCOUNT.DUPLICATE=This account already exists
SYSTEM.ERROR.USER.NAME.DUPLICATE=The name already exists
SYSTEM.ERROR.USER.MOBILE.DUPLICATE=The mobile number already exists
SYSTEM.ERROR.USER.MAIL.DUPLICATE=The mailbox already exists
SYSTEM.ERROR.CODE.RATE.LIMIT=The verification code is sent too frequently. Please send it later
SYSTEM.ERROR.USER.PASSWORD.NOT.BLANK=Password cannot be empty
#SYSTEM.ERROR.USER.PASSWORD.FORMAT.ERROR=The password must be a combination of 6 to 18 digits including uppercase letters, lowercase letters, numbers and special symbols (excluding spaces)
SYSTEM.ERROR.USER.PASSWORD.FORMAT.ERROR=6-18 digit password with letters and numbers
SYSTEM.ERROR.USER.PASSWORD.SAME=The payment password cannot be the same as the login password
SYSTEM.ERROR.USER.SUPER.ADMIN.CANT.DO=The operation is not supported by the administrator or administrator role
SYSTEM.ERROR.USER.SUPER.ADMIN.CANT.EDIT=Cannot modify super administrator or super administrator role
SYSTEM.ERROR.ROLE.CANT.DELETE=This role is bound by an employee and cannot be deleted
SYSTEM.ERROR.START.END.TIME.NOT.NULL=Start time and end time cannot be empty
SYSTEM.ERROR.START.LE.END=The start time should be less than or equal to the end time
SYSTEM.ERROR.CANT.CHANGE.TENANT.STATUS=The current time must be between the start time and the end time before it can be set as enabled
SYSTEM.ERROR.CANT.REMOVE.TENANT.USER.LINK=The administrator account associated with the tenant cannot be deleted
SYSTEM.ERROR.TMP.CODE.BLANK=Verification code does not match
SYSTEM.ERROR.TMP.TOKEN.BLANK=Token is invalid
SYSTEM.ERROR.TOKEN.BLANK.OR.NOT.EXIST=Token is invalid or does not exist
SYSTEM.ERROR.NO.PERMISSION=No access
SYSTEM.ERROR.TENANT.ID.NOT.BLANK=Tenant ID cannot be empty
SYSTEM.ERROR.TENANT.NOT.EXIST=The tenant does not exist or is disabled
SYSTEM.ERROR.DUPLICATE.REQUEST=Do not repeat the request
#SYSTEM.ERROR.AUTH.USER.HAS.DISABLED=The user has resigned/frozen
SYSTEM.ERROR.AUTH.USER.HAS.DISABLED=User does not exist/frozen
SYSTEM.ERROR.AUTH.USER.ACCOUNT.PASSWORD=Account or password error!
SYSTEM.ERROR.AUTH.USER.PASSWORD=Password error
SYSTEM.ERROR.AUTH.USER.PAY.PASSWORD.BLANK=Payment password is not set
SYSTEM.ERROR.AUTH.USER.MAIL.NOT.SET=Mailbox is not set
SYSTEM.ERROR.WECHAT.USER.NOT.EXIST=The user corresponding to the enterprise WeChat account does not exist
SYSTEM.ERROR.EXCEL.UPLOAD.EXIT=Please upload excel
SYSTEM.ERROR.EXCEL.NOT.DATA=Please upload at least one piece of data
SYSTEM.ERROR.EXCEL.MAX.LIMIT=Maximum upload %s data
SYSTEM.ERROR.NO.EXCEL.FILE=Please import excel file
SYSTEM.ERROR.CONFIG.NOT.EXIST=Related configuration (data dictionary does not exist)
SYSTEM.ERROR.COMPANY.LEVEL.EXCEED=At most two levels of the company
SYSTEM.ERROR.COMPANY.NOT.EXIST=The company does not exist or is disabled
SYSTEM.ERROR.DEPT.NAME.DUPLICATE=Departments under the same company cannot have the same name
SYSTEM.ERROR.DEPT.LEVEL.EXCEED=Up to 5 levels of departments in the same company
SYSTEM.ERROR.DEPT.DELETE=The current department has employees or subordinate departments, which cannot be deleted
SYSTEM.ERROR.COMPANY.GROUP.CANT.EDIT=Group cannot be modified or deleted
SYSTEM.ERROR.SMS.SEND=SMS sending error, error message %s
SYSTEM.ERROR.SMS.CODE.NOT.EXIST=The verification code has expired
SYSTEM.ERROR.SMS.CODE.NOT.CORRECT=Incorrect verification code
server-common/src/main/resources/locale/system_messages.properties 0 → 100644
# 系统信息
# 信息类型: info, error, warning, notice
# 格式: menu + 信息类型 +　模块　+ 信息
# 请按模块区分　例如menu.auth.not.found, system.info.system
# 系统异常
success=成功
system.error=系统错误! 请联系管理员
system.error.exception=系统异常
system.error.method.not.allowed=请求方法不对，请检查请求方法(post，get等)
system.error.not.found=请求地址不存在，请检查请求链接
system.error.null.pointer=NullPointerException，请联系管理员
system.error.illegal.argument=非法参数，请检查参数
system.error.type.mismatch=参数类型不匹配
system.error.missing.servlet.request.parameter=请求参数缺失，必填参数不能为空
system.error.body.mismatch=body参数异常，采用body传参，格式json
validation.error.exception=数据校验编码
server-common/src/main/resources/locale/system_messages_en_US.properties 0 → 100644
# 系统信息
# 信息类型: info, error, warning, notice
# 格式: menu + 信息类型 +　模块　+ 信息
# 请按模块区分　例如menu.auth.not.found, system.info.system
# 系统异常
success=Success
system.error=System error! Please contact the administrator
system.error.exception=System abnormality
system.error.method.not.allowed=The request method is incorrect. Please check the request method (post, get, etc.)
system.error.not.found=The request address does not exist, please check the request link
system.error.null.pointer=NullPointerException，please contact the administrator
system.error.illegal.argument=Illegal parameter, please check the parameter
system.error.type.mismatch=Parameter type mismatch
system.error.missing.servlet.request.parameter=The request parameter is missing. The required parameter cannot be empty
system.error.body.mismatch=The body parameter is abnormal. The body parameter is passed in json format
validation.error.exception=Data verification code
server-common/src/main/resources/locale/validation_messages.properties 0 → 100644
# 校验信息提示
# 信息类型: info, error, warning, notice
# 格式: validation + 信息类型 +\u3000模块 + 功能\u3000+ 信息
# 请按模块区分\u3000例如validation.error.auth.not.found, validation.info.system
# 数据校验
validation.error.notBlank=请输入参数{0}{1}
validation.error.min=大于参数
# 项目ID
validation.error.projectId.notBlank=项目ID不能为空
#系统管理模块
##数据字典模块
validation.error.system.dictionary.status.notBlank=状态不为空
validation.error.system.dictionary.status.allowValue=数据字典状态值错误
validation.error.system.dictionary.code.notBlank=数据字典编码不为空
validation.error.system.dictionary.code.size=数据字典编码必须在100个字符内
validation.error.system.dictionary.name.notBlank=数据字典名称不为空
validation.error.system.dictionary.name.size=数据字典名称必须在20个字符内
validation.error.system.dictionary.value.notBlank=数据字典值不能为空
validation.error.system.dictionary.value.allowValue=数据字典值只能为数字
validation.error.system.dictionary.description.notBlank=数据字典描述不能为空
validation.error.system.dictionary.description.size=数据字典描述必须在200字符内
validation.error.system.dict.option=可选值为 %s
\ No newline at end of file
server-common/src/main/resources/locale/validation_messages_en_US.properties 0 → 100644
# 校验信息提示
# 信息类型: info, error, warning, notice
# 格式: validation + 信息类型 +\u3000模块 + 功能\u3000+ 信息
# 请按模块区分\u3000例如validation.error.auth.not.found, validation.info.system
# 数据校验
validation.error.notBlank=请输入参数{0}{1}
validation.error.min=大于参数
# 项目ID
validation.error.projectId.notBlank=项目ID不能为空
#系统管理模块
##数据字典模块
validation.error.system.dictionary.status.notBlank=状态不为空
validation.error.system.dictionary.status.allowValue=数据字典状态值错误
validation.error.system.dictionary.code.notBlank=数据字典编码不为空
validation.error.system.dictionary.code.size=数据字典编码必须在100个字符内
validation.error.system.dictionary.name.notBlank=数据字典名称不为空
validation.error.system.dictionary.name.size=数据字典名称必须在20个字符内
validation.error.system.dictionary.value.notBlank=数据字典值不能为空
validation.error.system.dictionary.value.allowValue=数据字典值只能为数字
validation.error.system.dictionary.description.notBlank=数据字典描述不能为空
validation.error.system.dictionary.description.size=数据字典描述必须在200字符内
validation.error.system.dict.option=Optional value is %s
\ No newline at end of file
server-service/src/main/java/com/makeit/dto/platform/elder/ElderAddDTO.java 0 → 100644
package com.makeit.dto.platform.elder;
import com.makeit.common.dto.BaseTenantIdDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
/**
* <p>
* 长者基本信息
* </p>
*
* @author eugene young
* @since 2023-08-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Elder对象", description = "长者基本信息")
public class ElderAddDTO extends BaseTenantIdDTO {
@NotBlank(message = "姓名不能为空")
@Size(max = 50, message = "姓名最长为50个字符")
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "年龄")
private Integer age;
@ApiModelProperty(value = "性别 数据字典 1 男 2 女")
private String sex;
@NotBlank(message = "证件类型不能为空")
@ApiModelProperty(value = "证件类型 数据字典 1 身份证 2 IC卡 3 护照 4 驾驶证 5 其他证件")
private String certificateType;
@NotBlank(message = "证件号码不能为空")
@Size(max = 50, message = "证件号码最长为50个字符")
@ApiModelProperty(value = "证件号码")
private String certificateNumber;
@ApiModelProperty(value = "手机号码")
private String phone;
@ApiModelProperty(value = "空间id")
private String spaceId;
@ApiModelProperty(value = "小区/社区/街道空间id")
private String streetSpaceId;
@ApiModelProperty(value = "楼栋空间id")
private String buildingSpaceId;
@ApiModelProperty(value = "单元空间id")
private String unitSpaceId;
@ApiModelProperty(value = "楼层id")
private String floorSpaceId;
@ApiModelProperty(value = "房间id")
private String roomId;
@ApiModelProperty(value = "床位id")
private String bedId;
@ApiModelProperty(value = "空间-房间-床位路径")
private String spacePath;
@ApiModelProperty(value = "备注")
private String remark;
}
server-service/src/main/java/com/makeit/dto/platform/elder/ElderDTOVO.java 0 → 100644
package com.makeit.dto.platform.elder;
import com.makeit.common.dto.BaseTenantIdDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/**
* <p>
* 长者基本信息
* </p>
*
* @author eugene young
* @since 2023-08-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="Elder对象", description="长者基本信息")
public class ElderDTOVO extends BaseTenantIdDTO {
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "年龄")
private Integer age;
@ApiModelProperty(value = "性别 数据字典 1 男 2 女")
private String sex;
@ApiModelProperty(value = "证件类型 数据字典 1 身份证 2 IC卡 3 护照 4 驾驶证 5 其他证件")
private String certificateType;
@ApiModelProperty(value = "证件号码")
private String certificateNumber;
@ApiModelProperty(value = "手机号码")
private String phone;
@ApiModelProperty(value = "固定电话")
private String telephone;
@ApiModelProperty(value = "出生日期")
private String birth;
@ApiModelProperty(value = "民族")
private String nation;
@ApiModelProperty(value = "血型")
private String blood;
@ApiModelProperty(value = "身高")
private String height;
@ApiModelProperty(value = "体重")
private String weight;
@ApiModelProperty(value = "户籍地址")
private String registerAddress;
@ApiModelProperty(value = "户籍省code")
private String registerProvinceCode;
@ApiModelProperty(value = "户籍省名称")
private String registerProvinceName;
@ApiModelProperty(value = "户籍市code")
private String registerCityCode;
@ApiModelProperty(value = "户籍市名称")
private String registerCityName;
@ApiModelProperty(value = "户籍区code")
private String registerDistrictCode;
@ApiModelProperty(value = "户籍区名称")
private String registerDistrictName;
@ApiModelProperty(value = "户籍地址详细")
private String registerAddressDetail;
@ApiModelProperty(value = "家庭地址")
private String homeAddress;
@ApiModelProperty(value = "家庭省code")
private String homeProvinceCode;
@ApiModelProperty(value = "家庭省名称")
private String homeProvinceName;
@ApiModelProperty(value = "家庭市code")
private String homeCityCode;
@ApiModelProperty(value = "家庭市名称")
private String homeCityName;
@ApiModelProperty(value = "家庭区code")
private String homeDistrictCode;
@ApiModelProperty(value = "家庭区名称")
private String homeDistrictName;
@ApiModelProperty(value = "家庭地址详细")
private String homeAddressDetail;
@ApiModelProperty(value = "空间id")
private String spaceId;
@ApiModelProperty(value = "小区/社区/街道空间id")
private String streetSpaceId;
@ApiModelProperty(value = "楼栋空间id")
private String buildingSpaceId;
@ApiModelProperty(value = "单元空间id")
private String unitSpaceId;
@ApiModelProperty(value = "楼层id")
private String floorSpaceId;
@ApiModelProperty(value = "房间id")
private String roomId;
@ApiModelProperty(value = "床位id")
private String bedId;
@ApiModelProperty(value = "空间-房间-床位路径")
private String spacePath;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "头像文件id")
private String avatar;
@ApiModelProperty(value = "社会关系列表")
private List<ElderSocialRelationDTOVO> relationList;
@ApiModelProperty(value = "健康状况")
private ElderHealthInfoDTOVO healthInfo;
@ApiModelProperty(value = "其他信息")
private ElderOtherInfoDTOVO otherInfo;
}
server-service/src/main/java/com/makeit/dto/platform/elder/ElderHealthInfoDTOVO.java 0 → 100644
package com.makeit.dto.platform.elder;
import com.makeit.common.dto.BaseTenantIdDTO;
import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 长者健康状态
* </p>
*
* @author eugene young
* @since 2023-08-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElderHealthInfo对象", description="长者健康状态")
public class ElderHealthInfoDTOVO extends BaseTenantIdDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "长者id")
private String elderId;
@ApiModelProperty(value = "老人类型")
private String elderType;
@ApiModelProperty(value = "医疗保险 数据字典 1 有 0 无")
private String medicalInsurance;
@ApiModelProperty(value = "疾病状况")
private String illness;
@ApiModelProperty(value = "饮食禁忌")
private String foodProhibition;
@ApiModelProperty(value = "兴趣爱好")
private String hobbies;
@ApiModelProperty(value = "呼吸率，范围用-区分")
private String respiratoryRate;
@ApiModelProperty(value = "呼吸率异常时间 单位：s")
private String respiratoryExceptionTime;
@ApiModelProperty(value = "心率，范围用-区分")
private String heartRate;
@ApiModelProperty(value = "心率异常时间 单位 s")
private String heartExceptionTime;
@ApiModelProperty(value = "备注")
private String remark;
}
server-service/src/main/java/com/makeit/dto/platform/elder/ElderOtherInfoDTOVO.java 0 → 100644
package com.makeit.dto.platform.elder;
import com.makeit.common.dto.BaseTenantIdDTO;
import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 长者其他信息
* </p>
*
* @author eugene young
* @since 2023-08-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElderOtherInfo对象", description="长者其他信息")
public class ElderOtherInfoDTOVO extends BaseTenantIdDTO {
@ApiModelProperty(value = "长者id")
private String elderId;
@ApiModelProperty(value = "文化程度")
private String education;
@ApiModelProperty(value = "婚姻")
private String marriage;
@ApiModelProperty(value = "信仰")
private String belief;
@ApiModelProperty(value = "职业")
private String profession;
@ApiModelProperty(value = "收入")
private String income;
@ApiModelProperty(value = "生活状况")
private String lifeStatus;
@ApiModelProperty(value = "子女数量")
private Integer childrenQuantity;
@ApiModelProperty(value = "外地子女数量")
private Integer otherChildrenQuantity;
@ApiModelProperty(value = "政治面貌")
private String politicsStatus;
@ApiModelProperty(value = "工作单位")
private String workUnit;
}
server-service/src/main/java/com/makeit/dto/platform/elder/ElderSocialRelationDTOVO.java 0 → 100644
package com.makeit.dto.platform.elder;
import com.makeit.common.dto.BaseTenantIdDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 长者社会关系
* </p>
*
* @author eugene young
* @since 2023-08-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElderSocialRelation对象", description="长者社会关系")
public class ElderSocialRelationDTOVO extends BaseTenantIdDTO {
@ApiModelProperty(value = "长者id")
private String elderId;
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "关系 数据字典 1 配偶 2 父女")
private String relation;
@ApiModelProperty(value = "联系电话")
private String phone;
@ApiModelProperty(value = "身份证号码")
private String idCard;
@ApiModelProperty(value = "是否紧急联系人 数据字典 1 是 0 否")
private String emergencyContact;
@ApiModelProperty(value = "备注")
private String remark;
}
server-service/src/main/java/com/makeit/entity/platform/elder/Elder.java
package com.makeit.entity.platform.elder; package com.makeit.entity.platform.elder;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.makeit.common.entity.BaseBusEntity; import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
...@@ -19,7 +23,7 @@ import lombok.EqualsAndHashCode; ...@@ -19,7 +23,7 @@ import lombok.EqualsAndHashCode;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="Elder对象", description="长者基本信息") @ApiModel(value = "Elder对象", description = "长者基本信息")
public class Elder extends BaseBusEntity { public class Elder extends BaseBusEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -27,9 +31,11 @@ public class Elder extends BaseBusEntity { ...@@ -27,9 +31,11 @@ public class Elder extends BaseBusEntity {
@ApiModelProperty(value = "姓名") @ApiModelProperty(value = "姓名")
private String name; private String name;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "年龄") @ApiModelProperty(value = "年龄")
private Integer age; private Integer age;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "性别 数据字典 1 男 2 女") @ApiModelProperty(value = "性别 数据字典 1 男 2 女")
private String sex; private String sex;
...@@ -39,104 +45,136 @@ public class Elder extends BaseBusEntity { ...@@ -39,104 +45,136 @@ public class Elder extends BaseBusEntity {
@ApiModelProperty(value = "证件号码") @ApiModelProperty(value = "证件号码")
private String certificateNumber; private String certificateNumber;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "手机号码") @ApiModelProperty(value = "手机号码")
private String phone; private String phone;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "固定电话") @ApiModelProperty(value = "固定电话")
private String telephone; private String telephone;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "出生日期") @ApiModelProperty(value = "出生日期")
private String birth; private String birth;
@ApiModelProperty(value = "名族") @TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "民族")
private String nation; private String nation;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "血型") @ApiModelProperty(value = "血型")
private String blood; private String blood;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "身高") @ApiModelProperty(value = "身高")
private String height; private String height;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "体重") @ApiModelProperty(value = "体重")
private String weight; private String weight;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "户籍地址") @ApiModelProperty(value = "户籍地址")
private String registerAddress; private String registerAddress;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "户籍省code") @ApiModelProperty(value = "户籍省code")
private String registerProvinceCode; private String registerProvinceCode;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "户籍省名称") @ApiModelProperty(value = "户籍省名称")
private String registerProvinceName; private String registerProvinceName;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "户籍市code") @ApiModelProperty(value = "户籍市code")
private String registerCityCode; private String registerCityCode;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "户籍市名称") @ApiModelProperty(value = "户籍市名称")
private String registerCityName; private String registerCityName;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "户籍区code") @ApiModelProperty(value = "户籍区code")
private String registerDistrictCode; private String registerDistrictCode;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "户籍区名称") @ApiModelProperty(value = "户籍区名称")
private String registerDistrictName; private String registerDistrictName;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "户籍地址详细") @ApiModelProperty(value = "户籍地址详细")
private String registerAddressDetail; private String registerAddressDetail;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "家庭地址") @ApiModelProperty(value = "家庭地址")
private String homeAddress; private String homeAddress;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "家庭省code") @ApiModelProperty(value = "家庭省code")
private String homeProvinceCode; private String homeProvinceCode;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "家庭省名称") @ApiModelProperty(value = "家庭省名称")
private String homeProvinceName; private String homeProvinceName;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "家庭市code") @ApiModelProperty(value = "家庭市code")
private String homeCityCode; private String homeCityCode;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "家庭市名称") @ApiModelProperty(value = "家庭市名称")
private String homeCityName; private String homeCityName;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "家庭区code") @ApiModelProperty(value = "家庭区code")
private String homeDistrictCode; private String homeDistrictCode;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "家庭区名称") @ApiModelProperty(value = "家庭区名称")
private String homeDistrictName; private String homeDistrictName;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "家庭地址详细") @ApiModelProperty(value = "家庭地址详细")
private String homeAddressDetail; private String homeAddressDetail;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "空间id") @ApiModelProperty(value = "空间id")
private String spaceId; private String spaceId;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "小区/社区/街道空间id")
private String streetSpaceId;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "楼栋空间id")
private String buildingSpaceId;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "单元空间id")
private String unitSpaceId;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "楼层id")
private String floorSpaceId;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "房间id") @ApiModelProperty(value = "房间id")
private String roomId; private String roomId;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "床位id") @ApiModelProperty(value = "床位id")
private String bedId; private String bedId;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "空间-房间-床位路径") @ApiModelProperty(value = "空间-房间-床位路径")
private String spacePath; private String spacePath;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
@ApiModelProperty(value = "创建者") @TableField(updateStrategy = FieldStrategy.IGNORED)
private String createBy; @ApiModelProperty(value = "头像文件id")
private String avatar;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createDate;
@ApiModelProperty(value = "更新者")
private String updateBy;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateDate;
@ApiModelProperty(value = " 租户id ")
private String tenantId;
} }
server-service/src/main/java/com/makeit/entity/platform/elder/ElderHealthInfo.java
package com.makeit.entity.platform.elder; package com.makeit.entity.platform.elder;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.FieldStrategy;
import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.makeit.common.entity.BaseBusEntity; import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -27,50 +26,45 @@ public class ElderHealthInfo extends BaseBusEntity { ...@@ -27,50 +26,45 @@ public class ElderHealthInfo extends BaseBusEntity {
@ApiModelProperty(value = "长者id") @ApiModelProperty(value = "长者id")
private String elderId; private String elderId;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "老人类型") @ApiModelProperty(value = "老人类型")
private String elderType; private String elderType;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "医疗保险 数据字典 1 有 0 无") @ApiModelProperty(value = "医疗保险 数据字典 1 有 0 无")
private String medicalInsurance; private String medicalInsurance;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "疾病状况") @ApiModelProperty(value = "疾病状况")
private String illness; private String illness;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "饮食禁忌") @ApiModelProperty(value = "饮食禁忌")
private String foodProhibition; private String foodProhibition;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "兴趣爱好") @ApiModelProperty(value = "兴趣爱好")
private String hobbies; private String hobbies;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "呼吸率，范围用-区分") @ApiModelProperty(value = "呼吸率，范围用-区分")
private String respiratoryRate; private String respiratoryRate;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "呼吸率异常时间 单位：s") @ApiModelProperty(value = "呼吸率异常时间 单位：s")
private String respiratoryExceptionTime; private String respiratoryExceptionTime;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "心率，范围用-区分") @ApiModelProperty(value = "心率，范围用-区分")
private String heartRate; private String heartRate;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "心率异常时间 单位 s") @ApiModelProperty(value = "心率异常时间 单位 s")
private String heartExceptionTime; private String heartExceptionTime;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
@ApiModelProperty(value = "创建者")
private String createBy;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createDate;
@ApiModelProperty(value = "更新者")
private String updateBy;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateDate;
@ApiModelProperty(value = " 租户id ")
private String tenantId;
} }
server-service/src/main/java/com/makeit/entity/platform/elder/ElderOtherInfo.java
package com.makeit.entity.platform.elder; package com.makeit.entity.platform.elder;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.FieldStrategy;
import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.makeit.common.entity.BaseBusEntity; import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -27,50 +26,44 @@ public class ElderOtherInfo extends BaseBusEntity { ...@@ -27,50 +26,44 @@ public class ElderOtherInfo extends BaseBusEntity {
@ApiModelProperty(value = "长者id") @ApiModelProperty(value = "长者id")
private String elderId; private String elderId;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "文化程度") @ApiModelProperty(value = "文化程度")
private String education; private String education;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "婚姻") @ApiModelProperty(value = "婚姻")
private String marriage; private String marriage;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "信仰") @ApiModelProperty(value = "信仰")
private String belief; private String belief;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "职业") @ApiModelProperty(value = "职业")
private String profession; private String profession;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "收入") @ApiModelProperty(value = "收入")
private String income; private String income;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "生活状况") @ApiModelProperty(value = "生活状况")
private String lifeStatus; private String lifeStatus;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "子女数量") @ApiModelProperty(value = "子女数量")
private Integer childrenQuantity; private Integer childrenQuantity;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "外地子女数量") @ApiModelProperty(value = "外地子女数量")
private Integer otherChildrenQuantity; private Integer otherChildrenQuantity;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "政治面貌") @ApiModelProperty(value = "政治面貌")
private String politicsStatus; private String politicsStatus;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "工作单位") @ApiModelProperty(value = "工作单位")
private String workUnit; private String workUnit;
@ApiModelProperty(value = "创建者")
private String createBy;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createDate;
@ApiModelProperty(value = "更新者")
private String updateBy;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateDate;
@ApiModelProperty(value = " 租户id ")
private String tenantId;
} }
server-service/src/main/java/com/makeit/entity/platform/elder/ElderSocialRelation.java
package com.makeit.entity.platform.elder; package com.makeit.entity.platform.elder;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.FieldStrategy;
import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.makeit.common.entity.BaseBusEntity; import com.makeit.common.entity.BaseBusEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -27,38 +26,28 @@ public class ElderSocialRelation extends BaseBusEntity { ...@@ -27,38 +26,28 @@ public class ElderSocialRelation extends BaseBusEntity {
@ApiModelProperty(value = "长者id") @ApiModelProperty(value = "长者id")
private String elderId; private String elderId;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "姓名") @ApiModelProperty(value = "姓名")
private String name; private String name;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "关系 数据字典 1 配偶 2 父女") @ApiModelProperty(value = "关系 数据字典 1 配偶 2 父女")
private String relation; private String relation;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "联系电话") @ApiModelProperty(value = "联系电话")
private String phone; private String phone;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "身份证号码") @ApiModelProperty(value = "身份证号码")
private String idCard; private String idCard;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "是否紧急联系人 数据字典 1 是 0 否") @ApiModelProperty(value = "是否紧急联系人 数据字典 1 是 0 否")
private String emergencyContact; private String emergencyContact;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
@ApiModelProperty(value = "创建者")
private String createBy;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createDate;
@ApiModelProperty(value = "更新者")
private String updateBy;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateDate;
@ApiModelProperty(value = " 租户id ")
private String tenantId;
} }
server-service/src/main/java/com/makeit/server/platform/elder/ElderService.java
package com.makeit.server.platform.elder; package com.makeit.server.platform.elder;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.makeit.dto.platform.elder.ElderAddDTO;
import com.makeit.dto.platform.elder.ElderDTOVO;
import com.makeit.entity.platform.elder.Elder; import com.makeit.entity.platform.elder.Elder;
/** /**
...@@ -13,4 +15,10 @@ import com.makeit.entity.platform.elder.Elder; ...@@ -13,4 +15,10 @@ import com.makeit.entity.platform.elder.Elder;
*/ */
public interface ElderService extends IService<Elder> { public interface ElderService extends IService<Elder> {
void add(ElderAddDTO dto);
void edit(ElderDTOVO dto);
ElderDTOVO view(String id);
} }
server-service/src/main/java/com/makeit/server/platform/elder/impl/ElderServiceImpl.java
package com.makeit.server.platform.elder.impl; package com.makeit.server.platform.elder.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.dto.platform.elder.*;
import com.makeit.entity.platform.elder.Elder; import com.makeit.entity.platform.elder.Elder;
import com.makeit.entity.platform.elder.ElderHealthInfo;
import com.makeit.entity.platform.elder.ElderOtherInfo;
import com.makeit.entity.platform.elder.ElderSocialRelation;
import com.makeit.enums.CodeMessageEnum;
import com.makeit.exception.BusinessException;
import com.makeit.mapper.platform.elder.ElderMapper; import com.makeit.mapper.platform.elder.ElderMapper;
import com.makeit.server.platform.elder.ElderHealthInfoService;
import com.makeit.server.platform.elder.ElderOtherInfoService;
import com.makeit.server.platform.elder.ElderService; import com.makeit.server.platform.elder.ElderService;
import com.makeit.server.platform.elder.ElderSocialRelationService;
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.List;
/** /**
* <p> * <p>
...@@ -17,4 +32,98 @@ import org.springframework.stereotype.Service; ...@@ -17,4 +32,98 @@ import org.springframework.stereotype.Service;
@Service @Service
public class ElderServiceImpl extends ServiceImpl<ElderMapper, Elder> implements ElderService { public class ElderServiceImpl extends ServiceImpl<ElderMapper, Elder> implements ElderService {
@Autowired
private ElderSocialRelationService elderSocialRelationService;
@Autowired
private ElderHealthInfoService elderHealthInfoService;
@Autowired
private ElderOtherInfoService elderOtherInfoService;
private void check(ElderAddDTO dto) {
Elder old = getOne(new QueryWrapper<Elder>().lambda()
.eq(Elder::getCertificateType, dto.getCertificateType())
.eq(Elder::getCertificateNumber, dto.getCertificateNumber())
);
if (old != null && !old.getId().equals(dto.getId())) {
throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_ELDER_CERTIFICATENUMBER_DUPLICATE);
}
}
@Override
@Transactional
public void add(ElderAddDTO dto) {
check(dto);
Elder elder = BeanDtoVoUtils.convert(dto, Elder.class);
save(elder);
}
@Override
@Transactional
public void edit(ElderDTOVO dto) {
check(BeanDtoVoUtils.convert(dto, ElderAddDTO.class));
Elder elder = BeanDtoVoUtils.convert(dto, Elder.class);
updateById(elder);
List<ElderSocialRelation> relationList = BeanDtoVoUtils.listVo(dto.getRelationList(), ElderSocialRelation.class);
relationList.forEach(e -> {
e.setElderId(dto.getId());
});
elderSocialRelationService.remove(new QueryWrapper<ElderSocialRelation>().lambda()
.eq(ElderSocialRelation::getElderId, dto.getId()));
elderSocialRelationService.saveBatch(relationList);
ElderHealthInfo healthInfo = BeanDtoVoUtils.convert(dto.getHealthInfo(), ElderHealthInfo.class);
healthInfo.setElderId(dto.getId());
elderHealthInfoService.saveOrUpdate(healthInfo);
ElderOtherInfo otherInfo = BeanDtoVoUtils.convert(dto.getOtherInfo(), ElderOtherInfo.class);
otherInfo.setElderId(dto.getId());
elderOtherInfoService.saveOrUpdate(otherInfo);
}
@Override
public ElderDTOVO view(String id) {
Elder elder = getById(id);
ElderDTOVO vo = BeanDtoVoUtils.convert(elder, ElderDTOVO.class);
List<ElderSocialRelation> dbSocialRelationList = elderSocialRelationService.list(new QueryWrapper<ElderSocialRelation>().lambda()
.eq(ElderSocialRelation::getElderId, id));
List<ElderSocialRelationDTOVO> socialRelationList = BeanDtoVoUtils.listVo(dbSocialRelationList, ElderSocialRelationDTOVO.class);
vo.setRelationList(socialRelationList);
ElderHealthInfo dbHealthInfo = elderHealthInfoService.getOne(new QueryWrapper<ElderHealthInfo>().lambda()
.eq(ElderHealthInfo::getElderId, id));
ElderHealthInfoDTOVO healthInfo = BeanDtoVoUtils.convert(dbHealthInfo, ElderHealthInfoDTOVO.class);
vo.setHealthInfo(healthInfo);
ElderOtherInfo dbOtherInfo = elderOtherInfoService.getOne(new QueryWrapper<ElderOtherInfo>().lambda()
.eq(ElderOtherInfo::getElderId, id));
ElderOtherInfoDTOVO otherInfo = BeanDtoVoUtils.convert(dbOtherInfo, ElderOtherInfoDTOVO.class);
vo.setOtherInfo(otherInfo);
return vo;
}
} }
//TODO ywc 数据字典
//还有空间相关的没有 列表 详情 导入 导出
\ No newline at end of file
server-service/src/main/java/com/makeit/vo/platform/elder/ElderListVO.java 0 → 100644
package com.makeit.vo.platform.elder;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.makeit.common.dto.BaseTenantIdDTO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.ibatis.type.LocalDateTimeTypeHandler;
import java.time.LocalDateTime;
/**
* <p>
* 长者基本信息
* </p>
*
* @author eugene young
* @since 2023-08-29
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Elder对象", description = "长者基本信息")
public class ElderListVO extends BaseTenantIdDTO {
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "年龄")
private Integer age;
@ApiModelProperty(value = "性别 数据字典 1 男 2 女")
private String sex;
@ApiModelProperty(value = "证件类型 数据字典 1 身份证 2 IC卡 3 护照 4 驾驶证 5 其他证件")
private String certificateType;
@ApiModelProperty(value = "证件号码")
private String certificateNumber;
@ApiModelProperty(value = "手机号码")
private String phone;
@ApiModelProperty(value = "空间id")
private String spaceId;
@ApiModelProperty(value = "小区/社区/街道空间id")
private String streetSpaceId;
@ApiModelProperty(value = "楼栋空间id")
private String buildingSpaceId;
@ApiModelProperty(value = "单元空间id")
private String unitSpaceId;
@ApiModelProperty(value = "楼层id")
private String floorSpaceId;
@ApiModelProperty(value = "房间id")
private String roomId;
@ApiModelProperty(value = "床位id")
private String bedId;
@ApiModelProperty(value = "空间-房间-床位路径")
private String spacePath;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间", required = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createdAt;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间", required = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updatedAt;
@ApiModelProperty(value = "创建人名称")
private String createBy;
@ApiModelProperty(value = "更新人名称")
private String updateBy;
}
server-web/platform-web.iml
...@@ -245,6 +245,8 @@ ...@@ -245,6 +245,8 @@
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" /> <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:core:3.3.2" level="project" /> <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.2" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
<orderEntry type="module" module-name="saas-module" />
<orderEntry type="module" module-name="server-service" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.5.6" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.5.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.6" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.6" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.6" level="project" />
......
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