|
@@ -35,12 +35,9 @@ import co.elastic.clients.elasticsearch.core.*;
|
|
import co.elastic.clients.elasticsearch.core.search.Hit;
|
|
import co.elastic.clients.elasticsearch.core.search.Hit;
|
|
import co.elastic.clients.json.JsonData;
|
|
import co.elastic.clients.json.JsonData;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
-import com.alibaba.fastjson.JSONArray;
|
|
|
|
-import com.alibaba.fastjson2.JSONObject;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
-import org.elasticsearch.client.RequestOptions;
|
|
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.BeanUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.context.annotation.Lazy;
|
|
import org.springframework.context.annotation.Lazy;
|
|
@@ -588,6 +585,7 @@ public class EsService {
|
|
String s = format.format(customField.getCreateTime());
|
|
String s = format.format(customField.getCreateTime());
|
|
String dateStr = "\'" + s + "\'";
|
|
String dateStr = "\'" + s + "\'";
|
|
String projectId = "ctx._source.custom_field.project_id = " + customField.getProjectId() + ";";
|
|
String projectId = "ctx._source.custom_field.project_id = " + customField.getProjectId() + ";";
|
|
|
|
+ String taskId = "ctx._source.custom_field.task_id = " + customField.getTaskId() + ";";
|
|
String field = "ctx._source.custom_field.field=" + customField.getField() + ";";
|
|
String field = "ctx._source.custom_field.field=" + customField.getField() + ";";
|
|
String fieldType = "ctx._source.custom_field.field_type = " + customField.getFieldType() + ";";
|
|
String fieldType = "ctx._source.custom_field.field_type = " + customField.getFieldType() + ";";
|
|
String personId = "ctx._source.custom_field.person_id = " + customField.getPersonId() + ";";
|
|
String personId = "ctx._source.custom_field.person_id = " + customField.getPersonId() + ";";
|
|
@@ -595,7 +593,7 @@ public class EsService {
|
|
String fieldValue = "ctx._source.custom_field.field_value = " + valueField + ";";
|
|
String fieldValue = "ctx._source.custom_field.field_value = " + valueField + ";";
|
|
String statsValue = "ctx._source.custom_field.stats_value = " + valueStats;
|
|
String statsValue = "ctx._source.custom_field.stats_value = " + valueStats;
|
|
|
|
|
|
- String source = projectId + field + fieldType + personId + createTime + fieldValue + statsValue;
|
|
|
|
|
|
+ String source = projectId + taskId + field + fieldType + personId + createTime + fieldValue + statsValue;
|
|
InlineScript inlineScript = InlineScript.of(i -> i.lang("painless").source(source));
|
|
InlineScript inlineScript = InlineScript.of(i -> i.lang("painless").source(source));
|
|
Script script = Script.of(i -> i.inline(inlineScript));
|
|
Script script = Script.of(i -> i.inline(inlineScript));
|
|
Query query = QueryBuilders.term(i -> i.field("_id").value(id));
|
|
Query query = QueryBuilders.term(i -> i.field("_id").value(id));
|