修复一些bug

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

@@ -71,7 +71,11 @@ public class AddressQueryEngine {
         //先走yysz_address
         AddressResult yyszAddressResult =null;
         yyszAddressResult = yyszMultiSearch(addrs, level );
-        if (yyszAddressResult != null) return yyszAddressResult;
+        if (yyszAddressResult != null){
+            return yyszAddressResult;
+        }else {
+            System.out.println("yysz_address地址" + addrs + "未查询到数据！");
+        }
         if (!Objects.equals(netType, "internet")) {
             //武大
             if (Objects.equals(netType, "qingpu")) {
@@ -275,14 +279,12 @@ public class AddressQueryEngine {
                 return AddressTools.getInstance().faildQuery(AddressResultEnum.RESULT_NULL, "搜索无结果");
             try {
                 AddressResult addressResult = yyszResultToResult(JSONObject.parseObject(body));
-                if (addressResult==null)System.out.println("yysz_address地址[" + address + "]未查询到数据！");
                 return addressResult;
             } catch (Exception e) {
                 System.err.println(e);
                 return AddressTools.getInstance().faildQuery(AddressResultEnum.DATA_FROMAT_FAILD, "格式化失败");
             }
         } else {
-            System.out.println("yysz_address地址[" + address + "]未查询到数据！");
             return null;
         }
     }

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

@@ -166,7 +166,7 @@ public class DataCallBack {
                     return;
                 }
                 int id = tAddressCallbackRep.findMaxId().orElse(0)+1;
-                TAddressCallback tAddressCallback = new TAddressCallback(id, LocalDate.now(),addrStr, splitAddress.getAddr(),
+                TAddressCallback tAddressCallback = new TAddressCallback(id, Instant.now(),addrStr, splitAddress.getAddr(),
                         splitAddress.getProvince(),splitAddress.getCity(),splitAddress.getStreet(), splitAddress.getCommunity(),
                         (short) 0);
                 tAddressCallbackRep.save(tAddressCallback);

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

@@ -111,9 +111,7 @@ public class TransfromDataTool {
             JSONObject jsonObject = array.getJSONObject(i);
             AddressResult.ContentBean content = new AddressResult.ContentBean();
             content.setPname(jsonObject.getString("city"));
-            content.setCityname(jsonObject.getString("city"));
-            content.setAdname(jsonObject.getString("district"));
-            content.setType(jsonObject.getString("level"));
+            content.setCityname(jsonObject.getString("city"));content.setType(jsonObject.getString("level"));
             content.setAddress(jsonObject.getString("formatted_address"));
             content.setName(jsonObject.getString("street"));
             String[] loc = jsonObject.getString("location").split(",");

src/main/java/com/skyversation/poiaddr/util/jpa/entity/TAddressCallback.java

@@ -9,6 +9,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import java.time.Instant;
 import java.time.LocalDate;
 
 @Getter
@@ -23,7 +24,7 @@ public class TAddressCallback{
     private Integer id;
 
     @Column(name = "create_time")
-    private LocalDate createTime;
+    private Instant createTime;
 
     @Column(name = "address")
     private String address;

src/main/java/com/skyversation/poiaddr/util/net/AddressNetTools.java

@@ -45,8 +45,8 @@ public class AddressNetTools {
     @Async
     public ResponseEntity requestGet(String url, MultiValueMap<String, String> params, Map<String, String> headerMap, Integer ifReloadSize) {
         SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory();
-        requestFactory.setConnectTimeout(3 * 1000);
-        requestFactory.setReadTimeout(3 * 1000);
+        requestFactory.setConnectTimeout(15 * 1000);
+        requestFactory.setReadTimeout(15 * 1000);
         RestTemplate client = new RestTemplate(requestFactory);
         client.getMessageConverters().set(1, new StringHttpMessageConverter(StandardCharsets.UTF_8));
         HttpHeaders headers = new HttpHeaders();