From f3b9a1274942d72bd30548aadd32f57b4b3f3ea1 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 4 Nov 2025 16:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=95=A6=E7=85=8C=E5=8A=9F?= =?UTF-8?q?=E8=83=BD2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PoliceCameraItemController.java | 16 +++++++++---- .../dto/PoliceCameraItemBatchMoveDto.java | 19 +++++++++++++++ .../service/IPoliceCameraItemService.java | 3 +++ .../impl/PoliceCameraItemServiceImpl.java | 23 +++++++++++++++++++ 4 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/policecamera/entity/dto/PoliceCameraItemBatchMoveDto.java 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 50a085a49..0cc009cc8 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 @@ -18,6 +18,7 @@ import com.zhgd.xmgl.modules.policecamera.entity.PoliceCameraGroup; import com.zhgd.xmgl.modules.policecamera.entity.PoliceCameraItem; import com.zhgd.xmgl.modules.policecamera.entity.ProjectPoliceCameraConfig; import com.zhgd.xmgl.modules.policecamera.entity.vo.CountWorkingHoursVo; +import com.zhgd.xmgl.modules.policecamera.entity.dto.PoliceCameraItemBatchMoveDto; import com.zhgd.xmgl.modules.policecamera.entity.vo.GroupTreeWithDevVo; import com.zhgd.xmgl.modules.policecamera.entity.vo.PoliceCameraItemVo; import com.zhgd.xmgl.modules.policecamera.entity.vo.VideoItemInfoVo; @@ -120,7 +121,7 @@ public class PoliceCameraItemController { * @param policeCameraItem * @return */ - @OperLog(operModul = "视频管理", operType = "添加视频设备", operDesc = "添加视频设备") + @OperLog(operModul = "执法记录仪管理", operType = "添加执法记录仪设备", operDesc = "添加执法记录仪设备") @ApiOperation(value = "添加执法记录仪设备列表信息", notes = "添加执法记录仪设备列表信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody PoliceCameraItem policeCameraItem) { @@ -134,7 +135,7 @@ public class PoliceCameraItemController { * @param policeCameraItem * @return */ - @OperLog(operModul = "视频管理", operType = "编辑视频设备", operDesc = "编辑视频设备") + @OperLog(operModul = "执法记录仪管理", operType = "编辑执法记录仪设备", operDesc = "编辑执法记录仪设备") @ApiOperation(value = "编辑执法记录仪设备列表信息", notes = "编辑执法记录仪设备列表信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody PoliceCameraItem policeCameraItem) { @@ -148,7 +149,7 @@ public class PoliceCameraItemController { * @param * @return */ - @OperLog(operModul = "视频管理", operType = "删除视频设备", operDesc = "删除视频设备") + @OperLog(operModul = "执法记录仪管理", operType = "删除执法记录仪设备", operDesc = "删除执法记录仪设备") @ApiOperation(value = "删除执法记录仪设备列表信息", notes = "删除执法记录仪设备列表信息", httpMethod = "POST") @ApiImplicitParam(name = "itemId", value = "执法记录仪设备列表ID", paramType = "body", required = true, dataType = "Integer") @PostMapping(value = "/delete") @@ -157,7 +158,7 @@ public class PoliceCameraItemController { return Result.ok(); } - @ApiOperation(value = "通过id查询视频设备详情", notes = "通过id查询视频设备详情", httpMethod = "GET") + @ApiOperation(value = "通过id查询执法记录仪设备详情", notes = "通过id查询执法记录仪设备详情", httpMethod = "GET") @ApiImplicitParam(name = "itemId", value = "执法记录仪设备列表ID", paramType = "body", required = true, dataType = "Integer") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name = "itemId", required = true) String id) { @@ -429,4 +430,11 @@ public class PoliceCameraItemController { public Result> countWorkingHours(@RequestBody Map map) { return Result.success(policeCameraItemService.countWorkingHours(map)); } + @OperLog(operModul = "执法记录仪管理", operType = "批量移动执法记录仪设备", operDesc = "批量移动执法记录仪设备") + @ApiOperation(value = "批量移动执法记录仪设备", notes = "批量移动执法记录仪设备", httpMethod = "POST") + @PostMapping(value = "/batchMove") + public Result batchMove(@RequestBody PoliceCameraItemBatchMoveDto dto) { + policeCameraItemService.batchMove(dto); + return Result.ok(); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/dto/PoliceCameraItemBatchMoveDto.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/dto/PoliceCameraItemBatchMoveDto.java new file mode 100644 index 000000000..0aa528a75 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/dto/PoliceCameraItemBatchMoveDto.java @@ -0,0 +1,19 @@ +package com.zhgd.xmgl.modules.policecamera.entity.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PoliceCameraItemBatchMoveDto { + /** + * 执法记录仪主键ids(多个,分割) + */ + @ApiModelProperty("执法记录仪主键ids(多个,分割)") + private String itemIds; + /** + *分组id + */ + @ApiModelProperty("分组id") + private Long groupId; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/IPoliceCameraItemService.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/IPoliceCameraItemService.java index 82ef2906c..018632122 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/service/IPoliceCameraItemService.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/service/IPoliceCameraItemService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.xmgl.modules.policecamera.entity.PoliceCameraItem; import com.zhgd.xmgl.modules.policecamera.entity.vo.CountWorkingHoursVo; +import com.zhgd.xmgl.modules.policecamera.entity.dto.PoliceCameraItemBatchMoveDto; import com.zhgd.xmgl.modules.policecamera.entity.vo.PoliceCameraItemVo; import com.zhgd.xmgl.modules.policecamera.entity.vo.VideoItemInfoVo; import com.zhgd.xmgl.modules.xz.entity.vo.CountStatusVo; @@ -105,4 +106,6 @@ public interface IPoliceCameraItemService extends IService { List getListByProjectSn(String projectSn); List countWorkingHours(Map map); + + void batchMove(PoliceCameraItemBatchMoveDto dto); } 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 66a7e640e..1d8fb3860 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 @@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -23,12 +24,15 @@ 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.CountWorkingHoursVo; +import com.zhgd.xmgl.modules.policecamera.entity.*; +import com.zhgd.xmgl.modules.policecamera.entity.dto.PoliceCameraItemBatchMoveDto; 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.IPoliceCameraGroupService; import com.zhgd.xmgl.modules.policecamera.service.IPoliceCameraItemService; import com.zhgd.xmgl.modules.policecamera.service.IPoliceCameraVideoConfigService; import com.zhgd.xmgl.modules.policecamera.service.IWorkTicketCameraRelService; @@ -87,6 +91,9 @@ public class PoliceCameraItemServiceImpl extends ServiceImpl queryPageList(HashMap param) { @@ -362,4 +369,20 @@ public class PoliceCameraItemServiceImpl extends ServiceImpl() + .set(PoliceCameraItem::getGroupId, dto.getGroupId()) + .in(PoliceCameraItem::getItemId, StrUtil.split(dto.getItemIds(), ",")) + ); + } + }