From 562c422a189db116356e3537d3e572aba3ee5ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 25 Apr 2025 10:43:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=B7=A5=E7=A8=8B=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/TbProjectController.java | 18 ++++++++--- .../basic/dao/TbProjectMapper.java | 4 ++- .../basic/service/TbProjectService.java | 9 +++++- .../service/impl/TbProjectServiceImpl.java | 32 ++++++++++++++----- .../mappers/basic/TbProjectMapper.xml | 5 ++- 5 files changed, 53 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java index 5c7ee8f..957a87b 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java +++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java @@ -71,12 +71,22 @@ public class TbProjectController { * @param dto * @return */ - @PostMapping(value = "UpdateTbProject") + @PostMapping(value = "updateTbProject") @DecryptAndVerify(decryptedClass = TbProjectVo.class)//加解密统一管理 @LogAnnotation(operModul = "基础管理-线路工程管理", operation = "修改", operDesc = "系统级事件",operType="查询") - public ServerResponse UpdateTbProject(EncryptedReq dto) { - return tbProjectService.UpdateTbProject(dto.getData()); + public ServerResponse updateTbProject(EncryptedReq dto) { + return tbProjectService.updateTbProject(dto.getData()); } - + /** + * 线路工程管理-删除 + * @param dto + * @return + */ + @PostMapping(value = "delTbProject") + @DecryptAndVerify(decryptedClass = TbProjectVo.class)//加解密统一管理 + @LogAnnotation(operModul = "基础管理-线路工程管理", operation = "修改", operDesc = "系统级事件",operType="查询") + public ServerResponse delTbProject(EncryptedReq dto) { + return tbProjectService.delTbProject(dto.getData()); + } } diff --git a/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java b/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java index a4a2229..2124728 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java +++ b/src/main/java/com/bonus/digitalSignage/basic/dao/TbProjectMapper.java @@ -9,9 +9,11 @@ public interface TbProjectMapper { TbProjectVo getTbProjectById(TbProjectVo data); - void UpdateTbProject(TbProjectVo data); + void updateTbProject(TbProjectVo data); void addTbProject(TbProjectVo data); TbProjectVo getTbProjectByProName(TbProjectVo data); + + void delTbProject(TbProjectVo data); } diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/TbProjectService.java b/src/main/java/com/bonus/digitalSignage/basic/service/TbProjectService.java index e880075..2fb7496 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/TbProjectService.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/TbProjectService.java @@ -23,7 +23,7 @@ public interface TbProjectService { * @param data * @return */ - ServerResponse UpdateTbProject(TbProjectVo data); + ServerResponse updateTbProject(TbProjectVo data); /** * 线路工程管理-新增 @@ -31,4 +31,11 @@ public interface TbProjectService { * @return */ ServerResponse addTbProject(TbProjectVo data); + + /** + * 线路工程管理-删除 + * @param data + * @return + */ + ServerResponse delTbProject(TbProjectVo data); } diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java index 3d950ea..e0d27df 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java @@ -41,7 +41,7 @@ public class TbProjectServiceImpl implements TbProjectService { return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize()); } catch (Exception e) { log.error(e.toString(), e); - return ServerResponse.createErroe("查询列表失败"); + return ServerResponse.createErroe("线路工程管理-查询列表失败"); } } @@ -58,7 +58,7 @@ public class TbProjectServiceImpl implements TbProjectService { return ServerResponse.createSuccess(tbProject); } catch (Exception e) { log.error(e.toString(), e); - return ServerResponse.createErroe("查询详情失败"); + return ServerResponse.createErroe("线路工程管理-查询详情失败"); } } @@ -69,7 +69,7 @@ public class TbProjectServiceImpl implements TbProjectService { * @return */ @Override - public ServerResponse UpdateTbProject(TbProjectVo data) { + public ServerResponse updateTbProject(TbProjectVo data) { try { TbProjectVo tbProjectVo = tbProjectMapper.getTbProjectByProName(data); if (StringUtils.isNotNull(tbProjectVo) && data.getId()!=tbProjectVo.getId()){ @@ -77,11 +77,11 @@ public class TbProjectServiceImpl implements TbProjectService { } Long userId = UserUtil.getLoginUser().getId(); data.setUpdateUserId(userId); - tbProjectMapper.UpdateTbProject(data); - return ServerResponse.createSuccess("修改成功"); + tbProjectMapper.updateTbProject(data); + return ServerResponse.createSuccess("线路工程管理-修改成功"); } catch (Exception e) { log.error(e.toString(), e); - return ServerResponse.createErroe("修改失败"); + return ServerResponse.createErroe("线路工程管理-修改失败"); } } @@ -101,10 +101,26 @@ public class TbProjectServiceImpl implements TbProjectService { data.setCreateUserId(userId); data.setCreateTime(new Date()); tbProjectMapper.addTbProject(data); - return ServerResponse.createSuccess(); + return ServerResponse.createSuccess("线路工程管理-新增成功"); } catch (Exception e) { log.error(e.toString(), e); - return ServerResponse.createErroe("新增失败"); + return ServerResponse.createErroe("线路工程管理-新增失败"); + } + } + + /** + * 线路工程管理-删除 + * @param data + * @return + */ + @Override + public ServerResponse delTbProject(TbProjectVo data) { + try { + tbProjectMapper.delTbProject(data); + return ServerResponse.createSuccess("线路工程管理-删除成功"); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("线路工程管理-删除失败"); } } } diff --git a/src/main/resources/mappers/basic/TbProjectMapper.xml b/src/main/resources/mappers/basic/TbProjectMapper.xml index 7703fcb..c72e42f 100644 --- a/src/main/resources/mappers/basic/TbProjectMapper.xml +++ b/src/main/resources/mappers/basic/TbProjectMapper.xml @@ -35,7 +35,7 @@ 1 - + update tb_project depart_id = #{departId}, @@ -53,6 +53,9 @@ where id = #{id} + + update tb_project set is_active = '0' where id = #{id} +