From 034881e4de11192dc2ec5bfa5922563d63b84ae8 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Fri, 30 Oct 2020 15:46:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?OCT=20REM:=201.=20=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=A4=84=E7=BD=AE=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E5=8C=BA=E5=9F=9F=E8=AE=BE=E5=A4=87=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DisposeTaskController.java | 3 + .../dispose/manager/DisposeTaskManager.java | 9 +-- .../manager/impl/DisposeTaskManagerImpl.java | 17 +++--- .../com/dispose/mapper/DisposeTaskMapper.java | 1 + .../pojo/dto/protocol/task/DisposeObject.java | 5 ++ .../com/dispose/pojo/entity/DisposeTask.java | 4 ++ .../impl/DeviceTaskManagerServiceImpl.java | 3 + .../service/impl/DisposeTaskServiceImpl.java | 2 +- src/main/resources/db/schema.sql | 1 + src/main/resources/mappers/DisposeTask.xml | 4 ++ .../dev/manager/DisposeTaskManagerTest.java | 4 +- .../dev/mapper/DisposeTaskMapperTest.java | 8 +-- .../dev/service/DisposeTaskServiceTest.java | 56 ++++++++++--------- 13 files changed, 72 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/dispose/controller/DisposeTaskController.java b/src/main/java/com/dispose/controller/DisposeTaskController.java index b8c3086c..f4dcef9e 100644 --- a/src/main/java/com/dispose/controller/DisposeTaskController.java +++ b/src/main/java/com/dispose/controller/DisposeTaskController.java @@ -120,6 +120,7 @@ public class DisposeTaskController { DisposeTask task = DisposeTask.builder() .deviceId(devId) .accountId(aId) + .areaCode(v.getAreaCode() == null ? -1 : v.getAreaCode()) .disposeCapacity(capType) .disposeObject(Helper.ipAddressNormalize(v.getDisposeObject())) .objectType(t) @@ -172,6 +173,7 @@ public class DisposeTaskController { // 构造处置任务参数 DisposeTask task = DisposeTask.builder() .deviceId(Long.parseLong(Optional.ofNullable(req.getId()).orElse("-1"))) + .areaCode(-1) .accountId(userAccountService.getUserIdByAuthHead(Objects.requireNonNull(headers.get("Authorization")) .get(0))) .disposeCapacity(CommonEnumHandler.codeOf(DisposeCapacityType.class, @@ -248,6 +250,7 @@ public class DisposeTaskController { DisposeTask task = DisposeTask.builder() .deviceId(devId) .accountId(aId) + .areaCode(-1) .disposeCapacity(capType) .disposeObject(Helper.ipAddressNormalize(ip)) .objectType(DisposeObjectType.IP) diff --git a/src/main/java/com/dispose/manager/DisposeTaskManager.java b/src/main/java/com/dispose/manager/DisposeTaskManager.java index a828f33b..63dd59fe 100644 --- a/src/main/java/com/dispose/manager/DisposeTaskManager.java +++ b/src/main/java/com/dispose/manager/DisposeTaskManager.java @@ -19,11 +19,12 @@ public interface DisposeTaskManager { * Gets dispose task. * * @param deviceId the device id + * @param areaCode the area code * @param disposeIp the dispose ip * @param capType the cap type * @return the dispose task */ - DisposeTask getDisposeTask(Long deviceId, String disposeIp, DisposeCapacityType capType); + DisposeTask getDisposeTask(Long deviceId, Integer areaCode, String disposeIp, DisposeCapacityType capType); /** * Add dispose task error code. @@ -65,16 +66,16 @@ public interface DisposeTaskManager { DisposeTask getDisposeTaskById(Long taskId); /** - * Gets dispose task by id. + * Gets dispose tasks. * - * @return the dispose task list + * @return the dispose tasks */ List getDisposeTasks(); /** * Gets pages of task. * - * @param taskId the task id + * @param taskId the task id * @param startPage the start page * @param pageSize the page size * @return the pages of task diff --git a/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java index 0759b9c2..0239af82 100644 --- a/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/DisposeTaskManagerImpl.java @@ -34,13 +34,14 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager { * Gets dispose task. * * @param deviceId the device id + * @param areaCode the area code * @param disposeIp the dispose ip * @param capType the cap type * @return the dispose task */ @Override - public DisposeTask getDisposeTask(Long deviceId, String disposeIp, DisposeCapacityType capType) { - return disposeTaskMapper.getRunningTask(deviceId, capType, disposeIp); + public DisposeTask getDisposeTask(Long deviceId, Integer areaCode, String disposeIp, DisposeCapacityType capType) { + return disposeTaskMapper.getRunningTask(deviceId, areaCode, capType, disposeIp); } /** @@ -102,9 +103,9 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager { } /** - * Gets dispose task by id. + * Gets dispose tasks. * - * @return the dispose task list + * @return the dispose tasks */ @Override public List getDisposeTasks() { @@ -114,7 +115,7 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager { /** * Gets pages of task. * - * @param taskId the task id + * @param taskId the task id * @param startPage the start page * @param pageSize the page size * @return the pages of task @@ -129,7 +130,7 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager { // 设置分页信息 PageHelper.startPage(startPage, pageSize); - if(taskId.size() > 0) { + if (taskId.size() > 0) { preList = disposeTaskMapper.selectPageById(taskId); } else { preList = disposeTaskMapper.selectPageAll(); @@ -138,8 +139,8 @@ public class DisposeTaskManagerImpl implements DisposeTaskManager { pageInfo = new PageInfo<>(preList); - if(taskId.size() == 0){ - return new MulReturnType<>(pageInfo, new ArrayList<>()); + if (taskId.size() == 0) { + return new MulReturnType<>(pageInfo, new ArrayList<>()); } List taskList = new ArrayList<>(disposeTaskMapper.selectByIdSet(taskId)); diff --git a/src/main/java/com/dispose/mapper/DisposeTaskMapper.java b/src/main/java/com/dispose/mapper/DisposeTaskMapper.java index 4c9bb3d8..3bdbdc4e 100644 --- a/src/main/java/com/dispose/mapper/DisposeTaskMapper.java +++ b/src/main/java/com/dispose/mapper/DisposeTaskMapper.java @@ -86,6 +86,7 @@ public interface DisposeTaskMapper { * @return the running task */ DisposeTask getRunningTask(@Param("deviceId") Long deviceId, + @Param("areaCode") Integer areaCode, @Param("capType") DisposeCapacityType capType, @Param("disposeObject") String disposeObject); diff --git a/src/main/java/com/dispose/pojo/dto/protocol/task/DisposeObject.java b/src/main/java/com/dispose/pojo/dto/protocol/task/DisposeObject.java index a0c6fee8..e17ac115 100644 --- a/src/main/java/com/dispose/pojo/dto/protocol/task/DisposeObject.java +++ b/src/main/java/com/dispose/pojo/dto/protocol/task/DisposeObject.java @@ -38,4 +38,9 @@ public class DisposeObject { @NotNull(message = "objectType 处置类型不能为空", groups = ValidGroups.TaskStartReqValid.class) @ValidBaseEnum(enumClass = DisposeObjectType.class, groups = ValidGroups.TaskStartReqValid.class) private Integer objectType; + + /** + * The Area code. + */ + private Integer areaCode; } diff --git a/src/main/java/com/dispose/pojo/entity/DisposeTask.java b/src/main/java/com/dispose/pojo/entity/DisposeTask.java index 679bdeb1..6d0c01b4 100644 --- a/src/main/java/com/dispose/pojo/entity/DisposeTask.java +++ b/src/main/java/com/dispose/pojo/entity/DisposeTask.java @@ -52,6 +52,10 @@ public class DisposeTask implements Serializable { * The Account id. */ private Long accountId; + /** + * The Area code. + */ + private Integer areaCode; /** * The Dispose capacity. */ diff --git a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java index 515bf466..e2034e2f 100644 --- a/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java @@ -531,9 +531,12 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService { disposeAbilityRouterService.getAllAbilityDevices().stream() // 判断是否是当前设备的处置任务 .filter(f -> v.getDeviceId() == -1 || f.getDev().getId().equals(v.getDeviceId())) + // 判断是否是当前区域处置 + .filter(f -> v.getAreaCode() == -1 || f.getDev().getAreaCode().equals(v.getAreaCode())) // 当前设备是否支持该处置能力 .filter(c -> c.getDev().getDevCapacity().stream().anyMatch(m -> m.getCapacityType() == v .getDisposeCapacity())) + // 当前设备是否支持处置该IP .filter(c -> c.getDb().isCarryProtectIp(v.getDisposeObject())) .forEach(d -> { log.info("Add dispose task for device: {}", d.getDev()); diff --git a/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java b/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java index e245668e..b1a90e32 100644 --- a/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java @@ -40,7 +40,7 @@ public class DisposeTaskServiceImpl implements DisposeTaskService { */ @Override public MulReturnType createTask(DisposeTask task) { - DisposeTask exitTask = disposeTaskManager.getDisposeTask(task.getDeviceId(), + DisposeTask exitTask = disposeTaskManager.getDisposeTask(task.getDeviceId(), task.getAreaCode(), task.getDisposeObject(), task.getDisposeCapacity()); if (exitTask != null) { diff --git a/src/main/resources/db/schema.sql b/src/main/resources/db/schema.sql index a3d9064c..f2cbf521 100644 --- a/src/main/resources/db/schema.sql +++ b/src/main/resources/db/schema.sql @@ -107,6 +107,7 @@ CREATE TABLE `dispose_task` `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '处置任务唯一标识符', `deviceId` int(10) NOT NULL COMMENT '处置设备唯一标识符', `accountId` int(10) UNSIGNED NOT NULL COMMENT '用户唯一标识符', + `areaCode` int(11) NOT NULL DEFAULT -1 COMMENT '设备物理位置区域码', `disposeCapacity` int(11) NOT NULL COMMENT '处置能力类型：0：清洗 1：高防 2：黑洞 3：检测', `disposeObject` varchar(4096) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '处置对象', `objectType` int(8) NOT NULL COMMENT '处置对象类型：\r\n0：IP\r\n1：域名 \r\n2：URL', diff --git a/src/main/resources/mappers/DisposeTask.xml b/src/main/resources/mappers/DisposeTask.xml index 6970f96a..102b3010 100644 --- a/src/main/resources/mappers/DisposeTask.xml +++ b/src/main/resources/mappers/DisposeTask.xml @@ -5,6 +5,7 @@ + @@ -121,6 +122,9 @@ AND dt.deviceId = #{deviceId} + + AND dt.areaCode = #{areaCode} + SELECT d.*, - c.id c_id, - c.deviceId deviceId, - c.capacityType capacityType, - c.objectType objectType, - c.ipType ipType, - c.protectIp protectIp, - c.reserveNetflow reserveNetflow + c.id c_id, + c.deviceId deviceId, + c.capacityType capacityType, + c.objectType objectType, + c.ipType ipType, + c.protectIp protectIp, + c.reserveNetflow reserveNetflow FROM dispose_device d - LEFT JOIN dispose_capacity c ON d.id = c.deviceId + LEFT JOIN dispose_capacity c ON d.id = c.deviceId WHERE d.id IN #{id} @@ -129,4 +129,18 @@ SET status = ${@com.dispose.common.ObjectStatus@NORMAL.getValue()} WHERE id = #{id} - \ No newline at end of file + + + From 8271ce1f3a474ee92891101158bb9fca9a82b4cf Mon Sep 17 00:00:00 2001 From: HuangXin Date: Mon, 2 Nov 2020 10:55:46 +0800 Subject: [PATCH 4/5] =?UTF-8?q?OCT=20REM:=201.=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE=E5=BA=93=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/test_db/unit_test.sql | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/test_db/unit_test.sql b/src/main/resources/test_db/unit_test.sql index 6e33036a..3a13b4b8 100644 --- a/src/main/resources/test_db/unit_test.sql +++ b/src/main/resources/test_db/unit_test.sql @@ -146,6 +146,7 @@ CREATE TABLE `dispose_task` `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '处置任务唯一标识符', `deviceId` int(10) NOT NULL COMMENT '处置设备唯一标识符', `accountId` int(10) UNSIGNED NOT NULL COMMENT '用户唯一标识符', + `areaCode` int(11) NOT NULL DEFAULT -1 COMMENT '设备物理位置区域码', `disposeCapacity` int(11) NOT NULL COMMENT '处置能力类型：0：清洗 1：高防 2：黑洞 3：检测', `disposeObject` varchar(4096) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '处置对象', `objectType` int(8) NOT NULL COMMENT '处置对象类型：\r\n0：IP\r\n1：域名 \r\n2：URL', @@ -169,10 +170,11 @@ CREATE TABLE `dispose_task` -- Records of dispose_task -- ---------------------------- INSERT INTO `dispose_task` -VALUES (1, -1, 1, 0, '192.168.10.1', 1, CURRENT_TIMESTAMP, date_add(now(), interval 60 MINUTE), null, 2, 8796093022207, +VALUES (1, -1, 1, -1, 0, '192.168.10.1', 1, CURRENT_TIMESTAMP, date_add(now(), interval 60 MINUTE), null, 2, + 8796093022207, 1024, 0); INSERT INTO `dispose_task` -VALUES (2, -1, 1, 0, '192.168.10.2', 1, CURRENT_TIMESTAMP, date_add(now(), interval 60 MINUTE), null, 2, 8796093022207, +VALUES (2, -1, 1, -1, 0, '192.168.10.2', 1, CURRENT_TIMESTAMP, date_add(now(), interval 60 MINUTE), null, 2, 8796093022207, 1024, 0); -- ---------------------------- From cc170e79b378ff2331545605bdc6824fe5c01823 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Mon, 2 Nov 2020 17:43:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=AD=A3areaCod?= =?UTF-8?q?e=E5=88=A4=E6=96=AD=E4=B8=8D=E6=AD=A3=E7=A1=AE=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=89=BE=E4=B8=8D=E5=88=B0=E8=AE=BE=E5=A4=87=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dispose/manager/DisposeDeviceManager.java | 11 +++++----- .../impl/DisposeDeviceManagerImpl.java | 21 ++++++++++--------- .../dispose/mapper/DisposeDeviceMapper.java | 2 +- .../service/DisposeDeviceManagerService.java | 9 ++++---- .../impl/DisposeDeviceManagerServiceImpl.java | 11 +++++----- .../service/impl/DisposeTaskServiceImpl.java | 9 +++----- src/main/resources/mappers/DisposeDevice.xml | 7 ++++++- 7 files changed, 38 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/dispose/manager/DisposeDeviceManager.java b/src/main/java/com/dispose/manager/DisposeDeviceManager.java index dc6ff3b4..2dd64c04 100644 --- a/src/main/java/com/dispose/manager/DisposeDeviceManager.java +++ b/src/main/java/com/dispose/manager/DisposeDeviceManager.java @@ -50,17 +50,18 @@ public interface DisposeDeviceManager { Integer pageSize); /** - * Gets all dispose devices. + * Gets all normal dispose devices. * - * @return the all dispose devices + * @return the all normal dispose devices */ List getAllNormalDisposeDevices(); /** - * Gets all dispose devices. + * Gets dispose devices. * - * @param areaCode the areaCode + * @param devId the dev id + * @param areaCode the area code * @return the dispose devices */ - List getDisposeDevices(Integer areaCode); + List getDisposeDevices(Long devId, Integer areaCode); } diff --git a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java index a2eb6dbc..3ec759b5 100644 --- a/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java +++ b/src/main/java/com/dispose/manager/impl/DisposeDeviceManagerImpl.java @@ -115,7 +115,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); @@ -143,11 +143,11 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager { // HTTP 默认端口 if (dev.getUrlType() == HttpType.HTTP) { tDev = disposeDeviceMapper.getDeviceByAddress(dev.getIpAddr(), - HttpType.getDefaultPort(HttpType.HTTP)); + HttpType.getDefaultPort(HttpType.HTTP)); } else if (dev.getUrlType() == HttpType.HTTPS) { // HTTPS 默认端口 tDev = disposeDeviceMapper.getDeviceByAddress(dev.getIpAddr(), - HttpType.getDefaultPort(HttpType.HTTPS)); + HttpType.getDefaultPort(HttpType.HTTPS)); } } } @@ -264,9 +264,9 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager { } /** - * Gets all dispose devices. + * Gets all normal dispose devices. * - * @return the all dispose devices + * @return the all normal dispose devices */ @Override public List getAllNormalDisposeDevices() { @@ -277,13 +277,14 @@ public class DisposeDeviceManagerImpl implements DisposeDeviceManager { /** - * Gets dispose devices by areaCode. + * Gets dispose devices. * - * @param areaCode the areaCode - * @return the dispose devices by areaCode. + * @param devId the dev id + * @param areaCode the area code + * @return the dispose devices */ @Override - public List getDisposeDevices(Integer areaCode) { - return disposeDeviceMapper.getDeviceByAreaCode(areaCode); + public List getDisposeDevices(Long devId, Integer areaCode) { + return disposeDeviceMapper.getDeviceByAreaCode(devId, areaCode); } } diff --git a/src/main/java/com/dispose/mapper/DisposeDeviceMapper.java b/src/main/java/com/dispose/mapper/DisposeDeviceMapper.java index 95442c89..0766aa1b 100644 --- a/src/main/java/com/dispose/mapper/DisposeDeviceMapper.java +++ b/src/main/java/com/dispose/mapper/DisposeDeviceMapper.java @@ -101,6 +101,6 @@ public interface DisposeDeviceMapper { * @param areaCode the areaCode * @return the list */ - List getDeviceByAreaCode(@Param("areaCode") Integer areaCode); + List getDeviceByAreaCode(@Param("id") Long id, @Param("areaCode") Integer areaCode); } diff --git a/src/main/java/com/dispose/service/DisposeDeviceManagerService.java b/src/main/java/com/dispose/service/DisposeDeviceManagerService.java index 8a40e819..074a837c 100644 --- a/src/main/java/com/dispose/service/DisposeDeviceManagerService.java +++ b/src/main/java/com/dispose/service/DisposeDeviceManagerService.java @@ -57,10 +57,11 @@ public interface DisposeDeviceManagerService { List getAllDisposeDevice(); /** - * Gets dispose device by areaCode. + * Gets dispose device by area code. * - * @param areaCode the areaCode - * @return the all dispose device + * @param devId the dev id + * @param areaCode the area code + * @return the dispose device by area code */ - List getDisposeDeviceByAreaCode(Integer areaCode); + List getDisposeDeviceByAreaCode(Long devId, Integer areaCode); } diff --git a/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java b/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java index 92e94ffd..e92e62ad 100644 --- a/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/DisposeDeviceManagerServiceImpl.java @@ -130,14 +130,15 @@ public class DisposeDeviceManagerServiceImpl implements DisposeDeviceManagerServ } /** - * Gets dispose device by areaCode. + * Gets dispose device by area code. * - * @param areaCode the areaCode - * @return the all dispose device by areaCode + * @param devId the dev id + * @param areaCode the area code + * @return the dispose device by area code */ @Override - public List getDisposeDeviceByAreaCode(Integer areaCode) { - List disposeDevices = disposeDeviceManager.getDisposeDevices(areaCode); + public List getDisposeDeviceByAreaCode(Long devId, Integer areaCode) { + List disposeDevices = disposeDeviceManager.getDisposeDevices(devId, areaCode); if (disposeDevices == null) { return new ArrayList<>(); diff --git a/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java b/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java index 23eadd56..15facbff 100644 --- a/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java +++ b/src/main/java/com/dispose/service/impl/DisposeTaskServiceImpl.java @@ -14,7 +14,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; -import java.util.stream.Collectors; /** * The type Dispose task service. @@ -65,12 +64,10 @@ public class DisposeTaskServiceImpl implements DisposeTaskService { } //areaCode获取对应的deviceId - List devices = disposeDeviceManagerService.getDisposeDeviceByAreaCode(task.getAreaCode()); + List devices = disposeDeviceManagerService.getDisposeDeviceByAreaCode(task.getDeviceId(), + task.getAreaCode()); - // 获取请求id列表 - List deviceIds = devices.stream().map(DisposeDevice::getId).distinct().collect(Collectors.toList()); - - if (deviceIds.size() == 0 || !deviceIds.contains(task.getDeviceId())) { + if (devices.size() == 0) { return new MulReturnType<>(ErrorCode.ERR_NODEVICE_AREACODE, task); } else { return new MulReturnType<>(disposeTaskManager.addDisposeTask(task), diff --git a/src/main/resources/mappers/DisposeDevice.xml b/src/main/resources/mappers/DisposeDevice.xml index eb48fdb8..de7b3b0f 100644 --- a/src/main/resources/mappers/DisposeDevice.xml +++ b/src/main/resources/mappers/DisposeDevice.xml @@ -141,6 +141,11 @@ c.reserveNetflow reserveNetflow FROM dispose_device d LEFT JOIN dispose_capacity c ON d.id = c.deviceId - WHERE d.areaCode = #{areaCode} + + WHERE d.areaCode = #{areaCode} + + AND d.id = #{id} + +