From d1179bf5636a460e4a525133ef8902ef81b780f0 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Tue, 20 May 2025 11:40:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=A0=E9=99=A4=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E6=88=90=E5=8F=AF=E6=94=B9=E5=8F=98=E6=88=90?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/shxy/xymanager_common/vo/TerminalIdListVo.java | 2 ++ .../com/shxy/xymanager_service/impl/TerminalServiceImpl.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdListVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdListVo.java index 8b46ccb..8df483e 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdListVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdListVo.java @@ -13,4 +13,6 @@ public class TerminalIdListVo { @NotEmpty(message = "不能传入空值") @ApiModelProperty(value = "装置对象数组", required = true, example = "A0001") private List list; + + Integer newStatus; } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index 70b3f3d..0d21413 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -299,6 +299,9 @@ public class TerminalServiceImpl implements TerminalService { */ @Override public ServiceBody deleteTerminal(TerminalIdListVo vo) { + if (vo.getNewStatus() == null){ + vo.setNewStatus(0); + } ArrayList list = new ArrayList<>(); List beans = vo.getList(); for (TerminalIdVo item : beans) { @@ -306,7 +309,7 @@ public class TerminalServiceImpl implements TerminalService { terminals.setId(item.getTermid()); list.add(terminals); } - int i = terminalsDao.deleteById(list, CommonStatus.DELETE.value(), new Date()); + int i = terminalsDao.deleteById(list, vo.getNewStatus(), new Date()); cacheService.updateTerminalMap(); if (i != 0) { return Asserts.success("删除成功");