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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/security/BaseEmergencyWarnLogDao.java

@@ -15,4 +15,7 @@ public interface BaseEmergencyWarnLogDao extends PagingAndSortingRepository<Base
    @Query("select w from BaseEmergencyWarnLogDO w where w.orderId = ?1 and w.type is null ")
    List<BaseEmergencyWarnLogDO> findByOrderIdOrderByCreateTimeDesc(String oderId);
    @Query("select w from BaseEmergencyWarnLogDO w where w.orderId = ?1 and w.type = 2")
    List<BaseEmergencyWarnLogDO> findByOrderIdByType(String orderId);
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -895,7 +895,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        logTypeDO.setOrderId(orderId);
        logTypeDO.setUserType(1);
        logTypeDO.setCreateTime(new Date());
        logTypeDO.setContent("前往定位");
        logTypeDO.setContent("已取消");
        logTypeDO.setType(6);
        logDao.save(logTypeDO);
        return result;
@@ -1106,6 +1106,18 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                logDO.setContent("前往定位");
                logDao.save(logDO);
                List<BaseEmergencyWarnLogDO> byOrderIdByType = logDao.findByOrderIdByType(orderId);
                if (byOrderIdByType.size()<1){
                    logTypeDO.setUserCode(doctor);
                    logTypeDO.setUserName(doctorDO.getName());
                    logTypeDO.setOrderId(orderId);
                    logTypeDO.setUserType(2);
                    logTypeDO.setCreateTime(new Date());
                    logTypeDO.setContent("已知悉");
                    logTypeDO.setType(1);
                    logDao.save(logTypeDO);
                }
                logTypeDO.setUserCode(doctor);
                logTypeDO.setUserName(doctorDO.getName());
                logTypeDO.setOrderId(orderId);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/consult/ConsultService.java

@@ -106,8 +106,8 @@ public class ConsultService {
            json.put("nickName", patient.getName());
            json.put("token", token);
            json.put("channelName", channelName);
            json.put("userId", doctorDO.getId());
            json.put("userName", doctorDO.getName());
            json.put("userId", patient.getId());
            json.put("userName", patient.getName());
            json.put("sessionId", session_id);
            String first = "【key1】您好！【key2】向您发起了视频请求";
            first = first.replace("key1",patient.getName());

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

@@ -244,6 +244,13 @@ public class MessageUtil {
                wxTemplateConfigDO.setUrl(wxTemplateConfigDO.getUrl()+"?openid=" + openid + "&id=" + json.getString("id"));
                break;
            case 28://视频请求
                //小程序参数
                String miniprogramUrl = wxTemplateConfigDO.getUrl()+"?channelName="+ json.getString("channelName")+
                        "&nickName=" + json.getString("nickName")+ "&token=" + json.getString("token")
                        + "&userId=" + json.getString("userId")+ "&userName=" + json.getString("userName")
                        + "&sessionId=" + json.getString("sessionId")+"&isAckVideoType=1";
                wxTemplateConfigDO.setPagepath(miniprogramUrl);
                //?channelName="'&nickName=''&token=' '
                wxTemplateConfigDO.setUrl(wxTemplateConfigDO.getUrl()+"?openid=" + openid + "&channelName=" + json.getString("channelName")
                        + "&nickName=" + json.getString("nickName")+ "&token=" + json.getString("token")

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

@@ -3,6 +3,7 @@ package com.yihu.jw.care.job.data;
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 org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@@ -78,7 +79,7 @@ public class SaveDataPushJob implements Job {
        //System.out.println(date);
        date = DateUtil.getNextDay(date, -1);
        String filterOrg = "";//排除的测试机构
        String sqlOgr = "SELECT dict_code from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_org' and dict_code is not null ";
        String sqlOgr = "SELECT DISTINCT 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){
@@ -87,7 +88,7 @@ public class SaveDataPushJob implements Job {
        }
        String filterUser = " ";//排除的测试用户
        String sqltmp = "SELECT dict_code from wlyy_hospital_sys_dict WHERE (dict_name = 'jkzl_child' or dict_name = 'jkzl_older' " +
        String sqltmp = "SELECT DISTINCT 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<>();
@@ -260,7 +261,7 @@ public class SaveDataPushJob implements Job {
    //幼儿基本信息
    public void saveInfantInfo(String date){
        String infantInfoSql = "SELECT DISTINCT p.id AS id,o.address AS address,p.name AS `name`,t.status AS `status`,o.name AS `orgName`," +
                " TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) AS age,p.create_time AS createTime,p.update_time AS updateTime" +
                " TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) AS age,p.create_time AS createTime,p.update_time AS updateTime,p.idcard as idcard" +
                " FROM" +
                " base_doctor_patient_tmp t," +
                " base_patient p," +
@@ -271,14 +272,15 @@ public class SaveDataPushJob implements Job {
                " AND t.del = 1" +
                " AND p.del = 1" +
                " AND t.org_code = o.code" +
                " AND p.update_time >= '2021-05-31'";
                " AND p.update_time >= '"+date+"'";
        List<Map<String, Object>> infantInfoList = jdbcTemplate.queryForList(infantInfoSql);
        List list = new ArrayList();
        System.out.println(infantInfoList.size());
        for (Map<String, Object> map : infantInfoList) {
            ZhBaseInfantInfoDO zhBaseInfantInfoDO = new ZhBaseInfantInfoDO();
            zhBaseInfantInfoDO.setPatient(map.get("id").toString());
            zhBaseInfantInfoDO.setAddress(map.get("address").toString());
            zhBaseInfantInfoDO.setAge(map.get("age").toString());
            IdCardUtil.getAgeForIdcard(map.get("idcard").toString());
            zhBaseInfantInfoDO.setName(map.get("name").toString());
            zhBaseInfantInfoDO.setCreateTime(DateUtil.strToDate(map.get("createTime").toString()));
            zhBaseInfantInfoDO.setEnterSchoolName(map.get("orgName").toString());
@@ -299,7 +301,7 @@ public class SaveDataPushJob implements Job {
    // 居民设备表
    public void savePatientDevice(String date,Map<String,String> signOlderMap){
        String patientDeviceSql = "SELECT id,device_id,`user`,category_code,device_name,user_idcard,doctor_name,hospital_name,device_type from wlyy_patient_device WHERE czrq >= '"+date+"'";
        String patientDeviceSql = "SELECT id,device_id,`user`,category_code,device_name,user_idcard,doctor_name,hospital_name,device_type,czrq from wlyy_patient_device WHERE czrq >= '"+date+"'";
        List<ZhDevicePatientDevice> query = jdbcTemplate.query(patientDeviceSql, new BeanPropertyRowMapper<>(ZhDevicePatientDevice.class));
        Iterator<ZhDevicePatientDevice> iterator = query.iterator();

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

@@ -2,7 +2,10 @@ package com.yihu.jw.care.service.device;
import com.yihu.jw.care.job.data.SaveDataPushJob;
import com.yihu.jw.care.zhylyjkglxt.dao.ZhDeviceDataPushLogDao;
import com.yihu.jw.care.zhylyjkglxt.entity.ZhDeviceDataPushLogDO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -18,12 +21,14 @@ public class InitializeDataJobService {
    JdbcTemplate jdbcTemplate;
    @Autowired
    SaveDataPushJob saveDataPushJob;
    @Autowired
    ZhDeviceDataPushLogDao zhDeviceDataPushLogDao;
    public Object initialize(String date,String type){
        String filterOrg = "";//排除的测试机构
        String sqlOgr = "SELECT dict_code from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_org' and dict_code is not null ";
        String sqlOgr = "SELECT DISTINCT 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){
@@ -32,7 +37,7 @@ public class InitializeDataJobService {
        }
        String filterUser = " ";//排除的测试用户
        String sqltmp = "SELECT dict_code from wlyy_hospital_sys_dict WHERE (dict_name = 'jkzl_child' or dict_name = 'jkzl_older' " +
        String sqltmp = "SELECT DISTINCT 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<>();
@@ -119,6 +124,30 @@ public class InitializeDataJobService {
                System.out.println("初始化日常走访");
                saveDataPushJob.saveVisit(date);
                break;
            case "device":
                System.out.println("初始化居民设备表--开始");
                saveDataPushJob.savePatientDevice(date,signOlderMap);
                System.out.println("初始化居民设备表--结束");
                break;
            case "order":
                // 生活照料 工单
                System.out.println("初始化生活照料工单--开始");
                saveDataPushJob.saveLifeCareOrder(date,signOlderMap);
                System.out.println("初始化生活照料工单--结束");
                break;
            case "infant":
                //幼儿基本信息
                System.out.println("初始幼儿基本信息--开始");
                saveDataPushJob.saveInfantInfo(date);
                System.out.println("初始幼儿基本信息--结束");
                break;
            case "log":
                System.out.println("设备日志--开始");
                String sql = "SELECT * FROM device_data_push_log ORDER BY create_time DESC LIMIT 100 ";
                List<ZhDeviceDataPushLogDO> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ZhDeviceDataPushLogDO.class));
                zhDeviceDataPushLogDao.save(query);
                System.out.println("设备日志--结束");
                break;
        }
        /**********************push end****************************/
        System.gc();

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

@@ -1,7 +1,7 @@
package com.yihu.jw.care.zhylyjkglxt.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.AssignedIdentityEntity;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -12,7 +12,7 @@ import java.util.Date;
@Entity
@Table(name = "base_infant_info")
public class ZhBaseInfantInfoDO extends AssignedIdentityEntity implements java.io.Serializable {
public class ZhBaseInfantInfoDO extends IdEntity implements java.io.Serializable {
    private String patient; // 幼儿code
    private String name; // 幼儿名字