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

business/base-service/src/main/java/com/yihu/jw/thirdUpload/BaseNsOlineMedDao.java

@@ -0,0 +1,9 @@
package com.yihu.jw.thirdUpload;
import com.yihu.jw.entity.thirdUpload.BaseNsOnlineMedDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseNsOlineMedDao extends PagingAndSortingRepository<BaseNsOnlineMedDO,String>, JpaSpecificationExecutor<BaseNsOnlineMedDO> {
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/BaseNsOnlineAskDao.java

@@ -0,0 +1,10 @@
package com.yihu.jw.thirdUpload;
import com.yihu.jw.entity.thirdUpload.BaseNsOnlineAskDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseNsOnlineAskDao extends PagingAndSortingRepository<BaseNsOnlineAskDO, String>, JpaSpecificationExecutor<BaseNsOnlineAskDO> {
    //待写查询
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/BaseNsPrescriptionDao.java

@@ -0,0 +1,9 @@
package com.yihu.jw.thirdUpload;
import com.yihu.jw.entity.thirdUpload.BaseNsOnlineAskDO;
import com.yihu.jw.entity.thirdUpload.BaseNsPrescriptionDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseNsPrescriptionDao extends PagingAndSortingRepository<BaseNsPrescriptionDO, String>, JpaSpecificationExecutor<BaseNsPrescriptionDO> {
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/BaseNsPrescriptionDrugDao.java

@@ -0,0 +1,9 @@
package com.yihu.jw.thirdUpload;
import com.yihu.jw.entity.thirdUpload.BaseNsOnlineAskDO;
import com.yihu.jw.entity.thirdUpload.BaseNsPrescriptionDrugDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseNsPrescriptionDrugDao extends PagingAndSortingRepository<BaseNsPrescriptionDrugDO, String>, JpaSpecificationExecutor<BaseNsPrescriptionDrugDO> {
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/service/BaseNsOlineMedService.java

@@ -0,0 +1,39 @@
package com.yihu.jw.thirdUpload.service;
import com.yihu.jw.entity.thirdUpload.BaseNsOnlineMedDO;
import com.yihu.jw.thirdUpload.BaseNsOlineMedDao;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@Service
public class BaseNsOlineMedService extends BaseJpaService<BaseNsOnlineMedDO, BaseNsOlineMedDao> {
    @Autowired
    private BaseNsOlineMedDao baseNsOlineMedDao;
    public void saveNsOnlinemed(List<BaseNsOnlineMedDO> baseNsOnlineMedDOList)throws Exception{
        for (BaseNsOnlineMedDO baseNsOlineMedDO : baseNsOnlineMedDOList){
            if(StringUtils.isNoneBlank(baseNsOlineMedDO.getId())){
                BaseNsOnlineMedDO old = baseNsOlineMedDao.findOne(baseNsOlineMedDO.getId());
                BeanUtils.copyProperties(baseNsOlineMedDO,old,getNullPropertyNames(baseNsOlineMedDO));
                baseNsOlineMedDao.save(old);
            }else{
                baseNsOlineMedDao.save(baseNsOlineMedDO);
            }
        }
    }
    public void deleteById(String id) {
        BaseNsOnlineMedDO baseNsOnlineMedDO = baseNsOlineMedDao.findOne(id);
        if(baseNsOnlineMedDO != null){
            baseNsOlineMedDao.delete(id);
        }
    }
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/service/BaseNsOnlineAskService.java

@@ -0,0 +1,49 @@
package com.yihu.jw.thirdUpload.service;
import com.yihu.jw.entity.thirdUpload.BaseNsOnlineAskDO;
import com.yihu.jw.thirdUpload.BaseNsOnlineAskDao;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@Service
public class BaseNsOnlineAskService extends BaseJpaService<BaseNsOnlineAskDO, BaseNsOnlineAskDao> {
    @Autowired
    private BaseNsOnlineAskDao baseNsOnlineAskDao;
    public void saveNsOlineAsk(List<BaseNsOnlineAskDO> baseNsOnlineAskDOS) throws Exception{
        for (BaseNsOnlineAskDO baseNsOnlineAskDO : baseNsOnlineAskDOS){
            if (StringUtils.isNotBlank(baseNsOnlineAskDO.getId())){
                BaseNsOnlineAskDO old = baseNsOnlineAskDao.findOne(baseNsOnlineAskDO.getId());
                BeanUtils.copyProperties(baseNsOnlineAskDO, old, getNullPropertyNames(baseNsOnlineAskDO));
                //待完善
                baseNsOnlineAskDao.save(old);
            }else{
//                baseNsOnlineAskDO.setCreateTime(new Date());
//                baseNsOnlineAskDO.setUpload("1");
                baseNsOnlineAskDao.save(baseNsOnlineAskDO);
            }
        }
    }
    public void deleteById(String id){
        BaseNsOnlineAskDO baseNsOnlineAskDO =  baseNsOnlineAskDao.findOne(id);
        if (baseNsOnlineAskDO != null){
            baseNsOnlineAskDao.delete(id);
            //baseNsOnlineAskDO.setIs_del("0");
            //baseNsOnlineAskDO.save(baseNsOnlineAskDO);
        }
    }
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/service/BaseNsPrescriptionAService.java

@@ -0,0 +1,46 @@
package com.yihu.jw.thirdUpload.service;
import com.yihu.jw.entity.thirdUpload.BaseNsPrescriptionDO;
import com.yihu.jw.entity.thirdUpload.BaseNsPrescriptionDrugDO;
import com.yihu.jw.thirdUpload.BaseNsPrescriptionDao;
import com.yihu.jw.thirdUpload.BaseNsPrescriptionDrugDao;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@Service
public class BaseNsPrescriptionAService extends BaseJpaService<BaseNsPrescriptionDO, BaseNsPrescriptionDao> {
    @Autowired
    private BaseNsPrescriptionDao baseNsPrescriptionDao;
    public void savePrescription(List<BaseNsPrescriptionDO> baseNsPrescriptionDOS) throws Exception{
        for (BaseNsPrescriptionDO baseNsPrescriptionDO : baseNsPrescriptionDOS){
            if (StringUtils.isNoneBlank(baseNsPrescriptionDO.getId())){
                BaseNsPrescriptionDO old = baseNsPrescriptionDao.findOne(baseNsPrescriptionDO.getId());
                BeanUtils.copyProperties(baseNsPrescriptionDO, old, getNullPropertyNames(baseNsPrescriptionDO));
                baseNsPrescriptionDao.save(old);
            }else {
                baseNsPrescriptionDao.save(baseNsPrescriptionDO);
            }
        }
    }
    public void deleteById(String id) {
        BaseNsPrescriptionDO baseNsPrescriptionDO = baseNsPrescriptionDao.findOne(id);
        if (baseNsPrescriptionDO != null){
            baseNsPrescriptionDao.delete(id);
        }
    }
}

business/base-service/src/main/java/com/yihu/jw/thirdUpload/service/BaseNsPrescriptionDrugService.java

@@ -0,0 +1,41 @@
package com.yihu.jw.thirdUpload.service;
import com.yihu.jw.entity.thirdUpload.BaseNsPrescriptionDrugDO;
import com.yihu.jw.thirdUpload.BaseNsPrescriptionDrugDao;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import static com.yihu.jw.util.common.BeanUtils.getNullPropertyNames;
@Service
public class BaseNsPrescriptionDrugService extends BaseJpaService<BaseNsPrescriptionDrugDO, BaseNsPrescriptionDrugDao> {
    @Autowired
    private BaseNsPrescriptionDrugDao baseNsPrescriptionDrugDao;
    public void savePrescriptionDrug(List<BaseNsPrescriptionDrugDO> baseNsPrescriptionDrugDOS) throws Exception{
        for (BaseNsPrescriptionDrugDO baseNsPrescriptionDrugDO : baseNsPrescriptionDrugDOS){
            if (StringUtils.isNoneBlank(baseNsPrescriptionDrugDO.getId())){
                BaseNsPrescriptionDrugDO old = baseNsPrescriptionDrugDao.findOne(baseNsPrescriptionDrugDO.getId());
                BeanUtils.copyProperties(baseNsPrescriptionDrugDO, old, getNullPropertyNames(baseNsPrescriptionDrugDO));
                baseNsPrescriptionDrugDao.save(old);
            }else {
                baseNsPrescriptionDrugDao.save(baseNsPrescriptionDrugDO);
            }
        }
    }
    public void deleteById(String id) {
        BaseNsPrescriptionDrugDO baseNsPrescriptionDrugDO = baseNsPrescriptionDrugDao.findOne(id);
        if (baseNsPrescriptionDrugDO != null){
            baseNsPrescriptionDrugDao.delete(id);
        }
    }
}

business/es-service/src/main/java/com/yihu/jw/es/util/ElasticsearchUtil.java

@@ -376,6 +376,101 @@ public class ElasticsearchUtil {
        return excute(sql.toString(), SaveModel.class, "", "");
    }
    /**
     * 0级指标查询列表
     * @param startDate
     * @param endDate
     * @param area
     * @param level
     * @param index
     * @param timeLevel
     * @param interval
     * @param lowLevel
     * @param areaLevel
     * @return
     * @throws Exception
     */
    public List findDateQuotaLevel0(String startDate, String endDate, String area, int level, String index, String timeLevel, String interval, String lowLevel,String areaLevel) throws Exception {
        //时间格式转换  yyyy-MM-dd转成 2017-07-17T00:00:00+0800
        if (StringUtils.isNotEmpty(startDate)) {
            if (startDate.length() > 10) {
                startDate = changeTime(startDate);
            } else {
                startDate = changeDate(startDate);
            }
        }
        if (StringUtils.isNotEmpty(endDate)) {
            if (endDate.length() > 10) {
                endDate = changeTime(endDate);
            } else {
                endDate = changeDate(endDate);
            }
        }
        StringBuffer sql = new StringBuffer();
        StringBuffer groupBy = new StringBuffer();
        String low_level = level + "";
        if (StringUtils.isNotEmpty(lowLevel)) {
            low_level = lowLevel;
        }
        if (SaveModel.doctorLevel.equals(low_level)) {
            sql.append("select doctor as doctor,doctorName as doctorName,sum(result1) as result1, sum(result2) as result2 from " + esIndex + " where ");
            groupBy.append("  group by doctor,doctorName");
        }else if (SaveModel.deptLevel.equals(low_level)) {
            sql.append("select dept as dept,deptName as deptName,sum(result1) as result1, sum(result2) as result2 from " + esIndex + " where ");
            groupBy.append("  group by dept,deptName");
        } else if (SaveModel.OrgLevel.equals(low_level)) {
            sql.append("select hospital as hospital ,hospitalName as hospitalName,sum(result1) as result1,sum(result2) as result2 from " + esIndex + " where ");
            groupBy.append("  group by hospital,hospitalName");
        } else if (SaveModel.townLevel.equals(low_level)) {
            sql.append("select town as town,townName astownName,sum(result1) as result1,sum(result2) as result2 from " + esIndex + " where ");
            groupBy.append("  group by town,townName");
        } else if (SaveModel.cityLevel.equals(low_level)) {
            sql.append("select city,cityName,sum(result1) result1,sum(result2) result2 from " + esIndex + " where ");
            groupBy.append("  group by city,cityName");
        }
        if (StringUtils.isNotEmpty(area)) {
            if (SaveModel.doctorLevel.equals(level + "")) {
                sql.append(" doctor='" + area + "'");
            }else if (SaveModel.deptLevel.equals(level + "")) {
                sql.append(" dept='" + area + "'");
            } else if (SaveModel.OrgLevel.equals(level + "")) {
                sql.append(" hospital='" + area + "'");
            } else if (SaveModel.townLevel.equals(level + "")) {
                sql.append(" town='" + area + "'");
            } else if (SaveModel.cityLevel.equals(level + "")) {
                sql.append(" city='" + area + "'");
            }
            sql.append(" and ");
        }
//        sql.append(" quotaCode='" + index + "'  ");
        sql.append(" quotaCode in(" + index + ")  ");
        sql.append(" and timeLevel='" + timeLevel + "'  ");
        sql.append(" and areaLevel='"+areaLevel+"'");
        if (StringUtils.isNotEmpty(startDate)) {
            sql.append(" and quotaDate>='" + startDate + "'");
        }
        if (StringUtils.isNotEmpty(endDate)) {
            sql.append(" and quotaDate<='" + endDate + "'");
        }
        //根据时间维度分组
        if (StringUtils.isNotEmpty(interval)) {
            if (SaveModel.interval_month.equals(interval)) {
                groupBy.append(" ,date_histogram(field='quotaDate','interval'='month','time_zone'='+08:00','alias'='quotaDate') ");
            } else if (SaveModel.interval_week.equals(interval)) {
                groupBy.append(" ,date_histogram(field='quotaDate','interval'='week','time_zone'='+08:00','alias'='quotaDate') ");
            } else if (SaveModel.interval_day.equals(interval)) {
                groupBy.append(" ,date_histogram(field='quotaDate','interval'='1d','time_zone'='+08:00','alias'='quotaDate') ");
            }
        }
        sql.append(groupBy);
        logger.info("sql:"+sql);
        return excute(sql.toString(), SaveModel.class, "", "");
    }
    /**
     * 按照医生人数统计-不重复
@@ -700,6 +795,125 @@ public class ElasticsearchUtil {
        return excute(sql.toString(), SaveModel.class, "", "");
    }
    /**
     * 一级指标查询列表
     * @param startDate
     * @param endDate
     * @param area
     * @param level
     * @param index
     * @param timeLevel
     * @param slaveKey1
     * @param interval
     * @param lowLevel
     * @param areaLevel
     * @return
     * @throws Exception
     */
    public List findDateQuotaLevel1(String startDate, String endDate, String area, int level, String index, String timeLevel, String slaveKey1, String interval, String lowLevel,String areaLevel) throws Exception {
        //时间格式转换  yyyy-MM-dd转成 2017-07-17T00:00:00+0800
        if (StringUtils.isNotEmpty(startDate)) {
            if (startDate.length() > 10) {
                startDate = changeTime(startDate);
            } else {
                startDate = changeDate(startDate);
            }
        }
        if (StringUtils.isNotEmpty(endDate)) {
            if (endDate.length() > 10) {
                endDate = changeTime(endDate);
            } else {
                endDate = changeDate(endDate);
            }
        }
        StringBuffer sql = new StringBuffer();
        StringBuffer groupBy = new StringBuffer();
        String low_level = level + "";
        if (StringUtils.isNotEmpty(lowLevel)) {
            low_level = lowLevel;
        }
        if (SaveModel.doctorLevel.equals(low_level)) {
            sql.append("select doctor as doctor,doctorName as doctorName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,sum(result1) as result1, sum(result2) as result2,quotaDate as quotaDate from " + esIndex + " where ");
            groupBy.append("  group by doctor,doctorName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1)&&!slaveKey1.contains(",")&&(!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1))) {
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
        }
        if (SaveModel.deptLevel.equals(low_level)) {
            sql.append("select dept as dept,deptName as deptName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,sum(result1) as result1, sum(result2) as result2,quotaDate as quotaDate from " + esIndex + " where ");
            groupBy.append("  group by dept,deptName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1)&&!slaveKey1.contains(",")&&(!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1))) {
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
        } else if (SaveModel.OrgLevel.equals(low_level)) {
            sql.append("select hospital as hospital,hospitalName as hospitalName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,sum(result1)  as result1,sum(result2) as result2,quotaDate as quotaDate from " + esIndex + " where ");
            groupBy.append("  group by hospital,hospitalName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1)&&!slaveKey1.contains(",")&&(!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1))) {
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
        } else if (SaveModel.townLevel.equals(low_level)) {
            sql.append("select town as town,townName as townName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,sum(result1) as result1,sum(result2) as result2,quotaDate as quotaDate from " + esIndex + " where ");
            groupBy.append("  group by town,townName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1)&&!slaveKey1.contains(",")&&(!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1))) {
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
        } else if (SaveModel.cityLevel.equals(low_level)) {
            sql.append("select city as city,cityName as cityName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,sum(result1) as result1,sum(result2) as result2,quotaDate as quotaDate from " + esIndex + " where ");
            groupBy.append("  group by city,cityName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1)&&!slaveKey1.contains(",")&&(!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1))) {
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
        }
        if (StringUtils.isNotEmpty(area)) {
            if (SaveModel.doctorLevel.equals(level + "")) {
                sql.append(" doctor='" + area + "'");
            }else if (SaveModel.deptLevel.equals(level + "")) {
                sql.append(" dept='" + area + "'");
            } else if (SaveModel.OrgLevel.equals(level + "")) {
                sql.append(" hospital='" + area + "'");
            } else if (SaveModel.townLevel.equals(level + "")) {
                sql.append(" town='" + area + "'");
            } else if (SaveModel.cityLevel.equals(level + "")) {
                sql.append(" city='" + area + "'");
            }
            sql.append(" and ");
        }
//        sql.append(" quotaCode='" + index + "'  ");
        sql.append(" quotaCode in(" + index + ")  ");
        sql.append(" and timeLevel='" + timeLevel + "'  ");
        sql.append(" and areaLevel='"+areaLevel+"'");
        if (StringUtils.isNotEmpty(startDate)) {
            sql.append(" and quotaDate>='" + startDate + "'");
        }
        if (StringUtils.isNotEmpty(endDate)) {
            sql.append(" and quotaDate<='" + endDate + "'");
        }
        if (StringUtils.isNotEmpty(slaveKey1) && !commonParams.equals(slaveKey1)) {
            String[] temp = slaveKey1.split(",");
            String slaveKey1Temp = "";
            for(String one : temp){
                slaveKey1Temp += ",'"+one+"'";
            }
            sql.append(" and slaveKey1 in ("+slaveKey1Temp.substring(1)+")");
        }
        //根据时间维度分组
        if (StringUtils.isNotEmpty(interval)) {
            if (SaveModel.interval_month.equals(interval)) {
                groupBy.append(" ,date_histogram(field='quotaDate','interval'='month','time_zone'='+08:00','alias'='quotaDate') ");
            } else if (SaveModel.interval_week.equals(interval)) {
                groupBy.append(" ,date_histogram(field='quotaDate','interval'='week','time_zone'='+08:00','alias'='quotaDate') ");
            } else if (SaveModel.interval_day.equals(interval)) {
                groupBy.append(" ,date_histogram(field='quotaDate','interval'='1d','time_zone'='+08:00','alias'='quotaDate') ");
            }
        }
        sql.append(groupBy);
        logger.info("sql:"+sql);
        return excute(sql.toString(), SaveModel.class, "", "");
    }
    /**
     * 二级指标查询列表
     * 获取二级指标的增量、到达量
@@ -846,6 +1060,138 @@ public class ElasticsearchUtil {
        return excute(sql.toString(), SaveModel.class, "", "");
    }
    /**
     * 二级指标查询
     */
    public List findDateQuotaLevel2(String startDate, String endDate, String area, int level, String index, String timeLevel, String slaveKey1, String slaveKey2, String interval, String lowLevel,String areaLevel) {
        //时间格式转换  yyyy-MM-dd转成 2017-07-17T00:00:00+0800
        if (StringUtils.isNotEmpty(startDate)) {
            if (startDate.length() > 10) {
                startDate = changeTime(startDate);
            } else {
                startDate = changeDate(startDate);
            }
        }
        if (StringUtils.isNotEmpty(endDate)) {
            if (endDate.length() > 10) {
                endDate = changeTime(endDate);
            } else {
                endDate = changeDate(endDate);
            }
        }
        StringBuffer sql = new StringBuffer();
        StringBuffer groupBy = new StringBuffer();
        String low_level = level + "";
        if (StringUtils.isNotEmpty(lowLevel)) {
            low_level = lowLevel;
        }
        if (SaveModel.doctorLevel.equals(low_level)) {
            sql.append("select doctor as doctor,doctorName as doctorName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,slaveKey2 as slaveKey2,slaveKey2Name as slaveKey2Name,sum(result1) as result1,sum(result2) as result2 from " + esIndex + " where ");
            groupBy.append("  group by doctor,doctorName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1)) {
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey2) || commonParams.equals(slaveKey2)) {
                groupBy.append(",slaveKey2,slaveKey2Name");
            }
        }else if (SaveModel.deptLevel.equals(low_level)) {
            sql.append("select dept as dept,deptName as deptName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,slaveKey2 as slaveKey2,slaveKey2Name as slaveKey2Name,sum(result1) as result1,sum(result2) as result2 from " + esIndex + " where ");
            groupBy.append("  group by dept,deptName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1)) {
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey2) || commonParams.equals(slaveKey2)) {
                groupBy.append(",slaveKey2,slaveKey2Name");
            }
        } else if (SaveModel.OrgLevel.equals(low_level)) {
            sql.append("select hospital as hospital,hospitalName as hospitalName,sum(result1) as result1,sum(result2) as result2 from " + esIndex + " where ");
            groupBy.append("  group by hospital,hospitalName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1)) {
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey2) || commonParams.equals(slaveKey2)) {
                groupBy.append(",slaveKey2,slaveKey2Name");
            }
        } else if (SaveModel.townLevel.equals(low_level)) {
            sql.append("select town as town,townName as townName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,slaveKey2 as slaveKey2,slaveKey2Name as slaveKey2Name,sum(result1) as result1,sum(result2) as result2 from " + esIndex + " where ");
            groupBy.append("  group by town,townName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1)) {
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey2) || commonParams.equals(slaveKey2)) {
                groupBy.append(",slaveKey2,slaveKey2Name");
            }
        } else if (SaveModel.cityLevel.equals(low_level)) {
            sql.append("select city as city,cityName as cityName,slaveKey1 as slaveKey1,slaveKey1Name as slaveKey1Name,slaveKey2 as slaveKey2,slaveKey2Name as slaveKey2Name,sum(result1) as result1,sum(result2) as result2 from " + esIndex + " where ");
            groupBy.append("  group by city,cityName");
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey1) || commonParams.equals(slaveKey1)) {
                groupBy.append(",slaveKey1,slaveKey1Name");
            }
            if (!org.springframework.util.StringUtils.isEmpty(slaveKey2) || commonParams.equals(slaveKey2)) {
                groupBy.append(",slaveKey2,slaveKey2Name");
            }
        }
        if (StringUtils.isNotEmpty(area)) {
            if (SaveModel.doctorLevel.equals(level + "")) {
                sql.append(" doctor='" + area + "'");
            }else if (SaveModel.deptLevel.equals(level + "")) {
                sql.append(" dept='" + area + "'");
            } else if (SaveModel.OrgLevel.equals(level + "")) {
                sql.append(" hospital='" + area + "'");
            } else if (SaveModel.townLevel.equals(level + "")) {
                sql.append(" town='" + area + "'");
            } else if (SaveModel.cityLevel.equals(level + "")) {
                sql.append(" city='" + area + "'");
            }
            sql.append(" and ");
        }
        sql.append(" quotaCode in(" + index + ")  ");
        sql.append(" and timeLevel='" + timeLevel + "'  ");
        sql.append(" and areaLevel='"+areaLevel+"'");
        if (StringUtils.isNotEmpty(startDate)) {
            sql.append(" and quotaDate>='" + startDate + "'");
        }
        if (StringUtils.isNotEmpty(endDate)) {
            sql.append(" and quotaDate<='" + endDate + "'");
        }
        if (StringUtils.isNotBlank(slaveKey1) && (!commonParams.equals(slaveKey1))) {
            String[] str = slaveKey1.split(",");
            StringBuffer buffer = new StringBuffer();
            for (int i=0;i<str.length;i++){
                buffer.append("'"+str[i]+"',");
            }
            buffer.deleteCharAt(buffer.length()-1);
            sql.append(" and slaveKey1 in (" + buffer + ")");
        }
        if (StringUtils.isNotBlank(slaveKey2) && (!commonParams.equals(slaveKey2))) {
            String[] str = slaveKey2.split(",");
            StringBuffer buffer = new StringBuffer();
            for (int i=0;i<str.length;i++){
                buffer.append("'"+str[i]+"',");
            }
            buffer.deleteCharAt(buffer.length()-1);
            sql.append(" and slaveKey2 in (" + buffer + ")");
        }
        //根据时间维度分组
        if (StringUtils.isNotEmpty(interval)) {
            if (SaveModel.interval_month.equals(interval)) {
                groupBy.append(" ,date_histogram(field='quotaDate','interval'='month','time_zone'='+08:00','alias'='quotaDate') ");
            } else if (SaveModel.interval_week.equals(interval)) {
                groupBy.append(" ,date_histogram(field='quotaDate','interval'='week','time_zone'='+08:00','alias'='quotaDate') ");
            } else if (SaveModel.interval_day.equals(interval)) {
                groupBy.append(" ,date_histogram(field='quotaDate','interval'='1d','time_zone'='+08:00','alias'='quotaDate') ");
            }
        }
        sql.append(groupBy);
        logger.info("sql :" + sql.toString());
        return excute(sql.toString(), SaveModel.class, "", "");
    }
    /**
     * 时间格式转换  yyyy-MM-dd转成 2017-07-17T00:00:00+0800
     *
@@ -1169,6 +1515,11 @@ public class ElasticsearchUtil {
        return (SaveModel) list.get(0);
    }
    public SaveModel findOneDateQuotaLevel0(String startDate, String endDate, String area, int level, String index, String timelevel,String areaLevel) throws Exception {
        List list = findDateQuotaLevel0(startDate, endDate, area, level, index, timelevel, null, null,areaLevel);
        return (SaveModel) list.get(0);
    }
    /**
     * 1级维度
     * 查询某一天某一个1级维度的某个1级维度下的指标 例如查询65岁以上患者
@@ -1250,6 +1601,14 @@ public class ElasticsearchUtil {
        List list = findDateQuotaLevel1(startDate, endDate, area, level, index, timelevel, slaveKey1, null, null);
        return (SaveModel) list.get(0);
    }
    public SaveModel findOneDateQuotaLevel1(String startDate, String endDate, String area, int level, String index, String timelevel, String slaveKey1,String areaLevel) throws Exception {
        if (org.springframework.util.StringUtils.isEmpty(slaveKey1)) {
            slaveKey1 = commonParams;
        }
        List list = findDateQuotaLevel1(startDate, endDate, area, level, index, timelevel, slaveKey1, null, null,areaLevel);
        return (SaveModel) list.get(0);
    }
    public SaveModel bfindOneDateQuotaLevel12(String startDate, String endDate, String area, int level, String index, String timelevel, String slaveKey1, String slaveKey2) throws Exception {
        if (org.springframework.util.StringUtils.isEmpty(slaveKey1)) {
            slaveKey1 = commonParams;
@@ -1336,6 +1695,17 @@ public class ElasticsearchUtil {
        return (SaveModel) list.get(0);
    }
    /**
     * 二级维度指标查询，无一级维度
     */
    public SaveModel findOneDateQuotaLevel2NoSlaveKey1(String quotaDate, String area, int level, String index, String timelevel, String slaveKey2,String areaLevel) throws Exception {
        if (org.springframework.util.StringUtils.isEmpty(slaveKey2)) {
            slaveKey2 = commonParams;
        }
        List list = findDateQuotaLevel2(quotaDate, quotaDate, area, level, index, timelevel, null, slaveKey2, null, null,areaLevel);
        return (SaveModel) list.get(0);
    }
    /**
     * 根据2级维度的2级指标去聚合 没有一级维度
     * 查询某一天某一个2级维度的某个1级维度和2级维度下的指标  例如查询65岁以上的高血压患者

common/common-entity/sql记录

@@ -1468,11 +1468,24 @@ CREATE TABLE `base_doctor_service_permissions` (
--2021-09-08 ysj
CREATE TABLE `base_onenet_device` (
  `id` varchar(50) NOT NULL,
  `name` varchar(50) DEFAULT NULL COMMENT '设备名称',
  `sn` varchar(50) DEFAULT NULL COMMENT '设备sn码imei',
  `imsi` varchar(50) DEFAULT NULL COMMENT 'sim的imsi',
  `device_id` varchar(50) DEFAULT NULL COMMENT 'onenet平台设备id',
  `device_type` varchar(10) DEFAULT NULL COMMENT '设备厂商类型1未来鹰2 海康',
  `psk` varchar(50) DEFAULT NULL COMMENT 'onenet DTLS加密所使用的PSK',
  `category_code` varchar(10) DEFAULT NULL COMMENT '设备类型标识 14气感，15烟感',
  `create_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='onenet平台设备信息';
CREATE TABLE `base_onenet_receive_record` (
  `id` int(11) NOT NULL AUTO_INCREMENT,
  `status` tinyint(1) DEFAULT NULL COMMENT '状态 1新增 2处理失败',
  `content` varchar(5000) DEFAULT NULL COMMENT '内容',
  `create_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='onenet 数据接收记录表';

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/OnenetDevice.java

@@ -17,11 +17,22 @@ import javax.persistence.Table;
@Table(name = "base_onenet_device")
public class OnenetDevice extends UuidIdentityEntityWithCreateTime{
    private String name;//设备名称
    private String sn;//设备sn码imei
    private String imsi;//sim的imsi
    private String psk;//onenet DTLS加密所使用的PSK
    private String deviceId;//onenet平台设备id
    private String categoryCode;//设备类型标识 14气感，15烟感
    @Column(name="name")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(name="sn")
    public String getSn() {
        return sn;
@@ -38,6 +49,16 @@ public class OnenetDevice extends UuidIdentityEntityWithCreateTime{
    public void setImsi(String imsi) {
        this.imsi = imsi;
    }
    @Column(name="psk")
    public String getPsk() {
        return psk;
    }
    public void setPsk(String psk) {
        this.psk = psk;
    }
    @Column(name="device_id")
    public String getDeviceId() {
        return deviceId;

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/OnenetReceiveRecord.java

@@ -0,0 +1,58 @@
package com.yihu.jw.entity.care.device;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import org.springframework.data.annotation.CreatedDate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/9/9
 * @Description:
 */
@Entity
@Table(name = "base_onenet_receive_record")
@SequenceGenerator(name="id_generated", sequenceName="base_onenet_receive_record")
public class OnenetReceiveRecord extends IdEntity {
    private Integer status;//状态 1新增 2处理失败
    private String content;//内容
    //创建时间
    @CreatedDate
    protected Date createTime;
    @Column(name="status")
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Column(name="content")
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time", nullable = false, length = 0,updatable = false)
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/thirdUpload/BaseNsOnlineAskDO.java

@@ -0,0 +1,337 @@
package com.yihu.jw.entity.thirdUpload;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by wsy on 2021/8/31.
 */
@Entity
@Table(name = "base_ns_online_ask")
public class BaseNsOnlineAskDO extends UuidIdentityEntity {
    /*网络咨询服务信息表*/
    private String idOnlineAsk;     //网络咨询记录唯一标识
    private String netServiceCode;  //互联网医疗服务类型
    private String medClassCode;    //咨询类别
    private String medPopCode;      //咨询属性
    private String orgName;         //医疗机构名称
    private String orgCode;         //医疗机构编码
    private String cdOrgSub;        //医疗机构单位隶属
    private String cdArea;          //医疗机构地区
    private String visitDocName;    //医师姓名
    private String visitDocIdNo;    //医师身份证号
    private String visitDocCode;    //医师唯一标识
    private String visitDeptCode;   //咨询医师所属专业代码
    private String visitDeptName;   //咨询医师所属专业名称
    private String ptNo;             //患者姓名
    private String ptAge;            //患者年龄
    private String costType;         //患者费别
    private String ptBirthdate;     //出生日期
    private String geCode;           //患者性别
    private String ptTel;             //患者联系电话
    private String cardType;        //患者证件类型
    private String idNo;            //患者证件号
    private String ptDistrict;      //患者所在地区
    private String applyTime;       //咨询申请时间
    private String visitTime;       //接诊时间
    private String visitFinishTime;     //结束时间
    private String complaintContent;    //患者咨询内容
    private String procFile;            //诊疗过程文件
    private String price;               //咨询服务价格
    private String fgReply;             //医师是否回复
    private String crtTime;             //数据上传时间
    private String createTime;          //生成时间
    private String upload;              //上传时间
    @Column(name = "id_online_ask")
    public String getIdOnlineAsk() {
        return idOnlineAsk;
    }
    public void setIdOnlineAsk(String idOnlineAsk) {
        this.idOnlineAsk = idOnlineAsk;
    }
    @Column(name = "net_service_code")
    public String getNetServiceCode() {
        return netServiceCode;
    }
    public void setNetServiceCode(String netServiceCode) {
        this.netServiceCode = netServiceCode;
    }
    @Column(name = "med_class_code")
    public String getMedClassCode() {
        return medClassCode;
    }
    public void setMedClassCode(String medClassCode) {
        this.medClassCode = medClassCode;
    }
    @Column(name = "med_pop_code")
    public String getMedPopCode() {
        return medPopCode;
    }
    public void setMedPopCode(String medPopCode) {
        this.medPopCode = medPopCode;
    }
    @Column(name = "org_name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "cd_orgSub")
    public String getCdOrgSub() {
        return cdOrgSub;
    }
    public void setCdOrgSub(String cdOrgSub) {
        this.cdOrgSub = cdOrgSub;
    }
    @Column(name = "cd_area")
    public String getCdArea() {
        return cdArea;
    }
    public void setCdArea(String cdArea) {
        this.cdArea = cdArea;
    }
    @Column(name = "visit_doc_name")
    public String getVisitDocName() {
        return visitDocName;
    }
    public void setVisitDocName(String visitDocName) {
        this.visitDocName = visitDocName;
    }
    @Column(name = "visit_doc_id_no")
    public String getVisitDocIdNo() {
        return visitDocIdNo;
    }
    public void setVisitDocIdNo(String visitDocIdNo) {
        this.visitDocIdNo = visitDocIdNo;
    }
    @Column(name = "visit_doc_code")
    public String getVisitDocCode() {
        return visitDocCode;
    }
    public void setVisitDocCode(String visitDocCode) {
        this.visitDocCode = visitDocCode;
    }
    @Column(name = "visit_dept_code")
    public String getVisitDeptCode() {
        return visitDeptCode;
    }
    public void setVisitDeptCode(String visitDeptCode) {
        this.visitDeptCode = visitDeptCode;
    }
    @Column(name = "visit_dept_name")
    public String getVisitDeptName() {
        return visitDeptName;
    }
    public void setVisitDeptName(String visitDeptName) {
        this.visitDeptName = visitDeptName;
    }
    @Column(name = "pt_no")
    public String getPtNo() {
        return ptNo;
    }
    public void setPtNo(String ptNo) {
        this.ptNo = ptNo;
    }
    @Column(name = "pt_age")
    public String getPtAge() {
        return ptAge;
    }
    public void setPtAge(String ptAge) {
        this.ptAge = ptAge;
    }
    @Column(name = "cost_type")
    public String getCostType() {
        return costType;
    }
    public void setCostType(String costType) {
        this.costType = costType;
    }
    @Column(name = "pt_birthdate")
    public String getPtBirthdate() {
        return ptBirthdate;
    }
    public void setPtBirthdate(String ptBirthdate) {
        this.ptBirthdate = ptBirthdate;
    }
    @Column(name = "ge_code")
    public String getGeCode() {
        return geCode;
    }
    public void setGeCode(String geCode) {
        this.geCode = geCode;
    }
    @Column(name = "pt_tel")
    public String getPtTel() {
        return ptTel;
    }
    public void setPtTel(String ptTel) {
        this.ptTel = ptTel;
    }
    @Column(name = "card_type")
    public String getCardType() {
        return cardType;
    }
    public void setCardType(String cardType) {
        this.cardType = cardType;
    }
    @Column(name = "id_no")
    public String getIdNo() {
        return idNo;
    }
    public void setIdNo(String idNo) {
        this.idNo = idNo;
    }
    @Column(name = "pt_district")
    public String getPtDistrict() {
        return ptDistrict;
    }
    public void setPtDistrict(String ptDistrict) {
        this.ptDistrict = ptDistrict;
    }
    @Column(name = "apply_time")
    public String getApplyTime() {
        return applyTime;
    }
    public void setApplyTime(String applyTime) {
        this.applyTime = applyTime;
    }
    @Column(name = "visit_time")
    public String getVisitTime() {
        return visitTime;
    }
    public void setVisitTime(String visitTime) {
        this.visitTime = visitTime;
    }
    @Column(name = "visit_finish_time")
    public String getVisitFinishTime() {
        return visitFinishTime;
    }
    public void setVisitFinishTime(String visitFinishTime) {
        this.visitFinishTime = visitFinishTime;
    }
    @Column(name = "complaint_content")
    public String getComplaintContent() {
        return complaintContent;
    }
    public void setComplaintContent(String complaintContent) {
        this.complaintContent = complaintContent;
    }
    @Column(name = "proc_file")
    public String getProcFile() {
        return procFile;
    }
    public void setProcFile(String procFile) {
        this.procFile = procFile;
    }
    @Column(name = "price")
    public String getPrice() {
        return price;
    }
    public void setPrice(String price) {
        this.price = price;
    }
    @Column(name = "fg_reply")
    public String getFgReply() {
        return fgReply;
    }
    public void setFgReply(String fgReply) {
        this.fgReply = fgReply;
    }
    @Column(name = "crt_time")
    public String getCrtTime() {
        return crtTime;
    }
    public void setCrtTime(String crtTime) {
        this.crtTime = crtTime;
    }
    @Column(name = "create_time")
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(name = "upload")
    public String getUpload() {
        return upload;
    }
    public void setUpload(String upload) {
        this.upload = upload;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/thirdUpload/BaseNsOnlineMedDO.java

@@ -0,0 +1,377 @@
package com.yihu.jw.entity.thirdUpload;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by wsy on 2021/8/31.
 */
@Entity
@Table(name = "base_ns_online_med")
public class BaseNsOnlineMedDO extends UuidIdentityEntity {
    /*网络诊疗服务信息表*/
    private String idOnlineMed;     //网络诊疗记录唯一标识
    private String netServiceCode;  //互联网医疗服务类型
    private String medClassCode;    //诊疗类别
    private String orgName;         //医疗机构名称
    private String orgCode;         //医疗机构编码
    private String cdOrgSub;        //医疗机构单位隶属
    private String cdArea;          //医疗机构地区
    private String visitDocName;    //医师姓名
    private String visitDocIdNo;    //医师身份证号
    private String visitDocCode;    //医师唯一标识
    private String visitSubjectCode;    //医师所属专业代码
    private String visitSubjectName;    //医师所属专业名称
    private String visitDeptCode;       //医师所属科室代码
    private String visitDeptName;       //医师所属科室名称
    private String ptNo;                //患者姓名
    private String ptAge;               //患者年龄
    private String costType;            //患者费别
    private String ptBirthdate;         //出生日期
    private String geCode;              //患者性别
    private String ptTel;               //患者联系电话
    private String cardType;            //患者证件类型
    private String idNo;                //患者证件号
    private String ptDistrict;          //患者所在地区
    private String ptCardType;          //患者就诊卡类型
    private String ptCardNo;            //患者就诊卡号
    private String applyTime;           //咨询申请时间
    private String visitTime;           //接诊时间
    private String visitFinishTime;     //结束时间
    private String oldDiagCode;         //患者原诊断编码
    private String oldDiagName;         //患者原诊断名称
    private String diagCode;            //患者本次诊断编码
    private String diagName;            //患者本次诊断名称
    private String diseasesType;        //诊断类型
    private String complaintContent;    //患者诊疗内容
    private String procFile;            //诊疗过程文件
    private String price;               //咨询服务价格
    private String fgReply;             //医师是否回复
    private String crtTime;             //数据上传时间
    private String createTime;          //生成时间
    private String upload;               //上传时间
    @Column(name = "id_online_med")
    public String getIdOnlineMed() {
        return idOnlineMed;
    }
    public void setIdOnlineMed(String idOnlineMed) {
        this.idOnlineMed = idOnlineMed;
    }
    @Column(name = "net_service_code")
    public String getNetServiceCode() {
        return netServiceCode;
    }
    public void setNetServiceCode(String netServiceCode) {
        this.netServiceCode = netServiceCode;
    }
    @Column(name = "med_class_code")
    public String getMedClassCode() {
        return medClassCode;
    }
    public void setMedClassCode(String medClassCode) {
        this.medClassCode = medClassCode;
    }
    @Column(name = "org_name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "cd_org_sub")
    public String getCdOrgSub() {
        return cdOrgSub;
    }
    public void setCdOrgSub(String cdOrgSub) {
        this.cdOrgSub = cdOrgSub;
    }
    @Column(name = "cd_area")
    public String getCdArea() {
        return cdArea;
    }
    public void setCdArea(String cdArea) {
        this.cdArea = cdArea;
    }
    @Column(name = "visit_doc_name")
    public String getVisitDocName() {
        return visitDocName;
    }
    public void setVisitDocName(String visitDocName) {
        this.visitDocName = visitDocName;
    }
    @Column(name = "visit_doc_id_no")
    public String getVisitDocIdNo() {
        return visitDocIdNo;
    }
    public void setVisitDocIdNo(String visitDocIdNo) {
        this.visitDocIdNo = visitDocIdNo;
    }
    @Column(name = "visit_doc_code")
    public String getVisitDocCode() {
        return visitDocCode;
    }
    public void setVisitDocCode(String visitDocCode) {
        this.visitDocCode = visitDocCode;
    }
    @Column(name = "visit_subject_code")
    public String getVisitSubjectCode() {
        return visitSubjectCode;
    }
    public void setVisitSubjectCode(String visitSubjectCode) {
        this.visitSubjectCode = visitSubjectCode;
    }
    @Column(name = "visit_subject_name")
    public String getVisitSubjectName() {
        return visitSubjectName;
    }
    public void setVisitSubjectName(String visitSubjectName) {
        this.visitSubjectName = visitSubjectName;
    }
    @Column(name = "visit_dept_code")
    public String getVisitDeptCode() {
        return visitDeptCode;
    }
    public void setVisitDeptCode(String visitDeptCode) {
        this.visitDeptCode = visitDeptCode;
    }
    @Column(name = "visit_dept_name")
    public String getVisitDeptName() {
        return visitDeptName;
    }
    public void setVisitDeptName(String visitDeptName) {
        this.visitDeptName = visitDeptName;
    }
    @Column(name = "pt_no")
    public String getPtNo() {
        return ptNo;
    }
    public void setPtNo(String ptNo) {
        this.ptNo = ptNo;
    }
    @Column(name = "pt_age")
    public String getPtAge() {
        return ptAge;
    }
    public void setPtAge(String ptAge) {
        this.ptAge = ptAge;
    }
    @Column(name = "cost_type")
    public String getCostType() {
        return costType;
    }
    public void setCostType(String costType) {
        this.costType = costType;
    }
    @Column(name = "pt_birth_date")
    public String getPtBirthdate() {
        return ptBirthdate;
    }
    public void setPtBirthdate(String ptBirthdate) {
        this.ptBirthdate = ptBirthdate;
    }
    @Column(name = "ge_code")
    public String getGeCode() {
        return geCode;
    }
    public void setGeCode(String geCode) {
        this.geCode = geCode;
    }
    @Column(name = "pt_tel")
    public String getPtTel() {
        return ptTel;
    }
    public void setPtTel(String ptTel) {
        this.ptTel = ptTel;
    }
    @Column(name = "card_type")
    public String getCardType() {
        return cardType;
    }
    public void setCardType(String cardType) {
        this.cardType = cardType;
    }
    @Column(name = "id_no")
    public String getIdNo() {
        return idNo;
    }
    public void setIdNo(String idNo) {
        this.idNo = idNo;
    }
    @Column(name = "pt_district")
    public String getPtDistrict() {
        return ptDistrict;
    }
    public void setPtDistrict(String ptDistrict) {
        this.ptDistrict = ptDistrict;
    }
    @Column(name = "pt_card_type")
    public String getPtCardType() {
        return ptCardType;
    }
    public void setPtCardType(String ptCardType) {
        this.ptCardType = ptCardType;
    }
    @Column(name = "pt_card_no")
    public String getPtCardNo() {
        return ptCardNo;
    }
    public void setPtCardNo(String ptCardNo) {
        this.ptCardNo = ptCardNo;
    }
    @Column(name = "apply_time")
    public String getApplyTime() {
        return applyTime;
    }
    public void setApplyTime(String applyTime) {
        this.applyTime = applyTime;
    }
    @Column(name = "visit_time")
    public String getVisitTime() {
        return visitTime;
    }
    public void setVisitTime(String visitTime) {
        this.visitTime = visitTime;
    }
    @Column(name = "visit_finish_time")
    public String getVisitFinishTime() {
        return visitFinishTime;
    }
    public void setVisitFinishTime(String visitFinishTime) {
        this.visitFinishTime = visitFinishTime;
    }
    @Column(name = "old_diag_code")
    public String getOldDiagCode() {
        return oldDiagCode;
    }
    public void setOldDiagCode(String oldDiagCode) {
        this.oldDiagCode = oldDiagCode;
    }
    @Column(name = "old_diag_name")
    public String getOldDiagName() {
        return oldDiagName;
    }
    public void setOldDiagName(String oldDiagName) {
        this.oldDiagName = oldDiagName;
    }
    @Column(name = "diag_code")
    public String getDiagCode() {
        return diagCode;
    }
    public void setDiagCode(String diagCode) {
        this.diagCode = diagCode;
    }
    @Column(name = "diag_name")
    public String getDiagName() {
        return diagName;
    }
    public void setDiagName(String diagName) {
        this.diagName = diagName;
    }
    @Column(name = "diseases_type")
    public String getDiseasesType() {
        return diseasesType;
    }
    public void setDiseasesType(String diseasesType) {
        this.diseasesType = diseasesType;
    }
    @Column(name = "complaint_content")
    public String getComplaintContent() {
        return complaintContent;
    }
    public void setComplaintContent(String complaintContent) {
        this.complaintContent = complaintContent;
    }
    @Column(name = "proc_file")
    public String getProcFile() {
        return procFile;
    }
    public void setProcFile(String procFile) {
        this.procFile = procFile;
    }
    @Column(name = "price")
    public String getPrice() {
        return price;
    }
    public void setPrice(String price) {
        this.price = price;
    }
    @Column(name = "fg_reply")
    public String getFgReply() {
        return fgReply;
    }
    public void setFgReply(String fgReply) {
        this.fgReply = fgReply;
    }
    @Column(name = "crt_time")
    public String getCrtTime() {
        return crtTime;
    }
    public void setCrtTime(String crtTime) {
        this.crtTime = crtTime;
    }
    @Column(name = "create_time")
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(name = "upload")
    public String getUpload() {
        return upload;
    }
    public void setUpload(String upload) {
        this.upload = upload;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/thirdUpload/BaseNsPrescriptionDO.java

@@ -0,0 +1,435 @@
package com.yihu.jw.entity.thirdUpload;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by wsy on 2021/9/1.
 */
@Entity
@Table(name = "base_ns_prescription")
public class BaseNsPrescriptionDO extends UuidIdentityEntity {
    /*电子处方表*/
    private String idPrescription;      //记录唯一标识
    private String presNo;              //处方号
    private String presClassCode;       //处方类别编码
    private String presClassName;       //处方类别名称
    private String ptId;                //患者ID
    private String medRdNo;             //就诊号
    private String medClassCode;        //就诊类别编码
    private String medClassName;        //就诊类别名称
    private String ptNo;                //患者姓名
    private String geCode;              //患者性别编码
    private String ptAge;               //患者年龄
    private String birthday;            //出生日期
    private String cardType;            //患者证件类型
    private String idNo;                //患者有效证件号
    private String guarderName;         //监护人姓名
    private String guarderNo;           //监护人身份证号码
    private String ptTel;               //患者联系方式
    private String ptDistrict;          //患者所在地区
    private String allergicHistory;     //患者过敏信息
    private String costType;            //患者费别
    private String insClassCode;        //保险类别编码
    private String insClassName;        //保险类别名称
    private String orgCode;             //医疗机构编码
    private String orgName;             //医疗机构名称
    private String presSubjectCode;     //开方医师所属专业代码（诊疗科目代码）
    private String presSubjectName;     //开方医师所属专业名称（诊疗科目名称）
    private String presDeptCode;        //开方科室编码
    private String presDeptName;        //开方科室名称
    private String presTime;            //开方时间
    private String presDocCode;         //开方医生唯一标识
    private String presDocName;         //开方医生姓名
    private String presDocIdNo;         //开方医生身份证号
    private String trialDocCode;        //审方医生唯一标识
    private String trialDocName;        //审方医生姓名
    private String trialDocIdNo;        //审方医生身份证
    private String trialTime;           //审方时间
    private String diagCode;            //诊断编码
    private String diagName;            //诊断名称
    private String diseasesType;        //疾病分类
    private String mobilityFlag;        //行动不便标志
    private String longMedicalFlag;     //病情稳定需长期服药标志
    private String presEffecDays;       //处方有效期（单位天）
    private String totalPrice;          //总金额
    private String uploadTime;          //上传时间
    private String createTime;          //生成时间
    private String upload;              //上传时间
    @Column(name = "id_prescription")
    public String getIdPrescription() {
        return idPrescription;
    }
    public void setIdPrescription(String idPrescription) {
        this.idPrescription = idPrescription;
    }
    @Column(name = "pres_no")
    public String getPresNo() {
        return presNo;
    }
    public void setPresNo(String presNo) {
        this.presNo = presNo;
    }
    @Column(name = "pres_class_code")
    public String getPresClassCode() {
        return presClassCode;
    }
    public void setPresClassCode(String presClassCode) {
        this.presClassCode = presClassCode;
    }
    @Column(name = "pres_class_name")
    public String getPresClassName() {
        return presClassName;
    }
    public void setPresClassName(String presClassName) {
        this.presClassName = presClassName;
    }
    @Column(name = "pt_id")
    public String getPtId() {
        return ptId;
    }
    public void setPtId(String ptId) {
        this.ptId = ptId;
    }
    @Column(name = "med_rd_no")
    public String getMedRdNo() {
        return medRdNo;
    }
    public void setMedRdNo(String medRdNo) {
        this.medRdNo = medRdNo;
    }
    @Column(name = "med_class_code")
    public String getMedClassCode() {
        return medClassCode;
    }
    public void setMedClassCode(String medClassCode) {
        this.medClassCode = medClassCode;
    }
    @Column(name = "med_class_name")
    public String getMedClassName() {
        return medClassName;
    }
    public void setMedClassName(String medClassName) {
        this.medClassName = medClassName;
    }
    @Column(name = "pt_no")
    public String getPtNo() {
        return ptNo;
    }
    public void setPtNo(String ptNo) {
        this.ptNo = ptNo;
    }
    @Column(name = "ge_code")
    public String getGeCode() {
        return geCode;
    }
    public void setGeCode(String geCode) {
        this.geCode = geCode;
    }
    @Column(name = "pt_age")
    public String getPtAge() {
        return ptAge;
    }
    public void setPtAge(String ptAge) {
        this.ptAge = ptAge;
    }
    @Column(name = "birthday")
    public String getBirthday() {
        return birthday;
    }
    public void setBirthday(String birthday) {
        this.birthday = birthday;
    }
    @Column(name = "card_type")
    public String getCardType() {
        return cardType;
    }
    public void setCardType(String cardType) {
        this.cardType = cardType;
    }
    @Column(name = "id_no")
    public String getIdNo() {
        return idNo;
    }
    public void setIdNo(String idNo) {
        this.idNo = idNo;
    }
    @Column(name = "guarder_name")
    public String getGuarderName() {
        return guarderName;
    }
    public void setGuarderName(String guarderName) {
        this.guarderName = guarderName;
    }
    @Column(name = "guarder_no")
    public String getGuarderNo() {
        return guarderNo;
    }
    public void setGuarderNo(String guarderNo) {
        this.guarderNo = guarderNo;
    }
    @Column(name = "pt_tel")
    public String getPtTel() {
        return ptTel;
    }
    public void setPtTel(String ptTel) {
        this.ptTel = ptTel;
    }
    @Column(name = "pt_district")
    public String getPtDistrict() {
        return ptDistrict;
    }
    public void setPtDistrict(String ptDistrict) {
        this.ptDistrict = ptDistrict;
    }
    @Column(name = "allergic_history")
    public String getAllergicHistory() {
        return allergicHistory;
    }
    public void setAllergicHistory(String allergicHistory) {
        this.allergicHistory = allergicHistory;
    }
    @Column(name = "cost_type")
    public String getCostType() {
        return costType;
    }
    public void setCostType(String costType) {
        this.costType = costType;
    }
    @Column(name = "ins_class_code")
    public String getInsClassCode() {
        return insClassCode;
    }
    public void setInsClassCode(String insClassCode) {
        this.insClassCode = insClassCode;
    }
    @Column(name = "ins_class_name")
    public String getInsClassName() {
        return insClassName;
    }
    public void setInsClassName(String insClassName) {
        this.insClassName = insClassName;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "org_name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Column(name = "pres_subject_code")
    public String getPresSubjectCode() {
        return presSubjectCode;
    }
    public void setPresSubjectCode(String presSubjectCode) {
        this.presSubjectCode = presSubjectCode;
    }
    @Column(name = "pres_subject_name")
    public String getPresSubjectName() {
        return presSubjectName;
    }
    public void setPresSubjectName(String presSubjectName) {
        this.presSubjectName = presSubjectName;
    }
    @Column(name = "pres_dept_code")
    public String getPresDeptCode() {
        return presDeptCode;
    }
    public void setPresDeptCode(String presDeptCode) {
        this.presDeptCode = presDeptCode;
    }
    @Column(name = "pres_dept_name")
    public String getPresDeptName() {
        return presDeptName;
    }
    public void setPresDeptName(String presDeptName) {
        this.presDeptName = presDeptName;
    }
    @Column(name = "pres_time")
    public String getPresTime() {
        return presTime;
    }
    public void setPresTime(String presTime) {
        this.presTime = presTime;
    }
    @Column(name = "pres_doc_code")
    public String getPresDocCode() {
        return presDocCode;
    }
    public void setPresDocCode(String presDocCode) {
        this.presDocCode = presDocCode;
    }
    @Column(name = "pres_doc_name")
    public String getPresDocName() {
        return presDocName;
    }
    public void setPresDocName(String presDocName) {
        this.presDocName = presDocName;
    }
    @Column(name = "pres_doc_id_no")
    public String getPresDocIdNo() {
        return presDocIdNo;
    }
    public void setPresDocIdNo(String presDocIdNo) {
        this.presDocIdNo = presDocIdNo;
    }
    @Column(name = "trial_doc_code")
    public String getTrialDocCode() {
        return trialDocCode;
    }
    public void setTrialDocCode(String trialDocCode) {
        this.trialDocCode = trialDocCode;
    }
    @Column(name = "trial_doc_name")
    public String getTrialDocName() {
        return trialDocName;
    }
    public void setTrialDocName(String trialDocName) {
        this.trialDocName = trialDocName;
    }
    @Column(name = "trial_doc_id_no")
    public String getTrialDocIdNo() {
        return trialDocIdNo;
    }
    public void setTrialDocIdNo(String trialDocIdNo) {
        this.trialDocIdNo = trialDocIdNo;
    }
    @Column(name = "trial_time")
    public String getTrialTime() {
        return trialTime;
    }
    public void setTrialTime(String trialTime) {
        this.trialTime = trialTime;
    }
    @Column(name = "diag_code")
    public String getDiagCode() {
        return diagCode;
    }
    public void setDiagCode(String diagCode) {
        this.diagCode = diagCode;
    }
    @Column(name = "diag_name")
    public String getDiagName() {
        return diagName;
    }
    public void setDiagName(String diagName) {
        this.diagName = diagName;
    }
    @Column(name = "diseases_type")
    public String getDiseasesType() {
        return diseasesType;
    }
    public void setDiseasesType(String diseasesType) {
        this.diseasesType = diseasesType;
    }
    @Column(name = "mobility_flag")
    public String getMobilityFlag() {
        return mobilityFlag;
    }
    public void setMobilityFlag(String mobilityFlag) {
        this.mobilityFlag = mobilityFlag;
    }
    @Column(name = "long_medical_flag")
    public String getLongMedicalFlag() {
        return longMedicalFlag;
    }
    public void setLongMedicalFlag(String longMedicalFlag) {
        this.longMedicalFlag = longMedicalFlag;
    }
    @Column(name = "pres_effec_days")
    public String getPresEffecDays() {
        return presEffecDays;
    }
    public void setPresEffecDays(String presEffecDays) {
        this.presEffecDays = presEffecDays;
    }
    @Column(name = "total_price")
    public String getTotalPrice() {
        return totalPrice;
    }
    public void setTotalPrice(String totalPrice) {
        this.totalPrice = totalPrice;
    }
    @Column(name = "upload_time")
    public String getUploadTime() {
        return uploadTime;
    }
    public void setUploadTime(String uploadTime) {
        this.uploadTime = uploadTime;
    }
    @Column(name = "create_time")
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(name = "upload")
    public String getUpload() {
        return upload;
    }
    public void setUpload(String upload) {
        this.upload = upload;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/thirdUpload/BaseNsPrescriptionDrugDO.java

@@ -0,0 +1,265 @@
package com.yihu.jw.entity.thirdUpload;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created by wsy on 2021/9/1.
 */
@Entity
@Table(name = "base_ns_prescription_drug")
public class BaseNsPrescriptionDrugDO extends UuidIdentityEntity {
    private String idPrescriptionDrug;      //记录唯一标识流水号
    private String presNo;                  //处方号
    private String cuntryDrugCode;          //批准文号
    private String eletDrugCode;            //国家药品编码
    private String orgCode;                 //医疗机构编码
    private String apprDrugCode;            //药品通用编码
    private String apprDrugName;            //药品通用名称
    private String drugCode;                //药品商品编码
    private String drugName;                //药品商品名称
    private String drugForm;                //药品剂型
    private String prescriptionDays;        //用药天数
    private String dosage;                  //用药剂量-单次
    private String dosageUnit;              //用药剂量单位-单次
    private String totalDosage;             //用药剂量-总量
    private String totalDosageUnit;         //用药剂量单位-总量
    private String medicineFreq;            //用药频率编码
    private String drugUse;                 //药品用法
    private String standardDesc;            //规格
    private String singlePrice;             //单价
    private String drugTotalPrice;          //金额
    private String comments;                //嘱托
    private String antiComments;            //抗菌药说明
    private String decMethName;             //中药煎煮法名称
    private String createTime;              //生成时间
    private String upload;                  //上传时间
    @Column(name = "id_prescription_drug")
    public String getIdPrescriptionDrug() {
        return idPrescriptionDrug;
    }
    public void setIdPrescriptionDrug(String idPrescriptionDrug) {
        this.idPrescriptionDrug = idPrescriptionDrug;
    }
    @Column(name = "pres_no")
    public String getPresNo() {
        return presNo;
    }
    public void setPresNo(String presNo) {
        this.presNo = presNo;
    }
    @Column(name = "cuntry_drug_code")
    public String getCuntryDrugCode() {
        return cuntryDrugCode;
    }
    public void setCuntryDrugCode(String cuntryDrugCode) {
        this.cuntryDrugCode = cuntryDrugCode;
    }
    @Column(name = "elet_drug_code")
    public String getEletDrugCode() {
        return eletDrugCode;
    }
    public void setEletDrugCode(String eletDrugCode) {
        this.eletDrugCode = eletDrugCode;
    }
    @Column(name = "org_code")
    public String getOrgCode() {
        return orgCode;
    }
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
    @Column(name = "appr_drug_code")
    public String getApprDrugCode() {
        return apprDrugCode;
    }
    public void setApprDrugCode(String apprDrugCode) {
        this.apprDrugCode = apprDrugCode;
    }
    @Column(name = "appr_drug_name")
    public String getApprDrugName() {
        return apprDrugName;
    }
    public void setApprDrugName(String apprDrugName) {
        this.apprDrugName = apprDrugName;
    }
    @Column(name = "drug_code")
    public String getDrugCode() {
        return drugCode;
    }
    public void setDrugCode(String drugCode) {
        this.drugCode = drugCode;
    }
    @Column(name = "drug_name")
    public String getDrugName() {
        return drugName;
    }
    public void setDrugName(String drugName) {
        this.drugName = drugName;
    }
    @Column(name = "drug_form")
    public String getDrugForm() {
        return drugForm;
    }
    public void setDrugForm(String drugForm) {
        this.drugForm = drugForm;
    }
    @Column(name = "prescription_days")
    public String getPrescriptionDays() {
        return prescriptionDays;
    }
    public void setPrescriptionDays(String prescriptionDays) {
        this.prescriptionDays = prescriptionDays;
    }
    @Column(name = "dosage")
    public String getDosage() {
        return dosage;
    }
    public void setDosage(String dosage) {
        this.dosage = dosage;
    }
    @Column(name = "dosage_unit")
    public String getDosageUnit() {
        return dosageUnit;
    }
    public void setDosageUnit(String dosageUnit) {
        this.dosageUnit = dosageUnit;
    }
    @Column(name = "total_dosage")
    public String getTotalDosage() {
        return totalDosage;
    }
    public void setTotalDosage(String totalDosage) {
        this.totalDosage = totalDosage;
    }
    @Column(name = "total_dosage_unit")
    public String getTotalDosageUnit() {
        return totalDosageUnit;
    }
    public void setTotalDosageUnit(String totalDosageUnit) {
        this.totalDosageUnit = totalDosageUnit;
    }
    @Column(name = "medicine_freq")
    public String getMedicineFreq() {
        return medicineFreq;
    }
    public void setMedicineFreq(String medicineFreq) {
        this.medicineFreq = medicineFreq;
    }
    @Column(name = "drug_use")
    public String getDrugUse() {
        return drugUse;
    }
    public void setDrugUse(String drugUse) {
        this.drugUse = drugUse;
    }
    @Column(name = "standard_desc")
    public String getStandardDesc() {
        return standardDesc;
    }
    public void setStandardDesc(String standardDesc) {
        this.standardDesc = standardDesc;
    }
    @Column(name = "single_price")
    public String getSinglePrice() {
        return singlePrice;
    }
    public void setSinglePrice(String singlePrice) {
        this.singlePrice = singlePrice;
    }
    @Column(name = "drug_total_price")
    public String getDrugTotalPrice() {
        return drugTotalPrice;
    }
    public void setDrugTotalPrice(String drugTotalPrice) {
        this.drugTotalPrice = drugTotalPrice;
    }
    @Column(name = "comments")
    public String getComments() {
        return comments;
    }
    public void setComments(String comments) {
        this.comments = comments;
    }
    @Column(name = "anti_comments")
    public String getAntiComments() {
        return antiComments;
    }
    public void setAntiComments(String antiComments) {
        this.antiComments = antiComments;
    }
    @Column(name = "dec_meth_name")
    public String getDecMethName() {
        return decMethName;
    }
    public void setDecMethName(String decMethName) {
        this.decMethName = decMethName;
    }
    @Column(name = "create_time")
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(name = "upload")
    public String getUpload() {
        return upload;
    }
    public void setUpload(String upload) {
        this.upload = upload;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1520,4 +1520,8 @@ public class BaseHospitalRequestMapping {
        //发送微信模版消息
        public static final String sendWxTemple = "/sendWxTemple";
    }
    public static class UpWebTherapySupserviceInfo extends Basic {
        public static final String PREFIX = "/open/gc";
    }
}

common/common-util/src/main/java/com/yihu/jw/util/common/StringUtil.java

@@ -0,0 +1,26 @@
package com.yihu.jw.util.common;
import java.util.Random;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/9/9
 * @Description:
 */
public class StringUtil {
    public static String randomInt(int length) {
        String str = "0123456789";
        StringBuffer buffer = new StringBuffer();
        Random random = new Random();
        for(int i = 0; i < length; ++i) {
            int pos = random.nextInt(str.length());
            buffer.append(str.charAt(pos));
        }
        return buffer.toString();
    }
}

common/common-util/src/main/java/com/yihu/jw/util/date/DateUtil.java

@@ -521,6 +521,11 @@ public class DateUtil {
        return date;
    }
    public static String getNextMinute(int minutes) {
        Calendar c = Calendar.getInstance();
        c.add(Calendar.MINUTE, minutes);
        return dateToStrLong(c.getTime());
    }
    public static String getNextDay(Date d, int days) {
        Calendar c = Calendar.getInstance();

common/common-util/src/main/java/com/yihu/jw/util/http/HttpClientUtil.java

@@ -663,6 +663,62 @@ public class HttpClientUtil {
        return result;
    }
    public static void main(String[] args)  {
    /**
     * 向指定 URL 发送POST方法的请求
     *
     * @param url
     *            发送请求的 URL带上参数
     * @param param
     *            POST参数。
     * @return 所代表远程资源的响应结果
     */
    public String sendPost(String url, String param,Map<String,String> headerMap) {
        StringBuffer buffer = new StringBuffer();
        PrintWriter out = null;
        BufferedReader in = null;
        HttpURLConnection conn = null;
        try {
            URL realUrl = new URL(url);
            // 打开和URL之间的连接
            conn = (HttpURLConnection) realUrl.openConnection();
            conn.setRequestMethod("POST");
            conn.setDoOutput(true);
            conn.setDoInput(true);
            conn.setUseCaches(false);
            conn.setRequestProperty("Content-Type", "application/json");
            conn.setRequestProperty("accept", "*/*");
            conn.setRequestProperty("connection", "Keep-Alive");
            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
            if(headerMap!=null){
                for (String key:headerMap.keySet()){
                    conn.setRequestProperty(key, headerMap.get(key));
                }
            }
            OutputStreamWriter osw = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
            osw.write(param.toString());
            osw.flush();
            // 读取返回内容
            BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
            String temp;
            while ((temp = br.readLine()) != null) {
                buffer.append(temp);
                buffer.append("\n");
            }
        } catch (Exception e) {
            e.printStackTrace();
        } finally {
            try {
                if (out != null) {
                    out.close();
                }
                if (in != null) {
                    in.close();
                }
            } catch (IOException ex) {
                ex.printStackTrace();
            }
        }
        return buffer.toString();
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/dao/doctor/DoctorServicePermissionsDao.java

@@ -4,6 +4,8 @@ import com.yihu.jw.entity.care.common.DoctorServicePermissionsDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created with IntelliJ IDEA.
 *
@@ -13,5 +15,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 */
public interface DoctorServicePermissionsDao extends PagingAndSortingRepository<DoctorServicePermissionsDO, String>, JpaSpecificationExecutor<DoctorServicePermissionsDO> {
    List<DoctorServicePermissionsDO> findByDoctor(String doctor);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/doctor/DoctorServicePermissionsEndpoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.base.endpoint.doctor;
import com.yihu.jw.base.dao.doctor.DoctorServicePermissionsDao;
import com.yihu.jw.base.service.doctor.DoctorServicePermissionsService;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
@@ -34,6 +35,8 @@ public class DoctorServicePermissionsEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private DoctorServicePermissionsService permissionsService;
    @Autowired
    private DoctorServicePermissionsDao permissionsDao;
    @Autowired
    private BaseDoctorDao doctorDao;
    @PostMapping(value = "create")
@@ -42,6 +45,10 @@ public class DoctorServicePermissionsEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        DoctorServicePermissionsDO permissionsDO = toEntity(jsonData, DoctorServicePermissionsDO.class);
        List<DoctorServicePermissionsDO> permissionsDOList = permissionsDao.findByDoctor(permissionsDO.getDoctor());
        if(permissionsDOList.size()>0){
            return failed("同一个人员只能添加一次", ObjEnvelop.class);
        }
        permissionsDO = permissionsService.save(permissionsDO);
        return success(permissionsDO);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/searchClient/ClientSearchEndpoint.java

@@ -4,7 +4,7 @@ package com.yihu.jw.base.endpoint.searchClient;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.jw.base.aop.ClientSearchRequestLimit;
import com.yihu.jw.base.service.clientSearch.ClientSearchService;
import com.yihu.jw.entity.base.searchClient.BaseSearchNoveltyRepeatDO;
import com.yihu.jw.restmodel.web.Envelop;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/statistics/OpenStatisticsEndpoint.java

@@ -196,4 +196,28 @@ public class OpenStatisticsEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "statisticsOrderServer")
    @ApiOperation(value = "v1.1安防、生活照料服务类型分析")
    public ObjEnvelop statisticsOrderServer(
            @RequestParam(required = true) String endDate) {
        try {
            JSONObject result = statisticsService.statisticsOrderServer("46,48",endDate,2,"4");
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }
    }
    @GetMapping(value = "statisticsOrderResponse")
    @ApiOperation(value = "v1.1安防、生活响应分析 发起就算")
    public ObjEnvelop statisticsOrderResponse(
            @RequestParam(required = true) String endDate) {
        try {
            JSONObject result = statisticsService.statisticsOrderResponse(endDate);
            return success(result);
        } catch (Exception e) {
            return failedObjEnvelopException2(e);
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/third/yunxin/YunxinEndpoint.java

@@ -0,0 +1,48 @@
package com.yihu.jw.care.endpoint.third.yunxin;
import com.yihu.jw.care.service.yunxin.YunxinService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/9/9
 * @Description:
 */
@RestController
@RequestMapping(value = "yunxin")
@Api(value = "云信", description = "云信接口", tags = {"云信接口"})
public class YunxinEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private YunxinService yunxinService;
    @GetMapping(value = "appletSign")
    @ApiOperation(value = "生成小程序秘钥")
    public Envelop appletSign(
            @ApiParam(name = "userId", value = "userId")
            @RequestParam(value = "userId",defaultValue = "",required = true) String userId,
            @ApiParam(name = "channelName", value = "channelName")
            @RequestParam(value = "channelName",defaultValue = "",required = false) String channelName,
            @ApiParam(name = "flag", value = "flag")
            @RequestParam(value = "flag",defaultValue = "",required = false) String flag) throws Exception {
        if (StringUtils.isNoneBlank(flag)&&flag.equalsIgnoreCase("yx")){
            return success(yunxinService.yxToken2(userId,channelName));
        }else {
            return success(yunxinService.appletSign(userId));
        }
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/message/BaseServiceNewsService.java

@@ -73,6 +73,17 @@ public class BaseServiceNewsService {
        Map<String, List<DevicePatientDevice>> byDept1 = feeDetail.stream()
                .collect(Collectors.groupingBy(DevicePatientDevice::getUser));
        for (Map<String,Object> map:list){
            String patient = map.get("id").toString();
            sql = "select label_code,label_name from wlyy_patient_label where label_type=1 and patient='"+patient+"' ";
            List<Map<String,Object>> labels = jdbcTemplate.queryForList(sql);
            if (labels.size()>0){
                map.put("label_code",labels.get(0).get("label_code"));
                map.put("label_name",labels.get(0).get("label_name"));
            }
            else {
                map.put("label_code",null);
                map.put("label_name",null);
            }
            String idcard = map.get("idcard").toString();
            String devices= deviceService.getPatientDeviceCategoryCode(map.get("id").toString());
            if ("0".equals(devices)){
@@ -101,6 +112,17 @@ public class BaseServiceNewsService {
                "WHERE t.patient = p.id and t.`status`=1 and p.del =1";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        for (Map<String,Object> map:list){
            String patient = map.get("id").toString();
            sql = "select label_code,label_name from wlyy_patient_label where label_type=1 and patient='"+patient+"' ";
            List<Map<String,Object>> labels = jdbcTemplate.queryForList(sql);
            if (labels.size()>0){
                map.put("label_code",labels.get(0).get("label_code"));
                map.put("label_name",labels.get(0).get("label_name"));
            }
            else {
                map.put("label_code",null);
                map.put("label_name",null);
            }
            String devices= deviceService.getPatientDeviceCategoryCode(map.get("id").toString());
            if ("0".equals(devices)){
                map.put("devices",new ArrayList<>());

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -73,16 +73,25 @@ public class StatisticsService {
     */
    public JSONObject statisticsTotalAmount(String endDate) throws Exception {
        JSONObject res = new JSONObject();
        String index = "28,31,35,37,39,41,43,44";
        String index = "28,31,35,37,39,44";
        String[] indexes = index.split(",");
        for(String ind:indexes){
            //总量
            SaveModel saveModel = elasticsearchUtil.findOneDateQuotaLevel0(endDate, endDate, defalutArea, defalutLevel, ind, SaveModel.timeLevel_DDL);
            res.put("index_"+ind,saveModel.getResult2().longValue());
        }
        //41紧急预警43安防要与实时一样，查sql
        String emergencyCallSql = "SELECT COUNT(1) FROM base_emergency_assistance_order WHERE status >= 0";
        Integer emergencyCallNum = jdbcTemplate.queryForObject(emergencyCallSql,Integer.class);
        String securityMonitoringSql = "SELECT COUNT(1) FROM base_security_monitoring_order";
        Integer securityMonitoringNum = jdbcTemplate.queryForObject(securityMonitoringSql,Integer.class);
        res.put("index_"+41,emergencyCallNum+securityMonitoringNum);
        res.put("index_"+43,securityMonitoringNum);
        //评估类型
        res.put("capacityAssessment",capacityAssessment(endDate,defalutArea,defalutLevel));
        res.put("patientLabelStatistic",statisticsOrderServer("47",endDate,2,"2"));
        return res;
    }
@@ -837,6 +846,68 @@ public class StatisticsService {
        return re;
    }
    /**
     * 统计安防、生活
     * 误报警率完成率 完成率
     * @param endDate
     * @return
     */
    public JSONObject statisticsOrderResponse(String endDate){
        JSONObject res = new JSONObject();
        try {
            //安防总数
            SaveModel saveModel = elasticsearchUtil.findOneDateQuotaLevel0(endDate,endDate,defalutArea,2,"46","2","4");
            res.put("index_"+46+"_total",saveModel.getResult2().longValue());
            //安防完成
            saveModel = elasticsearchUtil.findOneDateQuotaLevel2NoSlaveKey1(endDate,defalutArea,2,"46","2","0","4");
            res.put("index_"+46+"_finish",saveModel.getResult2().longValue());
            //安防误报警
            saveModel = elasticsearchUtil.findOneDateQuotaLevel2NoSlaveKey1(endDate,defalutArea,2,"46","2","-2","4");
            res.put("index_"+46+"_error",saveModel.getResult2().longValue());
            //生活总数
            saveModel = elasticsearchUtil.findOneDateQuotaLevel0(endDate,endDate,defalutArea,2,"49","2","4");
            res.put("index_"+49+"_total",saveModel.getResult2().longValue());
            //生活完成
            saveModel = elasticsearchUtil.findOneDateQuotaLevel1(endDate,endDate,defalutArea,2,"49","2","2","4");
            res.put("index_"+49+"_finish",saveModel.getResult2().longValue());
        } catch (Exception e) {
            e.printStackTrace();
        }
        return res;
    }
    /**
     * 根据指标 level arealevel统计
     * @param endDate
     * @return
     * @throws Exception
     */
    public JSONObject statisticsOrderServer(String index,String endDate,Integer level,String areaLevel) throws Exception {
        JSONObject res = new JSONObject();
        String[] indexes = index.split(",");
        for(String ind:indexes){
            JSONArray jsonArray = new JSONArray();
            long total = 0l;
            //总量
            List<SaveModel> list = statisticsUtilService.findDateAllQuotaLevel1Sort2(endDate,endDate,defalutArea,level,ind,SaveModel.timeLevel_DDL,null,null,areaLevel);
            for(int i=0;i<list.size();i++){
                SaveModel saveModel = list.get(i);
                JSONObject json = new JSONObject();
                if (saveModel.getResult2().longValue()==0&&StringUtils.isBlank(saveModel.getSlaveKey1())){
                    continue;
                }
                json.put("num",saveModel.getResult2().longValue());
                json.put("code",saveModel.getSlaveKey1());
                json.put("name",saveModel.getSlaveKey1Name());
                total+=saveModel.getResult2().longValue();
                jsonArray.add(json);
            }
            res.put("index_"+ind+"_total",total);
            res.put("index_"+ind,jsonArray);
        }
        return res;
    }
    /**
     * 计算开始时间

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsUtilService.java

@@ -30,6 +30,12 @@ public class StatisticsUtilService {
        return list;
    }
    public List<SaveModel> findDateAllQuotaLevel1Sort2(String startDate, String endDate, String area, int level, String index, String timeLevel, String interval, String lowLevel,String areaLevel) throws Exception {
        List<SaveModel> list = elasticsearchUtil.findDateAllQuotaLevel1(startDate,endDate,area,level,index,timeLevel,interval,lowLevel,areaLevel);
        list.sort((a, b) -> Double.compare(b.getResult2(), a.getResult2()));
        return list;
    }
    /**
     * 计算开始时间
     * @param endDate

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/yunxin/YunxinService.java

@@ -0,0 +1,156 @@
package com.yihu.jw.care.service.yunxin;
import com.yihu.jw.entity.base.yx.YxTokenMappingDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.util.http.HttpClientUtil;
import com.yihu.jw.utils.CheckSumBuilder;
import com.yihu.jw.utils.GenerateUserSig;
import com.yihu.jw.yx.dao.YxTokenMappingDao;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import static com.yihu.jw.util.common.StringUtil.randomInt;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/9/9
 * @Description:
 */
@Service
public class YunxinService {
    private static final Logger logger = LoggerFactory.getLogger(YunxinService.class);
    @Autowired
    private WlyyHospitalSysDictDao hospitalSysDictDao;
    @Autowired
    private HttpClientUtil httpClientUtil;
    @Autowired
    private YxTokenMappingDao yxTokenMappingDao;
    public String yxToken2(String userId,String channelName){
        YxTokenMappingDO yxTokenMappingDO = yxTokenMappingDao.findMappingByAccid(userId);
        if (yxTokenMappingDO!=null){
            return yxTokenMappingDO.getToken();
        }
        WlyyHospitalSysDictDO sysDictDO = hospitalSysDictDao.findById("YXAPPKEY");
        WlyyHospitalSysDictDO hospitalSysDictDO =  hospitalSysDictDao.findById("YXAPPSECRET");
        if (sysDictDO==null){
            return  "找不到对应的key";
        }
        String appKey = sysDictDO.getDictValue();
        String appSecret = hospitalSysDictDO.getDictValue();
        String nonce = randomInt(10);
        String curTime = String.valueOf((new Date()).getTime() / 1000L);
        String checkSum = CheckSumBuilder.getCheckSum(appSecret, nonce ,curTime);//参考 计算CheckSum的java代码
        String url = "https://api.netease.im/nimserver/user/create.action";
        Map<String,Object> httpPost = new HashedMap();
        // 设置请求的header
        httpPost.put("AppKey", appKey);
        httpPost.put("Nonce", nonce);
        httpPost.put("CurTime", curTime);
        httpPost.put("CheckSum", checkSum);
        httpPost.put("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
        nvps.add(new BasicNameValuePair("accid", userId));
        YxTokenMappingDO yxTokenMappingDO1 = new YxTokenMappingDO();
        if (StringUtils.isNoneBlank(channelName)){
            nvps.add(new BasicNameValuePair("name",channelName));
            yxTokenMappingDO1.setName(channelName);
        }
        String response = httpClientUtil.headerPost(url,nvps,"UTF-8",httpPost);
        logger.info("返回日志"+response);
        if(StringUtils.isNoneBlank(response)){
            com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(response);
            if (jsonObject.getString("code").equalsIgnoreCase("200")){
                com.alibaba.fastjson.JSONObject jsonObject1 = com.alibaba.fastjson.JSONObject.parseObject(jsonObject.getString("info"));
                if (StringUtils.isNoneBlank(jsonObject1.getString("token"))){
                    yxTokenMappingDO1.setAccid(userId);
                    yxTokenMappingDO1.setToken(jsonObject1.getString("token"));
                    yxTokenMappingDao.save(yxTokenMappingDO1);
                }
                return jsonObject1.getString("token");
            }else if (jsonObject.getString("code").equalsIgnoreCase("414")&&jsonObject.getString("desc").contains("already")){
                return  refreshToken(userId);
            }
        }
        return null;
    }
    /**
     * 重置云信token
     * @param userId
     * @return
     */
    public String refreshToken(String userId){
        YxTokenMappingDO yxTokenMappingDO = yxTokenMappingDao.findMappingByAccid(userId);
        if (yxTokenMappingDO!=null){
            return yxTokenMappingDO.getToken();
        }
        WlyyHospitalSysDictDO sysDictDO = hospitalSysDictDao.findById("YXAPPKEY");
        WlyyHospitalSysDictDO hospitalSysDictDO =  hospitalSysDictDao.findById("YXAPPSECRET");
        if (sysDictDO==null){
            return  "找不到对应的key";
        }
        String appKey = sysDictDO.getDictValue();
        String appSecret = hospitalSysDictDO.getDictValue();
        String nonce =  randomInt(10);
        String curTime = String.valueOf((new Date()).getTime() / 1000L);
        String checkSum = CheckSumBuilder.getCheckSum(appSecret, nonce ,curTime);//参考 计算CheckSum的java代码
        String url = "https://api.netease.im/nimserver/user/refreshToken.action";
        Map<String,Object> httpPost = new HashedMap();
        // 设置请求的header
        httpPost.put("AppKey", appKey);
        httpPost.put("Nonce", nonce);
        httpPost.put("CurTime", curTime);
        httpPost.put("CheckSum", checkSum);
        httpPost.put("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
        nvps.add(new BasicNameValuePair("accid", userId));
        YxTokenMappingDO yxTokenMappingDO1 = new YxTokenMappingDO();
        String response = httpClientUtil.headerPost(url,nvps,"UTF-8",httpPost);
        logger.info("重置云信"+response);
        if(StringUtils.isNoneBlank(response)){
            com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(response);
            if (jsonObject.getString("code").equalsIgnoreCase("200")){
                com.alibaba.fastjson.JSONObject jsonObject1 = com.alibaba.fastjson.JSONObject.parseObject(jsonObject.getString("info"));
                if (StringUtils.isNoneBlank(jsonObject1.getString("token"))){
                    yxTokenMappingDO1.setAccid(userId);
                    yxTokenMappingDO1.setToken(jsonObject1.getString("token"));
                    yxTokenMappingDao.save(yxTokenMappingDO1);
                }
                return jsonObject1.getString("token");
            }
        }
        return null;
    }
    /**
     * 腾讯视频生成签名
     * @param userId
     * @return
     */
    public String appletSign(String userId){
        WlyyHospitalSysDictDO sysDictDO = hospitalSysDictDao.findById("SDKAPPID");
        WlyyHospitalSysDictDO hospitalSysDictDO =  hospitalSysDictDao.findById("SECRETKEY");
        if (sysDictDO!=null&&hospitalSysDictDO!=null){
            return GenerateUserSig.GenTLSSignature(Long.parseLong(sysDictDO.getDictValue()),userId,604800,null,hospitalSysDictDO.getDictValue());
        }
        return null;
    }
}

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/dao/device/OnenetDeviceDao.java

@@ -18,5 +18,11 @@ import java.util.List;
public interface OnenetDeviceDao extends PagingAndSortingRepository<OnenetDevice, String>, JpaSpecificationExecutor<OnenetDevice> {
    @Query("select a from OnenetDevice a where a.deviceId = ?1")
    List<OnenetDevice> findByDeviceId(String deviceId);
    OnenetDevice findByDeviceId(String deviceId);
    @Query("select a from OnenetDevice a where a.sn = ?1")
    OnenetDevice findBySn(String sn);
    @Query(value = "select * from base_onenet_device p where p.device_id is null ",nativeQuery = true)
    List<OnenetDevice> findByDeviceId();
}

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/dao/device/OnenetReceiveRecordDao.java

@@ -0,0 +1,17 @@
package com.yihu.jw.care.dao.device;
import com.yihu.jw.entity.care.device.OnenetReceiveRecord;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/9/9
 * @Description:
 */
public interface OnenetReceiveRecordDao extends PagingAndSortingRepository<OnenetReceiveRecord, Long>, JpaSpecificationExecutor<OnenetReceiveRecord> {
}

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/endpoint/OnenetController.java

@@ -11,8 +11,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import static com.yihu.jw.care.util.OneNetUtil.token;
/**
@@ -56,13 +54,11 @@ public class OnenetController extends BaseController{
        if (obj != null){
            boolean dataRight = OnenetPushUtil.checkSignature(obj, token);
            if (dataRight){
                onenetService.receive(body);
                logger.info("data receive: content" + obj.toString());
            }else {
                logger.info("data receive: signature error");
            }
        }else {
            logger.info("data receive: body empty error");
        }
@@ -116,13 +112,22 @@ public class OnenetController extends BaseController{
    @ApiOperation("触发器消息通知接收--废弃")
    @RequestMapping(value = "triggerMessage",method = {RequestMethod.POST,RequestMethod.GET})
    public String triggerMessage(
            HttpServletRequest request) {
    @RequestMapping(value = "addDevice",method = {RequestMethod.GET})
    public String addDevice() {
        try {
            String str = getRequestBodyData(request);
            onenetService.addDevice();
            return success();
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1,"addDevice failure");
        }
    }
            logger.info("======================:"+str);
    @ApiOperation("触发器消息通知接收--废弃")
    @RequestMapping(value = "triggerMessage",method = {RequestMethod.POST,RequestMethod.GET})
    public String triggerMessage(@RequestBody String body) {
        try {
            logger.info("======================:"+body);
            return success();
        } catch (Exception e) {
            e.printStackTrace();

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

@@ -1,14 +1,28 @@
package com.yihu.jw.care.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.yihu.jw.care.dao.device.DeviceDetailDao;
import com.yihu.jw.care.dao.device.DeviceHealthIndexDao;
import com.yihu.jw.care.dao.device.OnenetDeviceDao;
import com.yihu.jw.care.dao.device.OnenetReceiveRecordDao;
import com.yihu.jw.care.util.DeviceDataPushLogUtil;
import com.yihu.jw.care.util.SecurityOrderUtil;
import com.yihu.jw.entity.care.device.DeviceHealthIndex;
import com.yihu.jw.entity.care.device.OnenetDevice;
import com.yihu.jw.entity.care.device.OnenetReceiveRecord;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.http.HttpClientUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
/**
 * Created with IntelliJ IDEA.
@@ -25,23 +39,171 @@ public class OnenetService {
    private HttpClientUtil httpClientUtil;
    @Autowired
    private OnenetDeviceDao onenetDeviceDao;
    @Autowired
    private DeviceDetailDao deviceDetailDao;
    @Autowired
    private OnenetReceiveRecordDao onenetReceiveRecordDao;
    @Autowired
    private HvDeviceService hvDeviceService;
    @Autowired
    private DeviceDataPushLogUtil dataPushLogUtil;
    @Autowired
    private DeviceHealthIndexDao deviceHealthIndexDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private SecurityOrderUtil orderUtil;
    private static final String MasterAPIkey ="Da0iDvhQ5H8OD6phWq=tMubBcBw=";
    private static final String baseUrl = "http://api.heclouds.com";
    private static final String baseUrl = "https://api.heclouds.com";
    public static void main(String[] args) {
        String value = "001F0000161401000000000400005A1200000701C6FFADFFF900000E620245CA71";
        String order = value.substring(10,14);
        System.out.println(order);
        String gas_Level = value.substring(22,24);
        System.out.println(gas_Level);
    }
    /**
     * 为了防止消息重推 这里采取异步处理
     * （onenet：应用服务器收到平台每一次推送请求后，需要在有限时间内返回响应（目前是5秒），且HTTP响应状态码应设置为200，否则平台会认为请求发送失败，
     * 进行消息重推。重推采用指数退避策略，每条消息最多重推16次。如果某条消息一直失败，那么会在接下来的2小时45分4秒重推16次，之后不再重试）
     * @param body
     */
    @Async
    public void receive(String body){
        //{"msg":{"at":1630985527067,"imei":"868591057157041","type":1,"ds_id":"3200_0_5505","value":"001f0000041401000000000000005a1300000e01c6ffb1fffa00000e620245ca71","dev_id":768777611},"msg_signature":"qq8nsaH/QEUuDnjK+o8vgw==","nonce":"z8SlxYY%"}
        OnenetReceiveRecord record = new OnenetReceiveRecord();
        try {
            JSONObject jsonObject = JSON.parseObject(body);
            JSONObject msg = jsonObject.getJSONObject("msg");
            String deviceSn = msg.getString("imei");
            OnenetDevice onenetDevice = onenetDeviceDao.findBySn(deviceSn);
            String categoryCode = "";
            String title = "";
            if(onenetDevice!=null){
                categoryCode = onenetDevice.getCategoryCode();
                if("14".equals(categoryCode)){
                    title = "可燃气体探测器报警信息接收";
                }else if("15".equals(categoryCode)){
                    title = "烟探测器监测信息接收";
                }
            }
            hvDeviceService.updContactStatus(deviceSn,1);
            dataPushLogUtil.savePushLog(deviceSn,msg.toJSONString(),title);
            //未来鹰设备 类型2是设备状态（不准）
            Integer type = msg.getInteger("type");
            String value = msg.getString("value");
            if(type==1){
                String order = value.substring(10,14);
                if("1401".equals(order)){
                    //自定义命令数据更新（心跳/设备状态上报）
                    String gas_Level = value.substring(22,24);
                    Integer gas = Integer.parseInt(gas_Level, 16);
                    if(gas>0){
                        //气体浓度大于0触发报警
                        String sql = "select count(*) from base_device_health_index where device_sn = '"+deviceSn+"'" +
                                " and value>0 and create_time>='"+DateUtil.getNextMinute(-60)+"' ";
                        Integer count = jdbcTemplate.queryForObject(sql,Integer.class);
                        if(count==0){
                            logger.info("气体浓度大于0触发报警，deviceSn:{}",deviceSn);
                            //1小时内不重复发起
                            JSONObject tmp = new JSONObject();
                            tmp.put("gas",gas);
                            orderUtil.createSecurityOrder(deviceSn,null,new JSONObject(),null,6,"11","preventGasLeakage",JSON.toJSONString(tmp, SerializerFeature.WriteMapNullValue));
                        }
                    }
                    DeviceHealthIndex index = new DeviceHealthIndex();
                    index.setDeviceSn(deviceSn);
                    if("14".equals(categoryCode)){
                        index.setUnit("%LEL");
                        index.setDeviceType("1");
                    }else if("15".equals(categoryCode)){
                        index.setUnit("%");
                        index.setDeviceType("2");
                    }
    public void receive(){
                    index.setValue(gas+"");
                    index.setRecordTime(DateUtil.getStringDate());
                    deviceHealthIndexDao.save(index);
                }
            }
            record.setContent(msg.toJSONString());
            record.setStatus(1);
            record.setCreateTime(new Date());
        }catch (Exception e){
            e.printStackTrace();
            record.setStatus(2);
        }
        try {
            onenetReceiveRecordDao.save(record);
        }catch (Exception e){
            e.printStackTrace();
        }
    }
    /**
     * 添加设备
     */
    public void addDevice(){
        String url = baseUrl +"/devices";
        List<OnenetDevice> onenetDeviceList = onenetDeviceDao.findByDeviceId();
        List<OnenetDevice> onenetDevices = new ArrayList<>();
        for(OnenetDevice device:onenetDeviceList){
            try {
                JSONObject json = new JSONObject();
                json.put("title",device.getName());
                json.put("protocol","LWM2M");
                JSONObject auth_info = new JSONObject();
                auth_info.put(device.getSn(),device.getImsi());
                json.put("auth_info",auth_info);
                String result = apikeyPost(url,json.toJSONString());
                JSONObject jsonObject = JSON.parseObject(result);
                if(jsonObject.getInteger("errno")==0){
                    String deviceId = jsonObject.getJSONObject("data").getString("device_id");
                    String psk = jsonObject.getJSONObject("data").getString("psk");
                    device.setDeviceId(deviceId);
                    device.setPsk(psk);
                    onenetDevices.add(device);
                }
            }catch (Exception e){
                e.printStackTrace();
            }
        }
        if(onenetDevices.size()>0){
            onenetDeviceDao.save(onenetDevices);
        }
    }
    /**
     * 同步设备
     */
    public void sysDevice(){
        String url = baseUrl +"/";
    public void sysDevice(Integer page){
        page = page==null?1:page;
        String url = baseUrl +"/devices?page="+page+"&per_page=100";
        String result = apikeyGet(url);
        JSONObject jsonObject = JSON.parseObject(result);
        if(jsonObject.getInteger("errno")==0){
            List<OnenetDevice> onenetDeviceList = new ArrayList<>();
            JSONArray jsonArray = jsonObject.getJSONObject("data").getJSONArray("devices");
            for (int i=0;i<jsonArray.size();i++){
                JSONObject json = jsonArray.getJSONObject(0);
                String sn = json.getString("rg_id");
                String id = json.getString("id");
                OnenetDevice device = onenetDeviceDao.findBySn(sn);
                if(device!=null){
                    device.setDeviceId(id);
                    onenetDeviceList.add(device);
                }
            }
            if(onenetDeviceList.size()>0){
                onenetDeviceDao.save(onenetDeviceList);
            }
        }
    }
    /**
@@ -53,6 +215,21 @@ public class OnenetService {
        Map<String,String> headerMap = new HashMap<>();
        headerMap.put("api-key", MasterAPIkey);
        String result = httpClientUtil.sendGet(url,headerMap);
        logger.info("apikeyGet="+result);
        return result;
    }
    /**
     * onenet请求post方法
     * @param url
     * @param param
     * @return
     */
    public String apikeyPost(String url,String param){
        Map<String,String> headerMap = new HashMap<>();
        headerMap.put("api-key", MasterAPIkey);
        String result = httpClientUtil.sendPost(url,param,headerMap);
        logger.info("apikeyPost="+result);
        return result;
    }
}

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

@@ -71,7 +71,7 @@ public class OnenetPushUtil {
        System.arraycopy(obj.getNonce().getBytes(), 0, signature, token.length(), 8);
        System.arraycopy(obj.getMsg().toString().getBytes(), 0, signature, token.length() + 8, obj.getMsg().toString().length());
        String calSig = Base64.encodeBase64String(mdInst.digest(signature));
        logger.info("check signature: result:{}  receive sig:{},calculate sig: {}",calSig.equals(obj.getMsgSignature()),obj.getMsgSignature(),calSig);
        //logger.info("check signature: result:{}  receive sig:{},calculate sig: {}",calSig.equals(obj.getMsgSignature()),obj.getMsgSignature(),calSig);
        return calSig.equals(obj.getMsgSignature());
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/thirdUpload/ThirdUploadEndpoint.java

@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
@RestController
@RequestMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.PREFIX)     //请求地址前缀  /regulatory
@RequestMapping(value = BaseHospitalRequestMapping.UpWebTherapySupserviceInfo.PREFIX)     //请求地址前缀
@Api(value = "监管平台数据增删改查", description = "监管平台数据增删改查", tags = {"监管平台数据增删改查"})
public class ThirdUploadEndpoint extends EnvelopRestEndpoint {
    @Autowired

svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/compute/ComputeHelper.java

@@ -23,8 +23,12 @@ public class ComputeHelper {
    private JdbcTemplate jdbcTemplate;
    public String findOrgType(String wlyyJobCongId){
        String orgType="";
        String sql = "SELECT IFNULL(dict_value,'') from wlyy_hospital_sys_dict WHERE dict_name = 'quota_org_type' and dict_code = '"+wlyyJobCongId+"'";
        String orgType = jdbcTemplate.queryForObject(sql,String.class);
        List<String> orgTypes = jdbcTemplate.queryForList(sql,String.class);
        if (orgTypes.size()>0){
            return orgTypes.get(0);
        }
        return orgType;
    }
@@ -43,7 +47,10 @@ public class ComputeHelper {
            //计算数据 返回map key 根据团队和维度拼凑在map中的key   1-2-1  如果维度是长度是0返回团队id 1
            Map<String, List<DataModel>> computeMap = computeDataModel(dimensionQuotas, dataModels,wlyyJobCongId);
            List<SaveModel> savemodels = null;
            if("42".equals(wlyyJobCongId)){
            if ("45".equals(wlyyJobCongId)||"47".equals(wlyyJobCongId)){
                savemodels = initAndSetResultCity( dimensionQuotas, computeMap, wlyyJobCongId, endTime, timeLevel);
            }else if("42".equals(wlyyJobCongId)||"41".equals(wlyyJobCongId)||"43".equals(wlyyJobCongId)||"46".equals(wlyyJobCongId)||"48".equals(wlyyJobCongId)
            ||"49".equals(wlyyJobCongId)){
                //新生儿入学只到机构级别
                List<BaseOrgDO> orgDOs = findAllOrg(orgType);
                savemodels = initAndSetResultOrg(orgDOs, dimensionQuotas, computeMap, wlyyJobCongId, endTime, timeLevel);
@@ -72,7 +79,11 @@ public class ComputeHelper {
        Map<String, List<DataModel>> returnMap = new HashMap<>();
        dataModels.stream().forEach(one -> {
            String key;
            if("42".equals(wlyyJobCongId)){
            if ("45".equals(wlyyJobCongId)||"47".equals(wlyyJobCongId)){
                key = getCityKey(one,dimensionQuotas.size());
            }
            else if("42".equals(wlyyJobCongId)||"41".equals(wlyyJobCongId)||"43".equals(wlyyJobCongId)||"46".equals(wlyyJobCongId)||"48".equals(wlyyJobCongId)
            ||"49".equals(wlyyJobCongId)){
                key = getOrgKey(one, dimensionQuotas.size());
            }else{
                key = getKey(one, dimensionQuotas.size());
@@ -131,6 +142,24 @@ public class ComputeHelper {
        }
    }
    private String getCityKey(DataModel one, int size) {
        try {
            if (size > 0) {
                StringBuffer str = new StringBuffer("330100");
                for (int i = 1; i <= size; i++) {
                    String invokeKey = (String) DataModel.class.getMethod("getSlaveKey" + i).invoke(one);
                    str.append("-" + invokeKey);
                }
                return str.toString();
            } else {
                return one.getHospital();
            }
        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }
    /**
     * 得到全部机构
     *
@@ -357,4 +386,82 @@ public class ComputeHelper {
        }
        return returnList;
    }
    private List<SaveModel> initAndSetResultCity(List<BaseDimensionQuota> dimensionQuotas, Map<String, List<DataModel>> countMap, String wlyyJobCongId, String endTime, String timeLevel) throws Exception {
        List<SaveModel> returnList = new ArrayList<>();
        Map<String, SaveModel> lastMaps = new HashMap<>();
        //初始化医生的数据
        SaveModel saveModel = new SaveModel();
        saveModel.setCity("330100");
        saveModel.setCityName("杭州市");
//        saveModel.setTown(one.getTownCode());
//        saveModel.setTownName(one.getTownName());
//        saveModel.setHospitalName(one.getName());
//        saveModel.setHospital(one.getCode());
        saveModel.setQuotaCode(wlyyJobCongId);
        saveModel.setCreateTime(new Date());
        saveModel.setTimeLevel(timeLevel);
        saveModel.setAreaLevel("2");//市
        saveModel.setQuotaDate(DateUtil.strToDate(endTime, "yyyy-MM-dd"));
        lastMaps.put("330100", saveModel);
        //根据维度初始化数据
        for (int i = 0; i < dimensionQuotas.size(); i++) {
            Map<String, SaveModel> mapTemp = new HashMap<>();
            BaseDimensionQuota dimensionQuota = dimensionQuotas.get(i);
            List<Map<String, Object>> listMap = jdbcTemplate.queryForList(dimensionQuota.getDictSql());
            for (Map.Entry<String, SaveModel> oneSaveModel : lastMaps.entrySet()) {
                for (int j = 0; j < listMap.size(); j++) {
                    SaveModel saveModelTemp = new SaveModel();
                    Map<String, Object> dictModel = listMap.get(j);
                    BeanUtils.copyProperties(oneSaveModel.getValue(), saveModelTemp);
                    SaveModel.class.getMethod("setSlaveKey" + (i + 1) + "Name", String.class).invoke(saveModelTemp, dictModel.get("name"));
                    SaveModel.class.getMethod("setSlaveKey" + (i + 1), String.class).invoke(saveModelTemp, dictModel.get("code"));
                    //根据维度生成新的key
                    StringBuffer strKey = new StringBuffer(oneSaveModel.getKey() + "-" + dictModel.get("code"));
                    mapTemp.put(strKey.toString(), saveModelTemp);
                }
            }
            //如果字典长度是0 抛出异常
            if (listMap.size() == 0) {
                throw new Exception("dict size:0,sql:" + dimensionQuota.getDictSql());
            }
            lastMaps = mapTemp;
        }
        //设置值
        for (Map.Entry<String, SaveModel> one : lastMaps.entrySet()) {
            if (countMap.containsKey(one.getKey())) {
                List<DataModel> dataModels = countMap.get(one.getKey());
                Double result1 = 0.0;
                Double result2 = 0.0;
                for (int j = 0; j < dataModels.size(); j++) {
                    DataModel dataModel = dataModels.get(j);
                    Double num = 0.0;
                    if (dataModel.getNum() != null) {
                        num = dataModel.getNum();
                    } else {
                        num = 1.0;
                    }
                    result1 += num;
                    result2++;
                }
                saveModel = one.getValue();
                saveModel.setResult1(result1);
                saveModel.setResult2(result2);
                if (dataModels.size() > 0 && StringUtils.isNotEmpty(dataModels.get(0).getSlaveKey1()) && !StringUtils.isNotEmpty(saveModel.getSlaveKey1())) {
                    saveModel.setSlaveKey1(dataModels.get(0).getSlaveKey1());
                }
                if (dataModels.size() > 0 && StringUtils.isNotEmpty(dataModels.get(0).getSlaveKey2()) && !StringUtils.isNotEmpty(saveModel.getSlaveKey2())) {
                    saveModel.setSlaveKey2(dataModels.get(0).getSlaveKey2());
                }
                returnList.add(saveModel);
            } else {
                returnList.add(one.getValue());
            }
        }
        return returnList;
    }
}

svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/filter/FilterHelper.java

@@ -31,16 +31,17 @@ public class FilterHelper {
        List<DataModel> newList = new ArrayList<>();
        //失败的list
        List<ErrModel> errorList = new ArrayList<>();
        newList.addAll(dataModels);
        dataModels.stream().forEach(one -> {
            String returnStr=one.isNull();
            if (StringUtils.isEmpty(returnStr)) {
                newList.add(one);
            }else{
                //脏数据
                errorList.add(new ErrModel(one.getBusinessId(),returnStr));
            }
        });
//        dataModels.stream().forEach(one -> {
//            String returnStr=one.isNull();
//            if (StringUtils.isEmpty(returnStr)) {
//                newList.add(one);
//            }else{
//                //脏数据
//                errorList.add(new ErrModel(one.getBusinessId(),returnStr));
//            }
//        });
        return new FilterModel(newList, errorList);
    }