Merge remote-tracking branch 'origin/dev' into dev

db/inti-elder.sql

@@ -331,15 +331,22 @@ CREATE TABLE `plat_elder_sleep_analysis`
 
 
 CREATE TABLE `plat_elder_report_month`
 CREATE TABLE `plat_elder_report_month`
 (
 (
-    `id`          varchar(64) NOT NULL COMMENT 'id',
-    day           date        NOT NULL COMMENT '日期',
-    sleep_result  varchar(64) NOT NULL COMMENT '睡眠结果',
-    `create_by`   varchar(64) DEFAULT NULL COMMENT '创建者',
-    `create_date` datetime    DEFAULT NULL COMMENT '创建时间',
-    `update_by`   varchar(64) DEFAULT NULL COMMENT '更新者',
-    `update_date` datetime    DEFAULT NULL COMMENT '更新时间',
-    del_flag      char(1)     not null comment ' 删除标志 0否 1是 ',
-    `tenant_id`   varchar(64) DEFAULT NULL COMMENT ' 租户id ',
+    `id`                        varchar(64) NOT NULL COMMENT 'id',
+    `elder_id`                  VARCHAR(64) NOT NULL COMMENT '长者id',
+    day                         date        NOT NULL COMMENT '日期',
+    sleep_result                varchar(64) NOT NULL COMMENT '睡眠结果',
+    heart_rate                  int         NOT NULL COMMENT '心率',
+    respiratory_rate            int         NOT NULL COMMENT '呼吸率',
+    fail_count                  int         NOT NULL COMMENT '跌倒次数',
+    heart_exception_count       int         NOT NULL COMMENT '心率异常次数',
+    respiratory_exception_count int         NOT NULL COMMENT '呼吸异常次数',
+    behavior_exception_count    int         NOT NULL COMMENT '行为异常次数',
+    `create_by`                 varchar(64) DEFAULT NULL COMMENT '创建者',
+    `create_date`               datetime    DEFAULT NULL COMMENT '创建时间',
+    `update_by`                 varchar(64) DEFAULT NULL COMMENT '更新者',
+    `update_date`               datetime    DEFAULT NULL COMMENT '更新时间',
+    del_flag                    char(1)     not null comment ' 删除标志 0否 1是 ',
+    `tenant_id`                 varchar(64) DEFAULT NULL COMMENT ' 租户id ',
     PRIMARY KEY (`id`)
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='长者月报';
   DEFAULT CHARSET = utf8mb4 COMMENT ='长者月报';

server-generator/src/main/java/com/makeit/com/makeit/controller/PlatDeviceOtherController.java → server-generator/src/main/java/com/makeit/com/makeit/controller/PlatElderReportMonthController.java

@@ -7,15 +7,15 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 /**
 /**
  * <p>
  * <p>
- * 设备其他信息 前端控制器
+ * 长者月报 前端控制器
  * </p>
  * </p>
  *
  *
  * @author eugene young
  * @author eugene young
- * @since 2023-09-05
+ * @since 2023-09-14
  */
  */
 @RestController
 @RestController
-@RequestMapping("/plat-device-other")
-public class PlatDeviceOtherController {
+@RequestMapping("/plat-elder-report-month")
+public class PlatElderReportMonthController {
 
 
 }
 }
 
 

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

@@ -106,7 +106,7 @@ public class CodeGenerator {
 
 
         // 使用重点 下列字段填写表名 运行方法
         // 使用重点 下列字段填写表名 运行方法
 //        strategy.setInclude("edu_teacher","..."); // 多表-逆向工程
 //        strategy.setInclude("edu_teacher","..."); // 多表-逆向工程
-        strategy.setInclude("plat_elder_sleep","plat_elder_sleep_analysis");
+        strategy.setInclude("plat_elder_report_month");
 
 
         strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略
         strategy.setNaming(NamingStrategy.underline_to_camel);//数据库表映射到实体的命名策略
         strategy.setTablePrefix(pc.getModuleName() + "_"); //生成实体属性时去掉表"_"前缀并且第一个字母大写 如：gmt_create -> gmtCreate
         strategy.setTablePrefix(pc.getModuleName() + "_"); //生成实体属性时去掉表"_"前缀并且第一个字母大写 如：gmt_create -> gmtCreate

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

+package com.makeit.entity.platform.elder;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+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-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="PlatElderReportMonth对象", description="长者月报")
+public class PlatElderReportMonth extends BaseBusEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "长者id")
+    private String elderId;
+
+    @ApiModelProperty(value = "日期")
+    private LocalDate day;
+
+    @ApiModelProperty(value = "睡眠结果")
+    private String sleepResult;
+
+    @ApiModelProperty(value = "心率")
+    private Integer heartRate;
+
+    @ApiModelProperty(value = "呼吸率")
+    private Integer respiratoryRate;
+
+    @ApiModelProperty(value = "跌倒次数")
+    private Integer failCount;
+
+    @ApiModelProperty(value = "心率异常次数")
+    private Integer heartExceptionCount;
+
+    @ApiModelProperty(value = "呼吸异常次数")
+    private Integer respiratoryExceptionCount;
+
+    @ApiModelProperty(value = "行为异常次数")
+    private Integer behaviorExceptionCount;
+
+
+}

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

+package com.makeit.mapper.platform.elder;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.makeit.entity.platform.elder.PlatElderReportMonth;
+
+/**
+ * <p>
+ * 长者月报 Mapper 接口
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-09-14
+ */
+public interface PlatElderReportMonthMapper extends BaseMapper<PlatElderReportMonth> {
+
+}

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

+package com.makeit.service.platform.elder;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.makeit.entity.platform.elder.PlatElderReportMonth;
+
+/**
+ * <p>
+ * 长者月报 服务类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-09-14
+ */
+public interface PlatElderReportMonthService extends IService<PlatElderReportMonth> {
+
+}

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

+package com.makeit.service.platform.elder.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.makeit.entity.platform.elder.PlatElderReportMonth;
+import com.makeit.mapper.platform.elder.PlatElderReportMonthMapper;
+import com.makeit.service.platform.elder.PlatElderReportMonthService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 长者月报 服务实现类
+ * </p>
+ *
+ * @author eugene young
+ * @since 2023-09-14
+ */
+@Service
+public class PlatElderReportMonthServiceImpl extends ServiceImpl<PlatElderReportMonthMapper, PlatElderReportMonth> implements PlatElderReportMonthService {
+
+}