From 1c0d9374654bcac7ed97e06f4a412a6208d56e9a Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 10 Jul 2024 14:50:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E6=9C=AC=E6=98=AF=E9=BB=91=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E8=BD=A6=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=99=BD=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E8=BD=A6=EF=BC=8C=E6=8F=90=E7=A4=BA=E2=80=9C=E6=AD=A4=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E5=B7=B2=E8=A2=AB=E6=8B=89=E9=BB=91=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=86=8D=E8=BF=9B=E8=A1=8C=E6=96=B0=E5=A2=9E=E2=80=9D?= =?UTF-8?q?=E3=80=82=20=E6=96=B0=E5=A2=9E=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E6=9C=AC=E6=98=AF=E7=99=BD=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E8=BD=A6=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=BB=91=E5=90=8D=E5=8D=95?= =?UTF-8?q?=E8=BD=A6=EF=BC=8C=E6=8F=90=E7=A4=BA=E2=80=9C=E6=AD=A4=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E6=98=AF=E7=99=BD=E5=90=8D=E5=8D=95=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=96=B0=E5=A2=9E=E4=B8=BA=E9=BB=91=E5=90=8D=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=E8=8B=A5=E9=9C=80=E8=A6=81=E6=8B=89=E9=BB=91=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=EF=BC=8C=E5=8F=AF=E7=BC=96=E8=BE=91=E6=88=96=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=8B=89=E5=85=A5=E9=BB=91=E5=90=8D=E5=8D=95=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E2=80=9D=E3=80=82=20=E6=96=B0=E5=A2=9E=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E5=8E=9F=E6=9C=AC=E6=98=AF=E9=BB=91?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E8=BD=A6=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=BB=91?= =?UTF-8?q?=E5=90=8D=E5=8D=95=E8=BD=A6=EF=BC=8C=E6=8F=90=E7=A4=BA=E2=80=9C?= =?UTF-8?q?=E6=AD=A4=E8=BD=A6=E8=BE=86=E5=B7=B2=E8=A2=AB=E6=8B=89=E9=BB=91?= =?UTF-8?q?=E2=80=9D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../car/service/impl/CarInfoServiceImpl.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java index c091bc8db..28077133d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java @@ -25,6 +25,7 @@ import com.zhgd.xmgl.modules.car.enums.CarInfoCarModuleTypeEnum; import com.zhgd.xmgl.modules.car.mapper.*; import com.zhgd.xmgl.modules.car.service.ICarInfoService; import com.zhgd.xmgl.modules.project.entity.Project; +import com.zhgd.xmgl.modules.project.entity.vo.ProjectInfoExtVo; import com.zhgd.xmgl.modules.project.mapper.ProjectMapper; import com.zhgd.xmgl.modules.project.service.impl.ProjectServiceImpl; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; @@ -124,13 +125,24 @@ public class CarInfoServiceImpl extends ServiceImpl impl if (Objects.equals(old.getCarModuleType(), CarInfoCarModuleTypeEnum.GD.getValue())) { throw new OpenAlertException("该车辆已添加，请勿重复添加！"); } - addCarInfoForApprovalFlowIf(c); Date now = new Date(); - Project project = projectMapper.selectOne(new LambdaQueryWrapper().eq(Project::getSyncHikvision, 1) - .eq(Project::getProjectSn, c.getProjectSn())); - if (project == null) { + boolean isHk = projectCarCameraConfigService.isHikvisionConfig(c.getProjectSn()); + if (!isHk) { return; } + //新增的时候，原本是黑名单车，新增白名单车，提示“此车辆已被拉黑，无法再进行新增”。 + //新增的时候，原本是白名单车，新增黑名单车，提示“此车辆是白名单，无法新增为黑名单，若需要拉黑车辆，可编辑或点击拉入黑名单按钮”。 + //新增的时候，原本是黑名单车，新增黑名单车，提示“此车辆已被拉黑”。 + if (Objects.equals(old.getIsBlack(), 1) && !Objects.equals(c.getIsBlack(), 1)) { + throw new OpenAlertException("此车辆已被拉黑，无法再进行新增"); + } else if (!Objects.equals(old.getIsBlack(), 1) && Objects.equals(c.getIsBlack(), 1)) { + throw new OpenAlertException("此车辆是白名单，无法新增为黑名单，若需要拉黑车辆，可编辑或点击拉入黑名单按钮"); + } else if (Objects.equals(old.getIsBlack(), 1) && Objects.equals(c.getIsBlack(), 1)) { + throw new OpenAlertException("此车辆已被拉黑"); + } + + addCarInfoForApprovalFlowIf(c); + ProjectInfoExtVo project = projectService.getProjectInfoBySn(c.getProjectSn()); if (c.getIsBlack() == 1) { deleteCarInfoForHikvision(old, true); } else { @@ -163,7 +175,7 @@ public class CarInfoServiceImpl extends ServiceImpl impl * @param c */ private void addCarInfoForApprovalFlowIf(CarInfo c) { - if (isReservationType(c)) { + if (isReservationType(c) && !Objects.equals(c.getIsBlack(), 1)) { CarInfoApprovalFlow flow = new CarInfoApprovalFlow(); BeanUtil.copyProperties(c, flow); flow.setIsBlack(0);