代码修改

svr/svr-quota/doc/es/hlw_quota_test.txt

@@ -5,35 +5,38 @@ get http://172.26.0.56:9200/hlw_quota_test
创建索引
PUT http://172.26.0.56:9200/hlw_quota_test
{
{   "settings":{
         "number_of_shards":5,
         "number_of_replicas":1
     },
    "mappings" :{
        "properties":{
            "deptName":{
                "type":"text"
                "type":"keyword"
            },
            "city":{
                "type":"text"
                "type":"keyword"
            },
            "slaveKey4Name":{
                "type":"text"
                "type":"keyword"
            },
            "doctorName":{
                "type":"text"
                "type":"keyword"
            },
            "cityName":{
                "type":"text"
                "type":"keyword"
            },
            "areaLevel":{
                "type":"text"
                "type":"keyword"
            },
            "id":{
                "type":"text"
                "type":"keyword"
            },
            "hospital":{
                "type":"text"
                "type":"keyword"
            },
            "slaveKey3Name":{
                "type":"text"
                "type":"keyword"
            },
            "quotaDate":{
                "type":"date"
@@ -51,43 +54,44 @@ PUT http://172.26.0.56:9200/hlw_quota_test
                "type":"double"
            },
            "slaveKey1":{
                "type":"text"
                "type":"keyword"
            },
            "slaveKey2":{
                "type":"text"
                "type":"keyword"
            },
            "townName":{
                "type":"text"
                "type":"keyword"
            },
            "slaveKey3":{
                "type":"text"
                "type":"keyword"
            },
            "slaveKey4":{
                "type":"text"
                "type":"keyword"
            },
            "town":{
                "type":"text"
                "type":"keyword"
            },
            "slaveKey2Name":{
                "type":"text"
                "type":"keyword"
            },
            "timeLevel":{
                "type":"text"
                "type":"keyword"
            },
            "dept":{
                "type":"text"
                "type":"keyword"
            },
            "hospitalName":{
                "type":"text"
                "type":"keyword"
            },
            "doctor":{
                "type":"text"
                "type":"keyword"
            },
            "createTime":{
                "type":"date"
                "type":"date",
                "format" : "strict_date_optional_time||epoch_millis"
            },
            "slaveKey1Name":{
                "type":"text"
                "type":"keyword"
            }
        }
    }

svr/svr-quota/src/main/java/com/yihu/jw/quota/etl/extract/ExtractUtil.java

@@ -330,6 +330,9 @@ public class ExtractUtil {
            if (saveModel != null) {
                saveModel.setResult(statisticsResultMap.get(key));
                saveModel.setQuotaDate(daySlaveDictMap.get(key));
                saveModel.setResult1(Double.parseDouble(saveModel.getResult()));
                saveModel.setResult2(Double.parseDouble(saveModel.getResult()));
                saveModel.setTimeLevel(dataLevel);
                returnList.add(saveModel);
            }
        }

svr/svr-quota/src/main/java/com/yihu/jw/quota/etl/extract/mysql/MysqlExtract.java

@@ -19,6 +19,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import java.time.LocalDate;
import java.util.*;
/**
@@ -94,7 +95,7 @@ public class MysqlExtract {
                        String result = map.get("result").toString();
                        String mapKey = keyVal.substring(0, keyVal.length() - 1);
                        resultMap.put(mapKey, result);
//                        daySlaveDictMap.put(mapKey, map.get("quotaDate").toString());
                        daySlaveDictMap.put(mapKey, map.get("quotaDate").toString());
                    }
                    TjQuotaDimensionSlave tjQuotaDimensionSlave = new TjQuotaDimensionSlave();
                    tjQuotaDimensionSlave.setQuotaCode(quotaVo.getCode());
@@ -144,12 +145,15 @@ public class MysqlExtract {
        if ( !StringUtils.isEmpty(timeKey)) {
            if ("2".equals(dataLevel)) {
                whereSql.append( " and " + timeKey + " < '" + endTime + "'");
                selectGroupField += " '"+ LocalDate.now().toString() +"' as quotaDate ,";
            }else{
                if ( !StringUtils.isEmpty(startTime) && !StringUtils.isEmpty(endTime)) {
                    whereSql.append(" and " + timeKey + " >= '" + startTime + "'");
                    whereSql.append( " and " + timeKey + " < '" + endTime + "'");
                }
                selectGroupField += " DATE_FORMAT(" + timeKey + ",'%Y-%m-%d') as quotaDate ,";
            }
            whereGroupField += timeKey;
//            if ( !StringUtils.isEmpty(esConfig.getFullQuery() ) && esConfig.getFullQuery().equals("true")) {
//                whereSql.append( " and " + timeKey + " < '" + endTime + "'");
//                selectGroupField += " '"+ LocalDate.now().toString() +"' as quotaDate ,";
@@ -161,8 +165,9 @@ public class MysqlExtract {
//                selectGroupField += " DATE_FORMAT(" + timeKey + ",'%Y-%m-%d') as quotaDate ,";
//            }
//            whereGroupField += timeKey;
        }else {
            whereGroupField = allField.substring(0,allField.length() - 1);
        }
        whereGroupField = allField.substring(0,allField.length() - 1);
        //拼接整个sql 语法
        StringBuffer sql = new StringBuffer();
        if(StringUtils.isEmpty(esConfig.getAggregation())){

svr/svr-quota/src/main/java/com/yihu/jw/quota/service/job/JobService.java

@@ -51,7 +51,7 @@ public class JobService {
            int endNum = 2;
            int startNum = 1;
            if(tjQuota.getDataLevel()==null||tjQuota.getDataLevel()==3){
                startNum = 1;
                startNum = 2;
                endNum = 2;
            }else if(tjQuota.getDataLevel()==1){
                startNum = 1;

svr/svr-quota/src/main/java/com/yihu/jw/quota/vo/SaveModel.java

@@ -1,5 +1,6 @@
package com.yihu.jw.quota.vo;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.searchbox.annotations.JestId;
import org.springframework.data.annotation.CreatedDate;
@@ -76,8 +77,9 @@ public class SaveModel {
    private String distinctField;   // 去重字段
    private String distinctFieldValue;   // 去重字段值
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ssZ")// 2017-06-24T11:51:30+080
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm")// 2017-06-24T11:51:30+080
    @CreatedDate
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;//创建时间
    private Date createDate;//档案入库时间