Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/device/InitializeDataJobService.java

@@ -0,0 +1,133 @@
package com.yihu.jw.care.service.device;
import com.yihu.jw.care.job.data.SaveDataPushJob;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service
public class InitializeDataJobService {
    @Autowired
    JdbcTemplate jdbcTemplate;
    @Autowired
    SaveDataPushJob saveDataPushJob;
    public Object initialize(String date){
        String filterOrg = "";//排除的测试机构
        String sqlOgr = "SELECT dict_code from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_org' and dict_code is not null ";
        List<String> Orglist =  jdbcTemplate.queryForList(sqlOgr,String.class);
        Map<String,String> jkzlOrgMap = new HashMap<>();
        if(Orglist.size()>0){
            jkzlOrgMap = Orglist.stream().collect(Collectors.toMap(String::toString,String::toString));
            filterOrg = " '" +String.join("','",Orglist)+ "' ";
        }
        String filterUser = " ";//排除的测试用户
        String sqltmp = "SELECT dict_code from wlyy_hospital_sys_dict WHERE (dict_name = 'jkzl_child' or dict_name = 'jkzl_older' " +
                "  or dict_name = 'jkzl_user' or dict_name = 'jkzl_helper'  or dict_name = 'jkzl_teacher' ) and dict_code is not null";
        List<String> listtmp = jdbcTemplate.queryForList(sqltmp,String.class);
        Map<String,String> jkzlUserMap = new HashMap<>();
        if (listtmp.size() > 0) {
            jkzlUserMap = listtmp.stream().collect(Collectors.toMap(String::toString,String::toString));
            filterUser = " '" +String.join("','",listtmp)+ "' ";
        }
        //签约老人id
        String signOlderSql="SELECT " +
                " DISTINCT p.id " +
                " FROM  " +
                " base_patient p INNER JOIN base_service_package_sign_record sr on p.id = sr.patient and sr.`status`=1 and  " +
                " p.id not in ("+filterUser+") " +
                " WHERE p.del = 1 and p.archive_type =1  " ;
        List<String> signOlderList = jdbcTemplate.queryForList(signOlderSql,String.class);
        Map<String,String> signOlderMap = signOlderList.stream().collect(Collectors.toMap(String::toString,String::toString));
        /**********************push start**************************/
        saveDataPushJob.saveDevicePushLog(date);
        saveDataPushJob.saveSecurityMonitoringOrder(date,signOlderMap);
        saveDataPushJob.saveEmergencyAssistanceOrder(date,signOlderMap);
        saveDataPushJob.saveDoorCoachOrder(date,jkzlUserMap);
        saveDataPushJob.saveDoorCoachFeeDetail(date);
        saveDataPushJob.saveLifeCareOrder(date,signOlderMap);
        saveDataPushJob.saveLifeCareFeeDetail(date);
        saveDataPushJob.saveOlderInfo(date,signOlderMap);
        saveDataPushJob.saveInfantInfo(date);
        saveDataPushJob.saveServicePackageItem(date);
        saveDataPushJob.savePatientDevice(date,signOlderMap);
        saveDataPushJob.saveWlyyDevice(date);
        saveDataPushJob.saveDevicePushLog(date); //"2022-01-07"
        saveDataPushJob.saveSignOlderInfo(date);
        saveDataPushJob.saveHospitalOrg(date,jkzlOrgMap);
        saveDataPushJob.saveOldOrg(date,jkzlOrgMap);
        saveDataPushJob.saveInfantOrg(date,jkzlOrgMap);
        saveDataPushJob.saveTeacherInfo(date);
        saveDataPushJob.saveActivity(date);
        saveDataPushJob.saveVisit(date);
        /**********************push end****************************/
        return 1;
    }
    public void executeList(String[] sqls){
        for (String sql : sqls) {
            jdbcTemplate.execute(sql);
        }
    }
    public void deletePushData(){
        InitializeDataJobService initializeDataJobService = new InitializeDataJobService();
        /**********************del start*****************************/
        String[] sql = new String[20];
        sql[0]  = "DELETE from gsq_zhjd_zhylyjkglxt.wlyy_patient_device";
        sql[1] = "DELETE from gsq_zhjd_zhylyjkglxt.base_life_care_order";
       /* //患者设备表
        //厦门设备信息表
        sql[1] = "DELETE from gsq_zhjd_zhylyjkglxt.wlyy_devices";
        //服务项
        sql[2] = "DELETE from gsq_zhjd_zhylyjkglxt.base_service_package_item";
        //安防监护服务工单
        sql[3] = "DELETE from gsq_zhjd_zhylyjkglxt.base_security_monitoring_order";
        //居民信息（居民就是患者）
        sql[4] = "DELETE from gsq_zhjd_zhylyjkglxt.base_patient";
        //生活照料工单
        sql[5] = "DELETE from gsq_zhjd_zhylyjkglxt.base_life_care_order";
        //服务工单价格明细（服务项价格，医生出诊费用）
        sql[6] ="DELETE from gsq_zhjd_zhylyjkglxt.base_life_care_fee_detail";
        //居民紧急救助服务工单
        sql[7] ="DELETE from gsq_zhjd_zhylyjkglxt.base_emergency_assistance_order";
        //上门辅导服务工单
        sql[8] = "DELETE from gsq_zhjd_zhylyjkglxt.base_door_coach_order";
        //上门辅导服务工单价格明细（服务项价格，医生出诊费用）
        sql[9]  ="DELETE from gsq_zhjd_zhylyjkglxt.base_door_coach_fee_detail";
        //烟感气感实时数据
        sql[10] ="DELETE from gsq_zhjd_zhylyjkglxt.base_device_health_index";
        //幼儿基本信息
        sql[11] ="DELETE from gsq_zhjd_zhylyjkglxt.base_infant_info";
        //服务包签约记录表
        sql[12] ="DELETE from gsq_zhjd_zhylyjkglxt.base_service_package_sign_record";
        //爱牵挂睡眠带数据
        sql[13] ="DELETE from gsq_zhjd_zhylyjkglxt.base_sleep_device";
        //爱牵挂X1手表睡眠数据
        sql[14] = "DELETE from gsq_zhjd_zhylyjkglxt.base_sleep_x1device";
        //云芯拐杖设备上传记录
        sql[15] ="DELETE from gsq_zhjd_zhylyjkglxt.base_yxdevice_index";
        //设备项目推送数据日志
        sql[16] ="DELETE from gsq_zhjd_zhylyjkglxt.device_data_push_log";
        //居民标签类别表
        sql[17] ="DELETE from gsq_zhjd_zhylyjkglxt.wlyy_patient_label";*/
        initializeDataJobService.executeList(sql);
        /**********************del end*****************************/
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/web/JobController.java

@@ -10,7 +10,7 @@ import com.yihu.jw.care.job.message.PatientSendUnreadJob;
import com.yihu.jw.care.service.BirthdayReminderService;
import com.yihu.jw.care.service.JobService;
import com.yihu.jw.care.service.WlyysimFlowVoiceService;
import com.yihu.jw.care.util.DateUtil;
import com.yihu.jw.care.service.device.InitializeDataJobService;
import com.yihu.jw.care.util.SystemConf;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import io.swagger.annotations.Api;
@@ -24,9 +24,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
import java.util.HashMap;
import java.util.UUID;
/**
 * 任务启动
@@ -48,6 +46,8 @@ public class JobController extends BaseController {
    private WlyysimFlowVoiceService wlyysimFlowVoiceService;
    @Autowired
    private YunXunDeviceService yunXunDeviceService;
    @Autowired
    private InitializeDataJobService initializeDataJobService;
    @RequestMapping(value = "/deviceLostAssociationJob", method = RequestMethod.POST)
    @ApiOperation("医养物联网检测大屏失联率")
@@ -322,6 +322,28 @@ public class JobController extends BaseController {
        }
    }
    @RequestMapping(value = "/initialize",method = RequestMethod.POST)
    public String initializeDataJob(String date){
        try {
            initializeDataJobService.initialize(date);
            return write(200,"成功");
        } catch (Exception e) {
            error(e);
            return error(-1,e.getMessage());
        }
    }
    @RequestMapping(value = "/deletePushData",method = RequestMethod.POST)
    public String deletePushData(){
        try {
            initializeDataJobService.deletePushData();
            return write(200,"成功");
        } catch (Exception e) {
            error(e);
            return error(-1,e.getMessage());
        }
    }
    @RequestMapping(value = "/wlyySimFlowVoice", method = RequestMethod.POST)
    @ApiOperation("物联网卡流量语音初始化查询")

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,423 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.yihu.jw.entity.AssignedIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
@Table(name = "base_org")
@Entity
public class ZhBaseOrgDO extends AssignedIdentityEntityWithOperator {
    private String code; //机构代码，在工商局注册的代码，不能重复
    private String provinceCode; //省份标识
    private String provinceName; //省份名称
    private String cityCode; //城市标识
    private String cityName; //城市名称
    private String townCode; //区县标识
    private String townName; //区县名称
    private String streetCode; //街道标识
    private String streetName; //街道名称
    private String name; //机构名称
    private String alias; //机构别名
    private String spell; //机构名称拼音首字母
    private String type; //机构类型: 1.等级医院 2.社区医院3.养老机构 4.教育机构
    private String brief; //
    private String address; //
    private String photo; //
    private String longitude; //
    private String latitude; //
    private String legalperson; //
    private String orgAdmin; //
    private String orgUrl; //
    private String intro; //
    private String qrcode; //
    private String del; //
    private String createUser; //
    private String createUserName; //
    private Date createTime; //
    private String updateUser; //
    private String updateUserName; //
    private Date updateTime; //
    private String saasid; //
    private Integer orgLevel; //
    private String winNo; //
    private String mobile; //
    private Integer sort; //
    private String hisId; //
    private String credentials; //
    private String reportChapter; //
    private String logo; //
    private String adminMobile; //
    @Column(name = "code")
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(name = "province_code")
    public String getProvinceCode() {
        return provinceCode;
    }
    public void setProvinceCode(String provinceCode) {
        this.provinceCode = provinceCode;
    }
    @Column(name = "province_name")
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
    @Column(name = "city_code")
    public String getCityCode() {
        return cityCode;
    }
    public void setCityCode(String cityCode) {
        this.cityCode = cityCode;
    }
    @Column(name = "city_name")
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
    @Column(name = "town_code")
    public String getTownCode() {
        return townCode;
    }
    public void setTownCode(String townCode) {
        this.townCode = townCode;
    }
    @Column(name = "town_name")
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    @Column(name = "street_code")
    public String getStreetCode() {
        return streetCode;
    }
    public void setStreetCode(String streetCode) {
        this.streetCode = streetCode;
    }
    @Column(name = "street_name")
    public String getStreetName() {
        return streetName;
    }
    public void setStreetName(String streetName) {
        this.streetName = streetName;
    }
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "alias")
    public String getAlias() {
        return alias;
    }
    public void setAlias(String alias) {
        this.alias = alias;
    }
    @Column(name = "spell")
    public String getSpell() {
        return spell;
    }
    public void setSpell(String spell) {
        this.spell = spell;
    }
    @Column(name = "type")
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    @Column(name = "brief")
    public String getBrief() {
        return brief;
    }
    public void setBrief(String brief) {
        this.brief = brief;
    }
    @Column(name = "address")
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    @Column(name = "photo")
    public String getPhoto() {
        return photo;
    }
    public void setPhoto(String photo) {
        this.photo = photo;
    }
    @Column(name = "longitude")
    public String getLongitude() {
        return longitude;
    }
    public void setLongitude(String longitude) {
        this.longitude = longitude;
    }
    @Column(name = "latitude")
    public String getLatitude() {
        return latitude;
    }
    public void setLatitude(String latitude) {
        this.latitude = latitude;
    }
    @Column(name = "legalperson")
    public String getLegalperson() {
        return legalperson;
    }
    public void setLegalperson(String legalperson) {
        this.legalperson = legalperson;
    }
    @Column(name = "org_admin")
    public String getOrgAdmin() {
        return orgAdmin;
    }
    public void setOrgAdmin(String orgAdmin) {
        this.orgAdmin = orgAdmin;
    }
    @Column(name = "org_url")
    public String getOrgUrl() {
        return orgUrl;
    }
    public void setOrgUrl(String orgUrl) {
        this.orgUrl = orgUrl;
    }
    @Column(name = "intro")
    public String getIntro() {
        return intro;
    }
    public void setIntro(String intro) {
        this.intro = intro;
    }
    @Column(name = "qrcode")
    public String getQrcode() {
        return qrcode;
    }
    public void setQrcode(String qrcode) {
        this.qrcode = qrcode;
    }
    @Column(name = "del")
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
    @Override
    public String getCreateUser() {
        return createUser;
    }
    @Override
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    @Override
    public String getCreateUserName() {
        return createUserName;
    }
    @Override
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    @Override
    public String getUpdateUser() {
        return updateUser;
    }
    @Override
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    @Override
    public String getUpdateUserName() {
        return updateUserName;
    }
    @Override
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
    @Override
    public Date getCreateTime() {
        return createTime;
    }
    @Override
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Override
    public Date getUpdateTime() {
        return updateTime;
    }
    @Override
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @Column(name = "saasid")
    public String getSaasid() {
        return saasid;
    }
    public void setSaasid(String saasid) {
        this.saasid = saasid;
    }
    @Column(name = "org_level")
    public Integer getOrgLevel() {
        return orgLevel;
    }
    public void setOrgLevel(Integer orgLevel) {
        this.orgLevel = orgLevel;
    }
    @Column(name = "win_no")
    public String getWinNo() {
        return winNo;
    }
    public void setWinNo(String winNo) {
        this.winNo = winNo;
    }
    @Column(name = "mobile")
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    @Column(name = "sort")
    public Integer getSort() {
        return sort;
    }
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    @Column(name = "his_id")
    public String getHisId() {
        return hisId;
    }
    public void setHisId(String hisId) {
        this.hisId = hisId;
    }
    @Column(name = "credentials")
    public String getCredentials() {
        return credentials;
    }
    public void setCredentials(String credentials) {
        this.credentials = credentials;
    }
    @Column(name = "report_chapter")
    public String getReportChapter() {
        return reportChapter;
    }
    public void setReportChapter(String reportChapter) {
        this.reportChapter = reportChapter;
    }
    @Column(name = "logo")
    public String getLogo() {
        return logo;
    }
    public void setLogo(String logo) {
        this.logo = logo;
    }
    @Column(name = "admin_mobile")
    public String getAdminMobile() {
        return adminMobile;
    }
    public void setAdminMobile(String adminMobile) {
        this.adminMobile = adminMobile;
    }
}

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

@@ -0,0 +1,159 @@
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_visit")
public class ZhBaseVisitDO extends AssignedIdentityEntity {
    private String patient; //
    private String patientName; //
    private String type; //类型 1老人日常走访
    private String status; //状态 0计划中 1 已完成 2计划超时
    private Date visitDate; //完成走访时间
    private Date visitPlanDate; //计划走访时间
    private String doctor; //
    private String doctorName; //
    private String visitContent; //走访记录
    private String visitImg; //走访图片
    private Date createTime; //
    private String deviceMaintenance; //设备维护
    private String health; //健康情况
    private String lifeConsult; //生活咨询
    @Column(name = "patient")
    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 = "type")
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    @Column(name = "status")
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
    @Column(name = "visit_date")
    public Date getVisitDate() {
        return visitDate;
    }
    public void setVisitDate(Date visitDate) {
        this.visitDate = visitDate;
    }
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
    @Column(name = "visit_plan_date")
    public Date getVisitPlanDate() {
        return visitPlanDate;
    }
    public void setVisitPlanDate(Date visitPlanDate) {
        this.visitPlanDate = visitPlanDate;
    }
    @Column(name = "doctor")
    public String getDoctor() {
        return doctor;
    }
    public void setDoctor(String doctor) {
        this.doctor = doctor;
    }
    @Column(name = "doctor_name")
    public String getDoctorName() {
        return doctorName;
    }
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    @Column(name = "visit_content")
    public String getVisitContent() {
        return visitContent;
    }
    public void setVisitContent(String visitContent) {
        this.visitContent = visitContent;
    }
    @Column(name = "visit_img")
    public String getVisitImg() {
        return visitImg;
    }
    public void setVisitImg(String visitImg) {
        this.visitImg = visitImg;
    }
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
    @Column(name = "create_time")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @Column(name = "device_maintenance")
    public String getDeviceMaintenance() {
        return deviceMaintenance;
    }
    public void setDeviceMaintenance(String deviceMaintenance) {
        this.deviceMaintenance = deviceMaintenance;
    }
    @Column(name = "health")
    public String getHealth() {
        return health;
    }
    public void setHealth(String health) {
        this.health = health;
    }
    @Column(name = "life_consult")
    public String getLifeConsult() {
        return lifeConsult;
    }
    public void setLifeConsult(String lifeConsult) {
        this.lifeConsult = lifeConsult;
    }
}

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

@@ -0,0 +1,42 @@
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 = "base_infant_activity")
public class ZhInfantActivityDO extends AssignedIdentityEntity implements java.io.Serializable {
    private String type;
    private String total;
    private Date updateTime; //
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getTotal() {
        return total;
    }
    public void setTotal(String total) {
        this.total = total;
    }
    @Column(name = "update_time")
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/zhylyjkglxt/entity/ZhTeacherInfoDO.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.Table;
import java.util.Date;
@Table(name = "wlyy_teacher_info")
@Entity
public class ZhTeacherInfoDO extends AssignedIdentityEntity {
    private String name; //教师姓名
    private String sex; //教师性别
    private String age; //年龄
    private String jobTitle; //职称
    private String del; //作废标识，1正常，0作废
    private String mobile; //手机号
    private Date createTime; //
    private Date updateTime; //
    @Column(name = "name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name = "sex")
    public String getSex() {
        return sex;
    }
    public void setSex(String sex) {
        this.sex = sex;
    }
    @Column(name = "age")
    public String getAge() {
        return age;
    }
    public void setAge(String age) {
        this.age = age;
    }
    @Column(name = "job_title")
    public String getJobTitle() {
        return jobTitle;
    }
    public void setJobTitle(String jobTitle) {
        this.jobTitle = jobTitle;
    }
    @Column(name = "del")
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
    @Column(name = "mobile")
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    @JsonFormat(pattern = "yyyy-MM-dd", 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", timezone = "GMT+08:00")
    @Column(name = "update_time")
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
}

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

@@ -575,3 +575,101 @@ CREATE TABLE `base_service_package_sign_record` (
                                                    PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=COMPACT COMMENT='服务包签约记录表';
-- 教师基本信息表
CREATE TABLE `wlyy_teacher_info` (
                                     `id` varchar(50) NOT NULL COMMENT 'uuid唯一标识',
                                     `name` varchar(10) DEFAULT NULL COMMENT '姓名',
                                     `sex` varchar(50) DEFAULT NULL COMMENT '性别',
                                     `age` varchar(4) DEFAULT NULL COMMENT '年龄',
                                     `job_title` VARCHAR(20) DEFAULT NULL COMMENT '职位',
                                     `del` VARCHAR(1) DEFAULT '1' COMMENT '作废标识，1正常，0作废',
                                     `mobile` varchar(20) DEFAULT NULL COMMENT '手机号',
                                     `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
                                     `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
                                     PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='教师基本信息表';
-- 日常走访
CREATE TABLE `base_visit` (
                              `id` varchar(50) NOT NULL,
                              `patient` varchar(50) DEFAULT NULL,
                              `patient_name` varchar(50) DEFAULT NULL,
                              `type` varchar(1) DEFAULT NULL COMMENT '类型 1老人日常走访',
                              `status` varchar(1) DEFAULT NULL COMMENT '状态 0计划中 1 已完成 2计划超时',
                              `visit_date` datetime DEFAULT NULL COMMENT '完成走访时间',
                              `visit_plan_date` datetime DEFAULT NULL COMMENT '计划走访时间',
                              `doctor` varchar(50) DEFAULT NULL,
                              `doctor_name` varchar(50) DEFAULT NULL,
                              `visit_content` varchar(1000) DEFAULT NULL COMMENT '走访记录',
                              `visit_img` varchar(2000) DEFAULT NULL COMMENT '走访图片',
                              `create_time` datetime DEFAULT NULL,
                              `device_maintenance` varchar(500) DEFAULT NULL COMMENT '设备维护',
                              `health` varchar(500) DEFAULT NULL COMMENT '健康情况',
                              `life_consult` varchar(500) DEFAULT NULL COMMENT '生活咨询',
                              PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='走访表';
-- 机构
CREATE TABLE `base_org` (
                            `id` varchar(50) NOT NULL COMMENT 'uuid,uuid唯一标识,',
                            `code` varchar(50) DEFAULT NULL COMMENT '机构代码，在工商局注册的代码，不能重复',
                            `province_code` varchar(50) DEFAULT NULL COMMENT '省份标识',
                            `province_name` varchar(20) DEFAULT NULL COMMENT '省份名称\n',
                            `city_code` varchar(50) DEFAULT NULL COMMENT '城市标识',
                            `city_name` varchar(20) DEFAULT NULL COMMENT '城市名称\n',
                            `town_code` varchar(50) DEFAULT NULL COMMENT '区县标识',
                            `town_name` varchar(30) DEFAULT NULL COMMENT '区县名称\n',
                            `street_code` varchar(50) DEFAULT NULL COMMENT '街道标识',
                            `street_name` varchar(50) DEFAULT NULL COMMENT '街道名称',
                            `name` varchar(100) DEFAULT NULL COMMENT '机构名称',
                            `alias` varchar(10) DEFAULT NULL COMMENT '机构别名',
                            `spell` varchar(20) DEFAULT NULL COMMENT '机构名称拼音首字母',
                            `type` char(2) DEFAULT '1' COMMENT '机构类型: 1.等级医院 2.社区医院3.养老机构 4.教育机构',
                            `brief` text COMMENT '机构简介',
                            `address` varchar(300) DEFAULT NULL COMMENT '机构详细地址',
                            `photo` varchar(1000) DEFAULT NULL COMMENT '机构图片',
                            `longitude` varchar(20) DEFAULT NULL COMMENT '经度',
                            `latitude` varchar(20) DEFAULT NULL COMMENT '纬度',
                            `legalperson` varchar(50) DEFAULT NULL COMMENT '法人',
                            `org_admin` varchar(50) DEFAULT NULL COMMENT '机构管理员',
                            `org_url` varchar(200) DEFAULT NULL COMMENT '机构网址',
                            `intro` text COMMENT '机构简介',
                            `qrcode` varchar(30) DEFAULT NULL COMMENT '机构二维码',
                            `del` varchar(1) DEFAULT '1' COMMENT '作废标识，1正常，0作废',
                            `create_user` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '创建人',
                            `create_user_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '创建人名',
                            `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
                            `update_user` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '修改人',
                            `update_user_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '修改人名',
                            `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
                            `saasid` varchar(50) DEFAULT NULL,
                            `org_level` int(2) DEFAULT NULL COMMENT '11.一级甲等，12一级乙等，13一级丙等，21二级甲等，22二级乙等，23二级丙等，31三级特等，32三级甲等，33三级乙等，34三级丙级',
                            `win_no` varchar(50) DEFAULT NULL COMMENT '机构分部号，每个机构都不一样，例如中山医院：6总部7金榜8夏禾，眼科（0思北1五缘湾）',
                            `mobile` varchar(15) DEFAULT NULL COMMENT '手机号码',
                            `sort` int(11) DEFAULT NULL COMMENT '排序',
                            `his_id` varchar(100) DEFAULT NULL,
                            `credentials` varchar(500) DEFAULT NULL COMMENT '资格证书',
                            `report_chapter` varchar(500) DEFAULT NULL COMMENT '报告单专用章',
                            `logo` varchar(500) DEFAULT NULL COMMENT 'logo',
                            `admin_mobile` varchar(30) DEFAULT NULL,
                            PRIMARY KEY (`id`),
                            KEY `idx_id` (`id`),
                            KEY `idx_saasid` (`code`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='机构信息（医院）';
-- 幼儿活动指标
CREATE TABLE `base_infant_activity` (
                                        `id` int(50) NOT NULL AUTO_INCREMENT,
                                        `type` varchar(3) DEFAULT NULL COMMENT '类型 1活动浏览次数 2公艺课程播放 3幼儿活动报名数 4咨询',
                                        `total` varchar(50) DEFAULT NULL COMMENT '总数-指标',
                                        `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
                                        PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='幼儿活动指标';