diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraGroupController.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraGroupController.java index 3f66fa007..99c2b0619 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraGroupController.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraGroupController.java @@ -17,6 +17,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -106,5 +107,23 @@ public class PoliceCameraGroupController { return Result.ok(); } + @ApiOperation(value = "批量删除执法记录仪分组", notes = "批量删除执法记录仪分组", httpMethod = "POST") + @ApiImplicitParam(name = "ids", value = "执法记录仪分组ID字符串(多个以,分割)", paramType = "body", required = true, dataType = "String") + @PostMapping(value = "/deleteBatch") + 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 { + List idList = Arrays.asList(ids.split(",")); + for (String id : idList) { + policeCameraGroupService.deletePoliceCameraGroup(id); + } + result.success("删除成功!"); + } + return result; + } + } 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 85c3f4edc..2487e0f37 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 @@ -174,6 +174,7 @@ public class PoliceCameraItemController { vo.setId(item.getItemId()); vo.setType(2); vo.setName(item.getDevName()); + vo.setDeviceState(item.getDeviceState()); return vo; }).collect(Collectors.toList()); rtList.addAll(items); diff --git a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/GroupTreeWithDevVo.java b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/GroupTreeWithDevVo.java index d17b475e8..a11a83a34 100644 --- a/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/GroupTreeWithDevVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/policecamera/entity/vo/GroupTreeWithDevVo.java @@ -7,15 +7,35 @@ import java.util.List; @Data public class GroupTreeWithDevVo { + /** + * 唯一id=主键id+type + */ @ApiModelProperty("唯一id=主键id+type") private String uniqueId; + /** + * 父级id + */ @ApiModelProperty("父级id") private String parentId; + /** + * 主键id + */ @ApiModelProperty("主键id") private Long id; + /** + * 1:分组2:执法仪 + */ @ApiModelProperty("1:分组2:执法仪") private Integer type; + /** + * 名称 + */ @ApiModelProperty("名称") private String name; private List children; + /** + * 设备状态,1在线,2离线 + */ + @ApiModelProperty(value = "设备状态,1在线,2离线") + private java.lang.Integer deviceState; }