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

# Conflicts:
#	common/common-entity/sql记录

svr/svr-cloud-care/src/main/resources/application.yml

@@ -456,7 +456,7 @@ es:
  type:
    Statistics: hlw_quota_prod
    FollowUpContent: wlyy_followup_content
  host:  http://10.18.43.40:9000
  host:  http://10.18.43.40:9200
  tHost: 10.18.43.40:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr

svr/svr-statistics-es/doc/es/命令建索引.txt

@@ -0,0 +1,10 @@
curl -XPUT http://10.18.43.40:9200/hlw_quota_prod
curl -XPUT http://10.18.43.40:9200/hlw_quota_prod/_mapping/hlw_quota_prod?pretty -d '{"properties": {
"deptName": {"type": "string",    "index": "not_analyzed"},  "city": {"type": "string",    "index": "not_analyzed"},  "slaveKey4Name": {"type": "string",  "index": "not_analyzed"},  "doctorName": {"type": "string",  "index": "not_analyzed"},  "cityName": {"type": "string",  "index": "not_analyzed"},
  "areaLevel": {"type": "string",  "index": "not_analyzed"},  "hospital": {"type": "string",  "index": "not_analyzed"},  "slaveKey3Name": {  "type": "string",  "index": "not_analyzed"},  "quotaDate": {
  "type": "date"},  "quotaCode": {  "type": "string",  "index": "not_analyzed"},  "result2": {  "type": "double"},  "result1": {  "type": "double"},  "slaveKey1": {  "type": "string",  "index": "not_analyzed"},  "slaveKey2": {  "type": "string",  "index": "not_analyzed"},  "townName": {  "type": "string",  "index": "not_analyzed"
},  "slaveKey3": {  "type": "string",  "index": "not_analyzed"},  "slaveKey4": {  "type": "string",  "index": "not_analyzed"},  "town": {  "type": "string",  "index": "not_analyzed"
},  "slaveKey2Name": {  "type": "string",  "index": "not_analyzed"},  "timeLevel": {  "type": "string",  "index": "not_analyzed"},  "dept": {  "type": "string",  "index": "not_analyzed"},  "hospitalName": {  "type": "string",  "index": "not_analyzed"
},  "doctor": {  "type": "string",  "index": "not_analyzed"},  "createTime": {  "type": "date"},  "slaveKey1Name": {  "type": "string",  "index": "not_analyzed"}}
}'

svr/svr-statistics-es/doc/es/统计新增索引.txt

@@ -1,114 +1,114 @@
创建索引
POST  http://172.19.103.68:9200/hlw_quota_test
POST  http://172.19.103.68:9200/hlw_quota_prod
查询索引
GET http://172.19.103.68:9200/hlw_quota_test/
GET http://172.19.103.68:9200/hlw_quota_prod/
给索引加mapping
POST http://172.19.103.68:9200/hlw_quota_test/hlw_quota_test/_mapping
POST http://172.19.103.68:9200/hlw_quota_prod/hlw_quota_prod/_mapping
{
    "hlw_quota_test": {
            "properties": {
                "quotaCode": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "city": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "cityName": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "town": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "townName": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "hospital": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "hospitalName": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "dept": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "deptName": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "doctor": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "doctorName": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey1": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey1Name": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey2": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey2Name": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey3": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey3Name": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey4": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "slaveKey4Name": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "areaLevel": {
                    "type": "string",
                    "index": "not_analyzed"
                }, 
               "timeLevel": {
                    "type": "string",
                    "index": "not_analyzed"
                },
                "result1": {
                    "type": "double"
                },
                "result2": {
                    "type": "double"
                },
                "quotaDate": {
                    "type": "date"
                },
                "createTime": {
                    "type": "date"
                }
    "hlw_quota_prod": {
        "properties": {
            "deptName": {
                "type": "string",
                "index": "not_analyzed"
            },
              "city": {
                "type": "string",
                "index": "not_analyzed"
            },
              "slaveKey4Name": {
              "type": "string",
              "index": "not_analyzed"
            },
              "doctorName": {
              "type": "string",
              "index": "not_analyzed"
            },
              "cityName": {
              "type": "string",
              "index": "not_analyzed"
            },
              "areaLevel": {
              "type": "string",
              "index": "not_analyzed"
            },
              "hospital": {
              "type": "string",
              "index": "not_analyzed"
            },
              "slaveKey3Name": {
              "type": "string",
              "index": "not_analyzed"
            },
              "quotaDate": {
              "type": "date"
            },
              "quotaCode": {
              "type": "string",
              "index": "not_analyzed"
            },
              "result2": {
              "type": "double"
            },
              "result1": {
              "type": "double"
            },
              "slaveKey1": {
              "type": "string",
              "index": "not_analyzed"
            },
              "slaveKey2": {
              "type": "string",
              "index": "not_analyzed"
            },
              "townName": {
              "type": "string",
              "index": "not_analyzed"
            },
              "slaveKey3": {
              "type": "string",
              "index": "not_analyzed"
            },
              "slaveKey4": {
              "type": "string",
              "index": "not_analyzed"
            },
              "town": {
              "type": "string",
              "index": "not_analyzed"
            },
              "slaveKey2Name": {
              "type": "string",
              "index": "not_analyzed"
            },
              "timeLevel": {
              "type": "string",
              "index": "not_analyzed"
            },
              "dept": {
              "type": "string",
              "index": "not_analyzed"
            },
              "hospitalName": {
              "type": "string",
              "index": "not_analyzed"
            },
              "doctor": {
              "type": "string",
              "index": "not_analyzed"
            },
              "createTime": {
              "type": "date"
            },
              "slaveKey1Name": {
              "type": "string",
              "index": "not_analyzed"
            }
          }
        }
  }
增加索引搜索大小
PUT  http://172.19.103.68:9200/hlw_quota_test/_settings
PUT  http://172.19.103.68:9200/hlw_quota_prod/_settings
{
  "index": {
    "max_result_window": 500000

svr/svr-statistics-es/doc/业务文档/命令行处理.txt

@@ -0,0 +1,13 @@
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=28'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=29'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=30'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=34'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=35'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=36'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=42'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startById?id=8'
curl -X GET --header 'Accept: application/json' 'http://10.18.43.41:8081/job/startNowById?id=8'

svr/svr-statistics-es/src/main/resources/application-hzprod.yml

@@ -32,7 +32,7 @@ es:
  pwflag: 1 # 1需要密码，0不需要密码
  index: hlw_quota_prod
  type: hlw_quota_prod
  host:  http://10.18.43.40:9000
  host:  http://10.18.43.40:9200
  tHost: 10.18.43.40:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr