Merge branch 'dev' of chinawu123/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/family/PatientFamilyMemberService.java

@@ -627,19 +627,21 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
                }
                obj.put("state", "1");//0 ：未处理；1：已同意；2：已拒绝
                Integer onLineFlag =0;
                switch (map.get("archive_type").toString()){
                    case "1":
                        //老人
                        if(map.get("openid")!=null||"1".equals(map.get("on_line")+"")){
                            onLineFlag=1;
                        }
                        break;
                    case "2":
                        //新生儿
                        if(map.get("openid")!=null){
                            onLineFlag=1;
                        }
                        break;
                if (null!=map.get("archive_type")&&!StringUtils.isNotBlank(map.get("archive_type").toString())){
                    switch (map.get("archive_type").toString()){
                        case "1":
                            //老人
                            if(map.get("openid")!=null||"1".equals(map.get("on_line")+"")){
                                onLineFlag=1;
                            }
                            break;
                        case "2":
                            //新生儿
                            if(map.get("openid")!=null){
                                onLineFlag=1;
                            }
                            break;
                    }
                }
                obj.put("onLineFlag", onLineFlag);
                resultArray.add(obj);

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseDeviceHealthIndexDao.java

@@ -0,0 +1,9 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseDeviceHealthIndexDO;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseInfantInfoDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseDeviceHealthIndexDao extends PagingAndSortingRepository<ZhBaseDeviceHealthIndexDO,String>, JpaSpecificationExecutor<ZhBaseDeviceHealthIndexDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseInfantInfoDao.java

@@ -0,0 +1,9 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseInfantInfoDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseInfantInfoDao extends PagingAndSortingRepository<ZhBaseInfantInfoDO,String>, JpaSpecificationExecutor<ZhBaseInfantInfoDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseServicePackageSignRecordDao.java

@@ -0,0 +1,10 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseServicePackageSignRecordDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseServicePackageSignRecordDao extends PagingAndSortingRepository<ZhBaseServicePackageSignRecordDO,String>, JpaSpecificationExecutor<ZhBaseServicePackageSignRecordDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseSleepDeviceDao.java

@@ -0,0 +1,8 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseSleepDeviceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseSleepDeviceDao extends PagingAndSortingRepository<ZhBaseSleepDeviceDO,String>, JpaSpecificationExecutor<ZhBaseSleepDeviceDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseSleepX1deviceDao.java

@@ -0,0 +1,9 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseSleepX1deviceDO;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseYxdeviceIndexDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseSleepX1deviceDao extends PagingAndSortingRepository<ZhBaseSleepX1deviceDO,String>, JpaSpecificationExecutor<ZhBaseSleepX1deviceDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhBaseYxdeviceIndexDao.java

@@ -0,0 +1,9 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseServicePackageSignRecordDO;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhBaseYxdeviceIndexDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhBaseYxdeviceIndexDao extends PagingAndSortingRepository<ZhBaseYxdeviceIndexDO,String>, JpaSpecificationExecutor<ZhBaseYxdeviceIndexDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhDeviceDataPushLogDao.java

@@ -0,0 +1,9 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhDeviceDataPushLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhDeviceDataPushLogDao extends PagingAndSortingRepository<ZhDeviceDataPushLogDO,String>, JpaSpecificationExecutor<ZhDeviceDataPushLogDO> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/dao/ZhWlyyPatientLabelDao.java

@@ -0,0 +1,9 @@
package com.yihu.jw.care.zhylyjkglxt.dao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhWlyyPatientLabel;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ZhWlyyPatientLabelDao extends PagingAndSortingRepository<ZhWlyyPatientLabel,String>, JpaSpecificationExecutor<ZhWlyyPatientLabel> {
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhBaseDeviceHealthIndexDO.java

@@ -0,0 +1,79 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.AssignedIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "base_device_health_index")
public class ZhBaseDeviceHealthIndexDO extends AssignedIdentityEntity {
    private String deviceSn; //设备sn
    private String deviceType; //设备类型 1气感 2烟感
    private String value; //测量值
    private String unit; //单位
    private Date createTime; //创建时间
    private String recordTime; //记录时间
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
    public void setDeviceSn(String deviceSn) {
        this.deviceSn = deviceSn;
    }
    @Column(name = "device_type")
    public String getDeviceType() {
        return deviceType;
    }
    public void setDeviceType(String deviceType) {
        this.deviceType = deviceType;
    }
    public String getValue() {
        return value;
    }
    public void setValue(String value) {
        this.value = value;
    }
    public String getUnit() {
        return unit;
    }
    public void setUnit(String unit) {
        this.unit = unit;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "record_time")
    public String getRecordTime() {
        return recordTime;
    }
    public void setRecordTime(String recordTime) {
        this.recordTime = recordTime;
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhBaseInfantInfoDO.java

@@ -0,0 +1,107 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.AssignedIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "base_infant_info")
public class ZhBaseInfantInfoDO extends AssignedIdentityEntity implements java.io.Serializable {
    private String patient; // 幼儿code
    private String name; // 幼儿名字
    private String age; // 幼儿年龄
    private String enterSchool; //入学机构
    private String enterSchoolName; //入学机构名字
    private String ifEnterSchool; //是否入学（0否，1是）
    private String address; // 地址
    private Date createTime; //
    private Date updateTime; //
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getAge() {
        return age;
    }
    public void setAge(String age) {
        this.age = age;
    }
    @Column(name = "enter_school")
    public String getEnterSchool() {
        return enterSchool;
    }
    public void setEnterSchool(String enterSchool) {
        this.enterSchool = enterSchool;
    }
    @Column(name = "if_enter_school")
    public String getIfEnterSchool() {
        return ifEnterSchool;
    }
    public void setIfEnterSchool(String ifEnterSchool) {
        this.ifEnterSchool = ifEnterSchool;
    }
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "update_time")
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @Column(name = "enter_school_name")
    public String getEnterSchoolName() {
        return enterSchoolName;
    }
    public void setEnterSchoolName(String enterSchoolName) {
        this.enterSchoolName = enterSchoolName;
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhBaseServicePackageSignRecordDO.java

@@ -0,0 +1,136 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.AssignedIdentityEntity;
import com.yihu.jw.entity.base.servicePackage.ServicePackageRecordDO;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Entity
@Table(name = "base_service_package_sign_record")
public class ZhBaseServicePackageSignRecordDO extends AssignedIdentityEntity implements java.io.Serializable {
    private String patient;//居民code
    private String name;//居民姓名
    private String signDoctor;//签约医生code
    private String signDoctorName;//签约医生名称
    private Date startTime;//服务开始时间
    private Date endTime;//服务结束时间
    private Integer status;//状态 0新增，1生效，-1已过期
    /**
     * 签约的服务包
     */
    private List<ServicePackageRecordDO> recordDOList;
    //社区医生
    private List<Map<String,Object>> doctorList;
    //助老员
    private List<Map<String,Object>> helperList;
    //服务包
    private List<Map<String,Object>> packageList;
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "sign_doctor")
    public String getSignDoctor() {
        return signDoctor;
    }
    public void setSignDoctor(String signDoctor) {
        this.signDoctor = signDoctor;
    }
    @Column(name = "sign_doctor_name")
    public String getSignDoctorName() {
        return signDoctorName;
    }
    public void setSignDoctorName(String signDoctorName) {
        this.signDoctorName = signDoctorName;
    }
    @Column(name = "start_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getStartTime() {
        return startTime;
    }
    public void setStartTime(Date startTime) {
        this.startTime = startTime;
    }
    @Column(name = "end_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getEndTime() {
        return endTime;
    }
    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Transient
    public List<ServicePackageRecordDO> getRecordDOList() {
        return recordDOList;
    }
    public void setRecordDOList(List<ServicePackageRecordDO> recordDOList) {
        this.recordDOList = recordDOList;
    }
    @Transient
    public List<Map<String,Object>> getDoctorList() {
        return doctorList;
    }
    public void setDoctorList(List<Map<String,Object>> doctorList) {
        this.doctorList = doctorList;
    }
    @Transient
    public List<Map<String,Object>> getHelperList() {
        return helperList;
    }
    public void setHelperList(List<Map<String,Object>> helperList) {
        this.helperList = helperList;
    }
    @Transient
    public List<Map<String,Object>> getPackageList() {
        return packageList;
    }
    public void setPackageList(List<Map<String,Object>> packageList) {
        this.packageList = packageList;
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhBaseSleepDeviceDO.java

@@ -0,0 +1,221 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.AssignedIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@Table(name = "base_sleep_device")
@Entity
public class ZhBaseSleepDeviceDO extends AssignedIdentityEntity {
    public String patient;
    public String deviceSn; //睡眠带MAC地址
    public String fallaSleep;   //入睡时长 （分钟）
    public String sleepTime;    //睡眠时长 （分钟）
    public String restTime;     //休息时长 （分钟）
    public String awakeTime;    //清醒时长 （分钟）
    public String lightTime;//浅睡时长 （分钟）
    public String remTime;  //rem时长  （分钟）
    public String deepTime; //深睡时长 （分钟）
    public String bucket;   //睡眠时段
    public String avghr;    //平均心率
    public String avgbr;    //平均呼吸率
    public String awakePer; //清醒百分比
    public String remPer;   //rem百分比
    public String lightPer; //浅睡百分比
    public String deepPer;  //深睡百分比
    public String efficiency;   //睡眠效率
    public String score;    //睡眠评分
    public Date createTime; // //日期
    public Integer del; //是否有效 1有效 0无效
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
    public void setDeviceSn(String deviceSn) {
        this.deviceSn = deviceSn;
    }
    @Column(name = "falla_sleep")
    public String getFallaSleep() {
        return fallaSleep;
    }
    public void setFallaSleep(String fallaSleep) {
        this.fallaSleep = fallaSleep;
    }
    @Column(name = "sleep_time")
    public String getSleepTime() {
        return sleepTime;
    }
    public void setSleepTime(String sleepTime) {
        this.sleepTime = sleepTime;
    }
    @Column(name = "rest_time")
    public String getRestTime() {
        return restTime;
    }
    public void setRestTime(String restTime) {
        this.restTime = restTime;
    }
    @Column(name = "awake_time")
    public String getAwakeTime() {
        return awakeTime;
    }
    public void setAwakeTime(String awakeTime) {
        this.awakeTime = awakeTime;
    }
    @Column(name = "light_time")
    public String getLightTime() {
        return lightTime;
    }
    public void setLightTime(String lightTime) {
        this.lightTime = lightTime;
    }
    @Column(name = "rem_time")
    public String getRemTime() {
        return remTime;
    }
    public void setRemTime(String remTime) {
        this.remTime = remTime;
    }
    @Column(name = "deep_time")
    public String getDeepTime() {
        return deepTime;
    }
    public void setDeepTime(String deepTime) {
        this.deepTime = deepTime;
    }
    @Column(name = "bucket")
    public String getBucket() {
        return bucket;
    }
    public void setBucket(String bucket) {
        this.bucket = bucket;
    }
    @Column(name = "avghr")
    public String getAvghr() {
        return avghr;
    }
    public void setAvghr(String avghr) {
        this.avghr = avghr;
    }
    @Column(name = "avgbr")
    public String getAvgbr() {
        return avgbr;
    }
    public void setAvgbr(String avgbr) {
        this.avgbr = avgbr;
    }
    @Column(name = "awake_per")
    public String getAwakePer() {
        return awakePer;
    }
    public void setAwakePer(String awakePer) {
        this.awakePer = awakePer;
    }
    @Column(name = "rem_per")
    public String getRemPer() {
        return remPer;
    }
    public void setRemPer(String remPer) {
        this.remPer = remPer;
    }
    @Column(name = "light_per")
    public String getLightPer() {
        return lightPer;
    }
    public void setLightPer(String lightPer) {
        this.lightPer = lightPer;
    }
    @Column(name = "deep_per")
    public String getDeepPer() {
        return deepPer;
    }
    public void setDeepPer(String deepPer) {
        this.deepPer = deepPer;
    }
    @Column(name = "efficiency")
    public String getEfficiency() {
        return efficiency;
    }
    public void setEfficiency(String efficiency) {
        this.efficiency = efficiency;
    }
    @Column(name = "score")
    public String getScore() {
        return score;
    }
    public void setScore(String score) {
        this.score = score;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhBaseSleepX1deviceDO.java

@@ -0,0 +1,145 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.AssignedIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "base_sleep_x1device")
public class ZhBaseSleepX1deviceDO extends AssignedIdentityEntity {
    private String patient;
    private String deviceSn;
    private String sleepTime; //睡眠时长 分钟
    private String deepSleep; //深睡时长 分钟
    private String lightSleep; //浅睡时长 分钟
    private String awakeTime; // 清醒时长 分钟
    private Date createTime; // 开始时间
    private Date endTime;   //结束时间
    private Integer intervalTime; //固定30分钟
    private Integer total; // 检测次数
    private Integer del;  //是否有效 1有效 0无效
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
    public void setDeviceSn(String deviceSn) {
        this.deviceSn = deviceSn;
    }
    @Column(name = "sleep_time")
    public String getSleepTime() {
        return sleepTime;
    }
    public void setSleepTime(String sleepTime) {
        this.sleepTime = sleepTime;
    }
    @Column(name = "deep_sleep")
    public String getDeepSleep() {
        return deepSleep;
    }
    public void setDeepSleep(String deepSleep) {
        this.deepSleep = deepSleep;
    }
    @Column(name = "light_sleep")
    public String getLightSleep() {
        return lightSleep;
    }
    public void setLightSleep(String lightSleep) {
        this.lightSleep = lightSleep;
    }
    @Column(name = "awake_time")
    public String getAwakeTime() {
        return awakeTime;
    }
    public void setAwakeTime(String awakeTime) {
        this.awakeTime = awakeTime;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "end_time")
    public Date getEndTime() {
        return endTime;
    }
    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }
    @Column(name = "interval_time")
    public Integer getIntervalTime() {
        return intervalTime;
    }
    public void setIntervalTime(Integer intervalTime) {
        this.intervalTime = intervalTime;
    }
    @Column(name = "total")
    public Integer getTotal() {
        return total;
    }
    public void setTotal(Integer total) {
        this.total = total;
    }
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
    @Override
    public String toString() {
        return "ZhBaseSleepX1deviceDO{" +
                "patient='" + patient + '\'' +
                ", deviceSn='" + deviceSn + '\'' +
                ", sleepTime='" + sleepTime + '\'' +
                ", deepSleep='" + deepSleep + '\'' +
                ", lightSleep='" + lightSleep + '\'' +
                ", awakeTime='" + awakeTime + '\'' +
                ", createTime=" + createTime +
                ", endTime=" + endTime +
                ", intervalTime=" + intervalTime +
                ", total=" + total +
                ", del=" + del +
                '}';
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhBaseYxdeviceIndexDO.java

@@ -0,0 +1,53 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.AssignedIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@Table(name = "base_yxdevice_index")
@Entity
public class ZhBaseYxdeviceIndexDO extends AssignedIdentityEntity {
      private String  sn; //设备sn码
      private String  lat; //纬度
      private String  lon; //经度
      private Date createTime; //
    public String getSn() {
        return sn;
    }
    public void setSn(String sn) {
        this.sn = sn;
    }
    public String getLat() {
        return lat;
    }
    public void setLat(String lat) {
        this.lat = lat;
    }
    public String getLon() {
        return lon;
    }
    public void setLon(String lon) {
        this.lon = lon;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_Time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhDeviceDataPushLogDO.java

@@ -0,0 +1,100 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.AssignedIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "device_data_push_log")
public class ZhDeviceDataPushLogDO extends AssignedIdentityEntity implements java.io.Serializable {
    private String patient; //
    private String patientName; //
    private String deviceSn; //
    private String deviceName; //
    private String deviceCategory; //
    private String apiName; //
    private String data; //
    private Date createTime; //
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    @Column(name = "patient_name")
    public String getPatientName() {
        return patientName;
    }
    public void setPatientName(String patientName) {
        this.patientName = patientName;
    }
    @Column(name = "device_sn")
    public String getDeviceSn() {
        return deviceSn;
    }
    public void setDeviceSn(String deviceSn) {
        this.deviceSn = deviceSn;
    }
    @Column(name = "device_name")
    public String getDeviceName() {
        return deviceName;
    }
    public void setDeviceName(String deviceName) {
        this.deviceName = deviceName;
    }
    @Column(name = "device_category")
    public String getDeviceCategory() {
        return deviceCategory;
    }
    public void setDeviceCategory(String deviceCategory) {
        this.deviceCategory = deviceCategory;
    }
    @Column(name = "api_name")
    public String getApiName() {
        return apiName;
    }
    public void setApiName(String apiName) {
        this.apiName = apiName;
    }
    public String getData() {
        return data;
    }
    public void setData(String data) {
        this.data = data;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhSecurityMonitoringOrderDO.java

@@ -1,7 +1,7 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.entity.AssignedIdentityEntityWithOperator;
import com.yihu.jw.entity.care.securitymonitoring.EmergencyWarnConclusionDO;
import javax.persistence.Column;

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhWlyyPatientLabel.java

@@ -0,0 +1,84 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.yihu.jw.entity.AssignedIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@Entity
@Table(name = "wlyy_Patient_label")
public class ZhWlyyPatientLabel extends AssignedIdentityEntity implements java.io.Serializable {
      private String  labelCode; // 标签标识
      private String  labelName; //标签名称
      private String  labelType; //标签类型(1.服务类型 2居民标签 3能力状况 )
      private Integer  isSystem; //是否系统标签(0:否 1是)
      private String  patient; //
      private Integer  sort; //排序
      private Date czrq; //操作日期
    @Column(name = "label_code")
    public String getLabelCode() {
        return labelCode;
    }
    public void setLabelCode(String labelCode) {
        this.labelCode = labelCode;
    }
    @Column(name = "label_name")
    public String getLabelName() {
        return labelName;
    }
    public void setLabelName(String labelName) {
        this.labelName = labelName;
    }
    @Column(name = "label_type")
    public String getLabelType() {
        return labelType;
    }
    public void setLabelType(String labelType) {
        this.labelType = labelType;
    }
    @Column(name = "is_system")
    public Integer getIsSystem() {
        return isSystem;
    }
    public void setIsSystem(Integer isSystem) {
        this.isSystem = isSystem;
    }
    public String getPatient() {
        return patient;
    }
    public void setPatient(String patient) {
        this.patient = patient;
    }
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public Date getCzrq() {
        return czrq;
    }
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/sql记录.sql

@@ -452,3 +452,126 @@ CREATE TABLE `base_service_package_item` (
                                             PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=COMPACT COMMENT='服务项';
-- 幼儿基本信息
CREATE TABLE `base_infant_info` (
                                    `id` int(50) NOT NULL AUTO_INCREMENT,
                                    `patient` varchar(50) NOT NULL COMMENT '幼儿code',
                                    `name` varchar(50) DEFAULT NULL COMMENT '幼儿名字',
                                    `age` varchar(50) DEFAULT NULL COMMENT '幼儿年龄',
                                    `enter_school` varchar(50) DEFAULT NULL COMMENT '入学机构',
                                    `enter_school_name` varchar(50) DEFAULT NULL COMMENT '入学机构名字',
                                    `if_enter_school` varchar(2) DEFAULT NULL COMMENT '是否入学（0否，1是）',
                                    `address` varchar(50) DEFAULT NULL COMMENT '地址',
                                    `create_time` timestamp NULL DEFAULT NULL,
                                    `update_time` timestamp NULL DEFAULT NULL,
                                    PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- 爱牵挂X1手表睡眠数据
CREATE TABLE `base_sleep_x1device` (
                                       `id` varchar(50) NOT NULL,
                                       `patient` varchar(50) DEFAULT NULL COMMENT '居民id',
                                       `device_sn` varchar(50) DEFAULT NULL COMMENT '手表sn',
                                       `sleep_time` varchar(50) DEFAULT NULL COMMENT '睡眠时长 分钟',
                                       `deep_sleep` varchar(50) DEFAULT NULL COMMENT '深睡时长 分钟',
                                       `light_sleep` varchar(50) DEFAULT NULL COMMENT '浅睡时长 分钟',
                                       `awake_time` varchar(50) DEFAULT NULL COMMENT '清醒时长 分钟',
                                       `create_time` timestamp NULL DEFAULT NULL COMMENT '开始时间',
                                       `end_time` timestamp NULL DEFAULT NULL COMMENT '结束时间',
                                       `interval_time` int(11) DEFAULT NULL COMMENT '固定30分钟',
                                       `total` int(11) DEFAULT NULL COMMENT '检测次数',
                                       `del` int(1) DEFAULT NULL COMMENT '是否有效 1有效 0无效',
                                       PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='爱牵挂X1手表睡眠数据';
-- 爱牵挂睡眠带数据
CREATE TABLE `base_sleep_device` (
                                     `id` int(11) NOT NULL AUTO_INCREMENT,
                                     `patient` varchar(50) DEFAULT NULL COMMENT '居民id',
                                     `device_sn` varchar(50) DEFAULT NULL COMMENT '睡眠带sn',
                                     `falla_sleep` varchar(50) DEFAULT NULL COMMENT '入睡时长 分钟',
                                     `sleep_time` varchar(50) DEFAULT NULL COMMENT '睡眠时长 分钟',
                                     `rest_time` varchar(50) DEFAULT NULL COMMENT '休息时长 分钟',
                                     `awake_time` varchar(50) DEFAULT NULL COMMENT '清醒时长 分钟',
                                     `light_time` varchar(50) DEFAULT NULL COMMENT '浅睡时长 分钟',
                                     `rem_time` varchar(50) DEFAULT NULL COMMENT 'rem时长 分钟',
                                     `deep_time` varchar(50) DEFAULT NULL COMMENT '深睡时长 分钟',
                                     `bucket` varchar(300) DEFAULT NULL COMMENT '睡眠时段',
                                     `avghr` varchar(50) DEFAULT NULL COMMENT '平均心率',
                                     `avgbr` varchar(50) DEFAULT NULL COMMENT '平均呼吸率',
                                     `awake_per` varchar(50) DEFAULT NULL COMMENT '清醒百分比',
                                     `rem_per` varchar(50) DEFAULT NULL COMMENT 'rem百分比',
                                     `light_per` varchar(50) DEFAULT NULL COMMENT '浅睡百分比',
                                     `deep_per` varchar(50) DEFAULT NULL COMMENT '深睡百分比',
                                     `efficiency` varchar(50) DEFAULT NULL COMMENT '睡眠效率',
                                     `score` varchar(50) DEFAULT NULL COMMENT '睡眠评分 <=0无睡眠数据,<60待改善,<70一般,<85良好 其他，非常好',
                                     `create_time` timestamp NULL DEFAULT NULL COMMENT '产生日期',
                                     `del` int(1) DEFAULT NULL COMMENT '是否有效 1有效 0无效',
                                     PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8 COMMENT='爱牵挂睡眠带数据';
-- 设备项目推送数据日志
CREATE TABLE `device_data_push_log` (
                                        `id` int(11) NOT NULL AUTO_INCREMENT,
                                        `patient` varchar(50) DEFAULT NULL,
                                        `patient_name` varchar(50) DEFAULT NULL,
                                        `device_sn` varchar(50) DEFAULT NULL,
                                        `device_name` varchar(50) DEFAULT NULL,
                                        `device_category` varchar(50) DEFAULT NULL,
                                        `api_name` varchar(50) DEFAULT NULL,
                                        `data` varchar(2000) DEFAULT NULL,
                                        `create_time` datetime DEFAULT NULL,
                                        PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=3032 DEFAULT CHARSET=utf8mb4 COMMENT='设备项目推送数据日志';
-- 云芯拐杖设备上传记录
CREATE TABLE `base_yxdevice_index` (
                                       `id` varchar(50) NOT NULL,
                                       `sn` varchar(50) DEFAULT NULL COMMENT '设备sn码',
                                       `lat` varchar(50) DEFAULT NULL COMMENT '纬度',
                                       `lon` varchar(50) DEFAULT NULL COMMENT '经度',
                                       `create_time` datetime DEFAULT NULL,
                                       PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='云芯拐杖设备上传记录';
-- 烟感气感实时数据
CREATE TABLE `base_device_health_index` (
                                            `id` varchar(50) NOT NULL,
                                            `device_sn` varchar(50) DEFAULT NULL COMMENT '设备sn',
                                            `device_type` varchar(4) DEFAULT NULL COMMENT '设备类型 1气感 2烟感',
                                            `value` varchar(20) DEFAULT NULL COMMENT '测量值',
                                            `unit` varchar(20) DEFAULT NULL COMMENT '单位',
                                            `create_time` datetime DEFAULT NULL COMMENT '创建时间',
                                            `record_time` varchar(50) DEFAULT NULL COMMENT '记录时间',
                                            PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='烟感气感实时数据';
-- 居民标签类别表
CREATE TABLE `wlyy_patient_label` (
                                      `id` varchar(50) NOT NULL COMMENT '主键',
                                      `label_code` varchar(10) DEFAULT NULL COMMENT '标签标识',
                                      `label_name` varchar(50) DEFAULT NULL COMMENT '标签名称',
                                      `label_type` varchar(4) DEFAULT NULL COMMENT '标签类型(1.服务类型 2居民标签 3能力状况 )',
                                      `is_system` tinyint(1) unsigned DEFAULT '0' COMMENT '是否系统标签(0:否 1是)',
                                      `patient` varchar(50) DEFAULT NULL,
                                      `sort` tinyint(4) DEFAULT '0' COMMENT '排序',
                                      `czrq` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '操作日期',
                                      PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='居民标签类别表';
-- 服务包签约记录表
CREATE TABLE `base_service_package_sign_record` (
                                                    `id` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
                                                    `patient` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '居民code签约人',
                                                    `name` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '居民姓名',
                                                    `sign_doctor` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '签约医生code',
                                                    `sign_doctor_name` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '签约医生名称',
                                                    `start_time` datetime DEFAULT NULL COMMENT '服务开始时间',
                                                    `end_time` datetime DEFAULT NULL COMMENT '服务结束时间',
                                                    `status` tinyint(4) DEFAULT NULL COMMENT '状态 0新增，1生效，-1已过期',
                                                    `create_time` datetime DEFAULT NULL COMMENT '创建时间',
                                                    PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=COMPACT COMMENT='服务包签约记录表';