admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

新增的时候，原本是黑名单车，新增白名单车，提示“此车辆已被拉黑，无法再进行新增”。

Browse Source 
新增的时候，原本是白名单车，新增黑名单车，提示“此车辆是白名单，无法新增为黑名单，若需要拉黑车辆，可编辑或点击拉入黑名单按钮”。
新增的时候，原本是黑名单车，新增黑名单车，提示“此车辆已被拉黑”。
This commit is contained in:
guoshengxiong 2024-07-10 14:50:32 +08:00
parent 043a91a360
commit 1c0d937465
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
View File

@ -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.mapper.*;
import com.zhgd.xmgl.modules.car.service.ICarInfoService; import com.zhgd.xmgl.modules.car.service.ICarInfoService;
import com.zhgd.xmgl.modules.project.entity.Project; 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.mapper.ProjectMapper;
import com.zhgd.xmgl.modules.project.service.impl.ProjectServiceImpl; import com.zhgd.xmgl.modules.project.service.impl.ProjectServiceImpl;
import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
@ -124,13 +125,24 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
if (Objects.equals(old.getCarModuleType(), CarInfoCarModuleTypeEnum.GD.getValue())) { if (Objects.equals(old.getCarModuleType(), CarInfoCarModuleTypeEnum.GD.getValue())) {
throw new OpenAlertException("该车辆已添加，请勿重复添加！"); throw new OpenAlertException("该车辆已添加，请勿重复添加！");
} }
addCarInfoForApprovalFlowIf(c);
Date now = new Date(); Date now = new Date();
Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getSyncHikvision, 1) boolean isHk = projectCarCameraConfigService.isHikvisionConfig(c.getProjectSn());
.eq(Project::getProjectSn, c.getProjectSn())); if (!isHk) {
if (project == null) {
return; 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) { if (c.getIsBlack() == 1) {
deleteCarInfoForHikvision(old, true); deleteCarInfoForHikvision(old, true);
} else { } else {
@ -163,7 +175,7 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
* @param c * @param c
*/ */
private void addCarInfoForApprovalFlowIf(CarInfo c) { private void addCarInfoForApprovalFlowIf(CarInfo c) {
if (isReservationType(c)) { if (isReservationType(c) && !Objects.equals(c.getIsBlack(), 1)) {
CarInfoApprovalFlow flow = new CarInfoApprovalFlow(); CarInfoApprovalFlow flow = new CarInfoApprovalFlow();
BeanUtil.copyProperties(c, flow); BeanUtil.copyProperties(c, flow);
flow.setIsBlack(0); flow.setIsBlack(0);