From 10880df34e9b46a008f8aa5b73c39f7a7e8a08d2 Mon Sep 17 00:00:00 2001
From: linwl <304115325@qq.com>
Date: Fri, 5 Feb 2021 11:13:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=97=E6=96=97=E7=9A=84?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../telpo/dipperposition/common/SocketClient.java | 15 ++-------------
 .../impl/DipperDataAsyncTaskServiceImpl.java      |  8 +++++---
 .../service/impl/IpProvinceServiceImpl.java       |  7 ++++++-
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/telpo/dipperposition/common/SocketClient.java b/src/main/java/com/telpo/dipperposition/common/SocketClient.java
index dfb6947..8b7fca4 100644
--- a/src/main/java/com/telpo/dipperposition/common/SocketClient.java
+++ b/src/main/java/com/telpo/dipperposition/common/SocketClient.java
@@ -38,7 +38,7 @@ public class SocketClient {
     }
 
 
-    public byte[] sendCmd(String astCmd, String ackAckCheckRef) {
+    public byte[] sendCmd(String astCmd) {
         try {
             OutputStream os=socket.getOutputStream();
             PrintWriter pw=new PrintWriter(os);
@@ -56,23 +56,12 @@ public class SocketClient {
             ByteArrayOutputStream swapStream = new ByteArrayOutputStream();
             byte[] buff = new byte[100];
 
-            //StringBuffer ackResultBuf= new StringBuffer();
-            //String ackHexOut = HexConvert.convertStringToHex(ackAckCheckRef);
-//            reply=br.readLine();
-//            while(reply!=null){
-//                //log.debug("接收服务器的信息："+reply);
-//                //if (ackHexOut.equals(reply)) {
-//                ackResultBuf.append(reply);
-//                reply=br.readLine();
-//                //    break;
-//                //}
-//            }
             int rc = 0;
             while ((rc = is.read(buff, 0, 100)) > 0) {
                 swapStream.write(buff, 0, rc);
             }
             byte[] in2b = swapStream.toByteArray();
-            //String ackResult = HexConvert.convertHexToString(ackResultBuf.toString());
+
             //4.关闭资源
             swapStream.close();
             is.close();
diff --git a/src/main/java/com/telpo/dipperposition/service/impl/DipperDataAsyncTaskServiceImpl.java b/src/main/java/com/telpo/dipperposition/service/impl/DipperDataAsyncTaskServiceImpl.java
index 4218819..f034ebe 100644
--- a/src/main/java/com/telpo/dipperposition/service/impl/DipperDataAsyncTaskServiceImpl.java
+++ b/src/main/java/com/telpo/dipperposition/service/impl/DipperDataAsyncTaskServiceImpl.java
@@ -48,8 +48,9 @@ public class DipperDataAsyncTaskServiceImpl implements IDipperDataAsyncTaskServi
     private byte[] pullEPHFromDipper() {
 
         // 创建Socket客户端实例;
-        SocketClient client = new SocketClient(schedulingExecutorConfig.getAstServer(),
-                schedulingExecutorConfig.getAstEphAstHexPort(),schedulingExecutorConfig.getAstTimeout());
+        String serverAddr = schedulingExecutorConfig.getAstServer();
+        int serverPort = schedulingExecutorConfig.getAstEphAstHexPort();
+        SocketClient client = new SocketClient(serverAddr,serverPort,schedulingExecutorConfig.getAstTimeout());
 
         // astTimeCmd 组装
         String astTimeCmd = DIPPER_ALL_DATA_REQ;
@@ -63,8 +64,9 @@ public class DipperDataAsyncTaskServiceImpl implements IDipperDataAsyncTaskServi
 
         String hexIn = astTimeCmd + checkSum.substring(0,2) + " " + checkSum.substring(2,4);
 
+        byte[] sendResult = null;
         String ackAckCheckRef = "233E010102000421293C";
-        byte[] sendResult = client.sendCmd(hexIn, ackAckCheckRef);
+        sendResult = client.sendCmd(hexIn);
         client.closeConnection();
 
         return sendResult;
diff --git a/src/main/java/com/telpo/dipperposition/service/impl/IpProvinceServiceImpl.java b/src/main/java/com/telpo/dipperposition/service/impl/IpProvinceServiceImpl.java
index ccd1a63..10bc544 100644
--- a/src/main/java/com/telpo/dipperposition/service/impl/IpProvinceServiceImpl.java
+++ b/src/main/java/com/telpo/dipperposition/service/impl/IpProvinceServiceImpl.java
@@ -55,7 +55,12 @@ public class IpProvinceServiceImpl implements IpProvinceService {
       ExampleMatcher matcher = ExampleMatcher.matching().withIgnorePaths("_class");
       Example<IpProvinceEntity> example = Example.of(query, matcher);
       Optional<IpProvinceEntity> data = ipProvinceMapper.findOne(example);
-      return data.orElse(null);
+      if (data.isPresent() == true) {
+        return data.get();
+      } else {
+        return null;
+      }
+      //return data.orElse(null);
     } catch (Exception e) {
       log.error("获取IP省份异常:", e);
       return null;