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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/util/PatientPushOnOffUtil.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.dao.log.BasePatientPadPushOnOffDao;
import com.yihu.jw.entity.log.BasePatientPadPushOnOffEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -105,8 +104,7 @@ public class PatientPushOnOffUtil {
        String sql = "SELECT p.id FROM  base_patient p  WHERE  p.sign_status = 1 AND p.del = 1 and p.id not in(SELECT patient FROM  base_patient_pad_pushonoff GROUP BY patient)";
        List<String> patientList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(String.class));
        List<String> patientList = jdbcTemplate.queryForList(sql, String.class);
        List<BasePatientPadPushOnOffEntity> onOffEntityList = new ArrayList<>();
        patientList.forEach(patientId -> {
            for (int i = 1; i <= jsonArray.size(); i++) {

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

@@ -4,12 +4,14 @@ import com.yihu.jw.care.util.DateUtil;
import com.yihu.jw.care.zhylyjkglxt.dao.*;
import com.yihu.jw.care.zhylyjkglxt.entity.*;
import com.yihu.jw.util.common.IdCardUtil;
import lombok.SneakyThrows;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -72,6 +74,7 @@ public class SaveDataPushJob implements Job {
    @SneakyThrows
    @Override
    public void execute(JobExecutionContext context) throws JobExecutionException {
        logger.info("SaveDataPushJob:start");
@@ -116,23 +119,51 @@ public class SaveDataPushJob implements Job {
        //System.out.println(date);
        saveSecurityMonitoringOrder(date,signOlderMap);
        //间隔两秒 以防请求频繁被拦截
        Thread.sleep(2000);
        saveEmergencyAssistanceOrder(date,signOlderMap);
        Thread.sleep(2000);
        saveDoorCoachOrder(date,jkzlUserMap);
        Thread.sleep(2000);
        saveDoorCoachFeeDetail(date);
        Thread.sleep(2000);
        saveLifeCareOrder(date,signOlderMap);
        Thread.sleep(2000);
        saveLifeCareFeeDetail(date);
        Thread.sleep(2000);
        saveOlderInfo(date,signOlderMap);
        Thread.sleep(2000);
        saveInfantInfo(date);
        Thread.sleep(2000);
        saveServicePackageItem(date);
        Thread.sleep(2000);
        savePatientDevice(date,signOlderMap);
        Thread.sleep(2000);
        saveWlyyDevice(date);
        saveDevicePushLog(date); //"2022-01-07"
        Thread.sleep(2000);
        //saveDevicePushLog(date); //"2022-01-07"
        devicePushLog(date);
        Thread.sleep(2000);
        deviceHealthIndex(date);
        Thread.sleep(2000);
        yxIndex(date);
        Thread.sleep(200);
        sleep(date);
        Thread.sleep(2000);
        sleepX1(date);
        Thread.sleep(2000);
        saveSignOlderInfo(date);
        Thread.sleep(2000);
        saveHospitalOrg(date,jkzlOrgMap);
        Thread.sleep(2000);
        saveOldOrg(date,jkzlOrgMap);
        Thread.sleep(2000);
        saveInfantOrg(date,jkzlOrgMap);
        Thread.sleep(2000);
        saveTeacherInfo(date);
        Thread.sleep(2000);
        saveActivity(date);
        Thread.sleep(2000);
        saveVisit(date);
        logger.info("SaveDataPushJob:end");
    }
@@ -401,6 +432,66 @@ public class SaveDataPushJob implements Job {
        }
    }
    public void devicePushLog(String date){
        try {
            //设备采集信息总表
            String devicePushLogSql = "SELECT * FROM device_data_push_log WHERE create_time >= '"+date+"' ";
            List<ZhDeviceDataPushLogDO> devicePushLogList = jdbcTemplate.query(devicePushLogSql, new BeanPropertyRowMapper<>(ZhDeviceDataPushLogDO.class));
            zhDeviceDataPushLogDao.save(devicePushLogList);
            devicePushLogList = null;
        } catch (DataAccessException e) {
            e.printStackTrace();
        }
    }
    public void  deviceHealthIndex(String date){
        try {
            //烟感气感实时数据
            String deviceHealthIndexSql ="SELECT * FROM base_device_health_index WHERE create_time >= '"+date+"'";
            List<ZhBaseDeviceHealthIndexDO> deviceHealthIndexList = jdbcTemplate.query(deviceHealthIndexSql, new BeanPropertyRowMapper<>(ZhBaseDeviceHealthIndexDO.class));
            zhBaseDeviceHealthIndexDao.save(deviceHealthIndexList);
            deviceHealthIndexList = null;
        } catch (DataAccessException e) {
            e.printStackTrace();
        }
    }
    public void  yxIndex(String date){
        try {
            //拐杖
            String yxIndexSql = "SELECT * FROM base_yxdevice_index WHERE create_time >= '"+date+"'";
            List<ZhBaseYxdeviceIndexDO> yxIndexList = jdbcTemplate.query(yxIndexSql, new BeanPropertyRowMapper<>(ZhBaseYxdeviceIndexDO.class));
            zhBaseYxdeviceIndexDao.save(yxIndexList);
            yxIndexList = null;
        } catch (DataAccessException e) {
            e.printStackTrace();
        }
    }
    public void  sleep(String date){
        try {
            //睡眠带
            String sleepSql = "SELECT * FROM base_sleep_device where create_time >= '"+date +"'";
            List<ZhBaseSleepDeviceDO> sleepList = jdbcTemplate.query(sleepSql, new BeanPropertyRowMapper<>(ZhBaseSleepDeviceDO.class));
            zhBaseSleepDeviceDao.save(sleepList);
            sleepList = null;
        } catch (DataAccessException e) {
            e.printStackTrace();
        }
    }
    public void  sleepX1(String date){
        //手表
        try {
            String sleepX1Sql ="SELECT * FROM base_sleep_x1device WHERE create_time >= '"+date+"'";
            List<ZhBaseSleepX1deviceDO> sleepX1List = jdbcTemplate.query(sleepX1Sql, new BeanPropertyRowMapper<>(ZhBaseSleepX1deviceDO.class));
            zhBaseSleepX1deviceDao.save(sleepX1List);
        } catch (DataAccessException e) {
            e.printStackTrace();
        }
    }
    //设备表
    public void saveWlyyDevice(String date){
        try {

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

@@ -107,7 +107,7 @@ public class InitializeDataJobService {
                break;
            case "7":
                //居民设备采集信息
                saveDataPushJob.saveDevicePushLog(date); //"2022-01-07"
                saveDataPushJob.sleepX1(date); //"2022-01-07"
                break;
            case "8":
                //机构