wdy

alioss-java/pom.xml

@@ -49,7 +49,34 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.elasticsearch</groupId>
+			<artifactId>elasticsearch</artifactId>
+			<version>7.4.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.elasticsearch.client</groupId>
+			<artifactId>elasticsearch-rest-client</artifactId>
+			<version>7.4.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.elasticsearch.client</groupId>
+			<artifactId>elasticsearch-rest-high-level-client</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.elasticsearch</groupId>
+					<artifactId>elasticsearch</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.elasticsearch.client</groupId>
+					<artifactId>elasticsearch-rest-client</artifactId>
+				</exclusion>
+			</exclusions>
+			<version>7.4.0</version>
+		</dependency>
 	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>

alioss-java/src/main/java/com/example/aliossjava/companyName.java

+package com.example.aliossjava;
+
+
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.SearchHits;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.stereotype.Service;
+import java.util.*;
+
+/**
+ * @author shiming.zhao
+ * @date 2019/04/18
+ */
+@Service
+public class companyName {
+
+    public List<String> nameList(String region, String type, String modality, String nameNum, String goodName) throws Exception {
+        List<String> querycompanyNanme = querycompanyNanme(goodName,nameNum);
+        List<String> nameList = new ArrayList<>();
+        for (String str : querycompanyNanme){
+            JSONObject responseObj = JSONObject.parseObject(str);
+            nameList.add(region + responseObj.getString("company_name") + type + modality);
+        }
+        return nameList;
+    }
+
+    /**
+     * 根据条件查询公司名称
+     * @return
+     */
+    public static List<String> querycompanyNanme(String fieldKey,String fieldnum) throws Exception {
+        CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+        credentialsProvider.setCredentials(AuthScope.ANY,
+                new UsernamePasswordCredentials("elastic", "w3OL+51eo*)c=^7"));
+        RestClientBuilder client = RestClient.builder(new HttpHost("es-cn-zz11nl9y20001gczg.public.elasticsearch.aliyuncs.com", 9200))
+                .setHttpClientConfigCallback(new RestClientBuilder.HttpClientConfigCallback() {
+                    @Override
+                    public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) {
+                        return httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider);
+                    }
+                });
+        RestHighLevelClient restClient= new RestHighLevelClient(client);
+        SearchRequest searchRequest = new SearchRequest("treasure_name");
+        searchRequest.types("_doc");
+        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+        if (fieldnum.equals("不限") && fieldKey.equals("")){
+            searchSourceBuilder.query(QueryBuilders.boolQuery());
+        }
+        else if(fieldKey.equals("")){
+            searchSourceBuilder.query(QueryBuilders.boolQuery()
+                    .must(QueryBuilders.termQuery("name_size", Integer.valueOf(fieldnum))));
+        }
+        else if (fieldnum.equals("不限")){
+            searchSourceBuilder.query(QueryBuilders.boolQuery().
+                    must(QueryBuilders.termsQuery("company_name", fieldKey)));
+        }
+        else{
+            searchSourceBuilder.query(QueryBuilders.boolQuery().
+                    must(QueryBuilders.termsQuery("company_name", fieldKey))
+                    .must(QueryBuilders.termQuery("name_size", Integer.valueOf(fieldnum))));
+        }
+
+        searchRequest.source(searchSourceBuilder);
+        SearchResponse searchResponse = restClient.search(searchRequest, RequestOptions.DEFAULT);
+        List<String> result = new LinkedList<>();
+        SearchHits searchHits=searchResponse.getHits();
+        searchHits.forEach(i->{
+            result.add(i.getSourceAsString());
+        });
+        return result;
+    }
+
+}

alioss-java/src/main/java/com/example/aliossjava/uploadossapi.java

 package com.example.aliossjava;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpRequest;
 import org.springframework.web.bind.annotation.*;
 
@@ -7,10 +8,16 @@ import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import com.alibaba.fastjson.JSONObject;
 
+import java.util.List;
+
 
 @RestController
 public class uploadossapi {
 
+
+    @Autowired
+    private companyName companyName;
+
     /*
     * @RequestMapping 路由映射的注解
     * */
@@ -35,6 +42,30 @@ public class uploadossapi {
         }
     }
 
+
+    /**
+     *
+     * @param baseinfo
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping(value = "/getNames",method = RequestMethod.POST)
+    public List<String> companyName(@RequestBody @Valid String baseinfo) throws Exception {
+
+        try {
+            JSONObject jsonObject = JSONObject.parseObject(baseinfo);
+            String region=jsonObject.getString("region");
+            String type=jsonObject.getString("type");
+            String modality=jsonObject.getString("modality");
+            String nameNum=jsonObject.getString("nameNum");
+            String goodName=jsonObject.getString("goodName");
+            return companyName.nameList(region, type, modality, nameNum, goodName);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
     /*
    * @RequestMapping 路由映射的注解
    * */

alioss-java/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

-com\example\aliossjava\AliossJavaApplication.class
 com\example\aliossjava\testuploadossapi.class
+com\example\aliossjava\AliossJavaApplication.class
 com\example\aliossjava\uploadossapi.class
 com\example\aliossjava\utilupload.class

alioss-java/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

-D:\alidemo\zhichan\alioss-java\src\main\java\com\example\aliossjava\uploadossapi.java
-D:\alidemo\zhichan\alioss-java\src\main\java\com\example\aliossjava\utilupload.java
-D:\alidemo\zhichan\alioss-java\src\main\java\com\example\aliossjava\testuploadossapi.java
-D:\alidemo\zhichan\alioss-java\src\main\java\com\example\aliossjava\AliossJavaApplication.java
+F:\新建文件夹\alioss-java\zhichan\alioss-java\src\main\java\com\example\aliossjava\companyName.java
+F:\新建文件夹\alioss-java\zhichan\alioss-java\src\main\java\com\example\aliossjava\testuploadossapi.java
+F:\新建文件夹\alioss-java\zhichan\alioss-java\src\main\java\com\example\aliossjava\AliossJavaApplication.java
+F:\新建文件夹\alioss-java\zhichan\alioss-java\src\main\java\com\example\aliossjava\uploadossapi.java
+F:\新建文件夹\alioss-java\zhichan\alioss-java\src\main\java\com\example\aliossjava\utilupload.java

alioss-java/target/surefire-reports/com.example.aliossjava.AliossJavaApplicationTests.txt

 -------------------------------------------------------------------------------
 Test set: com.example.aliossjava.AliossJavaApplicationTests
 -------------------------------------------------------------------------------
-<<<<<<< HEAD
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.428 s - in com.example.aliossjava.AliossJavaApplicationTests
-=======
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.933 s - in com.example.aliossjava.AliossJavaApplicationTests
->>>>>>> 2862ef1fdb112a293158fc3a4e90950cf5be1ece
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.767 s - in com.example.aliossjava.AliossJavaApplicationTests