调整util目录

src/main/java/com/yihu/quota/controller/ElasticSearchController.java

@@ -7,8 +7,8 @@ import com.yihu.ehr.elasticsearch.ElasticSearchUtil;
import com.yihu.ehr.elasticsearch.config.ElasticSearchConfig;
import com.yihu.ehr.query.services.SolrQuery;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.quota.etl.util.ElasticsearchUtil;
import com.yihu.quota.etl.util.EsClientUtil;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.util.EsClientUtil;
import com.yihu.quota.vo.PersonalInfoModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

src/main/java/com/yihu/quota/etl/extract/ExtractPercentHelper.java

@@ -3,8 +3,8 @@ package com.yihu.quota.etl.extract;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.quota.etl.extract.es.EsExtract;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.etl.util.ElasticsearchUtil;
import com.yihu.quota.etl.util.EsClientUtil;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.util.EsClientUtil;
import com.yihu.quota.model.jpa.TjQuota;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;

src/main/java/com/yihu/quota/etl/extract/es/EsExtract.java

@@ -5,8 +5,8 @@ import com.yihu.ehr.util.datetime.DateUtil;
import com.yihu.quota.etl.Contant;
import com.yihu.quota.etl.extract.ExtractUtil;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.etl.util.ElasticsearchUtil;
import com.yihu.quota.etl.util.EsClientUtil;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.util.EsClientUtil;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.service.orgHealthCategory.OrgHealthCategoryStatisticsService;

src/main/java/com/yihu/quota/etl/extract/es/EsResultExtract.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.elasticsearch.ElasticSearchPool;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.etl.util.ElasticsearchUtil;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.model.jpa.TjQuota;
import com.yihu.quota.model.jpa.save.TjDataSave;
import com.yihu.quota.model.jpa.save.TjQuotaDataSave;

src/main/java/com/yihu/quota/etl/save/LargDataWithRunnable.java

@@ -1,7 +1,7 @@
package com.yihu.quota.etl.save;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.etl.util.EsClientUtil;
import com.yihu.quota.util.EsClientUtil;
import com.yihu.quota.vo.SaveModel;
import io.searchbox.client.JestClient;
import io.searchbox.core.Bulk;

src/main/java/com/yihu/quota/etl/save/es/ElastricSearchSave.java

@@ -3,7 +3,7 @@ package com.yihu.quota.etl.save.es;
import com.yihu.quota.etl.Contant;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.etl.save.LargDataWithRunnable;
import com.yihu.quota.etl.util.EsClientUtil;
import com.yihu.quota.util.EsClientUtil;
import com.yihu.quota.vo.SaveModel;
import io.searchbox.client.JestClient;
import io.searchbox.core.Bulk;

src/main/java/com/yihu/quota/job/EsQuotaJob.java

@@ -7,7 +7,7 @@ import com.yihu.quota.etl.extract.ExtractHelper;
import com.yihu.quota.etl.extract.solr.SolrExtract;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.etl.save.SaveHelper;
import com.yihu.quota.etl.util.ElasticsearchUtil;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.model.jpa.TjQuotaLog;
import com.yihu.quota.model.jpa.source.TjQuotaDataSource;
import com.yihu.quota.service.source.TjDataSourceService;

src/main/java/com/yihu/quota/job/EsQuotaPercentJob.java

@@ -6,8 +6,8 @@ import com.yihu.quota.etl.extract.ExtractHelper;
import com.yihu.quota.etl.extract.ExtractPercentHelper;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.etl.save.SaveHelper;
import com.yihu.quota.etl.util.ElasticsearchUtil;
import com.yihu.quota.etl.util.EsClientUtil;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.util.EsClientUtil;
import com.yihu.quota.model.jpa.TjQuotaLog;
import com.yihu.quota.util.SpringUtil;
import com.yihu.quota.vo.QuotaVo;

src/main/java/com/yihu/quota/service/quota/BaseStatistsService.java

@@ -6,7 +6,7 @@ import com.yihu.quota.dao.TjQuotaDao;
import com.yihu.quota.dao.TjQuotaGovProvisionDao;
import com.yihu.quota.etl.extract.es.EsResultExtract;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.etl.util.ElasticsearchUtil;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.model.jpa.TjQuota;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;

src/main/java/com/yihu/quota/service/singledisease/SingleDiseaseService.java

@@ -1,7 +1,7 @@
package com.yihu.quota.service.singledisease;
import com.yihu.quota.etl.extract.es.EsExtract;
import com.yihu.quota.etl.util.ElasticsearchUtil;
import com.yihu.quota.util.ElasticsearchUtil;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

src/main/java/com/yihu/quota/service/singledisease/SingleDiseaseServiceNew.java

@@ -1,7 +1,7 @@
package com.yihu.quota.service.singledisease;
import com.yihu.quota.etl.extract.es.EsExtract;
import com.yihu.quota.etl.util.ElasticsearchUtil;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.vo.DictModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;

src/main/java/com/yihu/quota/etl/util/ElasticsearchUtil.java

@@ -1,4 +1,4 @@
package com.yihu.quota.etl.util;
package com.yihu.quota.util;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;

src/main/java/com/yihu/quota/etl/util/EsClientUtil.java

@@ -1,4 +1,4 @@
package com.yihu.quota.etl.util;
package com.yihu.quota.util;
import com.yihu.quota.etl.extract.es.EsExtract;

src/main/java/com/yihu/quota/util/IdCardUtil.java

@@ -1,80 +0,0 @@
package com.yihu.quota.util;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
/**
 * Created by Administrator on 2016.08.17.
 * 身份证工具类
 */
public class IdCardUtil {
    /**
     * 根据身份证的号码算出当前身份证持有者的年龄
     *
     * @param
     * @throws Exception
     */
    public static int getAgeForIdcard(String idcard) {
        try {
            int age = 0;
            if (org.springframework.util.StringUtils.isEmpty(idcard)) {
                return age;
            }
            String birth = "";
            if (idcard.length() == 18) {
                birth = idcard.substring(6, 14);
            } else if (idcard.length() == 15) {
                birth = "19" + idcard.substring(6, 12);
            } else {
                return 0;
            }
            int year = Integer.valueOf(birth.substring(0, 4));
            int month = Integer.valueOf(birth.substring(4, 6));
            int day = Integer.valueOf(birth.substring(6));
            Calendar cal = Calendar.getInstance();
            age = cal.get(Calendar.YEAR) - year;
            //周岁计算
            if (cal.get(Calendar.MONTH) < (month - 1) || (cal.get(Calendar.MONTH) == (month - 1) && cal.get(Calendar.DATE) < day)) {
                age--;
            }
            return age;
        } catch (Exception e) {
            return 0;
        }
    }
    /**
     * 身份证提取出身日期
     *
     * @param card
     * @return
     * @throws Exception
     */
    public static Date getBirthdayForIdcard(String card)
            throws Exception {
        Date b = null;
        if (card.length() == 18) {
            String year = card.substring(6).substring(0, 4);// 得到年份
            String yue = card.substring(10).substring(0, 2);// 得到月份
            String ri = card.substring(12).substring(0, 2);// 得到日
            // String day=CardCode.substring(12).substring(0,2);//得到日
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
            b = format.parse(year + "-" + yue + "-" + ri);
        } else if (card.length() == 15) {
            String uyear = "19" + card.substring(6, 8);// 年份
            String uyue = card.substring(8, 10);// 月份
            String uri = card.substring(10, 12);// 得到日
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
            b = format.parse(uyear + "-" + uyue + "-" + uri);
        }
        return b;
    }
}