From 19c6ad37c6871da38cb12d07dd2abf457b7e266a Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 7 Aug 2025 16:49:13 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E6=91=84?= =?UTF-8?q?=E5=83=8F=E5=A4=B4=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加摄像头管理相关的实体类、Mapper、Service、Controller等 - 实现摄像头管理的基础功能，包括查询、新增、修改、删除等 - 添加摄像头管理的Excel导出功能 - 为摄像头管理相关操作添加权限控制 --- .../WmsCameraManagementController.java | 106 +++++++++++++++ .../com/klp/domain/WmsCameraManagement.java | 89 +++++++++++++ .../klp/domain/bo/WmsCameraManagementBo.java | 96 ++++++++++++++ .../klp/domain/vo/WmsCameraManagementVo.java | 119 +++++++++++++++++ .../klp/mapper/WmsCameraManagementMapper.java | 15 +++ .../service/IWmsCameraManagementService.java | 49 +++++++ .../impl/WmsCameraManagementServiceImpl.java | 123 ++++++++++++++++++ .../mapper/klp/WmsCameraManagementMapper.xml | 31 +++++ 8 files changed, 628 insertions(+) create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsCameraManagementController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsCameraManagement.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsCameraManagementBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsCameraManagementVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsCameraManagementMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsCameraManagementService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsCameraManagementServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsCameraManagementMapper.xml diff --git a/klp-wms/src/main/java/com/klp/controller/WmsCameraManagementController.java b/klp-wms/src/main/java/com/klp/controller/WmsCameraManagementController.java new file mode 100644 index 00000000..970c88bc --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsCameraManagementController.java @@ -0,0 +1,106 @@ +package com.klp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.domain.vo.WmsCameraManagementVo; +import com.klp.domain.bo.WmsCameraManagementBo; +import com.klp.service.IWmsCameraManagementService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 摄像头管理 + * + * @author Joshi + * @date 2025-08-07 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/cameraManagement") +public class WmsCameraManagementController extends BaseController { + + private final IWmsCameraManagementService iWmsCameraManagementService; + + /** + * 查询摄像头管理列表 + */ + @SaCheckPermission("wms:cameraManagement:list") + @GetMapping("/list") + public TableDataInfo list(WmsCameraManagementBo bo, PageQuery pageQuery) { + return iWmsCameraManagementService.queryPageList(bo, pageQuery); + } + + /** + * 导出摄像头管理列表 + */ + @SaCheckPermission("wms:cameraManagement:export") + @Log(title = "摄像头管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsCameraManagementBo bo, HttpServletResponse response) { + List list = iWmsCameraManagementService.queryList(bo); + ExcelUtil.exportExcel(list, "摄像头管理", WmsCameraManagementVo.class, response); + } + + /** + * 获取摄像头管理详细信息 + * + * @param cameraId 主键 + */ + @SaCheckPermission("wms:cameraManagement:query") + @GetMapping("/{cameraId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long cameraId) { + return R.ok(iWmsCameraManagementService.queryById(cameraId)); + } + + /** + * 新增摄像头管理 + */ + @SaCheckPermission("wms:cameraManagement:add") + @Log(title = "摄像头管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsCameraManagementBo bo) { + return toAjax(iWmsCameraManagementService.insertByBo(bo)); + } + + /** + * 修改摄像头管理 + */ + @SaCheckPermission("wms:cameraManagement:edit") + @Log(title = "摄像头管理", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsCameraManagementBo bo) { + return toAjax(iWmsCameraManagementService.updateByBo(bo)); + } + + /** + * 删除摄像头管理 + * + * @param cameraIds 主键串 + */ + @SaCheckPermission("wms:cameraManagement:remove") + @Log(title = "摄像头管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{cameraIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] cameraIds) { + return toAjax(iWmsCameraManagementService.deleteWithValidByIds(Arrays.asList(cameraIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCameraManagement.java b/klp-wms/src/main/java/com/klp/domain/WmsCameraManagement.java new file mode 100644 index 00000000..317aff5d --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsCameraManagement.java @@ -0,0 +1,89 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 摄像头管理对象 wms_camera_management + * + * @author Joshi + * @date 2025-08-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_camera_management") +public class WmsCameraManagement extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 自增主键 + */ + @TableId(value = "camera_id") + private Long cameraId; + /** + * 摄像头编号（系统生成，如 camef8bd40d71795） + */ + private String cameraCode; + /** + * 摄像头名称（如：仓库东门摄像头） + */ + private String cameraName; + /** + * RTSP 推流地址（摄像头原生地址） + */ + private String rtspUrl; + /** + * ws - fmp4 播放地址 + */ + private String wsFmp4; + /** + * http - fmp4 播放地址 + */ + private String httpFmp4; + /** + * rtsp 播放地址 + */ + private String rtspAddr; + /** + * hls 播放地址 + */ + private String hlsAddr; + /** + * 安装位置（如：仓库 A 区货架 3） + */ + private String location; + /** + * 所属分组/区域（直接存储名称，如：仓库 A 区） + */ + private String groupName; + /** + * 所属仓库（如：一号仓库） + */ + private String warehouseName; + /** + * 状态：0-未启用 1-正常 2-离线 3-故障 + */ + private Long status; + /** + * 摄像头访问用户名 + */ + private String username; + /** + * 摄像头访问密码 + */ + private String password; + /** + * 删除标志 + */ + @TableLogic + private Long delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCameraManagementBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCameraManagementBo.java new file mode 100644 index 00000000..fcb400e2 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCameraManagementBo.java @@ -0,0 +1,96 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 摄像头管理业务对象 wms_camera_management + * + * @author Joshi + * @date 2025-08-07 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsCameraManagementBo extends BaseEntity { + + /** + * 自增主键 + */ + private Long cameraId; + + /** + * 摄像头编号（系统生成，如 camef8bd40d71795） + */ + private String cameraCode; + + /** + * 摄像头名称（如：仓库东门摄像头） + */ + private String cameraName; + + /** + * RTSP 推流地址（摄像头原生地址） + */ + private String rtspUrl; + + /** + * ws - fmp4 播放地址 + */ + private String wsFmp4; + + /** + * http - fmp4 播放地址 + */ + private String httpFmp4; + + /** + * rtsp 播放地址 + */ + private String rtspAddr; + + /** + * hls 播放地址 + */ + private String hlsAddr; + + /** + * 安装位置（如：仓库 A 区货架 3） + */ + private String location; + + /** + * 所属分组/区域（直接存储名称，如：仓库 A 区） + */ + private String groupName; + + /** + * 所属仓库（如：一号仓库） + */ + private String warehouseName; + + /** + * 状态：0-未启用 1-正常 2-离线 3-故障 + */ + private Long status; + + /** + * 摄像头访问用户名 + */ + private String username; + + /** + * 摄像头访问密码 + */ + private String password; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCameraManagementVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCameraManagementVo.java new file mode 100644 index 00000000..c27e5c64 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCameraManagementVo.java @@ -0,0 +1,119 @@ +package com.klp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 摄像头管理视图对象 wms_camera_management + * + * @author Joshi + * @date 2025-08-07 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsCameraManagementVo { + + private static final long serialVersionUID = 1L; + + /** + * 自增主键 + */ + @ExcelProperty(value = "自增主键") + private Long cameraId; + + /** + * 摄像头编号（系统生成，如 camef8bd40d71795） + */ + @ExcelProperty(value = "摄像头编号", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "系=统生成，如,c=amef8bd40d71795") + private String cameraCode; + + /** + * 摄像头名称（如：仓库东门摄像头） + */ + @ExcelProperty(value = "摄像头名称", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=：仓库东门摄像头") + private String cameraName; + + /** + * RTSP 推流地址（摄像头原生地址） + */ + @ExcelProperty(value = "RTSP 推流地址", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "摄=像头原生地址") + private String rtspUrl; + + /** + * ws - fmp4 播放地址 + */ + @ExcelProperty(value = "ws - fmp4 播放地址") + private String wsFmp4; + + /** + * http - fmp4 播放地址 + */ + @ExcelProperty(value = "http - fmp4 播放地址") + private String httpFmp4; + + /** + * rtsp 播放地址 + */ + @ExcelProperty(value = "rtsp 播放地址") + private String rtspAddr; + + /** + * hls 播放地址 + */ + @ExcelProperty(value = "hls 播放地址") + private String hlsAddr; + + /** + * 安装位置（如：仓库 A 区货架 3） + */ + @ExcelProperty(value = "安装位置", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=：仓库,A=,区=货架,3=") + private String location; + + /** + * 所属分组/区域（直接存储名称，如：仓库 A 区） + */ + @ExcelProperty(value = "所属分组/区域", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "直=接存储名称，如：仓库,A=,区=") + private String groupName; + + /** + * 所属仓库（如：一号仓库） + */ + @ExcelProperty(value = "所属仓库", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=：一号仓库") + private String warehouseName; + + /** + * 状态：0-未启用 1-正常 2-离线 3-故障 + */ + @ExcelProperty(value = "状态：0-未启用 1-正常 2-离线 3-故障") + private Long status; + + /** + * 摄像头访问用户名 + */ + @ExcelProperty(value = "摄像头访问用户名") + private String username; + + /** + * 摄像头访问密码 + */ + @ExcelProperty(value = "摄像头访问密码") + private String password; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsCameraManagementMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsCameraManagementMapper.java new file mode 100644 index 00000000..7d9cbe91 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsCameraManagementMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsCameraManagement; +import com.klp.domain.vo.WmsCameraManagementVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 摄像头管理Mapper接口 + * + * @author Joshi + * @date 2025-08-07 + */ +public interface WmsCameraManagementMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsCameraManagementService.java b/klp-wms/src/main/java/com/klp/service/IWmsCameraManagementService.java new file mode 100644 index 00000000..bc885b7b --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsCameraManagementService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsCameraManagement; +import com.klp.domain.vo.WmsCameraManagementVo; +import com.klp.domain.bo.WmsCameraManagementBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 摄像头管理Service接口 + * + * @author Joshi + * @date 2025-08-07 + */ +public interface IWmsCameraManagementService { + + /** + * 查询摄像头管理 + */ + WmsCameraManagementVo queryById(Long cameraId); + + /** + * 查询摄像头管理列表 + */ + TableDataInfo queryPageList(WmsCameraManagementBo bo, PageQuery pageQuery); + + /** + * 查询摄像头管理列表 + */ + List queryList(WmsCameraManagementBo bo); + + /** + * 新增摄像头管理 + */ + Boolean insertByBo(WmsCameraManagementBo bo); + + /** + * 修改摄像头管理 + */ + Boolean updateByBo(WmsCameraManagementBo bo); + + /** + * 校验并批量删除摄像头管理信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCameraManagementServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCameraManagementServiceImpl.java new file mode 100644 index 00000000..3e792b3d --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCameraManagementServiceImpl.java @@ -0,0 +1,123 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.klp.common.utils.StringUtils; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.domain.bo.WmsCameraManagementBo; +import com.klp.domain.vo.WmsCameraManagementVo; +import com.klp.domain.WmsCameraManagement; +import com.klp.mapper.WmsCameraManagementMapper; +import com.klp.service.IWmsCameraManagementService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 摄像头管理Service业务层处理 + * + * @author Joshi + * @date 2025-08-07 + */ +@RequiredArgsConstructor +@Service +public class WmsCameraManagementServiceImpl implements IWmsCameraManagementService { + + private final WmsCameraManagementMapper baseMapper; + + /** + * 查询摄像头管理 + */ + @Override + public WmsCameraManagementVo queryById(Long cameraId){ + return baseMapper.selectVoById(cameraId); + } + + /** + * 查询摄像头管理列表 + */ + @Override + public TableDataInfo queryPageList(WmsCameraManagementBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询摄像头管理列表 + */ + @Override + public List queryList(WmsCameraManagementBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsCameraManagementBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq( + + StringUtils.isNotBlank(bo.getCameraCode()), WmsCameraManagement::getCameraCode, bo.getCameraCode()); + lqw.like(StringUtils.isNotBlank(bo.getCameraName()), WmsCameraManagement::getCameraName, bo.getCameraName()); + lqw.eq(StringUtils.isNotBlank(bo.getRtspUrl()), WmsCameraManagement::getRtspUrl, bo.getRtspUrl()); + lqw.eq(StringUtils.isNotBlank(bo.getWsFmp4()), WmsCameraManagement::getWsFmp4, bo.getWsFmp4()); + lqw.eq(StringUtils.isNotBlank(bo.getHttpFmp4()), WmsCameraManagement::getHttpFmp4, bo.getHttpFmp4()); + lqw.eq(StringUtils.isNotBlank(bo.getRtspAddr()), WmsCameraManagement::getRtspAddr, bo.getRtspAddr()); + lqw.eq(StringUtils.isNotBlank(bo.getHlsAddr()), WmsCameraManagement::getHlsAddr, bo.getHlsAddr()); + lqw.eq(StringUtils.isNotBlank(bo.getLocation()), WmsCameraManagement::getLocation, bo.getLocation()); + lqw.like(StringUtils.isNotBlank(bo.getGroupName()), WmsCameraManagement::getGroupName, bo.getGroupName()); + lqw.like(StringUtils.isNotBlank(bo.getWarehouseName()), WmsCameraManagement::getWarehouseName, bo.getWarehouseName()); + lqw.eq(bo.getStatus() != null, WmsCameraManagement::getStatus, bo.getStatus()); + lqw.like(StringUtils.isNotBlank(bo.getUsername()), WmsCameraManagement::getUsername, bo.getUsername()); + lqw.eq(StringUtils.isNotBlank(bo.getPassword()), WmsCameraManagement::getPassword, bo.getPassword()); + return lqw; + } + + /** + * 新增摄像头管理 + */ + @Override + public Boolean insertByBo(WmsCameraManagementBo bo) { + WmsCameraManagement add = BeanUtil.toBean(bo, WmsCameraManagement.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setCameraId(add.getCameraId()); + } + return flag; + } + + /** + * 修改摄像头管理 + */ + @Override + public Boolean updateByBo(WmsCameraManagementBo bo) { + WmsCameraManagement update = BeanUtil.toBean(bo, WmsCameraManagement.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsCameraManagement entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除摄像头管理 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCameraManagementMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCameraManagementMapper.xml new file mode 100644 index 00000000..ca870e2f --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsCameraManagementMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +