From 9e922f7de43609f025cd813313c8c70b99bf373d Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 17 Nov 2025 18:27:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=BC=80=E5=A7=8B=EF=BC=8C=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E8=A2=AB=E5=8D=A0=E7=94=A8=E7=9A=84=E6=89=A7=E6=B3=95=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BB=AA=E7=9A=84=E5=B7=A5=E4=BD=9C=E7=A5=A8=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/WorkTicketCameraRelMapper.java | 3 +++ .../mapper/xml/WorkTicketCameraRelMapper.xml | 8 ++++++++ .../service/IWorkTicketCameraRelService.java | 10 +++++++++- .../impl/WorkTicketCameraRelServiceImpl.java | 6 ++++++ .../service/impl/WorkTicketServiceImpl.java | 16 ++++++++++++++++ 5 files changed, 42 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketCameraRelMapper.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketCameraRelMapper.java index 4f6fb299b..d1d3dcbd6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketCameraRelMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/WorkTicketCameraRelMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhgd.xmgl.modules.policecamera.entity.WorkTicketCameraRel; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * @Description: 工作票与执法记录仪关联关系表 * @author: pds @@ -12,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface WorkTicketCameraRelMapper extends BaseMapper { + List findOccupiedTicketNumbers(Long ticketId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketCameraRelMapper.xml b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketCameraRelMapper.xml index 73a041f5b..f8eef482b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketCameraRelMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/mapper/xml/WorkTicketCameraRelMapper.xml @@ -1,4 +1,12 @@ + + diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/IWorkTicketCameraRelService.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/IWorkTicketCameraRelService.java index 2298d7217..fc0776c14 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/IWorkTicketCameraRelService.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/IWorkTicketCameraRelService.java @@ -3,6 +3,8 @@ package com.zhgd.xmgl.modules.policecamera.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.policecamera.entity.WorkTicketCameraRel; +import java.util.List; + /** * @Description: 工作票与执法记录仪关联关系表 * @author: pds @@ -10,5 +12,11 @@ import com.zhgd.xmgl.modules.policecamera.entity.WorkTicketCameraRel; * @version: V1.0 */ public interface IWorkTicketCameraRelService extends IService { - + /** + * 查询被占用的执法记录仪的工作票的编号 + * + * @param ticketId + * @return + */ + List findOccupiedTicketNumbers(Long ticketId); } diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketCameraRelServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketCameraRelServiceImpl.java index 2f0cce462..5ac0e7c26 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketCameraRelServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketCameraRelServiceImpl.java @@ -6,6 +6,8 @@ import com.zhgd.xmgl.modules.policecamera.mapper.WorkTicketCameraRelMapper; import com.zhgd.xmgl.modules.policecamera.service.IWorkTicketCameraRelService; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Description: 工作票与执法记录仪关联关系表 * @author: pds @@ -15,4 +17,8 @@ import org.springframework.stereotype.Service; @Service public class WorkTicketCameraRelServiceImpl extends ServiceImpl implements IWorkTicketCameraRelService { + @Override + public List findOccupiedTicketNumbers(Long ticketId) { + return baseMapper.findOccupiedTicketNumbers(ticketId); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java index 41d43cee3..55be9f36a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/WorkTicketServiceImpl.java @@ -281,6 +281,7 @@ public class WorkTicketServiceImpl extends ServiceImpl workTicketNumbers = workTicketCameraRelService.findOccupiedTicketNumbers(workTicketDto.getId()); + if (CollUtil.isNotEmpty(workTicketNumbers)) { + throw new OpenPromptException(StrUtil.format("此工作票绑定的监控设备已被{}占用,无法恢复到施工中状态,请解绑后重试", StrUtil.join(",", workTicketNumbers))); + } + } + } + @Override public CountWorkTicketVo countWorkTicket(HashMap map) { return baseMapper.countWorkTicket(map);