merge

src/main/java/com/skyversation/poiaddr/addquery/AddressQueryEngine.java

@@ -60,8 +60,11 @@ public class AddressQueryEngine {
 //                System.out.println("数据库查询有结果！！！！");
                 JSONArray pois = new JSONArray();
                 pois.addAll(dbPois);
-                addressResult = new TransfromDataTool().gdV3ResultToResult(addr, pois, false);
-                if (addressResult != null && addressResult.getData() != null && addressResult.getData().size() > 0 && ifRuleData(addressResult.getData().get(0).getScore())) {
+                addressResult = new TransfromDataTool().gdV3ResultToResult(addr, pois, false);// 只做格式转换，和多选一，就可以了
+
+
+//                if (addressResult != null && addressResult.getData() != null && addressResult.getData().size() > 0 && ifRuleData(addressResult.getData().get(0).getScore())) {
+                if (addressResult != null && addressResult.getData() != null && addressResult.getData().size() > 0) {
                     addressResult.setCode(AddressResultEnum.GD_SUCCESS);
                     addressResult.setMessage("成功");
                     return getCjWgWgwByLoc(addressResult);

src/main/java/com/skyversation/poiaddr/service/AreaService.java

@@ -185,16 +185,16 @@ public class AreaService {
         }
 
         if (addr.contains("号")) {
-            addr = addr.substring(0, addr.lastIndexOf("号") + 1);
+            addr = addr.substring(0, addr.lastIndexOf("号"));// 红宝石50号   红宝石50    返回 红宝石503弄
         }
         if (addr.contains("弄")) {
-            addr = addr.substring(0, addr.lastIndexOf("弄") + 1);
+            addr = addr.substring(0, addr.lastIndexOf("弄"));
         }
         if (allAddressData.containsKey(addr)) {
             resultData.add(allAddressData.get(addr));
             return resultData;
         } else {
-            int sumSize = 100;
+            int sumSize = 20;
             for (String address : allAddressData.keySet()) {
                 if (address.contains(addr) && sumSize > 0) {
                     sumSize--;

src/main/resources/application.properties

@@ -9,8 +9,8 @@ spring.servlet.multipart.max-request-size=300MB
 #spring.datasource.password=root
 #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 # \u6570\u636E\u5E93\u914D\u7F6E\uFF08\u672C\u5730\u8C03\u8BD5\u73AF\u5883\uFF09
-#spring.datasource.url=jdbc:postgresql://127.0.0.1:5432/postgres?stringtype=unspecified&u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false&tinyInt1isBit=false
-spring.datasource.url=jdbc:postgresql://192.168.1.4:5432/postgres?stringtype=unspecified&u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false&tinyInt1isBit=false
+spring.datasource.url=jdbc:postgresql://127.0.0.1:5432/postgres?stringtype=unspecified&u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false&tinyInt1isBit=false
+#spring.datasource.url=jdbc:postgresql://192.168.1.4:5432/postgres?stringtype=unspecified&u003fuseUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&serverTimezone=PRC&useSSL=false&tinyInt1isBit=false
 spring.datasource.username=postgres
 #spring.datasource.password=WE176852439@lmx
 spring.datasource.password=SKYversation0816