代码修改

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BasePatientOutBed.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.care.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@@ -18,6 +19,7 @@ public class BasePatientOutBed extends IdEntity {
    private Integer status;//是否回床 0否,1是
    private Date createTime;// 创建日期 即起床时间
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
@@ -26,6 +28,7 @@ public class BasePatientOutBed extends IdEntity {
        this.patient = patient;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
@@ -34,6 +37,7 @@ public class BasePatientOutBed extends IdEntity {
        this.deviceSn = deviceSn;
    }
    @Column(name = "status")
    public Integer getStatus() {
        return status;
    }
@@ -43,6 +47,7 @@ public class BasePatientOutBed extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BasePatientStepDo.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.care.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@@ -20,6 +21,7 @@ public class BasePatientStepDo extends IdEntity{
    private Date createTime;
    private Integer del;
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
@@ -28,6 +30,7 @@ public class BasePatientStepDo extends IdEntity{
        this.patient = patient;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
@@ -36,6 +39,7 @@ public class BasePatientStepDo extends IdEntity{
        this.deviceSn = deviceSn;
    }
    @Column(name = "steps")
    public String getSteps() {
        return steps;
    }
@@ -44,6 +48,7 @@ public class BasePatientStepDo extends IdEntity{
        this.steps = steps;
    }
    @Column(name = "day")
    public String getDay() {
        return day;
    }
@@ -53,6 +58,7 @@ public class BasePatientStepDo extends IdEntity{
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
@@ -61,6 +67,7 @@ public class BasePatientStepDo extends IdEntity{
        this.createTime = createTime;
    }
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BaseSleepDeviceReport.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.care.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@@ -36,6 +37,7 @@ public class BaseSleepDeviceReport extends IdEntity {
    public Date createTime; // //日期
    public Integer del; //是否有效 1有效 0无效
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
@@ -44,6 +46,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.patient = patient;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
@@ -52,6 +55,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.deviceSn = deviceSn;
    }
    @Column(name = "falla_sleep")
    public String getFallaSleep() {
        return fallaSleep;
    }
@@ -60,6 +64,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.fallaSleep = fallaSleep;
    }
    @Column(name = "sleep_time")
    public String getSleepTime() {
        return sleepTime;
    }
@@ -68,6 +73,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.sleepTime = sleepTime;
    }
    @Column(name = "rest_time")
    public String getRestTime() {
        return restTime;
    }
@@ -76,6 +82,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.restTime = restTime;
    }
    @Column(name = "awake_time")
    public String getAwakeTime() {
        return awakeTime;
    }
@@ -84,6 +91,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.awakeTime = awakeTime;
    }
    @Column(name = "light_time")
    public String getLightTime() {
        return lightTime;
    }
@@ -92,6 +100,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.lightTime = lightTime;
    }
    @Column(name = "rem_time")
    public String getRemTime() {
        return remTime;
    }
@@ -100,6 +109,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.remTime = remTime;
    }
    @Column(name = "deep_time")
    public String getDeepTime() {
        return deepTime;
    }
@@ -108,6 +118,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.deepTime = deepTime;
    }
    @Column(name = "bucket")
    public String getBucket() {
        return bucket;
    }
@@ -116,6 +127,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.bucket = bucket;
    }
    @Column(name = "avghr")
    public String getAvghr() {
        return avghr;
    }
@@ -124,6 +136,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.avghr = avghr;
    }
    @Column(name = "avgbr")
    public String getAvgbr() {
        return avgbr;
    }
@@ -132,6 +145,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.avgbr = avgbr;
    }
    @Column(name = "awake_per")
    public String getAwakePer() {
        return awakePer;
    }
@@ -140,6 +154,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.awakePer = awakePer;
    }
    @Column(name = "rem_per")
    public String getRemPer() {
        return remPer;
    }
@@ -148,6 +163,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.remPer = remPer;
    }
    @Column(name = "light_per")
    public String getLightPer() {
        return lightPer;
    }
@@ -156,6 +172,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.lightPer = lightPer;
    }
    @Column(name = "deep_per")
    public String getDeepPer() {
        return deepPer;
    }
@@ -164,6 +181,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.deepPer = deepPer;
    }
    @Column(name = "efficiency")
    public String getEfficiency() {
        return efficiency;
    }
@@ -172,6 +190,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.efficiency = efficiency;
    }
    @Column(name = "score")
    public String getScore() {
        return score;
    }
@@ -181,6 +200,7 @@ public class BaseSleepDeviceReport extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
@@ -189,6 +209,7 @@ public class BaseSleepDeviceReport extends IdEntity {
        this.createTime = createTime;
    }
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BaseSleepNightRecord.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.care.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@@ -21,6 +22,7 @@ public class BaseSleepNightRecord extends IdEntity {
    private Date createTime;// 创建日期 即起床时间
    private Date updateTime;// 更新日期
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
@@ -29,6 +31,7 @@ public class BaseSleepNightRecord extends IdEntity {
        this.patient = patient;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
@@ -37,6 +40,7 @@ public class BaseSleepNightRecord extends IdEntity {
        this.deviceSn = deviceSn;
    }
    @Column(name = "out_time")
    public String getOutTime() {
        return outTime;
    }
@@ -45,6 +49,7 @@ public class BaseSleepNightRecord extends IdEntity {
        this.outTime = outTime;
    }
    @Column(name = "status")
    public Integer getStatus() {
        return status;
    }
@@ -53,6 +58,7 @@ public class BaseSleepNightRecord extends IdEntity {
        this.status = status;
    }
    @Column(name = "day")
    public String getDay() {
        return day;
    }
@@ -62,6 +68,7 @@ public class BaseSleepNightRecord extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
@@ -71,6 +78,7 @@ public class BaseSleepNightRecord extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "update_time")
    public Date getUpdateTime() {
        return updateTime;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BaseSleepPlan.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.care.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -25,6 +26,7 @@ public class BaseSleepPlan extends IdEntity {
    private String nightRestTime;
    private Date createTime;
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
@@ -33,6 +35,7 @@ public class BaseSleepPlan extends IdEntity {
        this.patient = patient;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
@@ -41,6 +44,7 @@ public class BaseSleepPlan extends IdEntity {
        this.deviceSn = deviceSn;
    }
    @Column(name = "get_up_time")
    public String getGetUpTime() {
        return getUpTime;
    }
@@ -49,6 +53,7 @@ public class BaseSleepPlan extends IdEntity {
        this.getUpTime = getUpTime;
    }
    @Column(name = "nap_time")
    public String getNapTime() {
        return napTime;
    }
@@ -57,6 +62,7 @@ public class BaseSleepPlan extends IdEntity {
        this.napTime = napTime;
    }
    @Column(name = "night_rest_time")
    public String getNightRestTime() {
        return nightRestTime;
    }
@@ -66,6 +72,7 @@ public class BaseSleepPlan extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BaseSleepPlanDetail.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.care.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -34,6 +35,7 @@ public class BaseSleepPlanDetail extends IdEntity {
    private String breath;
    private Integer bedStatus; //0未在床 1在床
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
@@ -42,6 +44,7 @@ public class BaseSleepPlanDetail extends IdEntity {
        this.patient = patient;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
@@ -50,6 +53,7 @@ public class BaseSleepPlanDetail extends IdEntity {
        this.deviceSn = deviceSn;
    }
    @Column(name = "day")
    public String getDay() {
        return day;
    }
@@ -58,6 +62,7 @@ public class BaseSleepPlanDetail extends IdEntity {
        this.day = day;
    }
    @Column(name = "up_status")
    public Integer getUpStatus() {
        return upStatus;
    }
@@ -67,6 +72,7 @@ public class BaseSleepPlanDetail extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "up_time")
    public Date getUpTime() {
        return upTime;
    }
@@ -75,6 +81,7 @@ public class BaseSleepPlanDetail extends IdEntity {
        this.upTime = upTime;
    }
    @Column(name = "siesta_status")
    public Integer getSiestaStatus() {
        return siestaStatus;
    }
@@ -84,6 +91,7 @@ public class BaseSleepPlanDetail extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "siesta_time_begin")
    public Date getSiestaTimeBegin() {
        return siestaTimeBegin;
    }
@@ -93,6 +101,7 @@ public class BaseSleepPlanDetail extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "siesta_time_end")
    public Date getSiestaTimeEnd() {
        return siestaTimeEnd;
    }
@@ -101,6 +110,7 @@ public class BaseSleepPlanDetail extends IdEntity {
        this.siestaTimeEnd = siestaTimeEnd;
    }
    @Column(name = "siesta_long")
    public String getSiestaLong() {
        return siestaLong;
    }
@@ -109,6 +119,7 @@ public class BaseSleepPlanDetail extends IdEntity {
        this.siestaLong = siestaLong;
    }
    @Column(name = "in_status")
    public Integer getInStatus() {
        return inStatus;
    }
@@ -118,6 +129,7 @@ public class BaseSleepPlanDetail extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "in_time_begin")
    public Date getInTimeBegin() {
        return inTimeBegin;
    }
@@ -127,6 +139,7 @@ public class BaseSleepPlanDetail extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "in_time_end")
    public Date getInTimeEnd() {
        return inTimeEnd;
    }
@@ -136,6 +149,7 @@ public class BaseSleepPlanDetail extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
@@ -145,6 +159,7 @@ public class BaseSleepPlanDetail extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "update_time")
    public Date getUpdateTime() {
        return updateTime;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BaseSleepX1device.java

@@ -28,6 +28,7 @@ public class BaseSleepX1device extends UuidIdentityEntity {
    private Integer total; // 检测次数
    private Integer del;  //是否有效 1有效 0无效
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
@@ -36,6 +37,7 @@ public class BaseSleepX1device extends UuidIdentityEntity {
        this.patient = patient;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
@@ -44,6 +46,7 @@ public class BaseSleepX1device extends UuidIdentityEntity {
        this.deviceSn = deviceSn;
    }
    @Column(name = "sleep_time")
    public String getSleepTime() {
        return sleepTime;
    }
@@ -52,6 +55,7 @@ public class BaseSleepX1device extends UuidIdentityEntity {
        this.sleepTime = sleepTime;
    }
    @Column(name = "deep_sleep")
    public String getDeepSleep() {
        return deepSleep;
    }
@@ -60,6 +64,7 @@ public class BaseSleepX1device extends UuidIdentityEntity {
        this.deepSleep = deepSleep;
    }
    @Column(name = "light_sleep")
    public String getLightSleep() {
        return lightSleep;
    }
@@ -68,6 +73,7 @@ public class BaseSleepX1device extends UuidIdentityEntity {
        this.lightSleep = lightSleep;
    }
    @Column(name = "awake_time")
    public String getAwakeTime() {
        return awakeTime;
    }
@@ -96,6 +102,7 @@ public class BaseSleepX1device extends UuidIdentityEntity {
        this.endTime = endTime;
    }
    @Column(name = "interval_time")
    public Integer getIntervalTime() {
        return intervalTime;
    }
@@ -104,6 +111,7 @@ public class BaseSleepX1device extends UuidIdentityEntity {
        this.intervalTime = intervalTime;
    }
    @Column(name = "total")
    public Integer getTotal() {
        return total;
    }
@@ -112,6 +120,7 @@ public class BaseSleepX1device extends UuidIdentityEntity {
        this.total = total;
    }
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/BaseYxDeviceIndex.java

@@ -2,6 +2,7 @@ package com.yihu.jw.entity.care.device;
import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -20,6 +21,7 @@ public class BaseYxDeviceIndex extends UuidIdentityEntityWithCreateTime{
    private String lat;//纬度
    private String lon;//经度
    @Column(name = "sn")
    public String getSn() {
        return sn;
    }
@@ -28,6 +30,7 @@ public class BaseYxDeviceIndex extends UuidIdentityEntityWithCreateTime{
        this.sn = sn;
    }
    @Column(name = "lat")
    public String getLat() {
        return lat;
    }
@@ -36,6 +39,7 @@ public class BaseYxDeviceIndex extends UuidIdentityEntityWithCreateTime{
        this.lat = lat;
    }
    @Column(name = "lon")
    public String getLon() {
        return lon;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/Device.java

@@ -112,6 +112,7 @@ public class Device extends IdEntity {
		this.del = del;
	}
	@Column(name = "service_topic")
	public String getServiceTopic() {
		return serviceTopic;
	}
@@ -120,6 +121,7 @@ public class Device extends IdEntity {
		this.serviceTopic = serviceTopic;
	}
	@Column(name = "need_register")
	public String getNeedRegister() {
		return needRegister;
	}
@@ -128,6 +130,7 @@ public class Device extends IdEntity {
		this.needRegister = needRegister;
	}
	@Column(name = "device_type")
	public Integer getDeviceType() {
		return deviceType;
	}

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/DeviceDataPushLog.java

@@ -2,6 +2,7 @@ package com.yihu.jw.entity.care.device;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@@ -23,6 +24,7 @@ public class DeviceDataPushLog extends IdEntity {
    private Date createTime;
    @Column(name="patient")
    public String getPatient() {
        return patient;
    }
@@ -31,6 +33,7 @@ public class DeviceDataPushLog extends IdEntity {
        this.patient = patient;
    }
    @Column(name="patient_name")
    public String getPatientName() {
        return patientName;
    }
@@ -39,6 +42,7 @@ public class DeviceDataPushLog extends IdEntity {
        this.patientName = patientName;
    }
    @Column(name="device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
@@ -47,6 +51,7 @@ public class DeviceDataPushLog extends IdEntity {
        this.deviceSn = deviceSn;
    }
    @Column(name="device_name")
    public String getDeviceName() {
        return deviceName;
    }
@@ -55,6 +60,7 @@ public class DeviceDataPushLog extends IdEntity {
        this.deviceName = deviceName;
    }
    @Column(name="device_category")
    public String getDeviceCategory() {
        return deviceCategory;
    }
@@ -63,6 +69,7 @@ public class DeviceDataPushLog extends IdEntity {
        this.deviceCategory = deviceCategory;
    }
    @Column(name="api_name")
    public String getApiName() {
        return apiName;
    }
@@ -71,6 +78,7 @@ public class DeviceDataPushLog extends IdEntity {
        this.apiName = apiName;
    }
    @Column(name="data")
    public String getData() {
        return data;
    }
@@ -79,6 +87,7 @@ public class DeviceDataPushLog extends IdEntity {
        this.data = data;
    }
    @Column(name="create_time")
    public Date getCreateTime() {
        return createTime;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/DeviceDetail.java

@@ -354,6 +354,7 @@ public class DeviceDetail extends IdEntity {
        this.contactStatusTime = contactStatusTime;
    }
    @Column(name = "iccid")
    public String getIccid() {
        return iccid;
    }
@@ -362,6 +363,7 @@ public class DeviceDetail extends IdEntity {
        this.iccid = iccid;
    }
    @Column(name = "imsi")
    public String getImsi() {
        return imsi;
    }
@@ -370,6 +372,7 @@ public class DeviceDetail extends IdEntity {
        this.imsi = imsi;
    }
    @Column(name = "category_code")
    public String getCategoryCode() {
        return categoryCode;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/DeviceHealthIndex.java

@@ -2,6 +2,7 @@ package com.yihu.jw.entity.care.device;
import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -23,6 +24,7 @@ public class DeviceHealthIndex extends UuidIdentityEntityWithCreateTime{
    private String unit;//单位
    private String recordTime;//记录时间
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
@@ -31,6 +33,7 @@ public class DeviceHealthIndex extends UuidIdentityEntityWithCreateTime{
        this.deviceSn = deviceSn;
    }
    @Column(name = "device_type")
    public String getDeviceType() {
        return deviceType;
    }
@@ -39,6 +42,7 @@ public class DeviceHealthIndex extends UuidIdentityEntityWithCreateTime{
        this.deviceType = deviceType;
    }
    @Column(name = "value")
    public String getValue() {
        return value;
    }
@@ -47,6 +51,7 @@ public class DeviceHealthIndex extends UuidIdentityEntityWithCreateTime{
        this.value = value;
    }
    @Column(name = "unit")
    public String getUnit() {
        return unit;
    }
@@ -55,6 +60,7 @@ public class DeviceHealthIndex extends UuidIdentityEntityWithCreateTime{
        this.unit = unit;
    }
    @Column(name = "record_time")
    public String getRecordTime() {
        return recordTime;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/DevicePatientDevice.java

@@ -298,7 +298,8 @@ public class DevicePatientDevice extends IdEntity {
    public DevicePatientDevice() {
    }
    
    @Column(name = "apply_status")
    public Integer getApplyStatus() {
        return applyStatus;
    }
@@ -306,7 +307,8 @@ public class DevicePatientDevice extends IdEntity {
    public void setApplyStatus(Integer applyStatus) {
        this.applyStatus = applyStatus;
    }
    
    @Column(name = "apply_reason")
    public String getApplyReason() {
        return applyReason;
    }
@@ -315,6 +317,7 @@ public class DevicePatientDevice extends IdEntity {
        this.applyReason = applyReason;
    }
    @Column(name = "refuse_reason")
    public String getRefuseReason() {
        return refuseReason;
    }
@@ -332,6 +335,7 @@ public class DevicePatientDevice extends IdEntity {
        this.deviceImgUrl = deviceImgUrl;
    }
    @Column(name = "device_type")
    public Integer getDeviceType() {
        return deviceType;
    }
@@ -340,6 +344,7 @@ public class DevicePatientDevice extends IdEntity {
        this.deviceType = deviceType;
    }
    @Column(name = "iot_device_sn")
    public String getIotDeviceSn() {
        return iotDeviceSn;
    }
@@ -348,6 +353,7 @@ public class DevicePatientDevice extends IdEntity {
        this.iotDeviceSn = iotDeviceSn;
    }
    @Column(name = "safe_area_gz")
    public String getSafeAreaGz() {
        return safeAreaGz;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/DeviceSosLogDO.java

@@ -2,6 +2,7 @@ package com.yihu.jw.entity.care.device;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
@@ -26,6 +27,8 @@ public class DeviceSosLogDO extends IdEntity {
    private String sosSendMessage; //紧急救助返回消息
    private Date createTime;//
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
@@ -34,6 +37,7 @@ public class DeviceSosLogDO extends IdEntity {
        this.patient = patient;
    }
    @Column(name = "patient_name")
    public String getPatientName() {
        return patientName;
    }
@@ -42,6 +46,7 @@ public class DeviceSosLogDO extends IdEntity {
        this.patientName = patientName;
    }
    @Column(name = "idcard")
    public String getIdcard() {
        return idcard;
    }
@@ -50,6 +55,7 @@ public class DeviceSosLogDO extends IdEntity {
        this.idcard = idcard;
    }
    @Column(name = "category_code")
    public String getCategoryCode() {
        return categoryCode;
    }
@@ -58,6 +64,7 @@ public class DeviceSosLogDO extends IdEntity {
        this.categoryCode = categoryCode;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
@@ -66,6 +73,7 @@ public class DeviceSosLogDO extends IdEntity {
        this.deviceSn = deviceSn;
    }
    @Column(name = "sos_address")
    public String getSosAddress() {
        return sosAddress;
    }
@@ -74,6 +82,7 @@ public class DeviceSosLogDO extends IdEntity {
        this.sosAddress = sosAddress;
    }
    @Column(name = "sos_lat")
    public String getSosLat() {
        return sosLat;
    }
@@ -82,6 +91,7 @@ public class DeviceSosLogDO extends IdEntity {
        this.sosLat = sosLat;
    }
    @Column(name = "sos_lon")
    public String getSosLon() {
        return sosLon;
    }
@@ -90,6 +100,7 @@ public class DeviceSosLogDO extends IdEntity {
        this.sosLon = sosLon;
    }
    @Column(name = "sos_send_status")
    public String getSosSendStatus() {
        return sosSendStatus;
    }
@@ -98,6 +109,7 @@ public class DeviceSosLogDO extends IdEntity {
        this.sosSendStatus = sosSendStatus;
    }
    @Column(name = "sos_send_message")
    public String getSosSendMessage() {
        return sosSendMessage;
    }
@@ -106,6 +118,7 @@ public class DeviceSosLogDO extends IdEntity {
        this.sosSendMessage = sosSendMessage;
    }
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/HvDeviceRecord.java

@@ -2,6 +2,7 @@ package com.yihu.jw.entity.care.device;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -19,6 +20,7 @@ public class HvDeviceRecord extends UuidIdentityEntity {
    private String deviceId;//海康平台设备id
    private String deviceSn;//设备sn
    @Column(name = "device_id")
    public String getDeviceId() {
        return deviceId;
    }
@@ -27,6 +29,7 @@ public class HvDeviceRecord extends UuidIdentityEntity {
        this.deviceId = deviceId;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/PatientSafeAreaConfirm.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.care.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@@ -22,6 +23,7 @@ public class PatientSafeAreaConfirm extends IdEntity {
    private Date createTime;
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
@@ -30,6 +32,7 @@ public class PatientSafeAreaConfirm extends IdEntity {
        this.patient = patient;
    }
    @Column(name = "doctor_code")
    public String getDoctorCode() {
        return doctorCode;
    }
@@ -38,6 +41,7 @@ public class PatientSafeAreaConfirm extends IdEntity {
        this.doctorCode = doctorCode;
    }
    @Column(name = "safe_id")
    public String getSafeId() {
        return safeId;
    }
@@ -46,6 +50,7 @@ public class PatientSafeAreaConfirm extends IdEntity {
        this.safeId = safeId;
    }
    @Column(name = "del")
    public String getDel() {
        return del;
    }
@@ -54,6 +59,7 @@ public class PatientSafeAreaConfirm extends IdEntity {
        this.del = del;
    }
    @Column(name = "manage_status")
    public Integer getManageStatus() {
        return manageStatus;
    }
@@ -63,6 +69,7 @@ public class PatientSafeAreaConfirm extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/PatientSafeAreaDO.java

@@ -24,6 +24,7 @@ public class PatientSafeAreaDO extends IdEntity {
    private String del;//作废标识，1正常，0作废
    private Integer manageStatus;//电子围栏确认情况 0待确认 1已确认
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
@@ -41,6 +42,7 @@ public class PatientSafeAreaDO extends IdEntity {
        this.safeAreaGz = safeAreaGz;
    }
    @Column(name = "success_flag")
    public Integer getSuccessFlag() {
        return successFlag;
    }
@@ -50,6 +52,7 @@ public class PatientSafeAreaDO extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
@@ -59,6 +62,7 @@ public class PatientSafeAreaDO extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "update_time")
    public Date getUpdateTime() {
        return updateTime;
    }
@@ -67,6 +71,7 @@ public class PatientSafeAreaDO extends IdEntity {
        this.updateTime = updateTime;
    }
    @Column(name = "manage_status")
    public Integer getManageStatus() {
        return manageStatus;
    }
@@ -75,6 +80,7 @@ public class PatientSafeAreaDO extends IdEntity {
        this.manageStatus = manageStatus;
    }
    @Column(name = "del")
    public String getDel() {
        return del;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/YsConfigDo.java

@@ -2,6 +2,7 @@ package com.yihu.jw.entity.care.device;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -20,6 +21,7 @@ public class YsConfigDo extends IdEntity {
    private String iotAccessTokenKey; //iot token Key
    private String secretKey; //设备的解密秘钥 key
    @Column(name = "config_id")
    public Integer getConfigId() {
        return configId;
    }
@@ -28,6 +30,7 @@ public class YsConfigDo extends IdEntity {
        this.configId = configId;
    }
    @Column(name = "app_key")
    public String getAppKey() {
        return appKey;
    }
@@ -36,6 +39,7 @@ public class YsConfigDo extends IdEntity {
        this.appKey = appKey;
    }
    @Column(name = "app_secret")
    public String getAppSecret() {
        return appSecret;
    }
@@ -44,6 +48,7 @@ public class YsConfigDo extends IdEntity {
        this.appSecret = appSecret;
    }
    @Column(name = "msg_data_key")
    public String getMsgDataKey() {
        return msgDataKey;
    }
@@ -52,6 +57,7 @@ public class YsConfigDo extends IdEntity {
        this.msgDataKey = msgDataKey;
    }
    @Column(name = "access_token_key")
    public String getAccessTokenKey() {
        return accessTokenKey;
    }
@@ -60,6 +66,7 @@ public class YsConfigDo extends IdEntity {
        this.accessTokenKey = accessTokenKey;
    }
    @Column(name = "iot_access_token_key")
    public String getIotAccessTokenKey() {
        return iotAccessTokenKey;
    }
@@ -68,6 +75,7 @@ public class YsConfigDo extends IdEntity {
        this.iotAccessTokenKey = iotAccessTokenKey;
    }
    @Column(name = "secret_key")
    public String getSecretKey() {
        return secretKey;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/YsDeviceDo.java

@@ -3,6 +3,7 @@ package com.yihu.jw.entity.care.device;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -16,6 +17,7 @@ public class YsDeviceDo extends IdEntity {
    private String deviceSn;
    private Integer configId; //配置编号
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
@@ -24,6 +26,7 @@ public class YsDeviceDo extends IdEntity {
        this.deviceSn = deviceSn;
    }
    @Column(name = "config_id")
    public Integer getConfigId() {
        return configId;
    }