sunty
2021-07-27 801f4b3ef1789e9f167a9267825a8308230fcd5f
add total on deldata
2个文件已修改
39 ■■■■ 已修改文件
.idea/workspace.xml 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
EsApi.go 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.idea/workspace.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="ChangeListManager">
    <list default="true" id="2be7b635-bdd4-48e1-8bd6-40cf39b3fb96" name="Default Changelist" comment="" />
    <list default="true" id="2be7b635-bdd4-48e1-8bd6-40cf39b3fb96" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
    </list>
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -22,8 +24,8 @@
      <file pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/EsClient.go">
          <provider selected="true" editor-type-id="text-editor">
            <state relative-caret-position="456">
              <caret line="166" column="51" selection-start-line="166" selection-start-column="51" selection-end-line="166" selection-end-column="51" />
            <state relative-caret-position="2688">
              <caret line="166" selection-start-line="166" selection-end-line="166" />
            </state>
          </provider>
        </entry>
@@ -57,6 +59,8 @@
      <foldersAlwaysOnTop value="true" />
    </navigator>
    <panes>
      <pane id="PackagesPane" />
      <pane id="Scope" />
      <pane id="ProjectPane">
        <subPane>
          <expand>
@@ -68,8 +72,6 @@
          <select />
        </subPane>
      </pane>
      <pane id="PackagesPane" />
      <pane id="Scope" />
    </panes>
  </component>
  <component name="PropertiesComponent">
@@ -78,7 +80,7 @@
    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1591409471677" />
    <property name="go.gopath.indexing.explicitly.defined" value="true" />
    <property name="go.sdk.automatically.set" value="true" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/../jieba" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
  </component>
@@ -107,17 +109,17 @@
      <workItem from="1590646280118" duration="7715000" />
      <workItem from="1592791749821" duration="1208000" />
      <workItem from="1592795412897" duration="22000" />
      <workItem from="1627366945406" duration="26000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
    <option name="totallyTimeSpent" value="8945000" />
    <option name="totallyTimeSpent" value="8971000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
    <editor active="true" />
    <layout>
      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.11513859" />
      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.116204694" />
      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
      <window_info id="Image Layers" order="2" />
      <window_info id="Designer" order="3" />
@@ -160,8 +162,8 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/EsClient.go">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="456">
          <caret line="166" column="51" selection-start-line="166" selection-start-column="51" selection-end-line="166" selection-end-column="51" />
        <state relative-caret-position="2688">
          <caret line="166" selection-start-line="166" selection-end-line="166" />
        </state>
      </provider>
    </entry>
EsApi.go
@@ -1638,7 +1638,7 @@
}
//按日期范围,服务器Id删除数据
func DeleteAnalyServerData(serverIp string, serverPort string, indexName string, startTime string, endTime string, analyServerId string) (result bool, err error) {
func DeleteAnalyServerData(serverIp string, serverPort string, indexName string, startTime string, endTime string, analyServerId string) (total int, err error,) {
    url := "http://" + serverIp + ":" + serverPort + "/" + indexName + "/_delete_by_query"
    deleteJson := `{
    "query":{
@@ -1660,20 +1660,17 @@
        }
    }
}    `
    fmt.Println(url)
    fmt.Println(deleteJson)
    buf, err := EsReq("POST", url, []byte(deleteJson))
    if err != nil {
        return false, errors.New("请求失败")
        return -1, errors.New("请求失败")
    }
    deleteRes, err := SourceDeleted(buf)
    if err != nil {
        return false, errors.New("解码失败")
        return -1, errors.New("解码失败")
    }
    if deleteRes == -1 {
        result = false
    } else {
        result = true
    }
    return result, nil
    return deleteRes,nil
}
//给所有节点追加删除任务信息