老人模块更新

db/inti-elder.sql

@@ -154,7 +154,11 @@ CREATE TABLE `plat_elder_children_info`
     `openid`      varchar(64) NOT NULL COMMENT 'openid',
     `name`        varchar(64) DEFAULT NULL COMMENT '姓名',
     `phone`       varchar(64) DEFAULT NULL COMMENT '手机号码',
-    `org_id`      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 '组织路径',
     `create_by`   varchar(64) DEFAULT NULL COMMENT '创建者',
     `create_date` datetime    DEFAULT NULL COMMENT '创建时间',
     `update_by`   varchar(64) DEFAULT NULL COMMENT '更新者',

db/sys.sql

@@ -4,6 +4,9 @@ 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_category (id, code, name, create_date, update_date, del_flag)
+VALUES ('100', 'elder.realtime.now.status', '老人实时监测状态', '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)
@@ -14,6 +17,21 @@ VALUES ('20', 'elder.medicalInsurance.yes', '有', '1', 1, '', '6', '2022-05-16
 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_dictionary (id, code, name, value, sort, description, category_id, create_date, update_date, del_flag)
+VALUES ('100', 'elder.realtime.now.status.out', '外出', '10', 10, '', '100', '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 ('101', 'elder.realtime.now.status.run', '运动', '20', 20, '', '100', '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 ('102', 'elder.realtime.now.status.rest', '静息', '30', 30, '', '100', '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 ('103', 'elder.realtime.now.status.bed', '静息', '40', 40, '', '100', '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 ('104', 'elder.realtime.now.status.sleep', '睡眠', '50', 50, '', '100', '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);

server-common/src/main/java/com/makeit/enums/CodeMessageEnum.java

@@ -24,6 +24,8 @@ public enum CodeMessageEnum {
     SYSTEM_ERROR_SIGN_NOT_BLANK(5001, "SYSTEM.ERROR.SIGN.NOT.BLANK"),
     SYSTEM_ERROR_SIGN_ERROR(5001, "SYSTEM.ERROR.SIGN.ERROR"),
 
+    SYSTEM_ERROR_PHONE_DUPLICATE(500, "SYSTEM.ERROR.PHONE.DUPLICATE"),
+
     SYSTEM_ERROR_NAME_DUPLICATE(500, "SYSTEM.ERROR.NAME.DUPLICATE"),
     SYSTEM_ERROR_NAME_ENG_DUPLICATE(500, "SYSTEM.ERROR.NAME.ENG.DUPLICATE"),
     SYSTEM_ERROR_CODE_DUPLICATE(500, "SYSTEM.ERROR.CODE.DUPLICATE"),

server-common/src/main/resources/locale/business_messages.properties

@@ -13,6 +13,8 @@ SYSTEM.ERROR.PARAMETER.ILLEGAL=参数不合法
 SYSTEM.ERROR.SIGN.NOT.BLANK=签名不能为空
 SYSTEM.ERROR.SIGN.ERROR=签名错误
 
+SYSTEM.ERROR.PHONE.DUPLICATE=该手机号已存在
+
 SYSTEM.ERROR.NAME.DUPLICATE=该名称已存在
 SYSTEM.ERROR.NAME.ENG.DUPLICATE=该英文名称已存在
 

server-module/pom.xml

@@ -23,6 +23,12 @@
             <version>1.0.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.makeit</groupId>
+            <artifactId>server-service</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
 
     </dependencies>
 

server-module/server-module.iml

@@ -256,5 +256,6 @@
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.2" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" />
+    <orderEntry type="module" module-name="server-service" />
   </component>
 </module>
\ No newline at end of file

server-module/src/main/java/com/makeit/module/controller/elder/ElderController.java

-package com.makeit.module.controller.elder;
-
-public class ElderController {
-}

server-module/src/main/java/com/makeit/module/controller/elder/PlatElderChildrenInfoController.java

+package com.makeit.module.controller.elder;
+
+
+import com.makeit.common.dto.BaseIdDTO;
+import com.makeit.common.page.PageReqDTO;
+import com.makeit.common.page.PageVO;
+import com.makeit.common.response.ApiResponseEntity;
+import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.dto.platform.elder.PlatElderChildrenInfoEditVO;
+import com.makeit.dto.platform.elder.PlatElderChildrenInfoQueryDTO;
+import com.makeit.server.platform.elder.PlatElderChildrenInfoService;
+import com.makeit.vo.platform.elder.PlatElderChildrenInfoListVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 长者子女账号 前端控制器
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Api(tags = "长者子女账号")
+@RestController
+@RequestMapping("/plat/elder/children-info")
+public class PlatElderChildrenInfoController {
+
+    @Autowired
+    private PlatElderChildrenInfoService platElderChildrenInfoService;
+
+    @ApiOperation("分页列表")
+    @PostMapping("page")
+    public ApiResponseEntity<PageVO<PlatElderChildrenInfoListVO>> page(@RequestBody PageReqDTO<PlatElderChildrenInfoQueryDTO> page) {
+        return ApiResponseUtils.success(platElderChildrenInfoService.page(page));
+    }
+
+    @ApiOperation("列表")
+    @PostMapping("list")
+    public ApiResponseEntity<List<PlatElderChildrenInfoListVO>> list(@RequestBody PlatElderChildrenInfoQueryDTO dto) {
+        return ApiResponseUtils.success(platElderChildrenInfoService.list(dto));
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("edit")
+    public ApiResponseEntity<?> edit(@Validated @RequestBody PlatElderChildrenInfoEditVO dto) {
+        platElderChildrenInfoService.edit(dto);
+        return ApiResponseUtils.success();
+    }
+
+    @ApiOperation("详情")
+    @PostMapping("view")
+    public ApiResponseEntity<PlatElderChildrenInfoEditVO> view(@RequestBody BaseIdDTO baseIdDTO) {
+        return ApiResponseUtils.success(platElderChildrenInfoService.view(baseIdDTO.getId()));
+    }
+
+    @ApiOperation("删除")
+    @PostMapping("del")
+    public ApiResponseEntity<?> del(@RequestBody BaseIdDTO baseIdDTO) {
+        platElderChildrenInfoService.del(baseIdDTO.getId());
+        return ApiResponseUtils.success();
+    }
+
+
+}
+

server-module/src/main/java/com/makeit/module/controller/elder/PlatElderController.java

+package com.makeit.module.controller.elder;
+
+
+import com.makeit.common.dto.BaseBatchIdDTO;
+import com.makeit.common.dto.BaseIdDTO;
+import com.makeit.common.page.PageReqDTO;
+import com.makeit.common.page.PageVO;
+import com.makeit.common.response.ApiResponseEntity;
+import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.dto.platform.elder.*;
+import com.makeit.server.platform.elder.PlatElderService;
+import com.makeit.vo.platform.elder.PlatElderListVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * <p>
+ * 长者基本信息 前端控制器
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Api(tags = "长者基本信息")
+@RestController
+@RequestMapping("/plat/elder")
+public class PlatElderController {
+
+    @Autowired
+    private PlatElderService platElderService;
+
+    @ApiOperation("分页列表")
+    @PostMapping("page")
+    public ApiResponseEntity<PageVO<PlatElderListVO>> page(@RequestBody PageReqDTO<PlatElderQueryDTO> page) {
+        return ApiResponseUtils.success(platElderService.page(page));
+    }
+
+    @ApiOperation("列表")
+    @PostMapping("list")
+    public ApiResponseEntity<List<PlatElderListVO>> list(@RequestBody PlatElderQueryDTO dto) {
+        return ApiResponseUtils.success(platElderService.list(dto));
+    }
+
+    @ApiOperation("导出")
+    @PostMapping("exportExcel")
+    public void exportExcel(HttpServletResponse response, @RequestBody PlatElderQueryDTO dto) {
+        platElderService.exportExcel(response, dto);
+    }
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ApiResponseEntity<?> add(@Validated @RequestBody PlatElderAddDTO dto) {
+        platElderService.add(dto);
+        return ApiResponseUtils.success();
+    }
+
+    @ApiOperation("编辑")
+    @PostMapping("edit")
+    public ApiResponseEntity<?> edit(@Validated @RequestBody PlatElderDTOVO dto) {
+        platElderService.edit(dto);
+        return ApiResponseUtils.success();
+    }
+
+    @ApiOperation("详情")
+    @PostMapping("view")
+    public ApiResponseEntity<PlatElderDTOVO> view(@RequestBody BaseIdDTO baseIdDTO) {
+        return ApiResponseUtils.success(platElderService.view(baseIdDTO.getId()));
+    }
+
+    @ApiOperation("入住")
+    @PostMapping("checkIn")
+    public ApiResponseEntity<?> checkIn(@RequestBody PlatElderCheckInDTO dto) {
+        platElderService.checkIn(dto);
+        return ApiResponseUtils.success();
+    }
+
+    @ApiOperation("退住")
+    @PostMapping("checkOut")
+    public ApiResponseEntity<?> checkOut(@RequestBody PlatElderCheckOutDTO dto) {
+        platElderService.checkOut(dto);
+        return ApiResponseUtils.success();
+    }
+
+    @ApiOperation("删除")
+    @PostMapping("del")
+    public ApiResponseEntity<?> del(@RequestBody BaseIdDTO baseIdDTO) {
+        platElderService.del(baseIdDTO.getId());
+        return ApiResponseUtils.success();
+    }
+
+    @ApiOperation("删除")
+    @PostMapping("delBatch")
+    public ApiResponseEntity<?> delBatch(@RequestBody BaseBatchIdDTO baseBatchIdDTO) {
+        platElderService.delBatch(baseBatchIdDTO.getIdList());
+        return ApiResponseUtils.success();
+    }
+
+
+}
+

server-module/src/main/java/com/makeit/module/controller/elder/PlatElderMedicalExaminationInfoController.java

+package com.makeit.module.controller.elder;
+
+
+import com.makeit.common.dto.BaseIdDTO;
+import com.makeit.common.page.PageReqDTO;
+import com.makeit.common.page.PageVO;
+import com.makeit.common.response.ApiResponseEntity;
+import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.dto.platform.elder.PlatElderMedicalExaminationInfoDTOVO;
+import com.makeit.server.platform.elder.PlatElderMedicalExaminationInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 长者体检报告信息 前端控制器
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Api("长者体检报告信息")
+@RestController
+@RequestMapping("/plat/elder/medical-examination-info")
+public class PlatElderMedicalExaminationInfoController {
+
+    @Autowired
+    private PlatElderMedicalExaminationInfoService platElderMedicalExaminationInfoService;
+
+    @ApiOperation("分页列表")
+    @PostMapping("page")
+    public ApiResponseEntity<PageVO<PlatElderMedicalExaminationInfoDTOVO>> page(@RequestBody PageReqDTO<PlatElderMedicalExaminationInfoDTOVO> page) {
+        return ApiResponseUtils.success(platElderMedicalExaminationInfoService.page(page));
+    }
+
+    @ApiOperation("列表")
+    @PostMapping("list")
+    public ApiResponseEntity<List<PlatElderMedicalExaminationInfoDTOVO>> list(@RequestBody PlatElderMedicalExaminationInfoDTOVO dto) {
+        return ApiResponseUtils.success(platElderMedicalExaminationInfoService.list(dto));
+    }
+
+    @ApiOperation("新增")
+    @PostMapping("add")
+    public ApiResponseEntity<?> add(@Validated @RequestBody PlatElderMedicalExaminationInfoDTOVO dto) {
+        platElderMedicalExaminationInfoService.add(dto);
+        return ApiResponseUtils.success();
+    }
+
+    @ApiOperation("详情")
+    @PostMapping("view")
+    public ApiResponseEntity<PlatElderMedicalExaminationInfoDTOVO> view(@RequestBody BaseIdDTO baseIdDTO) {
+        return ApiResponseUtils.success(platElderMedicalExaminationInfoService.view(baseIdDTO.getId()));
+    }
+
+    @ApiOperation("删除")
+    @PostMapping("del")
+    public ApiResponseEntity<?> del(@RequestBody BaseIdDTO baseIdDTO) {
+        platElderMedicalExaminationInfoService.del(baseIdDTO.getId());
+        return ApiResponseUtils.success();
+    }
+
+}
+

server-module/src/main/java/com/makeit/module/controller/elder/PlatElderRealTimeController.java

+package com.makeit.module.controller.elder;
+
+
+import com.makeit.common.response.ApiResponseEntity;
+import com.makeit.dto.platform.elder.PlatElderIdDTO;
+import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeBodyVO;
+import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO;
+import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeNowVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 长者基本信息 前端控制器
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Api(tags = "长者实时监测")
+@RestController
+@RequestMapping("/plat/elder/realTime")
+public class PlatElderRealTimeController {
+
+    @ApiOperation("现在状态")
+    @PostMapping("nowStatus")
+    public ApiResponseEntity<PlatElderRealTimeNowVO> nowStatus(@RequestBody PlatElderIdDTO platElderIdDTO) {
+        return null;
+    }
+
+    @ApiOperation("心率呼吸率")
+    @PostMapping("heartRespiratory")
+    public ApiResponseEntity<PlatElderRealTimeHeartRespiratoryVO> heartRespiratory(@RequestBody PlatElderIdDTO platElderIdDTO) {
+        return null;
+    }
+
+    @ApiOperation("体动")
+    @PostMapping("body")
+    public ApiResponseEntity<PlatElderRealTimeBodyVO> body(@RequestBody PlatElderIdDTO platElderIdDTO) {
+        return null;
+    }
+
+    //TODO ywc 少一个坐标
+
+}
+

server-module/src/main/java/com/makeit/module/controller/elder/PlatElderReportController.java

+package com.makeit.module.controller.elder;
+
+
+import com.makeit.common.response.ApiResponseEntity;
+import com.makeit.dto.platform.elder.PlatElderIdDTO;
+import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeBodyVO;
+import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeHeartRespiratoryVO;
+import com.makeit.vo.platform.elder.realtime.PlatElderRealTimeNowVO;
+import com.makeit.vo.platform.elder.report.PlatElderSleepEvaluationVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 长者基本信息 前端控制器
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Api(tags = "长者报告")
+@RestController
+@RequestMapping("/plat/elder/realTime")
+public class PlatElderReportController {
+
+    @ApiOperation("现在状态")
+    @PostMapping("nowStatus")
+    public ApiResponseEntity<PlatElderSleepEvaluationVO> sleepEvaluation(@RequestBody PlatElderIdDTO platElderIdDTO) {
+        return null;
+    }
+
+}
+

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

+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;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * <p>
+ * 长者子女账号
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ElderChildrenInfo对象", description = "长者子女账号")
+public class PlatElderChildrenInfoEditVO extends BaseTenantDTO {
+
+    @ApiModelProperty(value = "长者id")
+    private String elderId;
+
+    @ApiModelProperty(value = "长者id")
+    private String elderName;
+
+    @NotBlank(message = "姓名不能为空")
+    @Size(max = 50, message = "姓名最长为50个字符")
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+}

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

+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="ElderChildrenInfo对象", description="长者子女账号")
+public class PlatElderChildrenInfoQueryDTO extends BaseTenantDTO {
+
+    @ApiModelProperty(value = "长者id")
+    private String elderId;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+    @ApiModelProperty(value = "组织id")
+    private String orgId;
+
+
+}

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

+package com.makeit.dto.platform.elder;
+
+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
+@ApiModel(value = "Elder对象", description = "长者基本信息")
+public class PlatElderIdDTO{
+
+    @ApiModelProperty(value = "长者id")
+    private String elderId;
+
+
+}

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

+package com.makeit.dto.platform.elder;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.makeit.common.dto.BaseTenantDTO;
+import com.makeit.module.system.dto.SysFileDTOVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 长者体检报告信息
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ElderMedicalExaminationInfo对象", description = "长者体检报告信息")
+public class PlatElderMedicalExaminationInfoDTOVO extends BaseTenantDTO {
+
+    @NotBlank(message = "长者id不能为空")
+    @ApiModelProperty(value = "长者id")
+    private String elderId;
+
+    @NotBlank(message = "体检报告不能为空")
+    @ApiModelProperty(value = "体检报告")
+    private String reportId;
+
+    @ApiModelProperty(value = "体检路径")
+    private SysFileDTOVO reportFile;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", required = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "创建人名称")
+    private String createBy;
+
+
+}

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

+package com.makeit.dto.platform.elder;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 长者基本信息
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Elder对象", description = "长者基本信息")
+public class PlatElderReportDTO extends PlatElderIdDTO{
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("开始时间")
+    private LocalDateTime startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("结束时间")
+    private LocalDateTime endTime;
+
+}

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

@@ -36,7 +36,19 @@ public class PlatElderChildrenInfo extends BaseBusEntity {
     @ApiModelProperty(value = "手机号码")
     private String phone;
 
-    @ApiModelProperty(value = "关联机构")
+    @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/enums/platform/elder/PlatElderMonitorReportEnum.java

+package com.makeit.enums.platform.elder;
+
+import com.makeit.enums.BaseEnum;
+import com.makeit.utils.sys.SysDictUtil;
+
+public class PlatElderMonitorReportEnum {
+    public enum NowStatus implements BaseEnum {
+        OUT("elder.realtime.now.status.out"),
+        RUN("elder.realtime.now.status.run"),
+        REST("elder.realtime.now.status.rest"),
+        BED("elder.realtime.now.status.bed"),
+        SLEEP("elder.realtime.now.status.sleep");
+
+        private String code;
+
+        NowStatus(String code) {
+            this.code = code;
+        }
+
+        public String getValue() {
+            return SysDictUtil.getValue(code);
+        }
+    }
+}

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

 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.PlatElderChildrenInfoEditVO;
+import com.makeit.dto.platform.elder.PlatElderChildrenInfoQueryDTO;
 import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
+import com.makeit.vo.platform.elder.PlatElderChildrenInfoListVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +20,13 @@ import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
  */
 public interface PlatElderChildrenInfoService extends IService<PlatElderChildrenInfo> {
 
+    PageVO<PlatElderChildrenInfoListVO> page(PageReqDTO<PlatElderChildrenInfoQueryDTO> page);
+
+    List<PlatElderChildrenInfoListVO> list(PlatElderChildrenInfoQueryDTO dto);
+
+    void edit(PlatElderChildrenInfoEditVO dto);
+
+    PlatElderChildrenInfoEditVO view(String id);
+
+    void del(String id);
 }

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

 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.PlatElderMedicalExaminationInfoDTOVO;
 import com.makeit.entity.platform.elder.PlatElderMedicalExaminationInfo;
 
+import java.util.List;
+
 /**
  * <p>
  * 长者体检报告信息 服务类
@@ -13,4 +18,14 @@ import com.makeit.entity.platform.elder.PlatElderMedicalExaminationInfo;
  */
 public interface PlatElderMedicalExaminationInfoService extends IService<PlatElderMedicalExaminationInfo> {
 
+    PageVO<PlatElderMedicalExaminationInfoDTOVO> page(PageReqDTO<PlatElderMedicalExaminationInfoDTOVO> page);
+
+    List<PlatElderMedicalExaminationInfoDTOVO> list(PlatElderMedicalExaminationInfoDTOVO dto);
+
+    void add(PlatElderMedicalExaminationInfoDTOVO dto);
+
+    PlatElderMedicalExaminationInfoDTOVO view(String id);
+
+    void del(String id);
+
 }

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

@@ -22,6 +22,8 @@ public interface PlatElderService extends IService<PlatElder> {
 
     PageVO<PlatElderListVO> page(PageReqDTO<PlatElderQueryDTO> page);
 
+    List<PlatElderListVO> list(PlatElderQueryDTO dto);
+
     void exportExcel(HttpServletResponse response, PlatElderQueryDTO dto);
 
     void add(PlatElderAddDTO dto);

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

 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.PlatElderChildrenInfoEditVO;
+import com.makeit.dto.platform.elder.PlatElderChildrenInfoQueryDTO;
+import com.makeit.entity.platform.elder.PlatElder;
 import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
+import com.makeit.enums.CodeMessageEnum;
+import com.makeit.exception.BusinessException;
 import com.makeit.mapper.platform.elder.PlatElderChildrenInfoMapper;
 import com.makeit.server.platform.elder.PlatElderChildrenInfoService;
+import com.makeit.server.platform.elder.PlatElderService;
+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.old.StringUtils;
+import com.makeit.utils.sql.join.JoinUtil;
+import com.makeit.vo.platform.elder.PlatElderChildrenInfoListVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +39,96 @@ import org.springframework.stereotype.Service;
 @Service
 public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChildrenInfoMapper, PlatElderChildrenInfo> implements PlatElderChildrenInfoService {
 
+    @Autowired
+    private PlatElderService platElderService;
+
+    private LambdaQueryWrapper<PlatElderChildrenInfo> lambdaQueryWrapper(PlatElderChildrenInfoQueryDTO dto) {
+        return new QueryWrapper<PlatElderChildrenInfo>().lambda()
+                .like(StringUtils.isNotBlank(dto.getName()), PlatElderChildrenInfo::getName, dto.getName())
+                .like(StringUtils.isNotBlank(dto.getPhone()), PlatElderChildrenInfo::getPhone, dto.getPhone())
+                .eq(StringUtils.isNotBlank(dto.getElderId()), PlatElderChildrenInfo::getElderId, dto.getElderId())
+                .apply(StringUtils.isNotBlank(dto.getOrgId()), "find_in_set('" + dto.getOrgId() + "',org_path)");
+    }
+
+    private void fill(List<PlatElderChildrenInfoListVO> voList) {
+        JoinUtil.joinSplit(voList, platElderService, PlatElderChildrenInfoListVO::getElderId, PlatElder::getId, (c, e) -> {
+            c.setElderName(StreamUtil.join(e, PlatElder::getName));
+        });
+    }
+
+    @Override
+    public PageVO<PlatElderChildrenInfoListVO> page(PageReqDTO<PlatElderChildrenInfoQueryDTO> page) {
+        PlatElderChildrenInfoQueryDTO dto = page.getData();
+        Page<PlatElderChildrenInfo> p = PageUtil.toMpPage(page);
+
+        Page<PlatElderChildrenInfo> voPage = page(p, lambdaQueryWrapper(dto));
+
+        List<PlatElderChildrenInfoListVO> voList = BeanDtoVoUtils.listVo(voPage.getRecords(), PlatElderChildrenInfoListVO.class);
+
+        fill(voList);
+
+        return PageUtil.toPageVO(BeanDtoVoUtils.listVo(voPage.getRecords(), PlatElderChildrenInfoListVO.class), voPage);
+    }
+
+    @Override
+    public List<PlatElderChildrenInfoListVO> list(PlatElderChildrenInfoQueryDTO dto) {
+
+        List<PlatElderChildrenInfo> list = list(lambdaQueryWrapper(dto));
+
+        List<PlatElderChildrenInfoListVO> voList = BeanDtoVoUtils.listVo(list, PlatElderChildrenInfoListVO.class);
+
+        fill(voList);
+
+        return voList;
+    }
+
+    private void check(PlatElderChildrenInfoEditVO dto) {
+        PlatElderChildrenInfo old = getOne(new QueryWrapper<PlatElderChildrenInfo>().lambda()
+                .eq(PlatElderChildrenInfo::getPhone, dto.getPhone()));
+
+        if (old != null && !old.getId().equals(dto.getId())) {
+            throw new BusinessException(CodeMessageEnum.SYSTEM_ERROR_PHONE_DUPLICATE);
+        }
+
+    }
+
+//    @Transactional
+//    @Override
+//    public void add(InsAgingCarDTOVO dto) {
+//
+//        check(dto);
+//
+//        save(BeanDtoVoUtils.convert(dto, InsAgingCar.class));
+//
+//    }
+
+    @Transactional
+    @Override
+    public void edit(PlatElderChildrenInfoEditVO dto) {
+
+        check(BeanDtoVoUtils.convert(dto, PlatElderChildrenInfoEditVO.class));
+
+        updateById(BeanDtoVoUtils.convert(dto, PlatElderChildrenInfo.class));
+
+    }
+
+    @Override
+    public PlatElderChildrenInfoEditVO view(String id) {
+        PlatElderChildrenInfoEditVO vo = BeanDtoVoUtils.convert(getById(id), PlatElderChildrenInfoEditVO.class);
+
+        JoinUtil.joinSplit(Arrays.asList(vo), platElderService, PlatElderChildrenInfoEditVO::getElderId, PlatElder::getId, (c, e) -> {
+            c.setElderName(StreamUtil.join(e, PlatElder::getName));
+        });
+
+        return vo;
+    }
+
+
+    @Transactional
+    @Override
+    public void del(String id) {
+        removeById(id);
+    }
+
 }
+//TODO ywc 组织还没填充
\ No newline at end of file

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

 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.PlatElderMedicalExaminationInfoDTOVO;
 import com.makeit.entity.platform.elder.PlatElderMedicalExaminationInfo;
 import com.makeit.mapper.platform.elder.PlatElderMedicalExaminationInfoMapper;
 import com.makeit.server.platform.elder.PlatElderMedicalExaminationInfoService;
+import com.makeit.utils.data.convert.BeanDtoVoUtils;
+import com.makeit.utils.data.convert.PageUtil;
+import com.makeit.utils.sys.FileUtil;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +30,62 @@ import org.springframework.stereotype.Service;
 @Service
 public class PlatElderMedicalExaminationInfoServiceImpl extends ServiceImpl<PlatElderMedicalExaminationInfoMapper, PlatElderMedicalExaminationInfo> implements PlatElderMedicalExaminationInfoService {
 
+
+    private LambdaQueryWrapper<PlatElderMedicalExaminationInfo> lambdaQueryWrapper(PlatElderMedicalExaminationInfoDTOVO dto) {
+        return new QueryWrapper<PlatElderMedicalExaminationInfo>().lambda()
+                .eq(PlatElderMedicalExaminationInfo::getElderId, dto.getElderId());
+    }
+
+    @Override
+    public PageVO<PlatElderMedicalExaminationInfoDTOVO> page(PageReqDTO<PlatElderMedicalExaminationInfoDTOVO> page) {
+        PlatElderMedicalExaminationInfoDTOVO dto = page.getData();
+        Page<PlatElderMedicalExaminationInfo> p = PageUtil.toMpPage(page);
+
+        Page<PlatElderMedicalExaminationInfo> voPage = page(p, lambdaQueryWrapper(dto));
+
+        List<PlatElderMedicalExaminationInfoDTOVO> voList = BeanDtoVoUtils.listVo(voPage.getRecords(), PlatElderMedicalExaminationInfoDTOVO.class);
+
+        FileUtil.convert(voList, PlatElderMedicalExaminationInfoDTOVO::getElderId, PlatElderMedicalExaminationInfoDTOVO::setReportFile);
+
+        return PageUtil.toPageVO(voList, voPage);
+    }
+
+    @Override
+    public List<PlatElderMedicalExaminationInfoDTOVO> list(PlatElderMedicalExaminationInfoDTOVO dto) {
+
+        List<PlatElderMedicalExaminationInfo> list = list(lambdaQueryWrapper(dto));
+
+        List<PlatElderMedicalExaminationInfoDTOVO> voList = BeanDtoVoUtils.listVo(list, PlatElderMedicalExaminationInfoDTOVO.class);
+
+        FileUtil.convert(voList, PlatElderMedicalExaminationInfoDTOVO::getElderId, PlatElderMedicalExaminationInfoDTOVO::setReportFile);
+
+        return voList;
+    }
+
+    @Transactional
+    @Override
+    public void add(PlatElderMedicalExaminationInfoDTOVO dto) {
+
+        save(BeanDtoVoUtils.convert(dto, PlatElderMedicalExaminationInfo.class));
+
+    }
+
+
+    @Override
+    public PlatElderMedicalExaminationInfoDTOVO view(String id) {
+        PlatElderMedicalExaminationInfoDTOVO vo = BeanDtoVoUtils.convert(getById(id), PlatElderMedicalExaminationInfoDTOVO.class);
+
+        FileUtil.convert(Arrays.asList(vo), PlatElderMedicalExaminationInfoDTOVO::getElderId, PlatElderMedicalExaminationInfoDTOVO::setReportFile);
+
+        return vo;
+    }
+
+
+    @Transactional
+    @Override
+    public void del(String id) {
+        removeById(id);
+    }
+
+
 }

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

@@ -80,6 +80,15 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
     }
 
     @Override
+    public List<PlatElderListVO> list(PlatElderQueryDTO dto) {
+        List<PlatElder> voList = list(lambdaQueryWrapper(dto));
+
+        List<PlatElderListVO> list = BeanDtoVoUtils.listVo(voList, PlatElderListVO.class);
+
+        return list;
+    }
+
+    @Override
     public void exportExcel(HttpServletResponse response, PlatElderQueryDTO dto) {
 
         List<PlatElder> dbList = list(lambdaQueryWrapper(dto));

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

+package com.makeit.vo.platform.elder;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.makeit.common.dto.BaseTenantDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 长者子女账号
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ElderChildrenInfo对象", description = "长者子女账号")
+public class PlatElderChildrenInfoListVO extends BaseTenantDTO {
+
+    @ApiModelProperty(value = "长者id")
+    private String elderId;
+
+    @ApiModelProperty(value = "长者id")
+    private String elderName;
+
+    @ApiModelProperty(value = "openid")
+    private String openid;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
+    @ApiModelProperty(value = "组织id")
+    private String orgId;
+
+    @ApiModelProperty(value = "组织名称")
+    private String orgName;
+
+    @ApiModelProperty(value = "城市组织id")
+    private String cityOrgId;
+
+    @ApiModelProperty(value = "区组织id")
+    private String districtOrgId;
+
+    @ApiModelProperty(value = "街道组织id")
+    private String streetOrgId;
+
+    @ApiModelProperty(value = "组织路径")
+    private String orgPath;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间", required = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createDate;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间", required = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateDate;
+
+
+    @ApiModelProperty(value = "创建人名称")
+    private String createBy;
+
+    @ApiModelProperty(value = "更新人名称")
+    private String updateBy;
+
+
+}

server-service/src/main/java/com/makeit/vo/platform/elder/realtime/PlatElderRealTimeBodyVO.java

+package com.makeit.vo.platform.elder.realtime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class PlatElderRealTimeBodyVO {
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("时间")
+    private LocalDateTime time;
+
+    @ApiModelProperty("体动指数")
+    private BigDecimal bodyMovementIndex;
+
+}

server-service/src/main/java/com/makeit/vo/platform/elder/realtime/PlatElderRealTimeHeartRespiratoryVO.java

+package com.makeit.vo.platform.elder.realtime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class PlatElderRealTimeHeartRespiratoryVO {
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("时间")
+    private LocalDateTime time;
+
+    @ApiModelProperty("心率")
+    private Integer heartRate;
+
+    @ApiModelProperty("呼吸率")
+    private Integer respiratoryRate;
+
+}

server-service/src/main/java/com/makeit/vo/platform/elder/realtime/PlatElderRealTimeNowVO.java

+package com.makeit.vo.platform.elder.realtime;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class PlatElderRealTimeNowVO {
+
+    @ApiModelProperty("状态")
+    private String status;
+
+    @ApiModelProperty("心率")
+    private Integer heartRate;
+
+    @ApiModelProperty("呼吸率")
+    private Integer respiratoryRate;
+
+    @ApiModelProperty("体动")
+    private BigDecimal body;
+
+}

server-service/src/main/java/com/makeit/vo/platform/elder/report/PlatElderSleepEvaluationVO.java

+package com.makeit.vo.platform.elder.report;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PlatElderSleepEvaluationVO {
+
+    @ApiModelProperty("得分")
+    private Integer score;
+
+    @ApiModelProperty("结果")
+    private String result;
+
+    @ApiModelProperty("评价")
+    private String evaluation;
+
+    @ApiModelProperty("睡眠时长")
+    private Integer sleepTime;
+
+    @ApiModelProperty("休息时长")
+    private Integer restTime;
+
+}