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

db/sys.sql

@@ -32,6 +32,9 @@ VALUES ('300', 'device.status', '设备状态', '2022-05-16 17:08:33', '2022-05-
 INSERT INTO sys_dictionary_category (id, code, name, create_date, update_date, del_flag)
 VALUES ('1000', 'device.breathe.personState', '呼吸心率运动状态', '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 ('2000', 'elder.marriage', '长者婚姻状况', '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 ('1', 'common.status.yes', '是', '1', 1, '', '2', '2022-05-16 17:13:23', '2022-05-16 17:13:27', '0');
@@ -124,6 +127,12 @@ VALUES ('1002', 'device.breathe.personState.breathe', '呼吸', '2', 2, '', '100
 INSERT INTO sys_dictionary (id, code, name, value, sort, description, category_id, create_date, update_date, del_flag)
 VALUES ('1003', 'device.breathe.personState.enter', '进入呼吸', '3', 3, '', '1000', '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 ('2000', 'elder.marriage.no', '未婚', '0', 0, '', '2000', '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 ('2001', 'elder.marriage.yes', '已婚', '1', 1, '', '2000', '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);
@@ -135,6 +144,8 @@ INSERT INTO sys_config_category (id, tenant_id, code, name, create_date, update_
 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_category (id, tenant_id, code, name, create_date, update_date, del_flag, create_by, update_by, eng_name) VALUES ('11', '0', 'elder.marriage', '长者婚姻狀況', '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);
 
@@ -156,6 +167,9 @@ INSERT INTO sys_config (id, tenant_id, code, name, value, sort, description, cat
 
 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);
 
+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 ('20', '0', 'elder.marriage.no', '未婚', '0', DEFAULT, DEFAULT, '11', '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 ('21', '0', 'elder.marriage.yes', '已婚', '1', DEFAULT, DEFAULT, '11', '2023-07-11 10:57:57', '2023-07-11 10:58:02', '0', null, null, null);
+
 
 
 

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

@@ -18,6 +18,20 @@ public class PlatElderEnum {
         }
     }
 
+    public enum MarriageEnum implements BaseEnum {
+        MAN("elder.marriage.no"), WOMAN("elder.marriage.yes");
+
+        private String code;
+
+        MarriageEnum(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");
 

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

 package com.makeit.vo.platform.elder.report.day;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,10 +9,10 @@ import java.time.LocalDate;
 @Data
 public class PlatElderReportMonthVO {
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("日期")
     private LocalDate day;
 
-
     @ApiModelProperty("睡眠结果")
     private String sleepResult;