Skip to content

黄嘉阳 / iot-platform-server

Go to a project
Commit 5fc97f14 by lzy
Options

Merge branch 'dev' of git.xmmakeit.com:huangjiay/iot-platform-server into dev

parents 3772e3d5 11bc26d3
Expand all
Inline Side-by-side
Showing with 965 additions and 297 deletions
db/inti-elder.sql
...@@ -38,6 +38,11 @@ CREATE TABLE `plat_elder` ...@@ -38,6 +38,11 @@ CREATE TABLE `plat_elder`
`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 '空间-房间-床位路径',
org_id varchar(64) NULL COMMENT '组织id',
city_org_id varchar(64) NULL COMMENT '城市组织id',
district_org_id varchar(64) NULL COMMENT '区组织id',
street_org_id varchar(64) NULL COMMENT '街道组织id',
org_path varchar(64) NULL COMMENT '组织路径',
`remark` varchar(1024) DEFAULT NULL COMMENT '备注', `remark` varchar(1024) DEFAULT NULL COMMENT '备注',
avatar varchar(64) NULL COMMENT '头像文件id', avatar varchar(64) NULL COMMENT '头像文件id',
`create_by` varchar(64) DEFAULT NULL COMMENT '创建者', `create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
......
db/sys.sql 0 → 100644
INSERT INTO sys_dictionary_category (id, code, name, create_date, update_date, del_flag)
VALUES ('5', 'sex', '性别', '2022-05-16 17:08:33', '2022-05-16 17:08:37', '0');
INSERT INTO sys_dictionary_category (id, code, name, create_date, update_date, del_flag)
VALUES ('6', 'elder.medicalInsurance', '老人医疗保险情况', '2022-05-16 17:08:33', '2022-05-16 17:08:37', '0');
INSERT INTO sys_dictionary (id, code, name, value, sort, description, category_id, create_date, update_date, del_flag)
VALUES ('12', 'sex.man', '男', '1', 1, '', '5', '2022-05-16 17:13:23', '2022-05-16 17:13:27', '0');
INSERT INTO sys_dictionary (id, code, name, value, sort, description, category_id, create_date, update_date, del_flag)
VALUES ('13', 'sex.woman', '女', '2', 2, '', '5', '2022-05-16 17:13:23', '2022-05-16 17:13:27', '0');
INSERT INTO sys_dictionary (id, code, name, value, sort, description, category_id, create_date, update_date, del_flag)
VALUES ('20', 'elder.medicalInsurance.yes', '有', '1', 1, '', '6', '2022-05-16 17:13:23', '2022-05-16 17:13:27', '0');
INSERT INTO sys_dictionary (id, code, name, value, sort, description, category_id, create_date, update_date, del_flag)
VALUES ('21', 'elder.medicalInsurance.no', '无', '0', 0, '', '6', '2022-05-16 17:13:23', '2022-05-16 17:13:27', '0');
INSERT INTO sys_config_category (id, tenant_id, code, name, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('1', '0', 'elder.certificateType', '长者证件类型', '2023-07-11 10:55:06', '2023-07-11 10:55:08', '0', null, null, null);
INSERT INTO sys_config_category (id, tenant_id, code, name, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('2', '0', 'elder.blood', '长者血型', '2023-07-11 10:55:06', '2023-07-11 10:55:08', '0', null, null, null);
INSERT INTO sys_config_category (id, tenant_id, code, name, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('3', '0', 'elder.socialRelation', '长者社会关系', '2023-07-11 10:55:06', '2023-07-11 10:55:08', '0', null, null, null);
INSERT INTO sys_config_category (id, tenant_id, code, name, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('4', '0', 'elder.elderType', '长者老人类型', '2023-07-11 10:55:06', '2023-07-11 10:55:08', '0', null, null, null);
INSERT INTO sys_config_category (id, tenant_id, code, name, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('5', '0', 'elder.illness', '长者疾病状况', '2023-07-11 10:55:06', '2023-07-11 10:55:08', '0', null, null, null);
INSERT INTO sys_config_category (id, tenant_id, code, name, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('6', '0', 'elder.foodProhibition', '长者饮食禁忌', '2023-07-11 10:55:06', '2023-07-11 10:55:08', '0', null, null, null);
INSERT INTO sys_config_category (id, tenant_id, code, name, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('7', '0', 'elder.hobbies', '长者兴趣爱好', '2023-07-11 10:55:06', '2023-07-11 10:55:08', '0', null, null, null);
INSERT INTO sys_config_category (id, tenant_id, code, name, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('8', '0', 'elder.education', '长者文化程度', '2023-07-11 10:55:06', '2023-07-11 10:55:08', '0', null, null, null);
INSERT INTO sys_config_category (id, tenant_id, code, name, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('9', '0', 'elder.belief', '长者宗教信仰', '2023-07-11 10:55:06', '2023-07-11 10:55:08', '0', null, null, null);
INSERT INTO sys_config_category (id, tenant_id, code, name, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('10', '0', 'elder.income', '长者收入水平', '2023-07-11 10:55:06', '2023-07-11 10:55:08', '0', null, null, null);
INSERT INTO sys_config (id, tenant_id, code, name, value, sort, description, category_id, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('1', '0', 'elder.certificateType.idCard', '身份证', '1', DEFAULT, DEFAULT, '1', '2023-07-11 10:57:57', '2023-07-11 10:58:02', '0', null, null, null);
INSERT INTO sys_config (id, tenant_id, code, name, value, sort, description, category_id, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('2', '0', 'elder.blood.a', 'A', '1', DEFAULT, DEFAULT, '2', '2023-07-11 10:57:57', '2023-07-11 10:58:02', '0', null, null, null);
INSERT INTO sys_config (id, tenant_id, code, name, value, sort, description, category_id, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('3', '0', 'elder.socialRelation.children', '子女', '1', DEFAULT, DEFAULT, '3', '2023-07-11 10:57:57', '2023-07-11 10:58:02', '0', null, null, null);
INSERT INTO sys_config (id, tenant_id, code, name, value, sort, description, category_id, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('4', '0', 'elder.elderType.single', '失独老人', '1', DEFAULT, DEFAULT, '4', '2023-07-11 10:57:57', '2023-07-11 10:58:02', '0', null, null, null);
INSERT INTO sys_config (id, tenant_id, code, name, value, sort, description, category_id, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('5', '0', 'elder.illness.heartDisease', '心脏病', '1', DEFAULT, DEFAULT, '5', '2023-07-11 10:57:57', '2023-07-11 10:58:02', '0', null, null, null);
INSERT INTO sys_config (id, tenant_id, code, name, value, sort, description, category_id, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('6', '0', 'elder.foodProhibition.avoidSpiciness', '忌辛辣', '1', DEFAULT, DEFAULT, '6', '2023-07-11 10:57:57', '2023-07-11 10:58:02', '0', null, null, null);
INSERT INTO sys_config (id, tenant_id, code, name, value, sort, description, category_id, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('7', '0', 'elder.hobbies.growFlowers', '养花', '1', DEFAULT, DEFAULT, '7', '2023-07-11 10:57:57', '2023-07-11 10:58:02', '0', null, null, null);
INSERT INTO sys_config (id, tenant_id, code, name, value, sort, description, category_id, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('8', '0', 'elder.education.seniorMiddleSchool', '高中', '1', DEFAULT, DEFAULT, '8', '2023-07-11 10:57:57', '2023-07-11 10:58:02', '0', null, null, null);
INSERT INTO sys_config (id, tenant_id, code, name, value, sort, description, category_id, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('9', '0', 'elder.belief.none', '无', '1', DEFAULT, DEFAULT, '9', '2023-07-11 10:57:57', '2023-07-11 10:58:02', '0', null, null, null);
INSERT INTO sys_config (id, tenant_id, code, name, value, sort, description, category_id, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('10', '0', 'elder.income.low', '低收入', '1', DEFAULT, DEFAULT, '10', '2023-07-11 10:57:57', '2023-07-11 10:58:02', '0', null, null, null);
server-common/src/main/java/com/makeit/enums/biz/sys/SysConfigCategoryConst.java
package com.makeit.enums.biz.sys; package com.makeit.enums.biz.sys;
public class SysConfigCategoryConst { public class SysConfigCategoryConst {
public static final String SERVICE_FEE = "service.fee"; public static final String ELDER_CERTIFICATE_TYPE = "elder.certificateType";
public static final String ELDER_BLOOD = "elder.blood";
public static final String ELDER_INCOME = "elder.income";
public static final String ELDER_EDUCATION = "elder.education";
public static final String ELDER_BELIEF = "elder.belief";
public static final String ELDER_ELDER_TYPE = "elder.elderType";
public static final String ELDER_ILLNESS = "elder.illness";
public static final String ELDER_HOBBIES = "elder.hobbies";
public static final String ELDER_Food_Prohibition = "elder.foodProhibition";
public static final String LOGISTICS_COMPANY = "logistics.company";
public static final String BREAKPOINT_DAYS = "breakpoint.days";
public static final String BREAKPOINT_DAYS_DEFAULT = "breakpoint.days.default";
public static final String ORDER_RECEIVE_BILL_PAY_METHOD = "order.receive.bill.payMethod";
public static final String ORDER_RECEIVE_BILL_PAY_METHOD_BALANCE = "order.receive.bill.payMethod.balance";
public static final String ORDER_RECEIVE_BILL_PAY_METHOD_CREDIT = "order.receive.bill.payMethod.credit";
public static final String ORDER_AFTER_SALE_REASON_TYPE = "order.after.sale.reason.type";
} }
server-common/src/main/java/com/makeit/enums/biz/sys/SysDictCategoryConst.java
...@@ -3,22 +3,6 @@ package com.makeit.enums.biz.sys; ...@@ -3,22 +3,6 @@ package com.makeit.enums.biz.sys;
public class SysDictCategoryConst { public class SysDictCategoryConst {
public static final String WECHAT_MENU_PREFIX = "wechtat."; public static final String WECHAT_MENU_PREFIX = "wechtat.";
public static final String INTEGRAL_HISTORY_SETTLEMENT_STATUS = "integral.history.settlementStatus"; public static final String NATION = "nation";
public static final String INTEGRAL_RECORD_AUDIT_STATUS = "integral.record.auditStatus";
public static final String REWARD_LEVEL_STATEMENT_CATEGORY = "reward.level.statement.category";
/**
* 设备通用参数详情-项目
*/
@Deprecated
public static final String BASE_EQUIP_PARAM_GROUP_ITEM = "base.equip.param.group.item";
/**
* 设备通用参数详情-单位
*/
public static final String BASE_EQUIP_PARAM_GROUP_UNIT = "fixture.param.unit";
} }
server-common/src/main/java/com/makeit/utils/data/excel/easyexcel/ConfigConverter.java
...@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.text.ParseException; import java.text.ParseException;
import java.util.Arrays;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -52,7 +53,18 @@ public class ConfigConverter implements Converter<String> { ...@@ -52,7 +53,18 @@ public class ConfigConverter implements Converter<String> {
return map; return map;
}); });
return m.get(cellData.getStringValue()); //return m.get(cellData.getStringValue());
ConfigFormat dictEnumFormat = contentProperty.getField().getAnnotation(ConfigFormat.class);
String s = Arrays.stream(cellData.getStringValue().split(dictEnumFormat.split())).filter(StringUtils::isNotBlank).map(m::get).filter(StringUtils::isNotBlank).collect(Collectors.joining(","));
if (StringUtils.isBlank(s)) {
s = "";
}
return s;
} }
@Override @Override
...@@ -67,10 +79,19 @@ public class ConfigConverter implements Converter<String> { ...@@ -67,10 +79,19 @@ public class ConfigConverter implements Converter<String> {
return map; return map;
}); });
String s = m.get(value); // String s = m.get(value);
// if (StringUtils.isBlank(s)) {
// s = "";
// }
ConfigFormat dictEnumFormat = contentProperty.getField().getAnnotation(ConfigFormat.class);
String s = Arrays.stream(value.split(",")).filter(StringUtils::isNotBlank).map(m::get).filter(StringUtils::isNotBlank).collect(Collectors.joining(dictEnumFormat.split()));
if (StringUtils.isBlank(s)) { if (StringUtils.isBlank(s)) {
s = ""; s = "";
} }
return new WriteCellData(s); return new WriteCellData(s);
} }
} }
server-common/src/main/java/com/makeit/utils/data/excel/easyexcel/ConfigFormat.java
...@@ -9,4 +9,6 @@ public @interface ConfigFormat { ...@@ -9,4 +9,6 @@ public @interface ConfigFormat {
String categoryCode(); String categoryCode();
String split() default "|";
} }
server-service/src/main/java/com/makeit/dto/platform/elder/ElderAddDTO.java → server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderAddDTO.java
package com.makeit.dto.platform.elder; package com.makeit.dto.platform.elder;
import com.makeit.common.dto.BaseTenantDTO; import com.makeit.common.dto.BaseTenantDTO;
import com.makeit.enums.platform.elder.PlatElderEnum;
import com.makeit.global.validator.DictEnum;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -20,7 +22,7 @@ import javax.validation.constraints.Size; ...@@ -20,7 +22,7 @@ import javax.validation.constraints.Size;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Elder对象", description = "长者基本信息") @ApiModel(value = "Elder对象", description = "长者基本信息")
public class ElderAddDTO extends BaseTenantDTO { public class PlatElderAddDTO extends BaseTenantDTO {
@NotBlank(message = "姓名不能为空") @NotBlank(message = "姓名不能为空")
@Size(max = 50, message = "姓名最长为50个字符") @Size(max = 50, message = "姓名最长为50个字符")
...@@ -30,11 +32,12 @@ public class ElderAddDTO extends BaseTenantDTO { ...@@ -30,11 +32,12 @@ public class ElderAddDTO extends BaseTenantDTO {
@ApiModelProperty(value = "年龄") @ApiModelProperty(value = "年龄")
private Integer age; private Integer age;
@DictEnum(em = PlatElderEnum.SexEnum.class, message = "性别可选值为{m}")
@ApiModelProperty(value = "性别 数据字典 1 男 2 女") @ApiModelProperty(value = "性别 数据字典 1 男 2 女")
private String sex; private String sex;
@NotBlank(message = "证件类型不能为空") @NotBlank(message = "证件类型不能为空")
@ApiModelProperty(value = "证件类型 数据字典 1 身份证 2 IC卡 3 护照 4 驾驶证 5 其他证件") @ApiModelProperty(value = "证件类型")
private String certificateType; private String certificateType;
@NotBlank(message = "证件号码不能为空") @NotBlank(message = "证件号码不能为空")
...@@ -73,4 +76,21 @@ public class ElderAddDTO extends BaseTenantDTO { ...@@ -73,4 +76,21 @@ public class ElderAddDTO extends BaseTenantDTO {
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
//TODO ywc 下面这些可以不用前端传
@ApiModelProperty(value = "组织id")
private String orgId;
@ApiModelProperty(value = "城市组织id")
private String cityOrgId;
@ApiModelProperty(value = "区组织id")
private String districtOrgId;
@ApiModelProperty(value = "街道组织id")
private String streetOrgId;
@ApiModelProperty(value = "组织路径")
private String orgPath;
} }
server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderCheckInDTO.java 0 → 100644
package com.makeit.dto.platform.elder;
import com.makeit.common.dto.BaseTenantDTO;
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 = "Elder对象", description = "长者基本信息")
public class PlatElderCheckInDTO extends BaseTenantDTO {
@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;
}
server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderCheckOutDTO.java 0 → 100644
package com.makeit.dto.platform.elder;
import com.makeit.common.dto.BaseTenantDTO;
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 = "Elder对象", description = "长者基本信息")
public class PlatElderCheckOutDTO extends BaseTenantDTO {
@ApiModelProperty("是否同步删除房间 0否 1是")
private String delRoomStatus;
}
server-service/src/main/java/com/makeit/dto/platform/elder/ElderDTOVO.java → server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderDTOVO.java
package com.makeit.dto.platform.elder; package com.makeit.dto.platform.elder;
import com.makeit.common.dto.BaseTenantDTO; import com.makeit.common.dto.BaseTenantDTO;
import com.makeit.enums.platform.elder.PlatElderEnum;
import com.makeit.global.validator.DictEnum;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -18,8 +20,8 @@ import java.util.List; ...@@ -18,8 +20,8 @@ import java.util.List;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="Elder对象", description="长者基本信息") @ApiModel(value = "Elder对象", description = "长者基本信息")
public class ElderDTOVO extends BaseTenantDTO { public class PlatElderDTOVO extends BaseTenantDTO {
@ApiModelProperty(value = "姓名") @ApiModelProperty(value = "姓名")
private String name; private String name;
...@@ -27,10 +29,11 @@ public class ElderDTOVO extends BaseTenantDTO { ...@@ -27,10 +29,11 @@ public class ElderDTOVO extends BaseTenantDTO {
@ApiModelProperty(value = "年龄") @ApiModelProperty(value = "年龄")
private Integer age; private Integer age;
@DictEnum(em = PlatElderEnum.SexEnum.class, message = "性别可选值为{m}")
@ApiModelProperty(value = "性别 数据字典 1 男 2 女") @ApiModelProperty(value = "性别 数据字典 1 男 2 女")
private String sex; private String sex;
@ApiModelProperty(value = "证件类型 数据字典 1 身份证 2 IC卡 3 护照 4 驾驶证 5 其他证件") @ApiModelProperty(value = "证件类型")
private String certificateType; private String certificateType;
@ApiModelProperty(value = "证件号码") @ApiModelProperty(value = "证件号码")
...@@ -108,27 +111,51 @@ public class ElderDTOVO extends BaseTenantDTO { ...@@ -108,27 +111,51 @@ public class ElderDTOVO extends BaseTenantDTO {
@ApiModelProperty(value = "空间id") @ApiModelProperty(value = "空间id")
private String spaceId; private String spaceId;
@ApiModelProperty(value = "空间id")
private String spaceName;
@ApiModelProperty(value = "小区/社区/街道空间id") @ApiModelProperty(value = "小区/社区/街道空间id")
private String streetSpaceId; private String streetSpaceId;
@ApiModelProperty(value = "小区/社区/街道空间名称")
private String streetSpaceName;
@ApiModelProperty(value = "楼栋空间id") @ApiModelProperty(value = "楼栋空间id")
private String buildingSpaceId; private String buildingSpaceId;
@ApiModelProperty(value = "楼栋空间名称")
private String buildingSpaceName;
@ApiModelProperty(value = "单元空间id") @ApiModelProperty(value = "单元空间id")
private String unitSpaceId; private String unitSpaceId;
@ApiModelProperty(value = "单元空间名称")
private String unitSpaceName;
@ApiModelProperty(value = "楼层id") @ApiModelProperty(value = "楼层id")
private String floorSpaceId; private String floorSpaceId;
@ApiModelProperty(value = "楼层id")
private String floorSpaceName;
@ApiModelProperty(value = "房间id") @ApiModelProperty(value = "房间id")
private String roomId; private String roomId;
@ApiModelProperty(value = "房间名称")
private String roomName;
@ApiModelProperty(value = "床位id") @ApiModelProperty(value = "床位id")
private String bedId; private String bedId;
@ApiModelProperty(value = "床位名称")
private String bedName;
@ApiModelProperty(value = "空间-房间-床位路径") @ApiModelProperty(value = "空间-房间-床位路径")
private String spacePath; private String spacePath;
@ApiModelProperty(value = "空间-房间-床位路径名称")
private String spacePathName;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
...@@ -136,12 +163,12 @@ public class ElderDTOVO extends BaseTenantDTO { ...@@ -136,12 +163,12 @@ public class ElderDTOVO extends BaseTenantDTO {
private String avatar; private String avatar;
@ApiModelProperty(value = "社会关系列表") @ApiModelProperty(value = "社会关系列表")
private List<ElderSocialRelationDTOVO> relationList; private List<PlatElderSocialRelationDTOVO> relationList;
@ApiModelProperty(value = "健康状况") @ApiModelProperty(value = "健康状况")
private ElderHealthInfoDTOVO healthInfo; private PlatElderHealthInfoDTOVO healthInfo;
@ApiModelProperty(value = "其他信息") @ApiModelProperty(value = "其他信息")
private ElderOtherInfoDTOVO otherInfo; private PlatElderOtherInfoDTOVO otherInfo;
} }
server-service/src/main/java/com/makeit/dto/platform/elder/ElderHealthInfoDTOVO.java → server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderHealthInfoDTOVO.java
package com.makeit.dto.platform.elder; package com.makeit.dto.platform.elder;
import com.makeit.common.dto.BaseTenantDTO; import com.makeit.common.dto.BaseTenantDTO;
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;
import lombok.Data; import lombok.Data;
...@@ -17,10 +16,8 @@ import lombok.EqualsAndHashCode; ...@@ -17,10 +16,8 @@ import lombok.EqualsAndHashCode;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElderHealthInfo对象", description="长者健康状态") @ApiModel(value = "ElderHealthInfo对象", description = "长者健康状态")
public class ElderHealthInfoDTOVO extends BaseTenantDTO { public class PlatElderHealthInfoDTOVO extends BaseTenantDTO {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "长者id") @ApiModelProperty(value = "长者id")
private String elderId; private String elderId;
......
server-service/src/main/java/com/makeit/dto/platform/elder/ElderOtherInfoDTOVO.java → server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderOtherInfoDTOVO.java
package com.makeit.dto.platform.elder; package com.makeit.dto.platform.elder;
import com.makeit.common.dto.BaseTenantDTO; import com.makeit.common.dto.BaseTenantDTO;
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;
import lombok.Data; import lombok.Data;
...@@ -18,7 +17,7 @@ import lombok.EqualsAndHashCode; ...@@ -18,7 +17,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElderOtherInfo对象", description="长者其他信息") @ApiModel(value="ElderOtherInfo对象", description="长者其他信息")
public class ElderOtherInfoDTOVO extends BaseTenantDTO { public class PlatElderOtherInfoDTOVO extends BaseTenantDTO {
@ApiModelProperty(value = "长者id") @ApiModelProperty(value = "长者id")
private String elderId; private String elderId;
......
server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderQueryDTO.java 0 → 100644
package com.makeit.dto.platform.elder;
import com.makeit.common.dto.BaseTenantDTO;
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 = "Elder对象", description = "长者基本信息")
public class PlatElderQueryDTO extends BaseTenantDTO {
@ApiModelProperty(value = "姓名")
private String name;
@ApiModelProperty(value = "证件类型")
private String certificateType;
@ApiModelProperty(value = "证件号码")
private String certificateNumber;
@ApiModelProperty(value = "手机号码")
private String phone;
@ApiModelProperty(value = "空间id")
private String spaceId;
@ApiModelProperty(value = "组织id")
private String orgId;
}
server-service/src/main/java/com/makeit/dto/platform/elder/ElderSocialRelationDTOVO.java → server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderSocialRelationDTOVO.java
...@@ -16,8 +16,9 @@ import lombok.EqualsAndHashCode; ...@@ -16,8 +16,9 @@ import lombok.EqualsAndHashCode;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElderSocialRelation对象", description="长者社会关系") @ApiModel(value = "ElderSocialRelation对象", description = "长者社会关系")
public class ElderSocialRelationDTOVO extends BaseTenantDTO { public class PlatElderSocialRelationDTOVO extends BaseTenantDTO {
@ApiModelProperty(value = "长者id") @ApiModelProperty(value = "长者id")
private String elderId; private String elderId;
......
server-service/src/main/java/com/makeit/entity/platform/elder/Elder.java → server-service/src/main/java/com/makeit/entity/platform/elder/PlatElder.java
package com.makeit.entity.platform.elder; package com.makeit.entity.platform.elder;
import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField; 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;
...@@ -24,7 +19,7 @@ import lombok.EqualsAndHashCode; ...@@ -24,7 +19,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 PlatElder extends BaseBusEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -39,7 +34,7 @@ public class Elder extends BaseBusEntity { ...@@ -39,7 +34,7 @@ public class Elder extends BaseBusEntity {
@ApiModelProperty(value = "性别 数据字典 1 男 2 女") @ApiModelProperty(value = "性别 数据字典 1 男 2 女")
private String sex; private String sex;
@ApiModelProperty(value = "证件类型 数据字典 1 身份证 2 IC卡 3 护照 4 驾驶证 5 其他证件") @ApiModelProperty(value = "证件类型")
private String certificateType; private String certificateType;
@ApiModelProperty(value = "证件号码") @ApiModelProperty(value = "证件号码")
...@@ -176,5 +171,20 @@ public class Elder extends BaseBusEntity { ...@@ -176,5 +171,20 @@ public class Elder extends BaseBusEntity {
@ApiModelProperty(value = "头像文件id") @ApiModelProperty(value = "头像文件id")
private String avatar; private String avatar;
@ApiModelProperty(value = "组织id")
private String orgId;
@ApiModelProperty(value = "城市组织id")
private String cityOrgId;
@ApiModelProperty(value = "区组织id")
private String districtOrgId;
@ApiModelProperty(value = "街道组织id")
private String streetOrgId;
@ApiModelProperty(value = "组织路径")
private String orgPath;
} }
server-service/src/main/java/com/makeit/entity/platform/elder/ElderChildrenInfo.java → server-service/src/main/java/com/makeit/entity/platform/elder/PlatElderChildrenInfo.java
...@@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode; ...@@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElderChildrenInfo对象", description="长者子女账号") @ApiModel(value="ElderChildrenInfo对象", description="长者子女账号")
public class ElderChildrenInfo extends BaseBusEntity { public class PlatElderChildrenInfo extends BaseBusEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -39,20 +39,4 @@ public class ElderChildrenInfo extends BaseBusEntity { ...@@ -39,20 +39,4 @@ public class ElderChildrenInfo extends BaseBusEntity {
@ApiModelProperty(value = "关联机构") @ApiModelProperty(value = "关联机构")
private String orgId; private String orgId;
@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/ElderHealthInfo.java → server-service/src/main/java/com/makeit/entity/platform/elder/PlatElderHealthInfo.java
...@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode; ...@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElderHealthInfo对象", description="长者健康状态") @ApiModel(value="ElderHealthInfo对象", description="长者健康状态")
public class ElderHealthInfo extends BaseBusEntity { public class PlatElderHealthInfo extends BaseBusEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
server-service/src/main/java/com/makeit/entity/platform/elder/ElderMedicalExaminationInfo.java → server-service/src/main/java/com/makeit/entity/platform/elder/PlatElderMedicalExaminationInfo.java
...@@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode; ...@@ -20,7 +20,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElderMedicalExaminationInfo对象", description="长者体检报告信息") @ApiModel(value="ElderMedicalExaminationInfo对象", description="长者体检报告信息")
public class ElderMedicalExaminationInfo extends BaseBusEntity { public class PlatElderMedicalExaminationInfo extends BaseBusEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -30,20 +30,5 @@ public class ElderMedicalExaminationInfo extends BaseBusEntity { ...@@ -30,20 +30,5 @@ public class ElderMedicalExaminationInfo extends BaseBusEntity {
@ApiModelProperty(value = "体检报告") @ApiModelProperty(value = "体检报告")
private String reportId; private String reportId;
@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 → server-service/src/main/java/com/makeit/entity/platform/elder/PlatElderOtherInfo.java
...@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode; ...@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElderOtherInfo对象", description="长者其他信息") @ApiModel(value="ElderOtherInfo对象", description="长者其他信息")
public class ElderOtherInfo extends BaseBusEntity { public class PlatElderOtherInfo extends BaseBusEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
server-service/src/main/java/com/makeit/entity/platform/elder/ElderSocialRelation.java → server-service/src/main/java/com/makeit/entity/platform/elder/PlatElderSocialRelation.java
...@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode; ...@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value="ElderSocialRelation对象", description="长者社会关系") @ApiModel(value="ElderSocialRelation对象", description="长者社会关系")
public class ElderSocialRelation extends BaseBusEntity { public class PlatElderSocialRelation extends BaseBusEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
server-service/src/main/java/com/makeit/enums/platform/elder/PlatElderEnum.java 0 → 100644
package com.makeit.enums.platform.elder;
import com.makeit.enums.BaseEnum;
import com.makeit.utils.sys.SysDictUtil;
public class PlatElderEnum {
public enum SexEnum implements BaseEnum {
MAN("sex.man"), WOMAN("sex.woman");
private String code;
SexEnum(String code) {
this.code = code;
}
public String getValue() {
return SysDictUtil.getValue(code);
}
}
public enum MedicalInsuranceEnum implements BaseEnum {
YES("elder.medicalInsurance.yes"), NO("elder.medicalInsurance.no");
private String code;
MedicalInsuranceEnum(String code) {
this.code = code;
}
public String getValue() {
return SysDictUtil.getValue(code);
}
}
}
server-service/src/main/java/com/makeit/mapper/platform/elder/ElderChildrenInfoMapper.java → server-service/src/main/java/com/makeit/mapper/platform/elder/PlatElderChildrenInfoMapper.java
package com.makeit.mapper.platform.elder; package com.makeit.mapper.platform.elder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.platform.elder.ElderChildrenInfo; import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
/** /**
* <p> * <p>
...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderChildrenInfo; ...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderChildrenInfo;
* @author eugene young * @author eugene young
* @since 2023-08-29 * @since 2023-08-29
*/ */
public interface ElderChildrenInfoMapper extends BaseMapper<ElderChildrenInfo> { public interface PlatElderChildrenInfoMapper extends BaseMapper<PlatElderChildrenInfo> {
} }
server-service/src/main/java/com/makeit/mapper/platform/elder/ElderHealthInfoMapper.java → server-service/src/main/java/com/makeit/mapper/platform/elder/PlatElderHealthInfoMapper.java
package com.makeit.mapper.platform.elder; package com.makeit.mapper.platform.elder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.platform.elder.ElderHealthInfo; import com.makeit.entity.platform.elder.PlatElderHealthInfo;
/** /**
* <p> * <p>
...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderHealthInfo; ...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderHealthInfo;
* @author eugene young * @author eugene young
* @since 2023-08-29 * @since 2023-08-29
*/ */
public interface ElderHealthInfoMapper extends BaseMapper<ElderHealthInfo> { public interface PlatElderHealthInfoMapper extends BaseMapper<PlatElderHealthInfo> {
} }
server-service/src/main/java/com/makeit/mapper/platform/elder/ElderMapper.java → server-service/src/main/java/com/makeit/mapper/platform/elder/PlatElderMapper.java
package com.makeit.mapper.platform.elder; package com.makeit.mapper.platform.elder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.platform.elder.Elder; import com.makeit.entity.platform.elder.PlatElder;
/** /**
* <p> * <p>
...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.Elder; ...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.Elder;
* @author eugene young * @author eugene young
* @since 2023-08-29 * @since 2023-08-29
*/ */
public interface ElderMapper extends BaseMapper<Elder> { public interface PlatElderMapper extends BaseMapper<PlatElder> {
} }
server-service/src/main/java/com/makeit/mapper/platform/elder/ElderMedicalExaminationInfoMapper.java → server-service/src/main/java/com/makeit/mapper/platform/elder/PlatElderMedicalExaminationInfoMapper.java
package com.makeit.mapper.platform.elder; package com.makeit.mapper.platform.elder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.platform.elder.ElderMedicalExaminationInfo; import com.makeit.entity.platform.elder.PlatElderMedicalExaminationInfo;
/** /**
* <p> * <p>
...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderMedicalExaminationInfo; ...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderMedicalExaminationInfo;
* @author eugene young * @author eugene young
* @since 2023-08-29 * @since 2023-08-29
*/ */
public interface ElderMedicalExaminationInfoMapper extends BaseMapper<ElderMedicalExaminationInfo> { public interface PlatElderMedicalExaminationInfoMapper extends BaseMapper<PlatElderMedicalExaminationInfo> {
} }
server-service/src/main/java/com/makeit/mapper/platform/elder/ElderOtherInfoMapper.java → server-service/src/main/java/com/makeit/mapper/platform/elder/PlatElderOtherInfoMapper.java
package com.makeit.mapper.platform.elder; package com.makeit.mapper.platform.elder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.platform.elder.ElderOtherInfo; import com.makeit.entity.platform.elder.PlatElderOtherInfo;
/** /**
* <p> * <p>
...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderOtherInfo; ...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderOtherInfo;
* @author eugene young * @author eugene young
* @since 2023-08-29 * @since 2023-08-29
*/ */
public interface ElderOtherInfoMapper extends BaseMapper<ElderOtherInfo> { public interface PlatElderOtherInfoMapper extends BaseMapper<PlatElderOtherInfo> {
} }
server-service/src/main/java/com/makeit/mapper/platform/elder/ElderSocialRelationMapper.java → server-service/src/main/java/com/makeit/mapper/platform/elder/PlatElderSocialRelationMapper.java
package com.makeit.mapper.platform.elder; package com.makeit.mapper.platform.elder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.makeit.entity.platform.elder.ElderSocialRelation; import com.makeit.entity.platform.elder.PlatElderSocialRelation;
/** /**
* <p> * <p>
...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderSocialRelation; ...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderSocialRelation;
* @author eugene young * @author eugene young
* @since 2023-08-29 * @since 2023-08-29
*/ */
public interface ElderSocialRelationMapper extends BaseMapper<ElderSocialRelation> { public interface PlatElderSocialRelationMapper extends BaseMapper<PlatElderSocialRelation> {
} }
server-service/src/main/java/com/makeit/server/platform/elder/ElderService.java deleted 100644 → 0
package com.makeit.server.platform.elder;
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;
/**
* <p>
* 长者基本信息 服务类
* </p>
*
* @author eugene young
* @since 2023-08-29
*/
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/ElderChildrenInfoService.java → server-service/src/main/java/com/makeit/server/platform/elder/PlatElderChildrenInfoService.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.entity.platform.elder.ElderChildrenInfo; import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
/** /**
* <p> * <p>
...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderChildrenInfo; ...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderChildrenInfo;
* @author eugene young * @author eugene young
* @since 2023-08-29 * @since 2023-08-29
*/ */
public interface ElderChildrenInfoService extends IService<ElderChildrenInfo> { public interface PlatElderChildrenInfoService extends IService<PlatElderChildrenInfo> {
} }
server-service/src/main/java/com/makeit/server/platform/elder/ElderHealthInfoService.java → server-service/src/main/java/com/makeit/server/platform/elder/PlatElderHealthInfoService.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.entity.platform.elder.ElderHealthInfo; import com.makeit.entity.platform.elder.PlatElderHealthInfo;
/** /**
* <p> * <p>
...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderHealthInfo; ...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderHealthInfo;
* @author eugene young * @author eugene young
* @since 2023-08-29 * @since 2023-08-29
*/ */
public interface ElderHealthInfoService extends IService<ElderHealthInfo> { public interface PlatElderHealthInfoService extends IService<PlatElderHealthInfo> {
} }
server-service/src/main/java/com/makeit/server/platform/elder/ElderMedicalExaminationInfoService.java → server-service/src/main/java/com/makeit/server/platform/elder/PlatElderMedicalExaminationInfoService.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.entity.platform.elder.ElderMedicalExaminationInfo; import com.makeit.entity.platform.elder.PlatElderMedicalExaminationInfo;
/** /**
* <p> * <p>
...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderMedicalExaminationInfo; ...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderMedicalExaminationInfo;
* @author eugene young * @author eugene young
* @since 2023-08-29 * @since 2023-08-29
*/ */
public interface ElderMedicalExaminationInfoService extends IService<ElderMedicalExaminationInfo> { public interface PlatElderMedicalExaminationInfoService extends IService<PlatElderMedicalExaminationInfo> {
} }
server-service/src/main/java/com/makeit/server/platform/elder/ElderOtherInfoService.java → server-service/src/main/java/com/makeit/server/platform/elder/PlatElderOtherInfoService.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.entity.platform.elder.ElderOtherInfo; import com.makeit.entity.platform.elder.PlatElderOtherInfo;
/** /**
* <p> * <p>
...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderOtherInfo; ...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderOtherInfo;
* @author eugene young * @author eugene young
* @since 2023-08-29 * @since 2023-08-29
*/ */
public interface ElderOtherInfoService extends IService<ElderOtherInfo> { public interface PlatElderOtherInfoService extends IService<PlatElderOtherInfo> {
} }
server-service/src/main/java/com/makeit/server/platform/elder/PlatElderService.java 0 → 100644
package com.makeit.server.platform.elder;
import com.baomidou.mybatisplus.extension.service.IService;
import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO;
import com.makeit.dto.platform.elder.*;
import com.makeit.entity.platform.elder.PlatElder;
import com.makeit.vo.platform.elder.PlatElderListVO;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* <p>
* 长者基本信息 服务类
* </p>
*
* @author eugene young
* @since 2023-08-29
*/
public interface PlatElderService extends IService<PlatElder> {
PageVO<PlatElderListVO> page(PageReqDTO<PlatElderQueryDTO> page);
void exportExcel(HttpServletResponse response, PlatElderQueryDTO dto);
void add(PlatElderAddDTO dto);
void edit(PlatElderDTOVO dto);
PlatElderDTOVO view(String id);
void checkIn(PlatElderCheckInDTO dto);
void checkOut(PlatElderCheckOutDTO dto);
void del(String id);
void delBatch(List<String> idList);
}
server-service/src/main/java/com/makeit/server/platform/elder/ElderSocialRelationService.java → server-service/src/main/java/com/makeit/server/platform/elder/PlatElderSocialRelationService.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.entity.platform.elder.ElderSocialRelation; import com.makeit.entity.platform.elder.PlatElderSocialRelation;
/** /**
* <p> * <p>
...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderSocialRelation; ...@@ -11,6 +11,6 @@ import com.makeit.entity.platform.elder.ElderSocialRelation;
* @author eugene young * @author eugene young
* @since 2023-08-29 * @since 2023-08-29
*/ */
public interface ElderSocialRelationService extends IService<ElderSocialRelation> { public interface PlatElderSocialRelationService extends IService<PlatElderSocialRelation> {
} }
server-service/src/main/java/com/makeit/server/platform/elder/impl/ElderServiceImpl.java deleted 100644 → 0
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.makeit.dto.platform.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.server.platform.elder.ElderHealthInfoService;
import com.makeit.server.platform.elder.ElderOtherInfoService;
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.transaction.annotation.Transactional;
import java.util.List;
/**
* <p>
* 长者基本信息 服务实现类
* </p>
*
* @author eugene young
* @since 2023-08-29
*/
@Service
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/server/platform/elder/impl/ElderChildrenInfoServiceImpl.java → server-service/src/main/java/com/makeit/server/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
package com.makeit.server.platform.elder.impl; package com.makeit.server.platform.elder.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.entity.platform.elder.ElderChildrenInfo; import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
import com.makeit.mapper.platform.elder.ElderChildrenInfoMapper; import com.makeit.mapper.platform.elder.PlatElderChildrenInfoMapper;
import com.makeit.server.platform.elder.ElderChildrenInfoService; import com.makeit.server.platform.elder.PlatElderChildrenInfoService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; ...@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
* @since 2023-08-29 * @since 2023-08-29
*/ */
@Service @Service
public class ElderChildrenInfoServiceImpl extends ServiceImpl<ElderChildrenInfoMapper, ElderChildrenInfo> implements ElderChildrenInfoService { public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChildrenInfoMapper, PlatElderChildrenInfo> implements PlatElderChildrenInfoService {
} }
server-service/src/main/java/com/makeit/server/platform/elder/impl/ElderHealthInfoServiceImpl.java → server-service/src/main/java/com/makeit/server/platform/elder/impl/PlatElderHealthInfoServiceImpl.java
package com.makeit.server.platform.elder.impl; package com.makeit.server.platform.elder.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.entity.platform.elder.ElderHealthInfo; import com.makeit.entity.platform.elder.PlatElderHealthInfo;
import com.makeit.mapper.platform.elder.ElderHealthInfoMapper; import com.makeit.mapper.platform.elder.PlatElderHealthInfoMapper;
import com.makeit.server.platform.elder.ElderHealthInfoService; import com.makeit.server.platform.elder.PlatElderHealthInfoService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; ...@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
* @since 2023-08-29 * @since 2023-08-29
*/ */
@Service @Service
public class ElderHealthInfoServiceImpl extends ServiceImpl<ElderHealthInfoMapper, ElderHealthInfo> implements ElderHealthInfoService { public class PlatElderHealthInfoServiceImpl extends ServiceImpl<PlatElderHealthInfoMapper, PlatElderHealthInfo> implements PlatElderHealthInfoService {
} }
server-service/src/main/java/com/makeit/server/platform/elder/impl/ElderMedicalExaminationInfoServiceImpl.java → server-service/src/main/java/com/makeit/server/platform/elder/impl/PlatElderMedicalExaminationInfoServiceImpl.java
package com.makeit.server.platform.elder.impl; package com.makeit.server.platform.elder.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.entity.platform.elder.ElderMedicalExaminationInfo; import com.makeit.entity.platform.elder.PlatElderMedicalExaminationInfo;
import com.makeit.mapper.platform.elder.ElderMedicalExaminationInfoMapper; import com.makeit.mapper.platform.elder.PlatElderMedicalExaminationInfoMapper;
import com.makeit.server.platform.elder.ElderMedicalExaminationInfoService; import com.makeit.server.platform.elder.PlatElderMedicalExaminationInfoService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; ...@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
* @since 2023-08-29 * @since 2023-08-29
*/ */
@Service @Service
public class ElderMedicalExaminationInfoServiceImpl extends ServiceImpl<ElderMedicalExaminationInfoMapper, ElderMedicalExaminationInfo> implements ElderMedicalExaminationInfoService { public class PlatElderMedicalExaminationInfoServiceImpl extends ServiceImpl<PlatElderMedicalExaminationInfoMapper, PlatElderMedicalExaminationInfo> implements PlatElderMedicalExaminationInfoService {
} }
server-service/src/main/java/com/makeit/server/platform/elder/impl/ElderOtherInfoServiceImpl.java → server-service/src/main/java/com/makeit/server/platform/elder/impl/PlatElderOtherInfoServiceImpl.java
package com.makeit.server.platform.elder.impl; package com.makeit.server.platform.elder.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.entity.platform.elder.ElderOtherInfo; import com.makeit.entity.platform.elder.PlatElderOtherInfo;
import com.makeit.mapper.platform.elder.ElderOtherInfoMapper; import com.makeit.mapper.platform.elder.PlatElderOtherInfoMapper;
import com.makeit.server.platform.elder.ElderOtherInfoService; import com.makeit.server.platform.elder.PlatElderOtherInfoService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; ...@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
* @since 2023-08-29 * @since 2023-08-29
*/ */
@Service @Service
public class ElderOtherInfoServiceImpl extends ServiceImpl<ElderOtherInfoMapper, ElderOtherInfo> implements ElderOtherInfoService { public class PlatElderOtherInfoServiceImpl extends ServiceImpl<PlatElderOtherInfoMapper, PlatElderOtherInfo> implements PlatElderOtherInfoService {
} }
server-service/src/main/java/com/makeit/server/platform/elder/impl/PlatElderServiceImpl.java 0 → 100644
package com.makeit.server.platform.elder.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.common.page.PageReqDTO;
import com.makeit.common.page.PageVO;
import com.makeit.dto.platform.elder.*;
import com.makeit.entity.platform.elder.PlatElder;
import com.makeit.entity.platform.elder.PlatElderHealthInfo;
import com.makeit.entity.platform.elder.PlatElderOtherInfo;
import com.makeit.entity.platform.elder.PlatElderSocialRelation;
import com.makeit.enums.CodeMessageEnum;
import com.makeit.enums.FileSuffixEnum;
import com.makeit.exception.BusinessException;
import com.makeit.mapper.platform.elder.PlatElderMapper;
import com.makeit.server.platform.elder.PlatElderHealthInfoService;
import com.makeit.server.platform.elder.PlatElderOtherInfoService;
import com.makeit.server.platform.elder.PlatElderService;
import com.makeit.server.platform.elder.PlatElderSocialRelationService;
import com.makeit.utils.data.convert.BeanDtoVoUtils;
import com.makeit.utils.data.convert.PageUtil;
import com.makeit.utils.data.convert.StreamUtil;
import com.makeit.utils.data.excel.ExcelUtil;
import com.makeit.utils.old.StringUtils;
import com.makeit.vo.platform.elder.PlatElderExportVO;
import com.makeit.vo.platform.elder.PlatElderListVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* <p>
* 长者基本信息 服务实现类
* </p>
*
* @author eugene young
* @since 2023-08-29
*/
@Service
public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder> implements PlatElderService {
@Autowired
private PlatElderSocialRelationService platElderSocialRelationService;
@Autowired
private PlatElderHealthInfoService platElderHealthInfoService;
@Autowired
private PlatElderOtherInfoService platElderOtherInfoService;
private LambdaQueryWrapper<PlatElder> lambdaQueryWrapper(PlatElderQueryDTO dto) {
return new QueryWrapper<PlatElder>().lambda()
.like(StringUtils.isNotBlank(dto.getName()), PlatElder::getName, dto.getName())
.eq(StringUtils.isNotBlank(dto.getCertificateType()), PlatElder::getCertificateType, dto.getCertificateType())
.like(StringUtils.isNotBlank(dto.getCertificateNumber()), PlatElder::getCertificateNumber, dto.getCertificateNumber())
.apply(StringUtils.isNotBlank(dto.getSpaceId()), "find_in_set('" + dto.getSpaceId() + "',space_path)")
.apply(StringUtils.isNotBlank(dto.getOrgId()), "find_in_set('" + dto.getOrgId() + "',org_path)");
}
@Override
public PageVO<PlatElderListVO> page(PageReqDTO<PlatElderQueryDTO> page) {
PlatElderQueryDTO dto = page.getData();
Page<PlatElder> p = PageUtil.toMpPage(page);
Page<PlatElder> voPage = page(p, lambdaQueryWrapper(dto));
List<PlatElder> voList = voPage.getRecords();
List<PlatElderListVO> list = BeanDtoVoUtils.listVo(voList, PlatElderListVO.class);
return PageUtil.toPageVO(list, voPage);
}
@Override
public void exportExcel(HttpServletResponse response, PlatElderQueryDTO dto) {
List<PlatElder> dbList = list(lambdaQueryWrapper(dto));
List<PlatElderHealthInfo> healthInfoList = platElderHealthInfoService.list(new QueryWrapper<PlatElderHealthInfo>().lambda()
.in(PlatElderHealthInfo::getElderId, StreamUtil.mapId(dbList, PlatElder::getId)));
Map<String, PlatElderHealthInfo> healthInfoMap = StreamUtil.toMap(healthInfoList, PlatElderHealthInfo::getElderId);
List<PlatElderOtherInfo> otherInfoList = platElderOtherInfoService.list(new QueryWrapper<PlatElderOtherInfo>().lambda()
.in(PlatElderOtherInfo::getElderId, StreamUtil.mapId(dbList, PlatElder::getId)));
Map<String, PlatElderOtherInfo> otherInfoMap = StreamUtil.toMap(otherInfoList, PlatElderOtherInfo::getElderId);
List<PlatElderExportVO> list = StreamUtil.map(dbList, e -> {
PlatElderExportVO vo = BeanDtoVoUtils.convert(e, PlatElderExportVO.class);
PlatElderHealthInfo healthInfo = healthInfoMap.get(e.getId());
if (healthInfo != null) {
BeanUtils.copyProperties(healthInfo, vo);
}
PlatElderOtherInfo otherInfo = otherInfoMap.get(e.getId());
if (otherInfo != null) {
BeanUtils.copyProperties(otherInfo, vo);
}
vo.setId(e.getId());
return vo;
});
ExcelUtil.export(response, "长者信息" + FileSuffixEnum.EXCEL.getSuffix(), PlatElderExportVO.class, list);
}
private void check(PlatElderAddDTO dto) {
PlatElder old = getOne(new QueryWrapper<PlatElder>().lambda()
.eq(PlatElder::getCertificateType, dto.getCertificateType())
.eq(PlatElder::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(PlatElderAddDTO dto) {
check(dto);
PlatElder platElder = BeanDtoVoUtils.convert(dto, PlatElder.class);
save(platElder);
}
@Override
@Transactional
public void edit(PlatElderDTOVO dto) {
check(BeanDtoVoUtils.convert(dto, PlatElderAddDTO.class));
PlatElder platElder = BeanDtoVoUtils.convert(dto, PlatElder.class);
updateById(platElder);
List<PlatElderSocialRelation> relationList = BeanDtoVoUtils.listVo(dto.getRelationList(), PlatElderSocialRelation.class);
relationList.forEach(e -> {
e.setElderId(dto.getId());
});
platElderSocialRelationService.remove(new QueryWrapper<PlatElderSocialRelation>().lambda()
.eq(PlatElderSocialRelation::getElderId, dto.getId()));
platElderSocialRelationService.saveBatch(relationList);
PlatElderHealthInfo healthInfo = BeanDtoVoUtils.convert(dto.getHealthInfo(), PlatElderHealthInfo.class);
healthInfo.setElderId(dto.getId());
platElderHealthInfoService.saveOrUpdate(healthInfo);
PlatElderOtherInfo otherInfo = BeanDtoVoUtils.convert(dto.getOtherInfo(), PlatElderOtherInfo.class);
otherInfo.setElderId(dto.getId());
platElderOtherInfoService.saveOrUpdate(otherInfo);
}
@Override
public PlatElderDTOVO view(String id) {
PlatElder platElder = getById(id);
PlatElderDTOVO vo = BeanDtoVoUtils.convert(platElder, PlatElderDTOVO.class);
List<PlatElderSocialRelation> dbSocialRelationList = platElderSocialRelationService.list(new QueryWrapper<PlatElderSocialRelation>().lambda()
.eq(PlatElderSocialRelation::getElderId, id));
List<PlatElderSocialRelationDTOVO> socialRelationList = BeanDtoVoUtils.listVo(dbSocialRelationList, PlatElderSocialRelationDTOVO.class);
vo.setRelationList(socialRelationList);
PlatElderHealthInfo dbHealthInfo = platElderHealthInfoService.getOne(new QueryWrapper<PlatElderHealthInfo>().lambda()
.eq(PlatElderHealthInfo::getElderId, id));
PlatElderHealthInfoDTOVO healthInfo = BeanDtoVoUtils.convert(dbHealthInfo, PlatElderHealthInfoDTOVO.class);
vo.setHealthInfo(healthInfo);
PlatElderOtherInfo dbOtherInfo = platElderOtherInfoService.getOne(new QueryWrapper<PlatElderOtherInfo>().lambda()
.eq(PlatElderOtherInfo::getElderId, id));
PlatElderOtherInfoDTOVO otherInfo = BeanDtoVoUtils.convert(dbOtherInfo, PlatElderOtherInfoDTOVO.class);
vo.setOtherInfo(otherInfo);
return vo;
}
//TODO ywc 可能要改床位表状态
@Transactional
@Override
public void checkIn(PlatElderCheckInDTO dto) {
PlatElder db = getById(dto.getId());
BeanUtils.copyProperties(dto, db);
updateById(db);
}
@Transactional
@Override
public void checkOut(PlatElderCheckOutDTO dto) {
PlatElder db = getById(dto.getId());
db.setSpaceId(null);
db.setStreetSpaceId(null);
db.setBuildingSpaceId(null);
db.setUnitSpaceId(null);
db.setFloorSpaceId(null);
db.setRoomId(null);
db.setBedId(null);
db.setSpacePath(null);
updateById(db);
//TODO ywc 是否删除房间 及其校验没做
}
@Override
public void del(String id) {
PlatElder db = getById(id);
if (StringUtils.isNotBlank(db.getBedId())) {
throw new RuntimeException();
}
removeById(id);
}
@Override
public void delBatch(List<String> idList) {
List<PlatElder> dbList = listByIds(idList);
dbList.forEach(e -> {
if (StringUtils.isNotBlank(e.getBedId())) {
throw new RuntimeException();//TODO ywc 报错具体换
}
});
removeByIds(idList);
}
}
//TODO ywc 数据字典
//还有空间相关的没有 列表 详情 导入 导出
//组织相关的
//下拉配置相关的
//TODO ywc 导入
\ No newline at end of file
server-service/src/main/java/com/makeit/server/platform/elder/impl/ElderSocialRelationServiceImpl.java → server-service/src/main/java/com/makeit/server/platform/elder/impl/PlatElderSocialRelationServiceImpl.java
package com.makeit.server.platform.elder.impl; package com.makeit.server.platform.elder.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.makeit.entity.platform.elder.ElderSocialRelation; import com.makeit.entity.platform.elder.PlatElderSocialRelation;
import com.makeit.mapper.platform.elder.ElderSocialRelationMapper; import com.makeit.mapper.platform.elder.PlatElderSocialRelationMapper;
import com.makeit.server.platform.elder.ElderSocialRelationService; import com.makeit.server.platform.elder.PlatElderSocialRelationService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; ...@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
* @since 2023-08-29 * @since 2023-08-29
*/ */
@Service @Service
public class ElderSocialRelationServiceImpl extends ServiceImpl<ElderSocialRelationMapper, ElderSocialRelation> implements ElderSocialRelationService { public class PlatElderSocialRelationServiceImpl extends ServiceImpl<PlatElderSocialRelationMapper, PlatElderSocialRelation> implements PlatElderSocialRelationService {
} }
server-service/src/main/java/com/makeit/vo/platform/elder/PlatElderExportVO.java 0 → 100644
package com.makeit.vo.platform.elder;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.makeit.common.dto.BaseTenantDTO;
import com.makeit.enums.biz.sys.SysConfigCategoryConst;
import com.makeit.enums.platform.elder.PlatElderEnum;
import com.makeit.utils.data.excel.easyexcel.ConfigConverter;
import com.makeit.utils.data.excel.easyexcel.ConfigFormat;
import com.makeit.utils.data.excel.easyexcel.DictEnumConverter;
import com.makeit.utils.data.excel.easyexcel.DictEnumFormat;
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 = "Elder对象", description = "长者基本信息")
public class PlatElderExportVO extends BaseTenantDTO {
@ExcelIgnore
@ApiModelProperty(value = "小区/社区/街道空间id")
private String streetSpaceId;
@ExcelProperty("小区")
@ApiModelProperty(value = "小区/社区/街道空间名称")
private String streetSpaceName;
@ExcelIgnore
@ApiModelProperty(value = "楼栋空间id")
private String buildingSpaceId;
@ExcelProperty("楼栋")
@ApiModelProperty(value = "楼栋空间名称")
private String buildingSpaceName;
@ExcelIgnore
@ApiModelProperty(value = "单元空间id")
private String unitSpaceId;
@ExcelProperty("单元")
@ApiModelProperty(value = "单元空间名称")
private String unitSpaceName;
@ExcelIgnore
@ApiModelProperty(value = "楼层id")
private String floorSpaceId;
@ExcelProperty("楼层")
@ApiModelProperty(value = "楼层id")
private String floorSpaceName;
@ExcelIgnore
@ApiModelProperty(value = "房间id")
private String roomId;
@ExcelProperty("房间号")
@ApiModelProperty(value = "房间名称")
private String roomName;
@ExcelIgnore
@ApiModelProperty(value = "床位id")
private String bedId;
@ExcelProperty("床位")
@ApiModelProperty(value = "床位名称")
private String bedName;
@ExcelProperty(value = "老人姓名")
@ApiModelProperty(value = "姓名")
private String name;
@DictEnumFormat(em = PlatElderEnum.SexEnum.class)
@ExcelProperty(value = "老人性别", converter = DictEnumConverter.class)
@ApiModelProperty(value = "性别 数据字典 1 男 2 女")
private String sex;
@ExcelProperty(value = "老人姓名")
@ApiModelProperty(value = "年龄")
private Integer age;
@ConfigFormat(categoryCode = SysConfigCategoryConst.ELDER_CERTIFICATE_TYPE)
@ExcelProperty(value = "证件类型名称", converter = ConfigConverter.class)
@ApiModelProperty(value = "证件类型")
private String certificateType;
@ExcelProperty(value = "证件号码")
@ApiModelProperty(value = "证件号码")
private String certificateNumber;
@ExcelProperty(value = "出生日期")
@ApiModelProperty(value = "出生日期")
private String birth;
//TODO ywc 前端直接填入 民族名称
@ExcelProperty(value = "民族")
@ApiModelProperty(value = "民族")
private String nation;
@ConfigFormat(categoryCode = SysConfigCategoryConst.ELDER_BLOOD)
@ExcelProperty(value = "血型", converter = ConfigConverter.class)
@ApiModelProperty(value = "血型")
private String blood;
@ExcelProperty(value = "联系电话")
@ApiModelProperty(value = "手机号码")
private String phone;
@ExcelProperty(value = "固定电话")
@ApiModelProperty(value = "固定电话")
private String telephone;
@ExcelIgnore
@ApiModelProperty(value = "家庭地址")
private String homeAddress;
@ExcelIgnore
@ApiModelProperty(value = "家庭省code")
private String homeProvinceCode;
@ExcelProperty(value = "现居住省份")
@ApiModelProperty(value = "家庭省名称")
private String homeProvinceName;
@ExcelIgnore
@ApiModelProperty(value = "家庭市code")
private String homeCityCode;
@ExcelProperty(value = "现居住市")
@ApiModelProperty(value = "家庭市名称")
private String homeCityName;
@ExcelIgnore
@ApiModelProperty(value = "家庭区code")
private String homeDistrictCode;
@ExcelProperty(value = "现居住区县")
@ApiModelProperty(value = "家庭区名称")
private String homeDistrictName;
@ExcelProperty(value = "现居住区县地址")
@ApiModelProperty(value = "家庭地址详细")
private String homeAddressDetail;
@ExcelIgnore
@ApiModelProperty(value = "户籍地址")
private String registerAddress;
@ExcelIgnore
@ApiModelProperty(value = "户籍省code")
private String registerProvinceCode;
@ExcelProperty(value = "户籍省份")
@ApiModelProperty(value = "户籍省名称")
private String registerProvinceName;
@ExcelIgnore
@ApiModelProperty(value = "户籍市code")
private String registerCityCode;
@ExcelProperty(value = "户籍市")
@ApiModelProperty(value = "户籍市名称")
private String registerCityName;
@ExcelIgnore
@ApiModelProperty(value = "户籍区code")
private String registerDistrictCode;
@ExcelProperty(value = "户籍区")
@ApiModelProperty(value = "户籍区名称")
private String registerDistrictName;
@ExcelProperty(value = "户籍地址")
@ApiModelProperty(value = "户籍地址详细")
private String registerAddressDetail;
@ConfigFormat(categoryCode = SysConfigCategoryConst.ELDER_INCOME)
@ExcelProperty(value = "收入水平", converter = ConfigConverter.class)
@ApiModelProperty(value = "收入")
private String income;
@ConfigFormat(categoryCode = SysConfigCategoryConst.ELDER_EDUCATION)
@ExcelProperty(value = "文化程度", converter = ConfigConverter.class)
@ApiModelProperty(value = "文化程度")
private String education;
@ConfigFormat(categoryCode = SysConfigCategoryConst.ELDER_BELIEF)
@ExcelProperty(value = "宗教信仰", converter = ConfigConverter.class)
@ApiModelProperty(value = "信仰")
private String belief;
@ExcelProperty(value = "政治面貌")
@ApiModelProperty(value = "政治面貌")
private String politicsStatus;
@ExcelProperty(value = "职业")
@ApiModelProperty(value = "职业")
private String profession;
@ExcelProperty(value = "工作单位")
@ApiModelProperty(value = "工作单位")
private String workUnit;
@ExcelProperty(value = "生活状况")
@ApiModelProperty(value = "生活状况")
private String lifeStatus;
@ExcelProperty(value = "外地子女数量")
@ApiModelProperty(value = "外地子女数量")
private Integer otherChildrenQuantity;
@ExcelProperty(value = "子女数量")
@ApiModelProperty(value = "子女数量")
private Integer childrenQuantity;
@DictEnumFormat(em = PlatElderEnum.MedicalInsuranceEnum.class)
@ExcelProperty(value = "宗教信仰", converter = DictEnumConverter.class)
@ApiModelProperty(value = "医疗保险 数据字典 1 有 0 无")
private String medicalInsurance;
@ConfigFormat(categoryCode = SysConfigCategoryConst.ELDER_ELDER_TYPE)
@ExcelProperty(value = "老人类型", converter = ConfigConverter.class)
@ApiModelProperty(value = "老人类型")
private String elderType;
@ConfigFormat(categoryCode = SysConfigCategoryConst.ELDER_ILLNESS)
@ExcelProperty(value = "疾病状况", converter = ConfigConverter.class)
@ApiModelProperty(value = "疾病状况")
private String illness;
@ConfigFormat(categoryCode = SysConfigCategoryConst.ELDER_HOBBIES)
@ExcelProperty(value = "兴趣爱好", converter = ConfigConverter.class)
@ApiModelProperty(value = "兴趣爱好")
private String hobbies;
@ConfigFormat(categoryCode = SysConfigCategoryConst.ELDER_Food_Prohibition)
@ExcelProperty(value = "饮食禁忌", converter = ConfigConverter.class)
@ApiModelProperty(value = "饮食禁忌")
private String foodProhibition;
// @ApiModelProperty(value = "婚姻")
// private String marriage;
@ApiModelProperty(value = "备注")
private String remark;
}
//TODO ywc 配置要不要一次性全部加载到内存中
//代码中匹配 替换
\ No newline at end of file
server-service/src/main/java/com/makeit/vo/platform/elder/ElderListVO.java → server-service/src/main/java/com/makeit/vo/platform/elder/PlatElderListVO.java
package com.makeit.vo.platform.elder; 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.fasterxml.jackson.annotation.JsonFormat;
import com.makeit.common.dto.BaseTenantDTO; import com.makeit.common.dto.BaseTenantDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.apache.ibatis.type.LocalDateTimeTypeHandler;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -24,7 +20,8 @@ import java.time.LocalDateTime; ...@@ -24,7 +20,8 @@ import java.time.LocalDateTime;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Elder对象", description = "长者基本信息") @ApiModel(value = "Elder对象", description = "长者基本信息")
public class ElderListVO extends BaseTenantDTO {
public class PlatElderListVO extends BaseTenantDTO {
@ApiModelProperty(value = "姓名") @ApiModelProperty(value = "姓名")
private String name; private String name;
...@@ -35,7 +32,7 @@ public class ElderListVO extends BaseTenantDTO { ...@@ -35,7 +32,7 @@ public class ElderListVO extends BaseTenantDTO {
@ApiModelProperty(value = "性别 数据字典 1 男 2 女") @ApiModelProperty(value = "性别 数据字典 1 男 2 女")
private String sex; private String sex;
@ApiModelProperty(value = "证件类型 数据字典 1 身份证 2 IC卡 3 护照 4 驾驶证 5 其他证件") @ApiModelProperty(value = "证件类型")
private String certificateType; private String certificateType;
@ApiModelProperty(value = "证件号码") @ApiModelProperty(value = "证件号码")
...@@ -45,43 +42,68 @@ public class ElderListVO extends BaseTenantDTO { ...@@ -45,43 +42,68 @@ public class ElderListVO extends BaseTenantDTO {
private String phone; private String phone;
@ApiModelProperty(value = "空间id") @ApiModelProperty(value = "空间id")
private String spaceId; private String spaceName;
@ApiModelProperty(value = "小区/社区/街道空间id") @ApiModelProperty(value = "小区/社区/街道空间id")
private String streetSpaceId; private String streetSpaceId;
@ApiModelProperty(value = "小区/社区/街道空间名称")
private String streetSpaceName;
@ApiModelProperty(value = "楼栋空间id") @ApiModelProperty(value = "楼栋空间id")
private String buildingSpaceId; private String buildingSpaceId;
@ApiModelProperty(value = "楼栋空间名称")
private String buildingSpaceName;
@ApiModelProperty(value = "单元空间id") @ApiModelProperty(value = "单元空间id")
private String unitSpaceId; private String unitSpaceId;
@ApiModelProperty(value = "单元空间名称")
private String unitSpaceName;
@ApiModelProperty(value = "楼层id") @ApiModelProperty(value = "楼层id")
private String floorSpaceId; private String floorSpaceId;
@ApiModelProperty(value = "楼层id")
private String floorSpaceName;
@ApiModelProperty(value = "房间id") @ApiModelProperty(value = "房间id")
private String roomId; private String roomId;
@ApiModelProperty(value = "房间名称")
private String roomName;
@ApiModelProperty(value = "床位id") @ApiModelProperty(value = "床位id")
private String bedId; private String bedId;
@ApiModelProperty(value = "床位名称")
private String bedName;
@ApiModelProperty(value = "空间-房间-床位路径") @ApiModelProperty(value = "空间-房间-床位路径")
private String spacePath; private String spacePath;
//TODO ywc
@ApiModelProperty(value = "空间-房间-床位路径名称")
private String spacePathName;
@ApiModelProperty(value = "备注")
private String remark;
/** /**
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间", required = false) @ApiModelProperty(value = "创建时间", required = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createdAt; private LocalDateTime createDate;
/** /**
* 更新时间 * 更新时间
*/ */
@ApiModelProperty(value = "更新时间", required = false) @ApiModelProperty(value = "更新时间", required = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updatedAt; private LocalDateTime updateDate;
@ApiModelProperty(value = "创建人名称") @ApiModelProperty(value = "创建人名称")
...@@ -91,6 +113,4 @@ public class ElderListVO extends BaseTenantDTO { ...@@ -91,6 +113,4 @@ public class ElderListVO extends BaseTenantDTO {
private String updateBy; private String updateBy;
} }
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