diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemController.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemController.java index 307d00f56..055bb491d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemController.java @@ -230,13 +230,17 @@ public class PoliceCameraItemController { @ApiOperation(value = "批量删除执法记录仪设备", notes = "批量删除执法记录仪设备", httpMethod = "POST") @ApiImplicitParam(name = "ids", value = "执法记录仪设备ID字符串(多个以,分割)", paramType = "body", required = true, dataType = "String") @PostMapping(value = "/deleteBatch") + @Transactional(rollbackFor = Exception.class) public Result deleteBatch(@ApiIgnore @RequestBody HashMap paramMap) { String ids = MapUtils.getString(paramMap, "ids"); Result result = new Result<>(); if (ids == null || "".equals(ids.trim())) { result.error500("参数不识别!"); } else { - policeCameraItemService.removeByIds(Arrays.asList(ids.split(","))); + List idList = Arrays.asList(ids.split(",")); + for (String id : idList) { + policeCameraItemService.deletePoliceCameraItem(id); + } Result.success("删除成功!"); } return result; diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemServiceImpl.java index 932743c71..f8cc27d2f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/impl/PoliceCameraItemServiceImpl.java @@ -1,7 +1,6 @@ package com.zhgd.xmgl.modules.policecamera.service.impl; -import cn.hutool.core.bean.BeanUtil; -import com.zhgd.xmgl.modules.policecamera.entity.vo.VideoItemInfoVo.VideoInfo; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.FileUtil; @@ -22,13 +21,16 @@ import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.policecamera.entity.PoliceCameraItem; import com.zhgd.xmgl.modules.policecamera.entity.PoliceCameraVideoConfig; import com.zhgd.xmgl.modules.policecamera.entity.ProjectPoliceCameraConfig; +import com.zhgd.xmgl.modules.policecamera.entity.WorkTicketCameraRel; import com.zhgd.xmgl.modules.policecamera.entity.vo.PoliceCameraItemVo; import com.zhgd.xmgl.modules.policecamera.entity.vo.VideoItemInfoVo; +import com.zhgd.xmgl.modules.policecamera.entity.vo.VideoItemInfoVo.VideoInfo; import com.zhgd.xmgl.modules.policecamera.enums.ProjectPoliceCameraConfigVideoTypeEnum; import com.zhgd.xmgl.modules.policecamera.mapper.PoliceCameraItemMapper; import com.zhgd.xmgl.modules.policecamera.mapper.ProjectPoliceCameraConfigMapper; import com.zhgd.xmgl.modules.policecamera.service.IPoliceCameraItemService; import com.zhgd.xmgl.modules.policecamera.service.IPoliceCameraVideoConfigService; +import com.zhgd.xmgl.modules.policecamera.service.IWorkTicketCameraRelService; import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper; import com.zhgd.xmgl.modules.video.mapper.ProjectVideoHkVqdMapper; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; @@ -62,6 +64,9 @@ public class PoliceCameraItemServiceImpl extends ServiceImpl() + .eq(WorkTicketCameraRel::getPoliceCameraId, itemId)); } @Override