From 0b0ffdfd5ceae7531ef44ce5e7e25b073d316ebb Mon Sep 17 00:00:00 2001
From: huangxin <huangxin@cmhi.chinamobile.com>
Date: Thu, 28 Jan 2021 10:38:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?OCT=20REM:=201.=20=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8DMapper=E8=8E=B7=E5=8F=96=E5=A4=84=E7=BD=AE=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=87=BD=E6=95=B0=E5=90=8D=202.=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=84=E7=BD=AE=E8=AE=BE=E5=A4=87IP=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E5=88=A4=E6=96=AD=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/dispose/common/Helper.java  | 35 +++++++++++++++++++
 .../impl/DisposeDeviceManagerImpl.java        | 26 +++++---------
 .../dispose/mapper/DisposeDeviceMapper.java   | 20 ++++++++---
 src/main/resources/mappers/DisposeDevice.xml  | 11 +++++-
 .../dev/manager/DisposeDeviceManagerTest.java |  2 +-
 .../dev/mapper/DisposeDeviceMapperTest.java   |  6 ++--
 .../dispose/test/testcase/qa/v200/P1All.java  |  2 +-
 .../test/testcase/qa/v200/P2DeviceAdd.java    |  2 +-
 .../testcase/qa/v200/P2DeviceUpgrade.java     |  2 +-
 9 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/dispose/common/Helper.java b/src/main/java/com/dispose/common/Helper.java
index 48d27a94..c28166b7 100644
--- a/src/main/java/com/dispose/common/Helper.java
+++ b/src/main/java/com/dispose/common/Helper.java
@@ -6,6 +6,7 @@ import inet.ipaddr.AddressStringException;
 import inet.ipaddr.IPAddress;
 import inet.ipaddr.IPAddressSeqRange;
 import inet.ipaddr.IPAddressString;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.BufferedReader;
@@ -227,4 +228,38 @@ public class Helper {
 
         return ret.orElse("");
     }
+
+    /**
+     * Is ip port match boolean.
+     *
+     * @param originPort the origin port
+     * @param targetPort the target port
+     * @param portType   the port type
+     * @return the boolean
+     */
+    public static boolean isIpPortMatch(String originPort, String targetPort, HttpType portType) {
+        String oPort, tPort;
+
+        if (portType == null) {
+            return false;
+        }
+
+        if (originPort != null && originPort.length() > 0) {
+            oPort = originPort;
+        } else {
+            oPort = portType.equals(HttpType.HTTP) ?
+                    HttpType.getDefaultPort(HttpType.HTTP) :
+                    HttpType.getDefaultPort(HttpType.HTTPS);
+        }
+
+        if (targetPort != null && targetPort.length() > 0) {
+            tPort = targetPort;
+        } else {
+            tPort = portType.equals(HttpType.HTTP) ?
+                    HttpType.getDefaultPort(HttpType.HTTP) :
+                    HttpType.getDefaultPort(HttpType.HTTPS);
+        }
+
+        return oPort.equals(tPort);
+    }
 }
diff --git a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java
index 29f98c37..57dc08da 100644
--- a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java
+++ b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java
@@ -1,6 +1,7 @@
 package com.dispose.manager.impl;
 
 import com.dispose.common.ErrorCode;
+import com.dispose.common.Helper;
 import com.dispose.common.HttpType;
 import com.dispose.common.IpAddrType;
 import com.dispose.common.ObjectStatus;
@@ -56,8 +57,8 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager {
     @Override
     public MulReturnType<ErrorCode, Long> addDisposeDevice(DisposeDevice dev) {
         // 看看系统中有没有存在相同IP+端口地址的设备，有的话返回失败
-        DisposeDevice tDev = disposeDeviceMapper.getDeviceByAddress(dev.getIpAddr(), dev.getIpPort(),
-                                                                    dev.getDeviceType().getValue());
+        DisposeDevice tDev = disposeDeviceMapper.getDeviceByAddrAndType(dev.getIpAddr(), dev.getIpPort(),
+                dev.getDeviceType().getValue());
 
         if (tDev != null) {
             // 如果设备是删除状态，则更新设备信息
@@ -116,7 +117,7 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager {
                     fdDest.setAccessible(true);
                     if (!obj.equals(fdDest.get(destDev))) {
                         log.debug("Upgrade field [{}] value form [{}] to [{}]", fdSrc.getName(), fdDest.get(destDev),
-                                  obj);
+                                obj);
                         fdDest.set(destDev, obj);
                     }
                     fdDest.setAccessible(false);
@@ -136,22 +137,11 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager {
      */
     @Override
     public MulReturnType<ErrorCode, Long> upgradeDisposeDevice(DisposeDevice dev) {
-        DisposeDevice tDev = disposeDeviceMapper.getDeviceByAddress(dev.getIpAddr(), dev.getIpPort(),
-                                                                    dev.getDeviceType().getValue());
+        // 根据Ip和设备类型获取设备
+        DisposeDevice tDev = disposeDeviceMapper.getDeviceByIpAndType(dev.getIpAddr(), dev.getDeviceType().getValue());
 
-        // 处理默认端口情况
-        if (tDev == null) {
-            if (dev.getIpPort() == null || dev.getIpPort().length() == 0) {
-                tDev = disposeDeviceMapper.getDeviceByAddress(dev.getIpAddr(),
-                                                              dev.getUrlType() == HttpType.HTTP ?
-                                                                      HttpType.getDefaultPort(HttpType.HTTP) :
-                                                                      HttpType.getDefaultPort(HttpType.HTTPS),
-                                                              dev.getDeviceType().getValue());
-            }
-        }
-
-        // 实在找不到设备返回错误
-        if (tDev == null) {
+        // 找不到设备
+        if (tDev == null || !Helper.isIpPortMatch(tDev.getIpPort(), dev.getIpPort(), dev.getUrlType())) {
             return new MulReturnType<>(ErrorCode.ERR_NOSUCHDEVICE, -1L);
         }
 
diff --git a/src/main/java/com/dispose/mapper/DisposeDeviceMapper.java b/src/main/java/com/dispose/mapper/DisposeDeviceMapper.java
index aa5f31ea..f9c7d9d2 100644
--- a/src/main/java/com/dispose/mapper/DisposeDeviceMapper.java
+++ b/src/main/java/com/dispose/mapper/DisposeDeviceMapper.java
@@ -78,14 +78,24 @@ public interface DisposeDeviceMapper {
     /**
      * Gets device by address.
      *
-     * @param ipAddr the ip addr
-     * @param ipPort the ip port
+     * @param ipAddr  the ip addr
+     * @param ipPort  the ip port
      * @param devType the device type
      * @return the device by address
      */
-    DisposeDevice getDeviceByAddress(@Param("ipAddr") String ipAddr,
-                                     @Param("ipPort") String ipPort,
-                                     @Param("devType") Integer devType);
+    DisposeDevice getDeviceByAddrAndType(@Param("ipAddr") String ipAddr,
+                                         @Param("ipPort") String ipPort,
+                                         @Param("devType") Integer devType);
+
+    /**
+     * Gets device by ip and type.
+     *
+     * @param ipAddr  the ip addr
+     * @param devType the dev type
+     * @return the device by ip and type
+     */
+    DisposeDevice getDeviceByIpAndType(@Param("ipAddr") String ipAddr,
+                                       @Param("devType") Integer devType);
 
 
     /**
diff --git a/src/main/resources/mappers/DisposeDevice.xml b/src/main/resources/mappers/DisposeDevice.xml
index 8fa31f5a..8df95439 100644
--- a/src/main/resources/mappers/DisposeDevice.xml
+++ b/src/main/resources/mappers/DisposeDevice.xml
@@ -63,7 +63,7 @@
                  LEFT JOIN dispose_capacity c ON d.id = c.deviceId
     </select>
 
-    <select id="getDeviceByAddress" resultMap="dispose_device">
+    <select id="getDeviceByAddrAndType" resultMap="dispose_device">
         SELECT d.*,
                c.*
         FROM dispose_device d
@@ -73,6 +73,15 @@
           AND d.deviceType = #{devType}
     </select>
 
+    <select id="getDeviceByIpAndType" resultMap="dispose_device">
+        SELECT d.*,
+               c.*
+        FROM dispose_device d
+                 LEFT JOIN dispose_capacity c ON d.id = c.deviceId
+        WHERE d.ipAddr = #{ipAddr}
+          AND d.deviceType = #{devType}
+    </select>
+
     <select id="getDeviceById" resultMap="dispose_device">
         SELECT d.*,
                c.*
diff --git a/src/test/java/com/dispose/test/dev/manager/DisposeDeviceManagerTest.java b/src/test/java/com/dispose/test/dev/manager/DisposeDeviceManagerTest.java
index 46f85a92..433191c4 100644
--- a/src/test/java/com/dispose/test/dev/manager/DisposeDeviceManagerTest.java
+++ b/src/test/java/com/dispose/test/dev/manager/DisposeDeviceManagerTest.java
@@ -200,7 +200,7 @@ public class DisposeDeviceManagerTest extends InitTestEnvironment {
             ) {
                 MulReturnType<ErrorCode, ObjectStatus> ret = disposeDeviceManager.changeDisposeDeviceStatus(v.getId(), obj);
 
-                DisposeDevice dev = disposeDeviceMapper.getDeviceByAddress(v.getIpAddr(), v.getIpPort(),
+                DisposeDevice dev = disposeDeviceMapper.getDeviceByAddrAndType(v.getIpAddr(), v.getIpPort(),
                                                                            v.getDeviceType().getValue());
 
                 if (ret.getFirstParam() == ErrorCode.ERR_OK) {
diff --git a/src/test/java/com/dispose/test/dev/mapper/DisposeDeviceMapperTest.java b/src/test/java/com/dispose/test/dev/mapper/DisposeDeviceMapperTest.java
index e60ff6a7..de64db8f 100644
--- a/src/test/java/com/dispose/test/dev/mapper/DisposeDeviceMapperTest.java
+++ b/src/test/java/com/dispose/test/dev/mapper/DisposeDeviceMapperTest.java
@@ -114,7 +114,7 @@ public class DisposeDeviceMapperTest extends InitTestEnvironment {
 
         devList.forEach(v -> {
             if(v.getIpPort().length() != 0){
-                DisposeDevice dev = disposeDeviceMapper.getDeviceByAddress(v.getIpAddr(), v.getIpPort(),
+                DisposeDevice dev = disposeDeviceMapper.getDeviceByAddrAndType(v.getIpAddr(), v.getIpPort(),
                                                                            v.getDeviceType().getValue());
 
                 String beforeVer = dev.getVersion();
@@ -165,12 +165,12 @@ public class DisposeDeviceMapperTest extends InitTestEnvironment {
         List<DisposeDevice> devList = disposeDeviceMapper.selectAll();
 
         devList.forEach(v -> {
-            DisposeDevice dev = disposeDeviceMapper.getDeviceByAddress(v.getIpAddr(), v.getIpPort(),
+            DisposeDevice dev = disposeDeviceMapper.getDeviceByAddrAndType(v.getIpAddr(), v.getIpPort(),
                                                                        v.getDeviceType().getValue());
             Assert.assertNotNull(dev);
 
             if(v.getIpPort().length() != 0){
-                dev = disposeDeviceMapper.getDeviceByAddress(v.getIpAddr(),
+                dev = disposeDeviceMapper.getDeviceByAddrAndType(v.getIpAddr(),
                         String.valueOf(Long.parseLong(Optional.ofNullable(v.getIpPort()).orElse("123")) + 1233),
                                                              v.getDeviceType().getValue());
 
diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P1All.java b/src/test/java/com/dispose/test/testcase/qa/v200/P1All.java
index ac568db7..b69afc54 100644
--- a/src/test/java/com/dispose/test/testcase/qa/v200/P1All.java
+++ b/src/test/java/com/dispose/test/testcase/qa/v200/P1All.java
@@ -196,7 +196,7 @@ public class P1All {
                     Assert.assertNotNull(k.getDevStatus());
                 });
 
-                DisposeDevice dev = c.getDisposeDeviceMapper().getDeviceByAddress("127.0.0.1", "",
+                DisposeDevice dev = c.getDisposeDeviceMapper().getDeviceByAddrAndType("127.0.0.1", "",
                                                                                   DisposeDeviceType.VIRTUAL_DISPOSE.getValue());
 
                 Assert.assertNotNull(dev);
diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceAdd.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceAdd.java
index bfac8ad3..824d400a 100644
--- a/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceAdd.java
+++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceAdd.java
@@ -797,7 +797,7 @@ public class P2DeviceAdd {
             Assert.assertNotNull(k.getDevId());
         });
 
-        DisposeDevice dev = c.getDisposeDeviceMapper().getDeviceByAddress("10.88.77.15", "", DisposeDeviceType.DPTECH_UMC
+        DisposeDevice dev = c.getDisposeDeviceMapper().getDeviceByAddrAndType("10.88.77.15", "", DisposeDeviceType.DPTECH_UMC
                 .getValue());
         Assert.assertNotNull(dev);
 
diff --git a/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceUpgrade.java b/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceUpgrade.java
index 01c0c7ce..5c7ee6bb 100644
--- a/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceUpgrade.java
+++ b/src/test/java/com/dispose/test/testcase/qa/v200/P2DeviceUpgrade.java
@@ -985,7 +985,7 @@ public class P2DeviceUpgrade {
             Assert.assertNotNull(k.getDevStatus());
         });
 
-        DisposeDevice dev = c.getDisposeDeviceMapper().getDeviceByAddress("127.0.0.1", "", DisposeDeviceType.VIRTUAL_DISPOSE
+        DisposeDevice dev = c.getDisposeDeviceMapper().getDeviceByAddrAndType("127.0.0.1", "", DisposeDeviceType.VIRTUAL_DISPOSE
                 .getValue());
         Assert.assertNotNull(dev);
 

From f170f59866b9bc6c5b725336c1dbfbc1671f2c3f Mon Sep 17 00:00:00 2001
From: huangxin <huangxin@cmhi.chinamobile.com>
Date: Thu, 28 Jan 2021 10:47:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?OCT=20REM:=201.=20=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=84=E7=BD=AE=E8=AE=BE=E5=A4=87IP=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E5=88=A4=E6=96=AD=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dispose/test/dev/debug/demo.java    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/test/java/com/dispose/test/dev/debug/demo.java b/src/test/java/com/dispose/test/dev/debug/demo.java
index c4d42a7a..ec9e387f 100644
--- a/src/test/java/com/dispose/test/dev/debug/demo.java
+++ b/src/test/java/com/dispose/test/dev/debug/demo.java
@@ -666,4 +666,20 @@ public class demo {
         log.info("demoList2 difference demoList1: {}", demoList.equals(demoList2));
         log.info("tmpTable difference tmpTable: {}", tmpTable.equals(tmpTable2));
     }
+
+    /**
+     * Ip port match test.
+     */
+    @Test
+    public void ipPortMatchTest() {
+        String[] srcPort = new String[] {"", "80", "443", "81", null};
+        String[] dstPort = new String[] {"", "80", "443", "81", null};
+
+        for(String s : srcPort) {
+            for(String d : dstPort) {
+                log.info("HTTP: [{}] match [{}] is {}", s, d, Helper.isIpPortMatch(s, d, HttpType.HTTP));
+                log.info("HTTPS: [{}] match [{}] is {}", s, d, Helper.isIpPortMatch(s, d, HttpType.HTTPS));
+            }
+        }
+    }
 }

From 975bdd0516afdfa71379d493770178b2a25a5fa8 Mon Sep 17 00:00:00 2001
From: huangxin <huangxin@cmhi.chinamobile.com>
Date: Thu, 28 Jan 2021 11:35:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?OCT=20REM:=201.=20=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=97=B6=EF=BC=8C=E7=A6=81=E6=AD=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9IP=EF=BC=8C=E7=AB=AF=E5=8F=A3=EF=BC=8C=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dispose/manager/impl/DisposeDeviceManagerImpl.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java
index 57dc08da..99a15e27 100644
--- a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java
+++ b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java
@@ -150,6 +150,9 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager {
         dev.setUserName(null);
         dev.setUrlType(null);
         dev.setPassword(null);
+        dev.setIpPort(null);
+        dev.setIpAddr(null);
+        dev.setDeviceType(null);
 
         // 更新值
         upgradeDisposeDeviceProperties(tDev, dev);