合并敦煌功能2

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<PoliceCameraItem> 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<PoliceCameraItemVo> queryById(@RequestParam(name = "itemId", required = true) String id) {
@@ -429,4 +430,11 @@ public class PoliceCameraItemController {
     public Result<List<CountWorkingHoursVo>> countWorkingHours(@RequestBody Map<String, Object> 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();
+    }
 }

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;
+
+}

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<PoliceCameraItem> {
     List<PoliceCameraItem> getListByProjectSn(String projectSn);
 
     List<CountWorkingHoursVo> countWorkingHours(Map<String, Object> map);
+
+    void batchMove(PoliceCameraItemBatchMoveDto dto);
 }

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<PoliceCameraItemMap
     @Lazy
     @Autowired
     private IPoliceCameraVideoConfigService policeCameraVideoConfigService;
+    @Lazy
+    @Autowired
+    private IPoliceCameraGroupService policeCameraGroupService;
 
     @Override
     public IPage<PoliceCameraItemVo> queryPageList(HashMap<String, Object> param) {
@@ -362,4 +369,20 @@ public class PoliceCameraItemServiceImpl extends ServiceImpl<PoliceCameraItemMap
         return hoursVos;
     }
 
+    @Override
+    @CacheEvict(value = "policeCameraItem", allEntries = true)
+    public void batchMove(PoliceCameraItemBatchMoveDto dto) {
+        if (StrUtil.isBlank(dto.getItemIds())) {
+            return;
+        }
+        PoliceCameraGroup group = policeCameraGroupService.getById(dto.getGroupId());
+        if (group == null) {
+            throw new OpenAlertException("执法记录仪分组不存在，请刷新页面重试");
+        }
+        this.update(null, new LambdaUpdateWrapper<PoliceCameraItem>()
+                .set(PoliceCameraItem::getGroupId, dto.getGroupId())
+                .in(PoliceCameraItem::getItemId, StrUtil.split(dto.getItemIds(), ","))
+        );
+    }
+
 }