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("删除成功");