Selaa lähdekoodia

项目结构修改

chenweida 7 vuotta sitten
vanhempi
commit
207b392444
46 muutettua tiedostoa jossa 654 lisäystä ja 27 poistoa
  1. 1 1
      common/common-data-es/pom.xml
  2. 0 0
      base/common-data-es/src/main/java/com/yihu/base/es/config/ElasticFactory.java
  3. 0 4
      common/common-data-es/src/main/java/com/yihu/jw/es/config/ElastricSearchSave.java
  4. 0 0
      base/common-data-es/src/main/java/com/yihu/base/es/config/model/SaveModel.java
  5. 0 0
      base/common-data-es/src/main/resources/template.yml
  6. 1 1
      common/common-data-hbase/pom.xml
  7. 0 0
      base/common-data-hbase/src/main/java/com/yihu/base/hbase/AbstractHBaseClient.java
  8. 0 0
      base/common-data-hbase/src/main/java/com/yihu/base/hbase/HBaseAdmin.java
  9. 0 0
      base/common-data-hbase/src/main/java/com/yihu/base/hbase/HBaseDao.java
  10. 0 0
      base/common-data-hbase/src/main/java/com/yihu/base/hbase/TableBundle.java
  11. 0 0
      base/common-data-hbase/src/main/java/com/yihu/base/hbase/config/HbaseConfig.java
  12. 0 0
      base/common-data-hbase/src/main/resources/hbase/core-site.xml
  13. 0 0
      base/common-data-hbase/src/main/resources/hbase/hbase-site.xml
  14. 0 0
      base/common-data-hbase/src/main/resources/hbase/hdfs-site.xml
  15. 1 1
      common/common-data-mysql/pom.xml
  16. 0 0
      base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/BaseJpaService.java
  17. 0 0
      base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/FieldCondition.java
  18. 0 0
      base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/ReturnIdPstCreator.java
  19. 0 0
      base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/URLHqlQueryParser.java
  20. 0 0
      base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/URLQueryParser.java
  21. 0 0
      base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/UpdatePstCallback.java
  22. 1 1
      common/common-data-redis/pom.xml
  23. 0 0
      base/common-data-redis/src/main/resources/template.yml
  24. 1 1
      common/common-data-solr/pom.xml
  25. 133 0
      base/common-data-solr/src/main/java/com/yihu/base/SolrAdmin.java
  26. 31 0
      base/common-data-solr/src/main/java/com/yihu/base/SolrContext.java
  27. 52 0
      base/common-data-solr/src/main/java/com/yihu/base/SolrPool.java
  28. 416 0
      base/common-data-solr/src/main/java/com/yihu/base/SolrUtil.java
  29. 1 1
      common/common-dfs/pom.xml
  30. 0 0
      base/common-log/pom.xml
  31. 0 0
      base/common-log/src/main/resources/consoleAppender_logback_demo.xml
  32. 0 0
      base/common-log/src/main/resources/dailyRollingFileAppender_logback_demo.xml
  33. 1 1
      common/common-mq/pom.xml
  34. 1 1
      common/common-quartz/pom.xml
  35. 0 0
      base/common-quartz/readme.MD
  36. 0 0
      base/common-quartz/src/main/java/com/yihu/base/config/quartz/DefaultJobFactory.java
  37. 0 0
      base/common-quartz/src/main/java/com/yihu/base/config/quartz/DefaultSchedulerConfig.java
  38. 0 0
      base/common-quartz/src/main/java/com/yihu/base/config/quartz/QuartzHelper.java
  39. 0 0
      base/common-quartz/src/main/resources/demo.yml
  40. 0 0
      base/common-quartz/src/main/resources/quartz.properties
  41. 0 0
      base/common-quartz/src/main/sql/QRTZ_BLOB_TRIGGERS.sql
  42. 1 1
      common/common-swagger/pom.xml
  43. 0 0
      base/common-swagger/readme.MD
  44. 0 0
      base/common-swagger/src/main/java/com/yihu/base/config/DefaultSwaggerConfig.java
  45. 12 12
      common-lib-parent-pom/pom.xml
  46. 1 2
      common/common-util/pom.xml

+ 1 - 1
common/common-data-es/pom.xml

@ -4,7 +4,7 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.jw</groupId>
        <groupId>com.yihu.base</groupId>
        <artifactId>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>

common/common-data-es/src/main/java/com/yihu/jw/es/config/ElasticFactory.java → base/common-data-es/src/main/java/com/yihu/base/es/config/ElasticFactory.java


+ 0 - 4
common/common-data-es/src/main/java/com/yihu/jw/es/config/ElastricSearchSave.java

@ -4,16 +4,12 @@ import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.es.config.model.SaveModel;
import io.searchbox.client.JestClient;
import io.searchbox.core.*;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import java.util.Date;
import java.util.List;
;

common/common-data-es/src/main/java/com/yihu/jw/es/config/model/SaveModel.java → base/common-data-es/src/main/java/com/yihu/base/es/config/model/SaveModel.java


common/common-data-es/src/main/resources/template.yml → base/common-data-es/src/main/resources/template.yml


+ 1 - 1
common/common-data-hbase/pom.xml

@ -4,7 +4,7 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.jw</groupId>
        <groupId>com.yihu.base</groupId>
        <artifactId>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>

common/common-data-hbase/src/main/java/com/yihu/ehr/hbase/AbstractHBaseClient.java → base/common-data-hbase/src/main/java/com/yihu/base/hbase/AbstractHBaseClient.java


common/common-data-hbase/src/main/java/com/yihu/ehr/hbase/HBaseAdmin.java → base/common-data-hbase/src/main/java/com/yihu/base/hbase/HBaseAdmin.java


common/common-data-hbase/src/main/java/com/yihu/ehr/hbase/HBaseDao.java → base/common-data-hbase/src/main/java/com/yihu/base/hbase/HBaseDao.java


common/common-data-hbase/src/main/java/com/yihu/ehr/hbase/TableBundle.java → base/common-data-hbase/src/main/java/com/yihu/base/hbase/TableBundle.java


common/common-data-hbase/src/main/java/com/yihu/ehr/hbase/config/HbaseConfig.java → base/common-data-hbase/src/main/java/com/yihu/base/hbase/config/HbaseConfig.java


common/common-data-hbase/src/main/resources/hbase/core-site.xml → base/common-data-hbase/src/main/resources/hbase/core-site.xml


common/common-data-hbase/src/main/resources/hbase/hbase-site.xml → base/common-data-hbase/src/main/resources/hbase/hbase-site.xml


common/common-data-hbase/src/main/resources/hbase/hdfs-site.xml → base/common-data-hbase/src/main/resources/hbase/hdfs-site.xml


+ 1 - 1
common/common-data-mysql/pom.xml

@ -4,7 +4,7 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.jw</groupId>
        <groupId>com.yihu.base</groupId>
        <artifactId>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>

common/common-data-mysql/src/main/java/com/yihu/jw/mysql/query/BaseJpaService.java → base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/BaseJpaService.java


common/common-data-mysql/src/main/java/com/yihu/jw/mysql/query/FieldCondition.java → base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/FieldCondition.java


common/common-data-mysql/src/main/java/com/yihu/jw/mysql/query/ReturnIdPstCreator.java → base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/ReturnIdPstCreator.java


common/common-data-mysql/src/main/java/com/yihu/jw/mysql/query/URLHqlQueryParser.java → base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/URLHqlQueryParser.java


common/common-data-mysql/src/main/java/com/yihu/jw/mysql/query/URLQueryParser.java → base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/URLQueryParser.java


common/common-data-mysql/src/main/java/com/yihu/jw/mysql/query/UpdatePstCallback.java → base/common-data-mysql/src/main/java/com/yihu/base/mysql/query/UpdatePstCallback.java


+ 1 - 1
common/common-data-redis/pom.xml

@ -4,7 +4,7 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.jw</groupId>
        <groupId>com.yihu.base</groupId>
        <artifactId>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>

common/common-data-redis/src/main/resources/template.yml → base/common-data-redis/src/main/resources/template.yml


+ 1 - 1
common/common-data-solr/pom.xml

@ -4,7 +4,7 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.jw</groupId>
        <groupId>com.yihu.base</groupId>
        <artifactId>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>

+ 133 - 0
base/common-data-solr/src/main/java/com/yihu/base/SolrAdmin.java

@ -0,0 +1,133 @@
package com.yihu.base;
import org.apache.commons.collections.map.HashedMap;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.response.UpdateResponse;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrInputDocument;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * Solr底层操作类
 *
 * @author hzp
 * @version 1.0
 * @created 2017.05.06
 */
@Service
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
public class SolrAdmin {
    @Autowired
    SolrPool pool;
    /************************* 基础操作 **************************************************/
    /**
     * 新建单条索引
     */
    public Boolean create(String core,Map<String, Object> map) throws Exception {
        SolrClient client = pool.getConnection(core);
        SolrInputDocument doc = new SolrInputDocument();
        //注意date的格式,要进行适当的转化
        for(String key:map.keySet())
        {
            doc.addField(key, map.get(key));
        }
        UpdateResponse re = client.add(doc);
        client.commit();
        pool.close(core); //释放连接
        if(re.getStatus()!=0) {
            System.out.print("create index cost " + re.getQTime());
            return true;
        }
        else{
            System.out.print("create index faild!");
            return false;
        }
    }
    /**
     * 修改单条索引单字段
     */
    public Boolean update(String core,String uniqueKey,String uniqueKeyValue,String key,Object value) throws Exception {
        Map<String,Object> map = new HashedMap();
        map.put(key,value);
        return update(core,uniqueKey+":"+uniqueKeyValue,map);
    }
    /**
     * 修改索引多字段
     */
    public Boolean update(String core,String keyQuery,Map<String, Object> map) throws Exception {
        SolrClient client = pool.getConnection(core);
        QueryResponse qr = client.query(new SolrQuery(keyQuery));
        SolrDocumentList docs = qr.getResults();
        if(docs!=null && docs.size()>0)
        {
            List<SolrInputDocument> solrList = new ArrayList<>();
            for(int i=0;i<docs.size();i++)
            {
                SolrDocument doc = docs.get(i);
                SolrInputDocument newItem = new SolrInputDocument();
                newItem.addField("rowkey",doc.get("rowkey"));
                for(String key :map.keySet())
                {
                    newItem.addField(key,map.get(key));
                }
                solrList.add(newItem);
            }
            UpdateResponse re = client.add(solrList);
            client.commit();
            pool.close(core); //释放连接
            if(re.getStatus()!=0) {
                System.out.print("update index cost " + re.getQTime());
                return true;
            }
            else{
                System.out.print("update index faild!");
                return false;
            }
        }
        else{
            System.out.print("Null result!");
        }
        return true;
    }
    /**
     * 删除单条索引
     */
    public Boolean delete(String core,String keyQuery) throws Exception {
        SolrClient client = pool.getConnection(core);
        UpdateResponse de = client.deleteByQuery(keyQuery);
        client.commit();
        pool.close(core); //释放连接
        if(de.getStatus()!=0) {
            System.out.print("delete index cost " + de.getQTime());
            return true;
        }
        else{
            System.out.print("delete index faild!");
            return false;
        }
    }
}

+ 31 - 0
base/common-data-solr/src/main/java/com/yihu/base/SolrContext.java

@ -0,0 +1,31 @@
package com.yihu.base;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.solr.core.SolrTemplate;
/**
 * Solr配置。仅支持SolrCloud,不支持单核模式。
 *
 * @author Sand
 * @version 1.0
 * @created 2016.04.18 18:47
 */
@Configuration
public class SolrContext {
    @Value("${spring.data.solr.zk-host}")
    String zkHost;
    @Bean
    public SolrClient solrClient() {
        return new CloudSolrClient(zkHost);
    }
    @Bean
    public SolrTemplate solrTemplate(SolrClient solrClient) throws Exception {
        return new SolrTemplate(solrClient);
    }
}

+ 52 - 0
base/common-data-solr/src/main/java/com/yihu/base/SolrPool.java

@ -0,0 +1,52 @@
package com.yihu.base;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.data.solr.server.support.MulticoreSolrClientFactory;
import org.springframework.stereotype.Service;
/**
 * Solr连接池
 * @author hzp
 * @version 1.0
 * @created 2016.04.26
 */
@Service
@Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
public class SolrPool {
    @Value("${spring.data.solr.zk-host}")
    String zkHost;
    private MulticoreSolrClientFactory factory;
    protected MulticoreSolrClientFactory getFactory(){
        if(factory==null)
        {
            CloudSolrClient client = new CloudSolrClient(zkHost);
            factory = new MulticoreSolrClientFactory(client);
        }
        return factory;
    }
    /**
     * 获取连接
     */
    public SolrClient getConnection(String core) throws Exception{
        return getFactory().getSolrClient(core);
    }
    /**
     * 关闭连接
     */
    public void close(String core) throws Exception{
        getFactory().removeSolrClient(core);
    }
}

+ 416 - 0
base/common-data-solr/src/main/java/com/yihu/base/SolrUtil.java

@ -0,0 +1,416 @@
eeepackage com.yihu.base;
import org.apache.commons.lang3.StringUtils;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.response.*;
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.params.FacetParams;
import org.apache.solr.common.util.NamedList;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * Solr底层查询类
 *
 * @author hzp
 * @version 1.0
 * @created 2016.04.26
 */
@Service
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
public class SolrUtil {
    @Autowired
    SolrPool pool;
    private final static String ASC = "asc";
    /**
     * 获取查询耗时
     */
    private int qtime;
    private int getQtime() {
        return qtime;
    }
    /************************** 查询操作 *****************************************************/
    /**
     * 简单查询方法
     */
    public SolrDocumentList query(String tablename, String q, Map<String, String> sort, long start, long rows) throws Exception {
        return query(tablename, q, null, sort, start, rows);
    }
    /**
     * Solr查询方法
     *
     * @param q     查询字符串
     * @param fq    过滤查询
     * @param sort  过滤条件
     * @param start 查询起始行
     * @param rows  查询行数
     * @return
     */
    public SolrDocumentList query(String core, String q, String fq, Map<String, String> sort, long start, long rows) throws Exception {
        SolrClient conn = pool.getConnection(core);
        SolrQuery query = new SolrQuery();
        if (null != q && !q.equals("")) //设置查询条件
        {
            query.setQuery(q);
        } else {
            query.setQuery("*:*");
        }
        if (null != fq && !fq.equals("")) //设置过滤条件
        {
            query.setFilterQueries(fq);
        }
        query.setStart(Integer.parseInt(String.valueOf(start)));//设置查询起始行
        query.setRows(Integer.parseInt(String.valueOf(rows)));//设置查询行数
        //设置排序
        if (sort != null) {
            for (Object co : sort.keySet()) {
                if (ASC == sort.get(co).toLowerCase() || ASC.equals(sort.get(co).toLowerCase())) {
                    query.addSort(co.toString(), SolrQuery.ORDER.asc);
                } else {
                    query.addSort(co.toString(), SolrQuery.ORDER.desc);
                }
            }
        }
        QueryResponse rsp = conn.query(query);
        qtime = rsp.getQTime();
        System.out.print("Solr Query Time:" + qtime);
        SolrDocumentList docs = rsp.getResults();
        pool.close(core); //释放连接
        return docs;
    }
    /******************************* Count 统计 ***********************************************/
    /**
     * 总数查询方法
     */
    public long count(String core, String q) throws Exception {
        return count(core, q, null);
    }
    /**
     * 总数查询方法
     */
    public long count(String core, String q, String fq) throws Exception {
        SolrClient conn = pool.getConnection(core);
        SolrQuery query = new SolrQuery();
        if (null != q && !q.equals("")) //设置查询条件
        {
            query.setQuery(q);
        } else {
            query.setQuery("*:*");
        }
        if (null != fq && !fq.equals("")) //设置过滤条件
        {
            query.setFilterQueries(fq);
        }
        query.setStart(0);
        query.setRows(0);
        QueryResponse rsp = conn.query(query);
        Integer start =  (int)rsp.getResults().getNumFound();
        query.setStart(start);
        rsp = conn.query(query);
        qtime = rsp.getQTime();
        System.out.print("Solr Count Time:" + qtime);
        SolrDocumentList docs = rsp.getResults();
        pool.close(core);
        return docs.getNumFound();
    }
    /**
     * 单组分组Count统计(start从0开始)
     */
    public Map<String, Long> groupCount(String core, String q, String fq, String groupField, int start, int rows) throws Exception {
        SolrClient conn = pool.getConnection(core);
        SolrQuery query = new SolrQuery();
        if (null != q && !q.equals("")) //设置查询条件
        {
            query.setQuery(q);
        } else {
            query.setQuery("*:*");
        }
        if (null != fq && !fq.equals("")) //设置过滤条件
        {
            query.setFilterQueries(fq);
        }
        query.setFacet(true);//设置facet=on
        query.setRows(0);
        query.addFacetField(groupField);
        query.setFacetLimit(rows);//限制每次返回结果数
        query.set(FacetParams.FACET_OFFSET, start);
        query.setFacetMissing(false);//不统计null的值
        query.setFacetMinCount(0);// 设置返回的数据中每个分组的数据最小值,比如设置为0,则统计数量最小为0,不然不显示
        QueryResponse rsp = conn.query(query);
        List<FacetField.Count> countList = rsp.getFacetField(groupField).getValues();
        qtime = rsp.getQTime();
        System.out.print("Solr Group Time:" + qtime);
        Map<String, Long> rmap = new HashMap<String, Long>();
        for (FacetField.Count count : countList) {
            if (count.getCount() > 0)
                rmap.put(count.getName(), (long) count.getCount());
        }
        pool.close(core);
        return rmap;
    }
    /**
     * 多组分组Count(独立计算)
     */
    public List<FacetField> groupCount(String core, String q, String fq, String[] groups) throws Exception {
        SolrClient conn = pool.getConnection(core);
        SolrQuery query = new SolrQuery();
        if (null != q && !q.equals("")) //设置查询条件
        {
            query.setQuery(q);
        } else {
            query.setQuery("*:*");
        }
        if (null != fq && !fq.equals("")) //设置过滤条件
        {
            query.setFilterQueries(fq);
        }
        query.setFacet(true);//设置facet=on
        query.setRows(0);
        query.addFacetField(groups);
        query.setFacetLimit(1000);//限制每次返回结果数
        query.set(FacetParams.FACET_OFFSET, 0);
        query.setFacetMissing(true);//不统计null的值
        query.setFacetMinCount(0);// 设置返回的数据中每个分组的数据最小值,比如设置为0,则统计数量最小为0,不然不显示
        QueryResponse rsp = conn.query(query);
        qtime = rsp.getQTime();
        System.out.print("Solr Group Time:" + qtime);
        List<FacetField> facets = rsp.getFacetFields();
        pool.close(core);
        return facets;
    }
    /**
     * 多组分组Count统计(关联计算)
     *
     * @return
     */
    public List<PivotField> groupCountMult(String core, String q, String fq, String groupFields, int start, int rows) throws Exception {
        SolrClient conn = pool.getConnection(core);
        SolrQuery query = new SolrQuery();
        if (null != q && !q.equals("")) //设置查询条件
        {
            query.setQuery(q);
        } else {
            query.setQuery("*:*");
        }
        if (null != fq && !fq.equals("")) //设置过滤条件
        {
            query.setFilterQueries(fq);
        }
        query.setFacet(true);//设置facet=on
        query.setRows(0);
        query.addFacetPivotField(groupFields);
        query.setFacetLimit(rows);//限制每次返回结果数
        query.setFacetMissing(false);//不统计null的值
        query.setFacetMinCount(0);// 设置返回的数据中每个分组的数据最小值,比如设置为0,则统计数量最小为0,不然不显示
        QueryResponse rsp = conn.query(query);
        qtime = rsp.getQTime();
        System.out.print("Solr Group Time:" + qtime);
        NamedList<List<PivotField>> namedList = rsp.getFacetPivot();
        pool.close(core);
        if (namedList != null && namedList.size() > 0) {
            return namedList.getVal(0);
        } else
            return null;
    }
    /**************************** 数值统计 ******************************************/
    /**
     * 分组数值统计
     *
     * @param core       表名
     * @param q          查询条件
     * @param statsField 统计字段
     * @param groupField 分组字段
     * @return
     */
    public List<FieldStatsInfo> getStats(String core, String q, String fq, String statsField, String groupField) throws Exception {
        SolrClient conn = pool.getConnection(core);
        SolrQuery query = new SolrQuery();
        if (null != q && !q.equals("")) //设置查询条件
        {
            query.setQuery(q);
        } else {
            query.setQuery("*:*");
        }
        if (null != fq && !fq.equals("")) //设置过滤条件
        {
            query.setFilterQueries(fq);
        }
        query.addGetFieldStatistics(statsField);
        query.addStatsFieldFacets(statsField, groupField);
        query.setRows(0);
        QueryResponse rsp = conn.query(query);
        qtime = rsp.getQTime();
        System.out.print("Solr Stats Time:" + qtime);
        Map<String, FieldStatsInfo> stats = rsp.getFieldStatsInfo();
        pool.close(core);
        if (stats != null && stats.size() > 0) {
            Map<String, List<FieldStatsInfo>> map = stats.get(statsField).getFacets();
            if (map != null) {
                return map.get(groupField);
            }
        }
        return null;
    }
    /**
     * 查询统计
     *
     * @param core       表名
     * @param facetQuery 查询条件
     * @return
     * @throws Exception
     */
    public Map<String, Integer> getFacetQuery(String core, String facetQuery) throws Exception {
        SolrClient conn = pool.getConnection(core);
        SolrQuery query = new SolrQuery();
        query.setQuery("*:*");
        query.setFacet(true);
        query.addFacetQuery(facetQuery);
        QueryResponse resp = conn.query(query);
        return resp.getFacetQuery();
    }
    /**
     * 单字段分组统计
     *
     * @param core
     * @param facetField
     * @param fq
     * @param minCount
     * @param start
     * @param limit
     * @param missing
     * @return
     * @throws Exception
     */
    public FacetField getFacetField(String core, String facetField, String fq, int minCount, int start, int limit, boolean missing) throws Exception {
        SolrClient conn = pool.getConnection(core);
        SolrQuery query = new SolrQuery();
        query.setQuery("*:*");
        if (!StringUtils.isBlank(fq)) {
            query.setFilterQueries(fq);
        }
        query.setStart(start)
                .setRows(0)
                .setFacet(true)
                .addFacetField(facetField)
                .setFacetMinCount(minCount)
                .setFacetLimit(limit)
                .setFacetMissing(missing);
        QueryResponse resp = conn.query(query);
        return resp.getFacetField(facetField);
    }
    /**
     * 日期范围分组统计
     *
     * @param core
     * @param dateField
     * @param startTime
     * @param endTime
     * @param grap
     * @param fq
     * @return
     * @throws Exception
     */
    public List<RangeFacet> getFacetDateRange(String core, String dateField, Date startTime, Date endTime, String grap, String fq) throws Exception {
        SolrClient conn = pool.getConnection(core);
        SolrQuery query = new SolrQuery();
        query.setQuery("*:*");
        if (!StringUtils.isBlank(fq)) {
            query.setFilterQueries(fq);
        }
        query.setRows(0)
               .setFacet(true)
               .addDateRangeFacet(dateField, startTime, endTime, grap);
        QueryResponse resp = conn.query(query);
        return resp.getFacetRanges();
    }
    /**
     * 数值型字段范围统计
     *
     * @param core
     * @param numField
     * @param start
     * @param end
     * @param grap
     * @param fq
     * @return
     * @throws Exception
     */
    public List<RangeFacet> getFacetNumRange(String core, String numField, int start, int end, int grap, String fq) throws Exception {
        SolrClient conn = pool.getConnection(core);
        SolrQuery query = new SolrQuery();
        query.setQuery("*:*");
        if (!StringUtils.isBlank(fq)) {
            query.setFilterQueries(fq);
        }
        query.setRows(0)
                .setFacet(true)
                .addNumericRangeFacet(numField, start, end, grap);
        QueryResponse resp = conn.query(query);
        return resp.getFacetRanges();
    }
}

+ 1 - 1
common/common-dfs/pom.xml

@ -4,7 +4,7 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.jw</groupId>
        <groupId>com.yihu.base</groupId>
        <artifactId>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>

common/common-log/pom.xml → base/common-log/pom.xml


common/common-log/src/main/resources/consoleAppender_logback_demo.xml → base/common-log/src/main/resources/consoleAppender_logback_demo.xml


common/common-log/src/main/resources/dailyRollingFileAppender_logback_demo.xml → base/common-log/src/main/resources/dailyRollingFileAppender_logback_demo.xml


+ 1 - 1
common/common-mq/pom.xml

@ -4,7 +4,7 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.jw</groupId>
        <groupId>com.yihu.base</groupId>
        <artifactId>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>

+ 1 - 1
common/common-quartz/pom.xml

@ -4,7 +4,7 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.jw</groupId>
        <groupId>com.yihu.base</groupId>
        <artifactId>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>

common/common-quartz/readme.MD → base/common-quartz/readme.MD


common/common-quartz/src/main/java/com/yihu/jw/config/quartz/DefaultJobFactory.java → base/common-quartz/src/main/java/com/yihu/base/config/quartz/DefaultJobFactory.java


common/common-quartz/src/main/java/com/yihu/jw/config/quartz/DefaultSchedulerConfig.java → base/common-quartz/src/main/java/com/yihu/base/config/quartz/DefaultSchedulerConfig.java


common/common-quartz/src/main/java/com/yihu/jw/config/quartz/QuartzHelper.java → base/common-quartz/src/main/java/com/yihu/base/config/quartz/QuartzHelper.java


common/common-quartz/src/main/resources/demo.yml → base/common-quartz/src/main/resources/demo.yml


common/common-quartz/src/main/resources/quartz.properties → base/common-quartz/src/main/resources/quartz.properties


common/common-quartz/src/main/sql/QRTZ_BLOB_TRIGGERS.sql → base/common-quartz/src/main/sql/QRTZ_BLOB_TRIGGERS.sql


+ 1 - 1
common/common-swagger/pom.xml

@ -4,7 +4,7 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.jw</groupId>
        <groupId>com.yihu.base</groupId>
        <artifactId>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>

common/common-swagger/readme.MD → base/common-swagger/readme.MD


common/common-swagger/src/main/java/com/yihu/jw/config/DefaultSwaggerConfig.java → base/common-swagger/src/main/java/com/yihu/base/config/DefaultSwaggerConfig.java


+ 12 - 12
common-lib-parent-pom/pom.xml

@ -10,7 +10,7 @@
        <relativePath>../svr-lib-parent-pom/pom.xml</relativePath>
    </parent>
    <groupId>com.yihu.jw</groupId>
    <groupId>com.yihu.base</groupId>
    <artifactId>common-lib-parent-pom</artifactId>
    <version>1.0.0</version>
    <packaging>pom</packaging>
@ -20,20 +20,20 @@
        <module>../common/common-rest-model</module>
        <module>../common/common-exception</module>
        <module>../common/common-request-mapping</module>
        <module>../common/common-swagger</module>
        <module>../common/common-util</module>
        <module>../common/common-quartz</module>
        <module>../common/common-log</module>
        <module>../common/common-dfs</module>
        <module>../common/common-mq</module>
        <module>../base/common-swagger</module>
        <module>../base/common-quartz</module>
        <module>../base/common-log</module>
        <module>../base/common-dfs</module>
        <module>../base/common-mq</module>
        <module>../common/common-data-es</module>
        <module>../common/common-data-solr</module>
        <module>../common/common-data-mysql</module>
        <module>../common/common-data-redis</module>
        <module>../common/common-data-hbase</module>
        <module>../base/common-data-es</module>
        <module>../base/common-data-solr</module>
        <module>../base/common-data-mysql</module>
        <module>../base/common-data-redis</module>
        <module>../base/common-data-hbase</module>
    </modules>
</project>

+ 1 - 2
common/common-util/pom.xml

@ -4,12 +4,11 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.yihu.jw</groupId>
        <groupId>com.yihu.base</groupId>
        <artifactId>common-lib-parent-pom</artifactId>
        <version>1.0.0</version>
        <relativePath>../../common-lib-parent-pom/pom.xml</relativePath>
    </parent>
    <groupId>com.yihu.jw</groupId>
    <artifactId>common-util</artifactId>
    <version>1.0.0</version>