From 37a96bcccd2d50276fe4956d3dc0668dbcabf7ec Mon Sep 17 00:00:00 2001 From: 10002617 Date: Tue, 14 Apr 2026 11:23:29 +0800 Subject: [PATCH] =?UTF-8?q?1432-=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/TicketController.java | 2 +- .../gongfu/controller/TicketController.java | 2 +- .../service/IAdminMessageService.java | 2 ++ .../service/IAppMessageService.java | 2 ++ .../service/IGongfuTicketService.java | 2 ++ .../repository/service/ITicketService.java | 2 ++ .../service/impl/AdminMessageServiceImpl.java | 7 +++++++ .../service/impl/AppMessageServiceImpl.java | 6 ++++++ .../service/impl/GongfuTicketServiceImpl.java | 18 ++++++++++++++++++ .../service/impl/TicketServiceImpl.java | 19 +++++++++++++++++++ .../resources/mapper/AdminMessageMapper.xml | 3 --- 11 files changed, 60 insertions(+), 5 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java index 65d46534..2fd4d5e6 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java @@ -1612,7 +1612,7 @@ public class TicketController extends ControllerBase { @PostMapping("deleteTicket") public ApiResult deleteTicket(@RequestBody List ticketIds) { - ticketService.removeByIds(ticketIds); + ticketService.removeTickets(ticketIds); return ApiResult.success(true); } } \ No newline at end of file diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java index 96277e96..c44dd55c 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/controller/TicketController.java @@ -1609,7 +1609,7 @@ public class TicketController extends ControllerBase { @PostMapping("deleteTicket") public ApiResult deleteTicket(@RequestBody List ticketIds) { - ticketService.removeByIds(ticketIds); + ticketService.removeTickets(ticketIds); return ApiResult.success(true); } } \ No newline at end of file diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminMessageService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminMessageService.java index 4861b51b..f0b91006 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminMessageService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAdminMessageService.java @@ -37,5 +37,7 @@ public interface IAdminMessageService extends IService { void remove(Integer source, Long sourceId, Integer userId, Integer subType); + void remove(Integer source, List sourceIds); + AdminNotReadMessageCountVO getNotReadMessageCount1(Integer userId); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppMessageService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppMessageService.java index 225c048d..01e04aed 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppMessageService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IAppMessageService.java @@ -34,4 +34,6 @@ public interface IAppMessageService extends IService { Integer getNotReadMessageCount(Integer userId,String from); AppNotReadMessageCountVO getNotReadMessageCount1(Integer userId, String from); + + void removeAppMessage(List ticketIds); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IGongfuTicketService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IGongfuTicketService.java index 2da68644..be702174 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IGongfuTicketService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IGongfuTicketService.java @@ -63,4 +63,6 @@ public interface IGongfuTicketService extends IService { List getEquipmentFailureRanking(EquipmentFailureRankingSearchQuery qo); List companyStatistics(CompanyStatisticsQuery qo); + + void removeTickets(List ticketIds); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java index f15ec9b8..2029966f 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITicketService.java @@ -63,4 +63,6 @@ public interface ITicketService extends IService { boolean close(Ticket ticket); TicketDTO getDto(Long id); + + void removeTickets(List ticketIds); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminMessageServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminMessageServiceImpl.java index 7404d1cd..4ab8cb0f 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminMessageServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminMessageServiceImpl.java @@ -125,6 +125,13 @@ public class AdminMessageServiceImpl extends ServiceImpl sourceIds) { + remove(new LambdaQueryWrapper() + .eq(AdminMessage::getSource, source) + .in(AdminMessage::getSourceId, sourceIds)); + } + @Override public AdminNotReadMessageCountVO getNotReadMessageCount1(Integer userId) { List datas = lambdaQuery() diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppMessageServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppMessageServiceImpl.java index 858c1937..1bf5e8f7 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppMessageServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppMessageServiceImpl.java @@ -156,4 +156,10 @@ public class AppMessageServiceImpl extends ServiceImpl ticketIds) { + remove(new LambdaQueryWrapper() + .in(AppMessage::getTicketId, ticketIds)); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuTicketServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuTicketServiceImpl.java index 1ceab5b6..0e24e3c6 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuTicketServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/GongfuTicketServiceImpl.java @@ -65,6 +65,12 @@ public class GongfuTicketServiceImpl extends ServiceImpl companyStatistics(CompanyStatisticsQuery qo) { return baseMapper.companyStatistics(qo); } + + @Override + @Transactional(rollbackFor = Exception.class) + public void removeTickets(List ticketIds) { + if (CollectionUtil.isEmpty(ticketIds)) { + return; + } + removeByIds(ticketIds); + List ticketIdsLong = ticketIds.stream().map(Long::parseLong).collect(Collectors.toList()); + adminMessageService.remove(3, ticketIdsLong); + appMessageService.removeAppMessage(ticketIdsLong); + } } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java index 1c9763b9..c1d18444 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java @@ -63,6 +63,12 @@ public class TicketServiceImpl extends ServiceImpl impleme @Resource private ITBaseCustomerService customerService; + @Resource + private IAdminMessageService adminMessageService; + + @Resource + private IAppMessageService appMessageService; + @Transactional @Override public Ticket add(TicketAddRequest request, Integer userId) { @@ -463,4 +469,17 @@ public class TicketServiceImpl extends ServiceImpl impleme public TicketDTO getDto(Long id) { return baseMapper.getDto(id); } + + @Override + @Transactional(rollbackFor = Exception.class) + public void removeTickets(List ticketIds) { + if (CollectionUtil.isEmpty(ticketIds)) { + return; + } + removeByIds(ticketIds); + List ticketIdsLong = ticketIds.stream().map(Long::parseLong).collect(Collectors.toList()); + adminMessageService.remove(0, ticketIdsLong); + appMessageService.removeAppMessage(ticketIdsLong); + } + } diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminMessageMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminMessageMapper.xml index 034c2d1d..bbdb2d7c 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/AdminMessageMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AdminMessageMapper.xml @@ -7,10 +7,7 @@ u.user_name AS 'userName',m.is_read AS 'isRead' FROM admin_message m INNER JOIN admin_user u ON m.user_id=u.id - LEFT JOIN ticket t ON m.source_id=t.id AND m.source=0 and t.is_delete = 0 - LEFT JOIN gongfu_ticket gt ON m.source_id=gt.id AND m.source=3 and gt.is_delete = 0 WHERE m.user_id=#{userId} - and ((m.source=0 and t.id is not null) or (m.source=3 and gt.id is not null) or m.source not in (0,3)) AND m.type=#{request.type}