Merge remote-tracking branch 'origin/master'

src/main/java/com/dispose/controller/DisposeTaskController.java

@@ -221,6 +221,7 @@ public class DisposeTaskController {
     public ProtocolRespDTO taskStopByIp(@RequestBody ProtocolReqDTO mr,
                                         @RequestHeader HttpHeaders headers)
             throws JsonProcessingException {
+        String regex = "\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z";
         ErrorCode err = mr.verifyRequest(headers);
 
         if (err != ErrorCode.ERR_OK) {
@@ -228,6 +229,24 @@ public class DisposeTaskController {
         }
 
         StopTaskReq reqInfo = mr.getRequestObject(StopTaskReq.class);
+        List<StopTaskData> item = reqInfo.getItems();
+        for (StopTaskData stopTaskData : item
+        ) {
+            if (stopTaskData.getId() == null || stopTaskData.getId().length() == 0) {
+                return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION);
+            }
+
+            if (stopTaskData.getDisposeIp() == null || stopTaskData.getDisposeIp().length() == 0) {
+                return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION);
+            } else if (!stopTaskData.getDisposeIp().matches(regex)) {
+                return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION);
+            }
+
+            if (String.valueOf(stopTaskData.getType()).length() == 0 || stopTaskData.getType() == null) {
+                return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION);
+            }
+        }
+
         TaskInfoRsp rspInfo = new TaskInfoRsp();
 
         reqInfo.getItems().forEach(v -> {
@@ -284,6 +303,20 @@ public class DisposeTaskController {
         }
 
         StopTaskReq reqInfo = mr.getRequestObject(StopTaskReq.class);
+
+        List<StopTaskData> item = reqInfo.getItems();
+        for (StopTaskData stopTaskData : item
+        ) {
+            if (stopTaskData.getId() == null || stopTaskData.getId().length() == 0) {
+                return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION);
+            }
+
+            if (String.valueOf(stopTaskData.getType()).length() == 0 || stopTaskData.getType() == null) {
+                return ProtocolRespDTO.result(ErrorCode.ERR_PARAMEXCEPTION);
+            }
+        }
+
+
         TaskInfoRsp rspInfo = new TaskInfoRsp();
 
         reqInfo.getItems().forEach(v -> {
@@ -512,7 +545,10 @@ public class DisposeTaskController {
             unExists.forEach(v -> {
                 TaskInfoData taskData = new TaskInfoData();
                 rspInfo.getItems().add(taskData);
+                taskData.setTaskId("-1");
                 taskData.setId(v);
+                taskData.setStartTime(0);
+                taskData.setDisposeTime(0);
                 taskData.setStatus(ErrorCode.ERR_NOSUCHDEVICE.getCode());
                 taskData.setMessage(ErrorCode.ERR_NOSUCHDEVICE.getMsg());
             });

src/main/java/com/dispose/pojo/vo/task/StopTaskData.java

@@ -24,7 +24,7 @@ public class StopTaskData {
     /**
      * The Type.
      */
-    private int type;
+    private Integer type;
     /**
      * The Dispose ip.
      */

src/test/java/com/dispose/controller/DeviceNodeInfoControllerQATest.java

@@ -16,6 +16,7 @@ package com.dispose.controller;
 import com.dispose.Global.InitTestEnvironment;
 import com.dispose.common.ErrorCode;
 import com.dispose.pojo.entity.DisposeDevice;
+import com.dispose.pojo.po.ReturnStatus;
 import com.dispose.pojo.vo.information.DeviceInfoData;
 import com.dispose.pojo.vo.information.DeviceInfoRsp;
 import com.dispose.pojo.vo.information.LinkStatusRsp;
@@ -95,17 +96,19 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
         String msgContent = verifyResp(ver);
         List<VersionRsp> verList = objectMapper.readValue(msgContent, new TypeReference<List<VersionRsp>>() {
         });
-        Assert.assertEquals(1, verList.size());
+        Assert.assertEquals(verList.size(), 1);
         for (VersionRsp versionRsp : verList
         ) {
             if (verifyDeviceIdExists(versionRsp.getId())) {
-                Assert.assertEquals(String.valueOf(versionRsp.getStatus()), "0");
+                Assert.assertEquals(String.valueOf(versionRsp.getStatus()), String.valueOf(ErrorCode.ERR_OK.getCode()));
-                Assert.assertEquals(versionRsp.getMessage(), "成功");
+                Assert.assertEquals(versionRsp.getMessage(), ErrorCode.ERR_OK.getMsg());
                 Assert.assertNotNull(versionRsp.getId());
                 Assert.assertNotNull(versionRsp.getVersion());
             } else {
-                Assert.assertNotEquals(String.valueOf(versionRsp.getStatus()), "0");
+                Assert.assertNotNull(versionRsp.getId());
-                Assert.assertNotEquals(versionRsp.getMessage(), "成功");
+                Assert.assertNull(versionRsp.getVersion());
+                Assert.assertEquals(String.valueOf(versionRsp.getStatus()), String.valueOf(ErrorCode.ERR_NOSUCHDEVICE.getCode()));
+                Assert.assertEquals(versionRsp.getMessage(), ErrorCode.ERR_NOSUCHDEVICE.getMsg());
             }
         }
     }
@@ -134,16 +137,19 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
         String msgContent = verifyResp(ver);
         List<VersionRsp> verList = objectMapper.readValue(msgContent, new TypeReference<List<VersionRsp>>() {
         });
+        Assert.assertTrue(verList.size() > 1);
         for (VersionRsp versionRsp : verList
         ) {
             if (verifyDeviceIdExists(versionRsp.getId())) {
-                Assert.assertEquals(String.valueOf(versionRsp.getStatus()), "0");
+                Assert.assertEquals(String.valueOf(versionRsp.getStatus()), String.valueOf(ErrorCode.ERR_OK.getCode()));
-                Assert.assertEquals(versionRsp.getMessage(), "成功");
+                Assert.assertEquals(versionRsp.getMessage(), ErrorCode.ERR_OK.getMsg());
                 Assert.assertNotNull(versionRsp.getId());
                 Assert.assertNotNull(versionRsp.getVersion());
             } else {
-                Assert.assertNotEquals(String.valueOf(versionRsp.getStatus()), "0");
+                Assert.assertNotNull(versionRsp.getId());
-                Assert.assertNotEquals(versionRsp.getMessage(), "成功");
+                Assert.assertNull(versionRsp.getVersion());
+                Assert.assertEquals(String.valueOf(versionRsp.getStatus()), String.valueOf(ErrorCode.ERR_NOSUCHDEVICE.getCode()));
+                Assert.assertEquals(versionRsp.getMessage(), ErrorCode.ERR_NOSUCHDEVICE.getMsg());
             }
         }
     }
@@ -170,10 +176,13 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
         String msgContent = verifyResp(ver);
         List<VersionRsp> verList = objectMapper.readValue(msgContent, new TypeReference<List<VersionRsp>>() {
         });
+        Assert.assertEquals(verList.size(), 1);
         for (VersionRsp versionRsp : verList
         ) {
-            Assert.assertNotEquals(String.valueOf(versionRsp.getStatus()), "0");
+            Assert.assertNotNull(versionRsp.getId());
-            Assert.assertNotEquals(versionRsp.getMessage(), "成功");
+            Assert.assertNull(versionRsp.getVersion());
+            Assert.assertEquals(String.valueOf(versionRsp.getStatus()), String.valueOf(ErrorCode.ERR_NOSUCHDEVICE.getCode()));
+            Assert.assertEquals(versionRsp.getMessage(), ErrorCode.ERR_NOSUCHDEVICE.getMsg());
         }
     }
 
@@ -309,16 +318,17 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
         String msgContent = verifyResp(deviceInfo);
         DeviceInfoRsp deviceInfoRsp = objectMapper.readValue(msgContent, DeviceInfoRsp.class);
         List<DeviceInfoData> deviceInfoList = deviceInfoRsp.getItems();
+        Assert.assertEquals(deviceInfoList.size(), 1);
         for (DeviceInfoData d : deviceInfoList
         ) {
             if (verifyDeviceIdExists(d.getId())) {
                 Assert.assertNotNull(d.getId());
-                Assert.assertEquals(d.getStatus(), 0);
+                Assert.assertEquals(d.getStatus(), ErrorCode.ERR_OK.getCode());
-                Assert.assertEquals(d.getMessage(), "成功");
+                Assert.assertEquals(d.getMessage(), ErrorCode.ERR_OK.getMsg());
             } else {
                 Assert.assertNotNull(d.getId());
-                Assert.assertNotEquals(d.getStatus(), 0);
+                Assert.assertNotEquals(d.getStatus(), ErrorCode.ERR_OK.getCode());
-                Assert.assertNotEquals(d.getMessage(), "成功");
+                Assert.assertNotEquals(d.getMessage(), ErrorCode.ERR_OK.getMsg());
             }
         }
     }
@@ -346,16 +356,17 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
         String msgContent = verifyResp(deviceInfo);
         DeviceInfoRsp deviceInfoRsp = objectMapper.readValue(msgContent, DeviceInfoRsp.class);
         List<DeviceInfoData> deviceInfoList = deviceInfoRsp.getItems();
+        Assert.assertTrue(deviceInfoList.size() > 1);
         for (DeviceInfoData d : deviceInfoList
         ) {
             if (verifyDeviceIdExists(d.getId())) {
                 Assert.assertNotNull(d.getId());
-                Assert.assertEquals(d.getStatus(), 0);
+                Assert.assertEquals(d.getStatus(), ErrorCode.ERR_OK.getCode());
-                Assert.assertEquals(d.getMessage(), "成功");
+                Assert.assertEquals(d.getMessage(), ErrorCode.ERR_OK.getMsg());
             } else {
                 Assert.assertNotNull(d.getId());
-                Assert.assertNotEquals(d.getStatus(), 0);
+                Assert.assertEquals(d.getStatus(), ErrorCode.ERR_NOSUCHDEVICE.getCode());
-                Assert.assertNotEquals(d.getMessage(), "成功");
+                Assert.assertEquals(d.getMessage(), ErrorCode.ERR_NOSUCHDEVICE.getMsg());
             }
         }
     }
@@ -383,17 +394,13 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
         String msgContent = verifyResp(deviceInfo);
         DeviceInfoRsp deviceInfoRsp = objectMapper.readValue(msgContent, DeviceInfoRsp.class);
         List<DeviceInfoData> deviceInfoList = deviceInfoRsp.getItems();
+
+        Assert.assertEquals(deviceInfoList.size(), 1);
         for (DeviceInfoData d : deviceInfoList
         ) {
-            if (verifyDeviceIdExists(d.getId())) {
+            Assert.assertNotNull(d.getId());
-                Assert.assertNotNull(d.getId());
+            Assert.assertEquals(d.getStatus(), ErrorCode.ERR_NOSUCHDEVICE.getCode());
-                Assert.assertEquals(d.getStatus(), 0);
+            Assert.assertEquals(d.getMessage(), ErrorCode.ERR_NOSUCHDEVICE.getMsg());
-                Assert.assertEquals(d.getMessage(), "成功");
-            } else {
-                Assert.assertNotNull(d.getId());
-                Assert.assertNotEquals(d.getStatus(), 0);
-                Assert.assertNotEquals(d.getMessage(), "成功");
-            }
         }
     }
 
@@ -416,9 +423,13 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
                 .getResponse()
                 .getContentAsString();
 
-        String msgContent = verifyResp(deviceInfo);
+        ReturnStatus rspInfo =  objectMapper.readValue(verifyResp(deviceInfo), ReturnStatus.class) ;
-        Assert.assertTrue(msgContent.contains(String.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode())));
+
-        Assert.assertTrue(msgContent.contains(ErrorCode.ERR_PARAMEXCEPTION.getMsg()));
+        Assert.assertNotNull(rspInfo.getStatus());
+        Assert.assertNotNull(rspInfo.getMessage());
+        Assert.assertEquals(Long.valueOf(rspInfo.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+        Assert.assertEquals(rspInfo.getMessage(), ErrorCode.ERR_PARAMEXCEPTION.getMsg());
+
     }
 
     /**
@@ -440,9 +451,12 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
                 .getResponse()
                 .getContentAsString();
 
-        String msgContent = verifyResp(deviceInfo);
+        ReturnStatus rspInfo =  objectMapper.readValue(verifyResp(deviceInfo), ReturnStatus.class) ;
-        Assert.assertTrue(msgContent.contains(String.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode())));
+
-        Assert.assertTrue(msgContent.contains(ErrorCode.ERR_PARAMEXCEPTION.getMsg()));
+        Assert.assertNotNull(rspInfo.getStatus());
+        Assert.assertNotNull(rspInfo.getMessage());
+        Assert.assertEquals(Long.valueOf(rspInfo.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+        Assert.assertEquals(rspInfo.getMessage(), ErrorCode.ERR_PARAMEXCEPTION.getMsg());
     }
 
     /**
@@ -464,9 +478,12 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
                 .getResponse()
                 .getContentAsString();
 
-        String msgContent = verifyResp(deviceInfo);
+        ReturnStatus rspInfo =  objectMapper.readValue(verifyResp(deviceInfo), ReturnStatus.class) ;
-        Assert.assertTrue(msgContent.contains(String.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode())));
+
-        Assert.assertTrue(msgContent.contains(ErrorCode.ERR_PARAMEXCEPTION.getMsg()));
+        Assert.assertNotNull(rspInfo.getStatus());
+        Assert.assertNotNull(rspInfo.getMessage());
+        Assert.assertEquals(Long.valueOf(rspInfo.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+        Assert.assertEquals(rspInfo.getMessage(), ErrorCode.ERR_PARAMEXCEPTION.getMsg());
     }
 
     /**
@@ -489,9 +506,12 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
                 .getResponse()
                 .getContentAsString();
 
-        String msgContent = verifyResp(deviceInfo);
+        ReturnStatus rspInfo =  objectMapper.readValue(verifyResp(deviceInfo), ReturnStatus.class) ;
-        Assert.assertTrue(msgContent.contains(String.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode())));
+
-        Assert.assertTrue(msgContent.contains(ErrorCode.ERR_PARAMEXCEPTION.getMsg()));
+        Assert.assertNotNull(rspInfo.getStatus());
+        Assert.assertNotNull(rspInfo.getMessage());
+        Assert.assertEquals(Long.valueOf(rspInfo.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+        Assert.assertEquals(rspInfo.getMessage(), ErrorCode.ERR_PARAMEXCEPTION.getMsg());
     }
 
     /**
@@ -519,17 +539,18 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
         List<LinkStatusRsp> linkStatusList = objectMapper.readValue(msgContent, new TypeReference<List<LinkStatusRsp>>() {
         });
 
+        Assert.assertEquals(linkStatusList.size(), 1);
         for (LinkStatusRsp linkStatusRsp : linkStatusList
         ) {
             if (verifyDeviceIdExists(linkStatusRsp.getId())) {
-                Assert.assertEquals(String.valueOf(linkStatusRsp.getStatus()), "0");
+                Assert.assertEquals(String.valueOf(linkStatusRsp.getStatus()), String.valueOf(ErrorCode.ERR_OK.getCode()));
-                Assert.assertEquals(linkStatusRsp.getMessage(), "成功");
+                Assert.assertEquals(linkStatusRsp.getMessage(), ErrorCode.ERR_OK.getMsg());
                 Assert.assertNotNull(linkStatusRsp.getId());
                 Assert.assertNotNull(String.valueOf(linkStatusRsp.getOnline()));
                 Assert.assertEquals(String.valueOf(linkStatusRsp.getOnline()), "1");
             } else {
-                Assert.assertNotEquals(String.valueOf(linkStatusRsp.getStatus()), "0");
+                Assert.assertEquals(String.valueOf(linkStatusRsp.getStatus()), String.valueOf(ErrorCode.ERR_NOSUCHDEVICE.getCode()));
-                Assert.assertNotEquals(linkStatusRsp.getMessage(), "成功");
+                Assert.assertEquals(linkStatusRsp.getMessage(), ErrorCode.ERR_NOSUCHDEVICE.getMsg());
                 Assert.assertEquals(String.valueOf(linkStatusRsp.getOnline()), "0");
             }
         }
@@ -563,14 +584,14 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
         for (LinkStatusRsp linkStatusRsp : linkStatusList
         ) {
             if (verifyDeviceIdExists(linkStatusRsp.getId())) {
-                Assert.assertEquals(String.valueOf(linkStatusRsp.getStatus()), "0");
+                Assert.assertEquals(String.valueOf(linkStatusRsp.getStatus()), String.valueOf(ErrorCode.ERR_OK.getCode()));
-                Assert.assertEquals(linkStatusRsp.getMessage(), "成功");
+                Assert.assertEquals(linkStatusRsp.getMessage(), ErrorCode.ERR_OK.getMsg());
                 Assert.assertNotNull(linkStatusRsp.getId());
                 Assert.assertNotNull(String.valueOf(linkStatusRsp.getOnline()));
                 Assert.assertEquals(String.valueOf(linkStatusRsp.getOnline()), "1");
             } else {
-                Assert.assertNotEquals(String.valueOf(linkStatusRsp.getStatus()), "0");
+                Assert.assertEquals(String.valueOf(linkStatusRsp.getStatus()), String.valueOf(ErrorCode.ERR_NOSUCHDEVICE.getCode()));
-                Assert.assertNotEquals(linkStatusRsp.getMessage(), "成功");
+                Assert.assertEquals(linkStatusRsp.getMessage(), ErrorCode.ERR_NOSUCHDEVICE.getMsg());
                 Assert.assertEquals(String.valueOf(linkStatusRsp.getOnline()), "0");
             }
         }
@@ -601,19 +622,12 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
         List<LinkStatusRsp> linkStatusList = objectMapper.readValue(msgContent, new TypeReference<List<LinkStatusRsp>>() {
         });
 
+        Assert.assertEquals(linkStatusList.size(), 1);
         for (LinkStatusRsp linkStatusRsp : linkStatusList
         ) {
-            if (verifyDeviceIdExists(linkStatusRsp.getId())) {
+            Assert.assertEquals(String.valueOf(linkStatusRsp.getStatus()), String.valueOf(ErrorCode.ERR_NOSUCHDEVICE.getCode()));
-                Assert.assertEquals(String.valueOf(linkStatusRsp.getStatus()), "0");
+            Assert.assertEquals(linkStatusRsp.getMessage(), ErrorCode.ERR_NOSUCHDEVICE.getMsg());
-                Assert.assertEquals(linkStatusRsp.getMessage(), "成功");
+            Assert.assertEquals(String.valueOf(linkStatusRsp.getOnline()), "0");
-                Assert.assertNotNull(linkStatusRsp.getId());
-                Assert.assertNotNull(String.valueOf(linkStatusRsp.getOnline()));
-                Assert.assertEquals(String.valueOf(linkStatusRsp.getOnline()), "1");
-            } else {
-                Assert.assertNotEquals(String.valueOf(linkStatusRsp.getStatus()), "0");
-                Assert.assertNotEquals(linkStatusRsp.getMessage(), "成功");
-                Assert.assertEquals(String.valueOf(linkStatusRsp.getOnline()), "0");
-            }
         }
     }
 
@@ -636,9 +650,12 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
                 .getResponse()
                 .getContentAsString();
 
-        String msgContent = verifyResp(linkstatus);
+        ReturnStatus rspInfo =  objectMapper.readValue(verifyResp(linkstatus), ReturnStatus.class) ;
-        Assert.assertTrue(msgContent.contains(String.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode())));
+
-        Assert.assertTrue(msgContent.contains(ErrorCode.ERR_PARAMEXCEPTION.getMsg()));
+        Assert.assertNotNull(rspInfo.getStatus());
+        Assert.assertNotNull(rspInfo.getMessage());
+        Assert.assertEquals(Long.valueOf(rspInfo.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+        Assert.assertEquals(rspInfo.getMessage(), ErrorCode.ERR_PARAMEXCEPTION.getMsg());
     }
 
     /**
@@ -660,9 +677,12 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
                 .getResponse()
                 .getContentAsString();
 
-        String msgContent = verifyResp(linkstatus);
+        ReturnStatus rspInfo =  objectMapper.readValue(verifyResp(linkstatus), ReturnStatus.class) ;
-        Assert.assertTrue(msgContent.contains(String.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode())));
+
-        Assert.assertTrue(msgContent.contains(ErrorCode.ERR_PARAMEXCEPTION.getMsg()));
+        Assert.assertNotNull(rspInfo.getStatus());
+        Assert.assertNotNull(rspInfo.getMessage());
+        Assert.assertEquals(Long.valueOf(rspInfo.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+        Assert.assertEquals(rspInfo.getMessage(), ErrorCode.ERR_PARAMEXCEPTION.getMsg());
     }
 
     /**
@@ -684,9 +704,12 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
                 .getResponse()
                 .getContentAsString();
 
-        String msgContent = verifyResp(linkstatus);
+        ReturnStatus rspInfo =  objectMapper.readValue(verifyResp(linkstatus), ReturnStatus.class) ;
-        Assert.assertTrue(msgContent.contains(String.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode())));
+
-        Assert.assertTrue(msgContent.contains(ErrorCode.ERR_PARAMEXCEPTION.getMsg()));
+        Assert.assertNotNull(rspInfo.getStatus());
+        Assert.assertNotNull(rspInfo.getMessage());
+        Assert.assertEquals(Long.valueOf(rspInfo.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+        Assert.assertEquals(rspInfo.getMessage(), ErrorCode.ERR_PARAMEXCEPTION.getMsg());
     }
 
     /**
@@ -709,9 +732,12 @@ public class DeviceNodeInfoControllerQATest extends InitTestEnvironment{
                 .getResponse()
                 .getContentAsString();
 
-        String msgContent = verifyResp(linkstatus);
+        ReturnStatus rspInfo =  objectMapper.readValue(verifyResp(linkstatus), ReturnStatus.class) ;
-        Assert.assertTrue(msgContent.contains(String.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode())));
+
-        Assert.assertTrue(msgContent.contains(ErrorCode.ERR_PARAMEXCEPTION.getMsg()));
+        Assert.assertNotNull(rspInfo.getStatus());
+        Assert.assertNotNull(rspInfo.getMessage());
+        Assert.assertEquals(Long.valueOf(rspInfo.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+        Assert.assertEquals(rspInfo.getMessage(), ErrorCode.ERR_PARAMEXCEPTION.getMsg());
     }
 
     /**

src/test/java/com/dispose/controller/DeviceNodeManagerControlllerSmokeTest.java

@@ -37,7 +37,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @Slf4j
-public class DeviceNodeManagerControlllerExceptionSmokeTest extends InitTestEnvironment {
+public class DeviceNodeManagerControlllerSmokeTest extends InitTestEnvironment {
     /**
      * The Mock mvc.
      */

src/test/java/com/dispose/controller/TaskControllerQATest.java

@@ -47,7 +47,7 @@ public class TaskControllerQATest extends InitTestEnvironment {
     private ObjectMapper objectMapper;
 
     @Test
-    public void t1_NormalContainsNonEmptyTaskTest() throws Exception {
+    public void a1_NormalContainsNonEmptyTaskTest() throws Exception {
         String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\":\"{\\\"id\\\":-1," +
                 "\\\"type\\\":0, \\\"disposeIp\\\":\\\"192.168.5.4\\\", " +
                 "\\\"disposeTime\\\":120, \\\"flowDirection\\\":2, \\\"attackType\\\":[0], " +
@@ -80,10 +80,15 @@ public class TaskControllerQATest extends InitTestEnvironment {
         }
     }
 
+    /**
+     * a2 disposeIp empty exception test.
+     *
+     * @throws Exception the exception
+     */
     @Test
-    public void t2_startTaskNoDisPoseIpExceptionTest() throws Exception {
+    public void a2_startTaskNoDisPoseIpExceptionTest() throws Exception {
         String reqDataNoIp = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\":\"{\\\"id\\\":-1," +
-                "\\\"type\\\":0, \\\"disposeIp\\\":, \\\"disposeTime\\\":120}\"}";
+                "\\\"type\\\":0, \\\"disposeIp\\\":\\\"\\\", \\\"disposeTime\\\":120}\"}";
 
         String taskStart = mockMvc.perform(MockMvcRequestBuilders
                 .post("/task/start")
@@ -103,9 +108,13 @@ public class TaskControllerQATest extends InitTestEnvironment {
         Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
     }
 
-
+    /**
+     * a3 disposeIp null exception test.
+     *
+     * @throws Exception the exception
+     */
     @Test
-    public void t3_startTaskNullDisposeIpExceptionTest() throws Exception {
+    public void a3_startTaskNullDisposeIpExceptionTest() throws Exception {
         //disposeIp null
         String reqDataNullIp = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\":\"{\\\"id\\\":-1," +
                 "\\\"type\\\":0, \\\"disposeIp\\\":null, \\\"disposeTime\\\":120}\"}";
@@ -128,9 +137,13 @@ public class TaskControllerQATest extends InitTestEnvironment {
         Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
     }
 
-
+    /**
+     * a4 disposeIp Integer empty exception test.
+     *
+     * @throws Exception the exception
+     */
     @Test
-    public void t4_startTaskIntegerDisposeIpExceptionTest() throws Exception {
+    public void a4_startTaskIntegerDisposeIpExceptionTest() throws Exception {
         String reqDataIntegerIp = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\":\"{\\\"id\\\":-1," +
                 "\\\"type\\\":0, \\\"disposeIp\\\":192345, \\\"disposeTime\\\":120}\"}";
 
@@ -156,12 +169,15 @@ public class TaskControllerQATest extends InitTestEnvironment {
         Assert.assertNotNull(startTaskRsp.getStatus());
         Assert.assertNotNull(startTaskRsp.getMessage());
         Assert.assertEquals(Long.valueOf(startTaskRsp.getStatus()), Long.valueOf(ErrorCode.ERR_NOSUCHDEVICE.getCode()));
-}
+    }
-
 
+    /**
+     * a5 id null exception test.
+     *
+     * @throws Exception the exception
+     */
     @Test
-    public void t5_startTaskNullIdExceptionTest() throws Exception {
+    public void a5_startTaskNullIdExceptionTest() throws Exception {
-        //Id null
         String reqDataNullId = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\":\"{\\\"id\\\":null," +
                 "\\\"type\\\":0, \\\"disposeIp\\\":\\\"192.168.4.2\\\", \\\"disposeTime\\\":120}\"}";
 
@@ -183,9 +199,13 @@ public class TaskControllerQATest extends InitTestEnvironment {
         Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
     }
 
+    /**
+     * a6 type empty exception test.
+     *
+     * @throws Exception the exception
+     */
     @Test
-    public void t6_startTaskNoTypeExceptionTest() throws Exception {
+    public void a6_startTaskNoTypeExceptionTest() throws Exception {
-        //no type
         String reqDataNoType = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\":\"{\\\"id\\\":-1," +
                 "\\\"type\\\":, \\\"disposeIp\\\":\\\"192.168.4.2\\\", \\\"disposeTime\\\":120}\"}";
 
@@ -207,9 +227,13 @@ public class TaskControllerQATest extends InitTestEnvironment {
         Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
     }
 
-
+    /**
+     * a7 type null exception test.
+     *
+     * @throws Exception the exception
+     */
     @Test
-    public void t7_startTaskNullTypeExceptionTest() throws Exception {    //null type
+    public void a7_startTaskNullTypeExceptionTest() throws Exception {    //null type
         String reqDataNullType = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\":\"{\\\"id\\\":-1," +
                 "\\\"type\\\":null, \\\"disposeIp\\\":\\\"192.168.4.2\\\", \\\"disposeTime\\\":120}\"}";
 
@@ -231,8 +255,13 @@ public class TaskControllerQATest extends InitTestEnvironment {
         Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
     }
 
+    /**
+     * a8 disposeTime empty exception test.
+     *
+     * @throws Exception the exception
+     */
     @Test
-    public void t8_startTaskNoDisposeTimeExceptionTest() throws Exception {
+    public void a8_startTaskNoDisposeTimeExceptionTest() throws Exception {
         //no disposeTime
         String reqDataNoDisposeTime = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\":\"{\\\"id\\\":-1," +
                 "\\\"type\\\":null, \\\"disposeIp\\\":\\\"192.168.4.2\\\", \\\"disposeTime\\\":}\"}";
@@ -255,9 +284,13 @@ public class TaskControllerQATest extends InitTestEnvironment {
         Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
     }
 
-
+    /**
+     * a9 disposeTime null exception test.
+     *
+     * @throws Exception the exception
+     */
     @Test
-    public void t9_startTaskNullDisposeTimeExceptionTest() throws Exception {
+    public void a9_startTaskNullDisposeTimeExceptionTest() throws Exception {
         //null disposeTime
         String reqDataNullDisposeTime = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\":\"{\\\"id\\\":-1," +
                 "\\\"type\\\":0, \\\"disposeIp\\\":\\\"192.168.4.2\\\", \\\"disposeTime\\\":null}\"}";
@@ -280,8 +313,13 @@ public class TaskControllerQATest extends InitTestEnvironment {
         Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
     }
 
+    /**
+     * a10 disposeTime String exception test.
+     *
+     * @throws Exception the exception
+     */
     @Test
-    public void t10_startTaskStringDisposeTimeExceptionTest() throws Exception {
+    public void a10_startTaskStringDisposeTimeExceptionTest() throws Exception {
         //string disposeTime
         String reqDataStringDisposeTime = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\":\"{\\\"id\\\":-1," +
                 "\\\"type\\\":null, \\\"disposeIp\\\":\\\"192.168.4.2\\\", \\\"disposeTime\\\":\\\"120\\\"}\"}";
@@ -304,11 +342,15 @@ public class TaskControllerQATest extends InitTestEnvironment {
         Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
     }
 
-
+    /**
+     * b1 taskId empty exception test.
+     *
+     * @throws Exception the exception
+     */
     @Test
-    public void t11_stopTaskNoTaskIdExceptionTest() throws Exception {
+    public void b1_stopTaskNoTaskIdExceptionTest() throws Exception {
         String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988," +
-                "\"msgContent\":\"{\\\"taskId\\\":}\"}";
+                "\"msgContent\":\"{\\\"taskId\\\":\\\"\\\"}\"}";
 
         String taskStop = mockMvc.perform(MockMvcRequestBuilders
                 .post("/task/stop")
@@ -328,8 +370,13 @@ public class TaskControllerQATest extends InitTestEnvironment {
         Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
     }
 
+    /**
+     * b2 taskId null exception test.
+     *
+     * @throws Exception the exception
+     */
     @Test
-    public void t12_stopTaskNullTaskIdExceptionTest() throws Exception {
+    public void b2_stopTaskNullTaskIdExceptionTest() throws Exception {
         String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988," +
                 "\"msgContent\":\"{\\\"taskId\\\":null}\"}";
 
@@ -362,12 +409,15 @@ public class TaskControllerQATest extends InitTestEnvironment {
                 Assert.assertEquals(Long.valueOf(task.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
             }
         }
-
     }
 
-
+    /**
+     * c1 id null exception test.
+     *
+     * @throws Exception the exception
+     */
     @Test
-    public void t13_stopTaskByIpNullIdExceptionTest() throws Exception {
+    public void c1_stopTaskByIpNullIdExceptionTest() throws Exception {
         String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
                 "[{\\\"id\\\":null,\\\"type\\\":0,\\\"disposeIp\\\":\\\"192.168.3.4\\\"}]}\"}";
 
@@ -389,5 +439,420 @@ public class TaskControllerQATest extends InitTestEnvironment {
         Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
     }
 
+    /**
+     * c2 id empty exception test.
+     *
+     * @throws Exception the exception
+     */
+    @Test
+    public void c2_stopTaskByIpNoIdExceptionTest() throws Exception {
+        String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
+                "[{\\\"id\\\":\\\"\\\",\\\"type\\\":0,\\\"disposeIp\\\":\\\"192.168.3.4\\\"}]}\"}";
+
+        String taskStopByIpNollId = mockMvc.perform(MockMvcRequestBuilders
+                .post("/task/stop_ip")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("Authorization", "Bearer " + getLogToken())
+                .content(reqData))
+                .andDo(print()).andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(521))
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        ReturnStatus returnStatus = objectMapper.readValue(verifyResp(taskStopByIpNollId), ReturnStatus.class);
+
+        Assert.assertNotNull(returnStatus.getStatus());
+        Assert.assertNotNull(returnStatus.getMessage());
+        Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+    }
+
+    /**
+     * c3 disposeIp empty exception test.
+     *
+     * @throws Exception the exception
+     */
+    @Test
+    public void c3_stopTaskByIpNoDisposeIpExceptionTest() throws Exception {
+        String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
+                "[{\\\"id\\\":\\\"314\\\",\\\"type\\\":0,\\\"disposeIp\\\":\\\"\\\"}]}\"}";
+
+        String taskStopByIpNoDisposeIp = mockMvc.perform(MockMvcRequestBuilders
+                .post("/task/stop_ip")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("Authorization", "Bearer " + getLogToken())
+                .content(reqData))
+                .andDo(print()).andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(521))
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        ReturnStatus returnStatus = objectMapper.readValue(verifyResp(taskStopByIpNoDisposeIp), ReturnStatus.class);
+
+        Assert.assertNotNull(returnStatus.getStatus());
+        Assert.assertNotNull(returnStatus.getMessage());
+        Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+    }
+
+    /**
+     * c4 disposeIp null exception test.
+     *
+     * @throws Exception the exception
+     */
+    @Test
+    public void c4_stopTaskByIpNullDisposeIpExceptionTest() throws Exception {
+        String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
+                "[{\\\"id\\\":\\\"314\\\",\\\"type\\\":0,\\\"disposeIp\\\":null}]}\"}";
+
+        String taskStopByIpNullDisposeIp = mockMvc.perform(MockMvcRequestBuilders
+                .post("/task/stop_ip")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("Authorization", "Bearer " + getLogToken())
+                .content(reqData))
+                .andDo(print()).andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(521))
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        ReturnStatus returnStatus = objectMapper.readValue(verifyResp(taskStopByIpNullDisposeIp), ReturnStatus.class);
+
+        Assert.assertNotNull(returnStatus.getStatus());
+        Assert.assertNotNull(returnStatus.getMessage());
+        Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+    }
+
+    /**
+     * c5 disposeIp "abc" exception test.
+     *
+     * @throws Exception the exception
+     */
+    @Test
+    public void c5_stopTaskByIpErrorDisposeIpExceptionTest() throws Exception {
+        String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
+                "[{\\\"id\\\":\\\"314\\\",\\\"type\\\":0,\\\"disposeIp\\\":\\\"abc\\\"}]}\"}";
+
+        String taskStopByIpErrorDisposeIp = mockMvc.perform(MockMvcRequestBuilders
+                .post("/task/stop_ip")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("Authorization", "Bearer " + getLogToken())
+                .content(reqData))
+                .andDo(print()).andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(521))
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        ReturnStatus returnStatus = objectMapper.readValue(verifyResp(taskStopByIpErrorDisposeIp), ReturnStatus.class);
+
+        Assert.assertNotNull(returnStatus.getStatus());
+        Assert.assertNotNull(returnStatus.getMessage());
+        Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+    }
+
+    /**
+     * c6 disposeIp Integer exception test.
+     *
+     * @throws Exception the exception
+     */
+    @Test
+    public void c6_stopTaskByIpIntegerDisposeIpExceptionTest() throws Exception {
+        String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
+                "[{\\\"id\\\":\\\"314\\\",\\\"type\\\":0,\\\"disposeIp\\\":123}]}\"}";
+
+        String taskStopByIpIntegerDisposeIp = mockMvc.perform(MockMvcRequestBuilders
+                .post("/task/stop_ip")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("Authorization", "Bearer " + getLogToken())
+                .content(reqData))
+                .andDo(print()).andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(521))
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        ReturnStatus returnStatus = objectMapper.readValue(verifyResp(taskStopByIpIntegerDisposeIp), ReturnStatus.class);
+
+        Assert.assertNotNull(returnStatus.getStatus());
+        Assert.assertNotNull(returnStatus.getMessage());
+        Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+    }
+
+    /**
+     * c7 type empty exception test.
+     *
+     * @throws Exception the exception
+     */
+    @Test
+    public void c7_stopTaskByIpNoTypeExceptionTest() throws Exception {
+        String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
+                "[{\\\"id\\\":\\\"314\\\",\\\"type\\\":,\\\"disposeIp\\\":\\\"192.168.5.4\\\"}]}\"}";
+
+        String taskStopByIpNoType = mockMvc.perform(MockMvcRequestBuilders
+                .post("/task/stop_ip")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("Authorization", "Bearer " + getLogToken())
+                .content(reqData))
+                .andDo(print()).andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(521))
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        ReturnStatus returnStatus = objectMapper.readValue(verifyResp(taskStopByIpNoType), ReturnStatus.class);
+
+        Assert.assertNotNull(returnStatus.getStatus());
+        Assert.assertNotNull(returnStatus.getMessage());
+        Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+    }
+
+    /**
+     * c8 type null exception test.
+     *
+     * @throws Exception the exception
+     */
+    @Test
+    public void c8_stopTaskByIpNullTypeExceptionTest() throws Exception {
+        String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
+                "[{\\\"id\\\":\\\"314\\\",\\\"type\\\":null,\\\"disposeIp\\\":\\\"192.168.5.4\\\"}]}\"}";
+
+        String taskStopByIpNullType = mockMvc.perform(MockMvcRequestBuilders
+                .post("/task/stop_ip")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("Authorization", "Bearer " + getLogToken())
+                .content(reqData))
+                .andDo(print()).andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(521))
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        ReturnStatus returnStatus = objectMapper.readValue(verifyResp(taskStopByIpNullType), ReturnStatus.class);
+
+        Assert.assertNotNull(returnStatus.getStatus());
+        Assert.assertNotNull(returnStatus.getMessage());
+        Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+    }
+
+    /**
+     * d1 stop task by single node test.
+     *
+     */
+    @Test
+    public void d1_NormalStopTaskByNodeTest() throws Exception {
+        String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
+                "[{\\\"id\\\":\\\"472\\\",\\\"type\\\":0}]}\"}";
+
+        String taskStopByNode = mockMvc.perform(MockMvcRequestBuilders
+                .post("/task/stop_node")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("Authorization", "Bearer " + getLogToken())
+                .content(reqData))
+                .andDo(print()).andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        String regex = "\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z";
+        TaskInfoRsp taskStopByIpRsp = objectMapper.readValue(verifyResp(taskStopByNode), TaskInfoRsp.class);
+
+        List<TaskInfoData> taskInfoList = taskStopByIpRsp.getItems();
+        for (TaskInfoData task : taskInfoList
+        ) {
+            Assert.assertNotNull(task.getId());
+            Assert.assertNotNull(task.getTaskId());
+            Assert.assertNotNull(task.getStatus());
+            Assert.assertNotNull(task.getMessage());
+
+            if (task.getStatus() == 0) {
+                Assert.assertEquals(String.valueOf(task.getStatus()), "0");
+                Assert.assertEquals(task.getMessage(), "成功");
+            } else {
+                Assert.assertNotEquals(String.valueOf(task.getStatus()), "0");
+                Assert.assertNotEquals(task.getMessage(), "成功");
+            }
+
+            if (task.getType() != null) {
+                Assert.assertNotEquals(String.valueOf(task.getType()), -1);
+            }
+
+            if (task.getDisposeIp() != null) {
+                Assert.assertTrue(task.getDisposeIp().matches(regex));
+            }
+
+            if (task.getDisposeTime() != null) {
+                Assert.assertNotEquals(String.valueOf(task.getDisposeTime()), -1);
+            }
+        }
+    }
+
+    /**
+     * d2 stop task by two nodes test.
+     *
+     */
+    @Test
+    public void d2_NormalStopTaskByNodesTest() throws Exception {
+        String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
+                "[{\\\"id\\\":\\\"472\\\",\\\"type\\\":0}, {\\\"id\\\":\\\"471\\\",\\\"type\\\":0}]}\"}";
+
+        String taskStopByNode = mockMvc.perform(MockMvcRequestBuilders
+                .post("/task/stop_node")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("Authorization", "Bearer " + getLogToken())
+                .content(reqData))
+                .andDo(print()).andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        String regex = "\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z";
+        TaskInfoRsp taskStopByIpRsp = objectMapper.readValue(verifyResp(taskStopByNode), TaskInfoRsp.class);
+
+        List<TaskInfoData> taskInfoList = taskStopByIpRsp.getItems();
+        for (TaskInfoData task : taskInfoList
+        ) {
+            Assert.assertNotNull(task.getId());
+            Assert.assertNotNull(task.getTaskId());
+            Assert.assertNotNull(task.getStatus());
+            Assert.assertNotNull(task.getMessage());
+
+            if (task.getStatus() == 0) {
+                Assert.assertEquals(String.valueOf(task.getStatus()), "0");
+                Assert.assertEquals(task.getMessage(), "成功");
+            } else {
+                Assert.assertNotEquals(String.valueOf(task.getStatus()), "0");
+                Assert.assertNotEquals(task.getMessage(), "成功");
+            }
+
+            if (task.getType() != null) {
+                Assert.assertNotEquals(String.valueOf(task.getType()), -1);
+            }
+
+            if (task.getDisposeIp() != null) {
+                Assert.assertTrue(task.getDisposeIp().matches(regex));
+            }
+
+            if (task.getDisposeTime() != null) {
+                Assert.assertNotEquals(String.valueOf(task.getDisposeTime()), -1);
+            }
+        }
+    }
+
+    /**
+     * d3 id empty exception test.
+     *
+     * @throws Exception the exception
+     */
+    @Test
+    public void d3_stopTaskByNodeNoIdExceptionTest() throws Exception {
+        String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
+                "[{\\\"id\\\":\\\"\\\",\\\"type\\\":0}}\"}";
+
+        String taskStopByNode = mockMvc.perform(MockMvcRequestBuilders
+                .post("/task/stop_node")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("Authorization", "Bearer " + getLogToken())
+                .content(reqData))
+                .andDo(print()).andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(521))
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        ReturnStatus returnStatus = objectMapper.readValue(verifyResp(taskStopByNode), ReturnStatus.class);
+
+        Assert.assertNotNull(returnStatus.getStatus());
+        Assert.assertNotNull(returnStatus.getMessage());
+        Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+    }
+
+    /**
+     * d4 id null exception test.
+     *
+     * @throws Exception the exception
+     */
+    @Test
+    public void d4_stopTaskByNodeNullIdExceptionTest() throws Exception {
+        String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
+                "[{\\\"id\\\":null,\\\"type\\\":0}}\"}";
+
+        String taskStopByNode = mockMvc.perform(MockMvcRequestBuilders
+                .post("/task/stop_node")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("Authorization", "Bearer " + getLogToken())
+                .content(reqData))
+                .andDo(print()).andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(521))
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        ReturnStatus returnStatus = objectMapper.readValue(verifyResp(taskStopByNode), ReturnStatus.class);
+
+        Assert.assertNotNull(returnStatus.getStatus());
+        Assert.assertNotNull(returnStatus.getMessage());
+        Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+    }
+
+    /**
+     * d5 type empty exception test.
+     *
+     * @throws Exception the exception
+     */
+    @Test
+    public void d5_stopTaskByNodeNoTypeExceptionTest() throws Exception {
+        String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
+                "[{\\\"id\\\":\\\"472\\\",\\\"type\\\":}}\"}";
+
+        String taskStopByNode = mockMvc.perform(MockMvcRequestBuilders
+                .post("/task/stop_node")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("Authorization", "Bearer " + getLogToken())
+                .content(reqData))
+                .andDo(print()).andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(521))
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        ReturnStatus returnStatus = objectMapper.readValue(verifyResp(taskStopByNode), ReturnStatus.class);
+
+        Assert.assertNotNull(returnStatus.getStatus());
+        Assert.assertNotNull(returnStatus.getMessage());
+        Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+    }
+
+    /**
+     * d6 type null exception test.
+     *
+     * @throws Exception the exception
+     */
+    @Test
+    public void d6_stopTaskByNodeNullTypeExceptionTest() throws Exception {
+        String reqData = "{\"ver\":2,\"cryptoType\":0,\"timeStamp\":1587604296988,\"msgContent\": \"{\\\"items\\\":" +
+                "[{\\\"id\\\":\\\"472\\\",\\\"type\\\":null}}\"}";
+
+        String taskStopByNode = mockMvc.perform(MockMvcRequestBuilders
+                .post("/task/stop_node")
+                .contentType(MediaType.APPLICATION_JSON)
+                .header("Authorization", "Bearer " + getLogToken())
+                .content(reqData))
+                .andDo(print()).andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(521))
+                .andReturn()
+                .getResponse()
+                .getContentAsString();
+
+        ReturnStatus returnStatus = objectMapper.readValue(verifyResp(taskStopByNode), ReturnStatus.class);
+
+        Assert.assertNotNull(returnStatus.getStatus());
+        Assert.assertNotNull(returnStatus.getMessage());
+        Assert.assertEquals(Long.valueOf(returnStatus.getStatus()), Long.valueOf(ErrorCode.ERR_PARAMEXCEPTION.getCode()));
+    }
+
+
 
 }

src/test/java/com/dispose/controller/TaskControllerSmokeTest.java

@@ -195,7 +195,7 @@ public class TaskControllerSmokeTest extends InitTestEnvironment {
         List<TaskInfoData> taskInfoList = startTaskRsp.getItems();
         for (TaskInfoData task : taskInfoList
         ) {
-            Assert.assertNotNull(task.getTaskId());
+            Assert.assertNotNull(task.getId());
             Assert.assertNotNull(task.getTaskId());
             Assert.assertNotNull(task.getStartTime());
             Assert.assertNotNull(task.getDisposeTime());
@@ -204,8 +204,8 @@ public class TaskControllerSmokeTest extends InitTestEnvironment {
 
             if (task.getStatus() == 0) {
                 Assert.assertEquals(Long.valueOf(task.getStatus()), Long.valueOf(ErrorCode.ERR_OK.getCode()));
-            } else if (task.getStatus() == 30) {
+            } else if (task.getStatus() == 19) {
-                Assert.assertEquals(Long.valueOf(task.getStatus()), Long.valueOf(ErrorCode.ERR_NOSUCHTASK.getCode()));
+                Assert.assertEquals(Long.valueOf(task.getStatus()), Long.valueOf(ErrorCode.ERR_NOSUCHDEVICE.getCode()));
             }
         }
     }