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

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/data/SaveDataPushJob.java

@@ -151,6 +151,7 @@ public class SaveDataPushJob implements Job {
        if(query.size()>0){
            zhSecurityMonitoringOrderDao.save(query);
        }
        query = null;
    }
    //紧急救助工单
@@ -167,6 +168,7 @@ public class SaveDataPushJob implements Job {
        if(query.size()>0){
            zhEmergencyAssistanceDao.save(query);
        }
        query = null;
    }
    //上门辅导工单
@@ -185,6 +187,7 @@ public class SaveDataPushJob implements Job {
        if(query.size()>0){
            zhBaseDoorCoachOrderDao.save(query);
        }
        query = null;
    }
    //上门辅导 服务工单价格
@@ -208,6 +211,7 @@ public class SaveDataPushJob implements Job {
        if(query.size()>0){
            zhLifeCareOrderDao.save(query);
        }
        query = null;
    }
    //生活照料 价格
@@ -215,6 +219,7 @@ public class SaveDataPushJob implements Job {
        String lifeCareFeeDetail="SELECT id,order_id,type,`name`,fee,fee_discount,`status`,pay_status,create_time,update_time FROM base_life_care_fee_detail WHERE create_time >= '"+date+"'";
        List<ZhLifeCareFeeDetailDO> query = jdbcTemplate.query(lifeCareFeeDetail, new BeanPropertyRowMapper<>(ZhLifeCareFeeDetailDO.class));
        zhLifeCareFeeDetailDao.save(query);
        query = null;
    }
    //老人居民信息
@@ -239,6 +244,10 @@ public class SaveDataPushJob implements Job {
        String labelSql = "SELECT * FROM wlyy_patient_label WHERE czrq >= '"+date+"'";
        List<ZhWlyyPatientLabel> labelList = jdbcTemplate.query(labelSql, new BeanPropertyRowMapper<>(ZhWlyyPatientLabel.class));
        zhWlyyPatientLabelDao.save(labelList);
        query = null;
        labelList = null;
    }
    //老人签约信息
@@ -247,6 +256,7 @@ public class SaveDataPushJob implements Job {
                "create_time ,`status` FROM base_service_package_sign_record  WHERE create_time >= '"+date+"' ";
        List<ZhBaseServicePackageSignRecordDO> query = jdbcTemplate.query(signOlderSql, new BeanPropertyRowMapper<>(ZhBaseServicePackageSignRecordDO.class));
        zhBaseServicePackageSignRecordDao.save(query);
        query = null;
    }
    //幼儿基本信息
@@ -278,12 +288,14 @@ public class SaveDataPushJob implements Job {
            list.add(zhBaseInfantInfoDO);
        }
        zhBaseInfantInfoDao.save(list);
        list = null;
    }
    //服务项
    public void saveServicePackageItem(String date){
        String servicePackageItemSql= "SELECT id,`name`,price,fee_type,org_name,introduce,del from base_service_package_item WHERE create_time >= '"+date+"'";
        List<ZhServicePackageItemDO> query = jdbcTemplate.query(servicePackageItemSql, new BeanPropertyRowMapper<>(ZhServicePackageItemDO.class));
        zhServicePackageItemDao.save(query);
        query = null;
    }
    // 居民设备表
@@ -302,7 +314,7 @@ public class SaveDataPushJob implements Job {
        if (query.size()>0) {
            zhDevicePatientDeviceDao.save(query);
        }
        query = null;
    }
    //居民设备采集信息
@@ -327,6 +339,12 @@ public class SaveDataPushJob implements Job {
        String sleepX1Sql ="SELECT * FROM base_sleep_x1device WHERE create_time >= '"+date+"'";
        List<ZhBaseSleepX1deviceDO> sleepX1List = jdbcTemplate.query(sleepX1Sql, new BeanPropertyRowMapper<>(ZhBaseSleepX1deviceDO.class));
        zhBaseSleepX1deviceDao.save(sleepX1List);
        sleepX1List = null;
        sleepList = null;
        yxIndexList = null;
        deviceHealthIndexList = null;
        devicePushLogList = null;
    }
    //设备表
@@ -334,6 +352,7 @@ public class SaveDataPushJob implements Job {
        String deviceSql = "SELECT id,apply_date,org_name,linkman,tel,server_ip,device_name,manufacturer,applicant_name,applicant_identity,applicant_tel,applicant_mail,grant_org_code,grant_time,grant_doctor_name,device_type,contact_status_time,contact_status,iccid FROM wlyy_devices WHERE apply_date >= '"+date+"'";
        List<ZhDeviceDetail> query = jdbcTemplate.query(deviceSql, new BeanPropertyRowMapper<>(ZhDeviceDetail.class));
        zhDeviceDetailDao.save(query);
        query = null;
    }
    /************************************机构 start******************************************/
@@ -354,6 +373,8 @@ public class SaveDataPushJob implements Job {
        zhBaseOrgDao.save(query);
        query = null;
    }
    //养老机构
@@ -370,6 +391,7 @@ public class SaveDataPushJob implements Job {
            }
        }
        zhBaseOrgDao.save(query);
        query = null;
    }
@@ -385,6 +407,7 @@ public class SaveDataPushJob implements Job {
            }
        }
        zhBaseOrgDao.save(query);
        query = null;
    }
    //教师信息
@@ -409,6 +432,8 @@ public class SaveDataPushJob implements Job {
            }
        }
        zhTeacherInfoDao.save(listDO);
        listDO = null;
    }
    //幼儿 活动 公艺 报名
@@ -461,6 +486,7 @@ public class SaveDataPushJob implements Job {
            }
        }
        zhInfantActivityDao.save(list);
        list = null;
    }
    //日常走访
@@ -470,6 +496,7 @@ public class SaveDataPushJob implements Job {
        if (query.size() > 0) {
            zhBaseVisitDao.save(query);
        }
        query = null;
    }