Browse Source

由于不能操作dwd表,所以没有is_delete区别

DESKTOP-6LTVLN7\Liumouren 3 weeks ago
parent
commit
125d5b9142

+ 4 - 4
src/main/java/com/skyversation/poiaddr/service/AreaService.java

@@ -222,7 +222,7 @@ public class AreaService {
         if (splitAddress.getCommunity() == null) {
             splitAddress.setCommunity("");
         }
-        String sql = "select * from " + Constant.getSearchTableName() + " WHERE is_delete != 1 and city like '%" + splitAddress.getCity() + "%' " +
+        String sql = "select * from " + Constant.getSearchTableName() + " WHERE  city like '%" + splitAddress.getCity() + "%' " +
                 "and county like '%" + splitAddress.getDistrict() + "%' and town like '%" + splitAddress.getStreet() + "%' " +
                 "and community like '%" + splitAddress.getCommunity() + "%' order by updatetime desc LIMIT 20";
         try {
@@ -247,7 +247,7 @@ public class AreaService {
 
         List<Address> list = null;
         if (StringUtils.hasText(splitAddress.getDistrict())) {
-            String sql = "select * from " + Constant.getSearchTableName() + " WHERE is_delete != 1 and county like '%" + splitAddress.getDistrict() + "%' " +
+            String sql = "select * from " + Constant.getSearchTableName() + " WHERE  county like '%" + splitAddress.getDistrict() + "%' " +
                     "and (sourceaddress like '%" + splitAddress.getSearchAddr() + "%' or address like '%" + splitAddress.getSearchAddr() + "%') order by updatetime desc LIMIT 20";
             try {
                 list = odsToAddr(DbConnection.getInstance().runSqlStr(sql));
@@ -256,7 +256,7 @@ public class AreaService {
             }
         }
         if (list == null) {
-            String sql = "select * from " + Constant.getSearchTableName() + " WHERE is_delete != 1 and (sourceaddress like '%" + splitAddress.getSearchAddr() + "%' or address like '%" + splitAddress.getSearchAddr() + "%') order by updatetime desc LIMIT 20";
+            String sql = "select * from " + Constant.getSearchTableName() + " WHERE sourceaddress like '%" + splitAddress.getSearchAddr() + "%' or address like '%" + splitAddress.getSearchAddr() + "%' order by updatetime desc LIMIT 20";
             try {
                 list = odsToAddr(DbConnection.getInstance().runSqlStr(sql));
             } catch (Exception e) {
@@ -275,7 +275,7 @@ public class AreaService {
      */
     public List<Address> getAddressPoiOnlyDB(String addr) {
         try {
-            return odsToAddr(DbConnection.getInstance().runSqlStr("select * from " + Constant.getSearchTableName() + " WHERE is_delete != 1 and sourceaddress LIKE '%" + addr + "%' or address LIKE  '%" + addr + "%' order by updatetime desc LIMIT 20"));
+            return odsToAddr(DbConnection.getInstance().runSqlStr("select * from " + Constant.getSearchTableName() + " WHERE  sourceaddress LIKE '%" + addr + "%' or address LIKE  '%" + addr + "%' order by updatetime desc LIMIT 20"));
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 1 - 1
src/main/java/com/skyversation/poiaddr/service/impl/YyskAddressStandardizationServiceImpl.java

@@ -81,7 +81,7 @@ public class YyskAddressStandardizationServiceImpl {
                     likeStr = hjdz.substring(0,matcher.start());
                 }
                 String sql = "select sourceaddress,city,county,town,community from \n" + Constant.getSearchTableName() +
-                        "   where is_delete != 1 and county = '松江区' and town is not null and sourceaddress like '%"+likeStr+"%' limit 1";
+                        "   where  county = '松江区' and town is not null and sourceaddress like '%"+likeStr+"%' limit 1";
 
                 List<Map<String, Object>> dbData = DbConnection.getInstance().runSqlStr(sql);
                 if(dbData != null && dbData.size() == 1){