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

.gitignore

@@ -17,6 +17,7 @@ target/
 /**/.idea
 /**/.idea
 /**/*.iws
 /**/*.iws
 /**/*.iml
 /**/*.iml
+/**/**/*.iml
 /**/*.ipr
 /**/*.ipr
 .idea/
 .idea/
 /**/.idea/
 /**/.idea/

pom.xml

@@ -10,6 +10,7 @@
         <module>saas-module</module>
         <module>saas-module</module>
         <module>server-api</module>
         <module>server-api</module>
         <module>server-service</module>
         <module>server-service</module>
+        <module>server-generator</module>
 
 
     </modules>
     </modules>
 
 

server-generator/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>iot-platforn-server</artifactId>
+        <groupId>com.makeit</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>server-generator</artifactId>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.makeit</groupId>
+            <artifactId>server-common</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.4.0</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

server-generator/src/main/java/com/makeit/com/makeit/controller/ElderChildrenInfoController.java

+package com.makeit.com.makeit.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 长者子女账号 前端控制器
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@RestController
+@RequestMapping("/elder-children-info")
+public class ElderChildrenInfoController {
+
+}
+

server-generator/src/main/java/com/makeit/com/makeit/controller/ElderController.java

+package com.makeit.com.makeit.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 长者基本信息 前端控制器
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@RestController
+@RequestMapping("/elder")
+public class ElderController {
+
+}
+

server-generator/src/main/java/com/makeit/com/makeit/controller/ElderHealthInfoController.java

+package com.makeit.com.makeit.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 长者健康状态 前端控制器
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@RestController
+@RequestMapping("/elder-health-info")
+public class ElderHealthInfoController {
+
+}
+

server-generator/src/main/java/com/makeit/com/makeit/controller/ElderMedicalExaminationInfoController.java

+package com.makeit.com.makeit.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 长者体检报告信息 前端控制器
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@RestController
+@RequestMapping("/elder-medical-examination-info")
+public class ElderMedicalExaminationInfoController {
+
+}
+

server-generator/src/main/java/com/makeit/com/makeit/controller/ElderOtherInfoController.java

+package com.makeit.com.makeit.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 长者其他信息 前端控制器
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@RestController
+@RequestMapping("/elder-other-info")
+public class ElderOtherInfoController {
+
+}
+

server-generator/src/main/java/com/makeit/com/makeit/controller/ElderSocialRelationController.java

+package com.makeit.com.makeit.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 长者社会关系 前端控制器
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@RestController
+@RequestMapping("/elder-social-relation")
+public class ElderSocialRelationController {
+
+}
+

server-generator/src/test/java/CodeGenerator.java

+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.makeit.common.entity.BaseBusEntity;
+import org.junit.jupiter.api.Test;
+
+
+public class CodeGenerator {
+
+    @Test
+    public void run() {
+
+        // 可多表 用,隔开
+        //String tables_name = "address";
+        //String tables_name = "address,admin,admin_province,admin_role,advertisement,advertisement_city,advertisement_day,advertisement_price,advertisement_price_rule,agreement,agriculture_goods,agriculture_goods_bid,agriculture_goods_category,area,area_info,contractor,dictionary_data,goods,goods_category,goods_order,goods_town,info_top_price,job,job_category,job_category_job,land,land_bid,land_bid_user,land_order,operation_log,permission,platform,point,point_rule,publish_price,role,role_permission,rural,rural_category,rural_unit,sensitive_word,supplier,template,tree,user,user_audit";
+        // 1、创建代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+
+        // 2、全局配置
+        GlobalConfig gc = new GlobalConfig();
+        // 生成路径
+        String projectPath = System.getProperty("user.dir");
+        gc.setOutputDir(projectPath + "/src/main/java");
+
+        gc.setAuthor("eugene young");
+        gc.setOpen(false); //生成后是否打开资源管理器
+        gc.setFileOverride(false); //重新生成时文件是否覆盖
+
+        //UserService
+        gc.setServiceName("%sService");    //去掉Service接口的首字母I
+
+        gc.setIdType(IdType.AUTO); //主键策略-主键为Long类型  ***
+        //gc.setDateType(DateType.ONLY_DATE);//定义生成的实体类中日期类型  ***
+        gc.setSwagger2(true);//开启Swagger2模式
+
+        //gc.setBaseColumnList(true);
+        //gc.setBaseResultMap(true);
+
+        mpg.setGlobalConfig(gc);
+
+        // 3、数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+        // 8.0及以上的数据库配置 5.6自行百度
+        dsc.setUrl("jdbc:mysql://124.71.100.177:3306/dev_iot_yanglao_platform?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
+        dsc.setUsername("jenlinks-iot");
+        dsc.setPassword("jenlinks-iot@123Frrd");
+        dsc.setDbType(DbType.MYSQL);
+
+
+        mpg.setDataSource(dsc);
+
+        // 4、包配置
+        PackageConfig pc = new PackageConfig();
+        //包  com.atguigu.eduservice
+        pc.setParent("com.makeit");
+        pc.setModuleName("server-generator"); //模块名
+
+        pc.setModuleName(null);
+
+        //包  com.atguigu.eduservice.com.xxl.job.admin.controller
+        pc.setController("com.makeit.controller");
+        pc.setEntity("entity");
+        pc.setService("com.makeit.service");
+        pc.setMapper("mappers");
+        mpg.setPackageInfo(pc);
+
+
+        // 自定义配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                // to do nothing
+            }
+        };
+
+/*        // 如果模板引擎是 freemarker
+        //String templatePath = "/templates/mapper.xml.ftl";
+        // 如果模板引擎是 velocity
+        String templatePath = "/templates/mapper.xml.vm";
+
+        // 自定义输出配置
+        List<FileOutConfig> focList = new ArrayList<>();
+        // 自定义配置会被优先输出
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
+                return projectPath + "/src/main/resources/mapper/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+ */
+        mpg.setCfg(cfg);
+
+        TemplateConfig templateConfig = new TemplateConfig();
+        templateConfig.setXml(null);
+        mpg.setTemplate(templateConfig);
+
+
+        // 5、策略配置
+        StrategyConfig strategy = new StrategyConfig();
+
+        // 使用重点 下列字段填写表名 运行方法
+//        strategy.setInclude("edu_teacher","..."); // 多表-逆向工程
+        strategy.setInclude("elder","elder_social_relation","elder_health_info","elder_other_info","elder_medical_examination_info","elder_children_info");
+
+        strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略
+        strategy.setTablePrefix(pc.getModuleName() + "_"); //生成实体属性时去掉表"_"前缀并且第一个字母大写 如：gmt_create -> gmtCreate
+
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);//数据库表字段映射到实体的命名策略
+        strategy.setEntityLombokModel(true); // lombok 模型 @Accessors(chain = true) setter链式操作
+
+        strategy.setRestControllerStyle(true); //restful api风格控制器
+        strategy.setControllerMappingHyphenStyle(true); //url中驼峰转连字符
+
+        //strategy.setTableFillList(Arrays.asList(new TableFill("delete_status", FieldFill.INSERT),new TableFill("gmt_create", FieldFill.INSERT),new TableFill("gmt_modified", FieldFill.INSERT_UPDATE)));
+        //strategy.setLogicDeleteFieldName("delete_status");
+
+        strategy.setSuperEntityClass(BaseBusEntity.class);
+
+        mpg.setStrategy(strategy);
+
+        // 6、执行
+        mpg.execute();
+    }
+}

server-service/pom.xml

@@ -23,6 +23,12 @@
             <version>1.0.0</version>
             <version>1.0.0</version>
         </dependency>
         </dependency>
 
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
 
 
     </dependencies>
     </dependencies>
 
 

server-service/src/main/java/com/makeit/entity/platform/elder/Elder.java

+package com.makeit.entity.platform.elder;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+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="Elder对象", description="长者基本信息")
+public class Elder extends BaseBusEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @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 roomId;
+
+    @ApiModelProperty(value = "床位id")
+    private String bedId;
+
+    @ApiModelProperty(value = "空间-房间-床位路径")
+    private String spacePath;
+
+    @ApiModelProperty(value = "备注")
+    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/ElderChildrenInfo.java

+package com.makeit.entity.platform.elder;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+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="ElderChildrenInfo对象", description="长者子女账号")
+public class ElderChildrenInfo extends BaseBusEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "长者id")
+    private String elderId;
+
+    @ApiModelProperty(value = "openid")
+    private String openid;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+    @ApiModelProperty(value = "关联机构")
+    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

+package com.makeit.entity.platform.elder;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+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 ElderHealthInfo extends BaseBusEntity {
+
+    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;
+
+    @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/ElderMedicalExaminationInfo.java

+package com.makeit.entity.platform.elder;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+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="ElderMedicalExaminationInfo对象", description="长者体检报告信息")
+public class ElderMedicalExaminationInfo extends BaseBusEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "长者id")
+    private String elderId;
+
+    @ApiModelProperty(value = "体检报告")
+    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

+package com.makeit.entity.platform.elder;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+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 ElderOtherInfo extends BaseBusEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @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;
+
+    @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;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+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="ElderSocialRelation对象", description="长者社会关系")
+public class ElderSocialRelation extends BaseBusEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @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;
+
+    @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/mapper/platform/elder/ElderChildrenInfoMapper.java

+package com.makeit.mapper.platform.elder;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.makeit.entity.platform.elder.ElderChildrenInfo;
+
+/**
+ * <p>
+ * 长者子女账号 Mapper 接口
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+public interface ElderChildrenInfoMapper extends BaseMapper<ElderChildrenInfo> {
+
+}

server-service/src/main/java/com/makeit/mapper/platform/elder/ElderHealthInfoMapper.java

+package com.makeit.mapper.platform.elder;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.makeit.entity.platform.elder.ElderHealthInfo;
+
+/**
+ * <p>
+ * 长者健康状态 Mapper 接口
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+public interface ElderHealthInfoMapper extends BaseMapper<ElderHealthInfo> {
+
+}

server-service/src/main/java/com/makeit/mapper/platform/elder/ElderMapper.java

+package com.makeit.mapper.platform.elder;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.makeit.entity.platform.elder.Elder;
+
+/**
+ * <p>
+ * 长者基本信息 Mapper 接口
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+public interface ElderMapper extends BaseMapper<Elder> {
+
+}

server-service/src/main/java/com/makeit/mapper/platform/elder/ElderMedicalExaminationInfoMapper.java

+package com.makeit.mapper.platform.elder;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.makeit.entity.platform.elder.ElderMedicalExaminationInfo;
+
+/**
+ * <p>
+ * 长者体检报告信息 Mapper 接口
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+public interface ElderMedicalExaminationInfoMapper extends BaseMapper<ElderMedicalExaminationInfo> {
+
+}

server-service/src/main/java/com/makeit/mapper/platform/elder/ElderOtherInfoMapper.java

+package com.makeit.mapper.platform.elder;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.makeit.entity.platform.elder.ElderOtherInfo;
+
+/**
+ * <p>
+ * 长者其他信息 Mapper 接口
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+public interface ElderOtherInfoMapper extends BaseMapper<ElderOtherInfo> {
+
+}

server-service/src/main/java/com/makeit/mapper/platform/elder/ElderSocialRelationMapper.java

+package com.makeit.mapper.platform.elder;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.makeit.entity.platform.elder.ElderSocialRelation;
+
+/**
+ * <p>
+ * 长者社会关系 Mapper 接口
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+public interface ElderSocialRelationMapper extends BaseMapper<ElderSocialRelation> {
+
+}

server-service/src/main/java/com/makeit/server/platform/elder/ElderChildrenInfoService.java

+package com.makeit.server.platform.elder;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.makeit.entity.platform.elder.ElderChildrenInfo;
+
+/**
+ * <p>
+ * 长者子女账号 服务类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+public interface ElderChildrenInfoService extends IService<ElderChildrenInfo> {
+
+}

server-service/src/main/java/com/makeit/server/platform/elder/ElderHealthInfoService.java

+package com.makeit.server.platform.elder;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.makeit.entity.platform.elder.ElderHealthInfo;
+
+/**
+ * <p>
+ * 长者健康状态 服务类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+public interface ElderHealthInfoService extends IService<ElderHealthInfo> {
+
+}

server-service/src/main/java/com/makeit/server/platform/elder/ElderMedicalExaminationInfoService.java

+package com.makeit.server.platform.elder;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.makeit.entity.platform.elder.ElderMedicalExaminationInfo;
+
+/**
+ * <p>
+ * 长者体检报告信息 服务类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+public interface ElderMedicalExaminationInfoService extends IService<ElderMedicalExaminationInfo> {
+
+}

server-service/src/main/java/com/makeit/server/platform/elder/ElderOtherInfoService.java

+package com.makeit.server.platform.elder;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.makeit.entity.platform.elder.ElderOtherInfo;
+
+/**
+ * <p>
+ * 长者其他信息 服务类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+public interface ElderOtherInfoService extends IService<ElderOtherInfo> {
+
+}

server-service/src/main/java/com/makeit/server/platform/elder/ElderService.java

+package com.makeit.server.platform.elder;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.makeit.entity.platform.elder.Elder;
+
+/**
+ * <p>
+ * 长者基本信息 服务类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+public interface ElderService extends IService<Elder> {
+
+}

server-service/src/main/java/com/makeit/server/platform/elder/ElderSocialRelationService.java

+package com.makeit.server.platform.elder;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.makeit.entity.platform.elder.ElderSocialRelation;
+
+/**
+ * <p>
+ * 长者社会关系 服务类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+public interface ElderSocialRelationService extends IService<ElderSocialRelation> {
+
+}

server-service/src/main/java/com/makeit/server/platform/elder/impl/ElderChildrenInfoServiceImpl.java

+package com.makeit.server.platform.elder.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.makeit.entity.platform.elder.ElderChildrenInfo;
+import com.makeit.mapper.platform.elder.ElderChildrenInfoMapper;
+import com.makeit.server.platform.elder.ElderChildrenInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 长者子女账号 服务实现类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Service
+public class ElderChildrenInfoServiceImpl extends ServiceImpl<ElderChildrenInfoMapper, ElderChildrenInfo> implements ElderChildrenInfoService {
+
+}

server-service/src/main/java/com/makeit/server/platform/elder/impl/ElderHealthInfoServiceImpl.java

+package com.makeit.server.platform.elder.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.makeit.entity.platform.elder.ElderHealthInfo;
+import com.makeit.mapper.platform.elder.ElderHealthInfoMapper;
+import com.makeit.server.platform.elder.ElderHealthInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 长者健康状态 服务实现类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Service
+public class ElderHealthInfoServiceImpl extends ServiceImpl<ElderHealthInfoMapper, ElderHealthInfo> implements ElderHealthInfoService {
+
+}

server-service/src/main/java/com/makeit/server/platform/elder/impl/ElderMedicalExaminationInfoServiceImpl.java

+package com.makeit.server.platform.elder.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.makeit.entity.platform.elder.ElderMedicalExaminationInfo;
+import com.makeit.mapper.platform.elder.ElderMedicalExaminationInfoMapper;
+import com.makeit.server.platform.elder.ElderMedicalExaminationInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 长者体检报告信息 服务实现类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Service
+public class ElderMedicalExaminationInfoServiceImpl extends ServiceImpl<ElderMedicalExaminationInfoMapper, ElderMedicalExaminationInfo> implements ElderMedicalExaminationInfoService {
+
+}

server-service/src/main/java/com/makeit/server/platform/elder/impl/ElderOtherInfoServiceImpl.java

+package com.makeit.server.platform.elder.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.makeit.entity.platform.elder.ElderOtherInfo;
+import com.makeit.mapper.platform.elder.ElderOtherInfoMapper;
+import com.makeit.server.platform.elder.ElderOtherInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 长者其他信息 服务实现类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Service
+public class ElderOtherInfoServiceImpl extends ServiceImpl<ElderOtherInfoMapper, ElderOtherInfo> implements ElderOtherInfoService {
+
+}

server-service/src/main/java/com/makeit/server/platform/elder/impl/ElderServiceImpl.java

+package com.makeit.server.platform.elder.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.makeit.entity.platform.elder.Elder;
+import com.makeit.mapper.platform.elder.ElderMapper;
+import com.makeit.server.platform.elder.ElderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 长者基本信息 服务实现类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Service
+public class ElderServiceImpl extends ServiceImpl<ElderMapper, Elder> implements ElderService {
+
+}

server-service/src/main/java/com/makeit/server/platform/elder/impl/ElderSocialRelationServiceImpl.java

+package com.makeit.server.platform.elder.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.makeit.entity.platform.elder.ElderSocialRelation;
+import com.makeit.mapper.platform.elder.ElderSocialRelationMapper;
+import com.makeit.server.platform.elder.ElderSocialRelationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 长者社会关系 服务实现类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Service
+public class ElderSocialRelationServiceImpl extends ServiceImpl<ElderSocialRelationMapper, ElderSocialRelation> implements ElderSocialRelationService {
+
+}

server-web/platform-web.iml

@@ -25,9 +25,9 @@
     </content>
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="server-common" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
     <orderEntry type="library" name="Maven: com.makeit:server-common:1.0.0" level="project" />
     <orderEntry type="library" name="Maven: com.makeit:server-common:1.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
+    <orderEntry type="module" module-name="server-common" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.5.6" level="project" />
@@ -176,7 +176,6 @@
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:5.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:5.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-lite:5.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-lite:5.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:5.0.3" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.07" level="project" />
     <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.07" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.1.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:easyexcel:3.1.1" level="project" />
@@ -196,6 +195,7 @@
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-bridge:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-script:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-dom:1.14" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-gvt:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-shared-resources:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.14" level="project" />
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-svggen:1.14" level="project" />