From cef84284bb62a90a8e3bb7e80d43dcb14a75eb8c Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Thu, 14 Aug 2025 09:16:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E7=8F=AD=E5=8C=BA=E5=9F=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AttendanceAreaController.java | 106 ++++++++++++++ .../property/domain/AttendanceArea.java | 46 ++++++ .../property/domain/bo/AttendanceAreaBo.java | 45 ++++++ .../property/domain/vo/AttendanceAreaVo.java | 56 ++++++++ .../property/mapper/AttendanceAreaMapper.java | 15 ++ .../service/IAttendanceAreaService.java | 69 +++++++++ .../impl/AttendanceAreaServiceImpl.java | 134 ++++++++++++++++++ script/config/nacos/datasource.yml | 2 +- 8 files changed, 472 insertions(+), 1 deletion(-) create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceAreaController.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArea.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceAreaVo.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceAreaMapper.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceAreaService.java create mode 100644 ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceAreaController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceAreaController.java new file mode 100644 index 00000000..e8a851a7 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceAreaController.java @@ -0,0 +1,106 @@ +package org.dromara.property.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.property.domain.vo.AttendanceAreaVo; +import org.dromara.property.domain.bo.AttendanceAreaBo; +import org.dromara.property.service.IAttendanceAreaService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 区域区域管理 + * 前端访问路由地址为:/property/attendanceArea + * + * @author LionLi + * @date 2025-08-13 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/attendanceArea") +public class AttendanceAreaController extends BaseController { + + private final IAttendanceAreaService attendanceAreaService; + + /** + * 查询区域区域管理列表 + */ + @SaCheckPermission("property:attendanceArea:list") + @GetMapping("/list") + public TableDataInfo list(AttendanceAreaBo bo, PageQuery pageQuery) { + return attendanceAreaService.queryPageList(bo, pageQuery); + } + + /** + * 导出区域区域管理列表 + */ + @SaCheckPermission("property:attendanceArea:export") + @Log(title = "区域区域管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(AttendanceAreaBo bo, HttpServletResponse response) { + List list = attendanceAreaService.queryList(bo); + ExcelUtil.exportExcel(list, "区域区域管理", AttendanceAreaVo.class, response); + } + + /** + * 获取区域区域管理详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("property:attendanceArea:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable("id") Long id) { + return R.ok(attendanceAreaService.queryById(id)); + } + + /** + * 新增区域区域管理 + */ + @SaCheckPermission("property:attendanceArea:add") + @Log(title = "区域区域管理", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody AttendanceAreaBo bo) { + return toAjax(attendanceAreaService.insertByBo(bo)); + } + + /** + * 修改区域区域管理 + */ + @SaCheckPermission("property:attendanceArea:edit") + @Log(title = "区域区域管理", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody AttendanceAreaBo bo) { + return toAjax(attendanceAreaService.updateByBo(bo)); + } + + /** + * 删除区域区域管理 + * + * @param ids 主键串 + */ + @SaCheckPermission("property:attendanceArea:remove") + @Log(title = "区域区域管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable("ids") Long[] ids) { + return toAjax(attendanceAreaService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArea.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArea.java new file mode 100644 index 00000000..12dd4157 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArea.java @@ -0,0 +1,46 @@ +package org.dromara.property.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * 区域区域管理对象 attendance_area + * + * @author LionLi + * @date 2025-08-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("attendance_area") +public class AttendanceArea extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 摄像机id + */ + private Long deviceManageId; + + /** + * 区域 + */ + private String area; + + /** + * 备注 + */ + private String reamark; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java new file mode 100644 index 00000000..6f4b3039 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java @@ -0,0 +1,45 @@ +package org.dromara.property.domain.bo; + +import org.dromara.property.domain.AttendanceArea; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * 区域区域管理业务对象 attendance_area + * + * @author LionLi + * @date 2025-08-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = AttendanceArea.class, reverseConvertGenerate = false) +public class AttendanceAreaBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 摄像机id + */ + private Long deviceManageId; + + /** + * 区域 + */ + private String area; + + /** + * 备注 + */ + private String reamark; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceAreaVo.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceAreaVo.java new file mode 100644 index 00000000..6ae4d374 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceAreaVo.java @@ -0,0 +1,56 @@ +package org.dromara.property.domain.vo; + +import org.dromara.property.domain.AttendanceArea; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 区域区域管理视图对象 attendance_area + * + * @author LionLi + * @date 2025-08-13 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = AttendanceArea.class) +public class AttendanceAreaVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 摄像机id + */ + @ExcelProperty(value = "摄像机id") + private Long deviceManageId; + + /** + * 区域 + */ + @ExcelProperty(value = "区域") + private String area; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String reamark; + + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceAreaMapper.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceAreaMapper.java new file mode 100644 index 00000000..cd78801b --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceAreaMapper.java @@ -0,0 +1,15 @@ +package org.dromara.property.mapper; + +import org.dromara.property.domain.AttendanceArea; +import org.dromara.property.domain.vo.AttendanceAreaVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 区域区域管理Mapper接口 + * + * @author LionLi + * @date 2025-08-13 + */ +public interface AttendanceAreaMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceAreaService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceAreaService.java new file mode 100644 index 00000000..d832b9d1 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceAreaService.java @@ -0,0 +1,69 @@ +package org.dromara.property.service; + +import org.dromara.property.domain.AttendanceArea; +import org.dromara.property.domain.vo.AttendanceAreaVo; +import org.dromara.property.domain.bo.AttendanceAreaBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 区域区域管理Service接口 + * + * @author LionLi + * @date 2025-08-13 + */ +public interface IAttendanceAreaService { + + /** + * 查询区域区域管理 + * + * @param id 主键 + * @return 区域区域管理 + */ + AttendanceAreaVo queryById(Long id); + + /** + * 分页查询区域区域管理列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 区域区域管理分页列表 + */ + TableDataInfo queryPageList(AttendanceAreaBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的区域区域管理列表 + * + * @param bo 查询条件 + * @return 区域区域管理列表 + */ + List queryList(AttendanceAreaBo bo); + + /** + * 新增区域区域管理 + * + * @param bo 区域区域管理 + * @return 是否新增成功 + */ + Boolean insertByBo(AttendanceAreaBo bo); + + /** + * 修改区域区域管理 + * + * @param bo 区域区域管理 + * @return 是否修改成功 + */ + Boolean updateByBo(AttendanceAreaBo bo); + + /** + * 校验并批量删除区域区域管理信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java new file mode 100644 index 00000000..e22440b7 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java @@ -0,0 +1,134 @@ +package org.dromara.property.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.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 lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.dromara.property.domain.bo.AttendanceAreaBo; +import org.dromara.property.domain.vo.AttendanceAreaVo; +import org.dromara.property.domain.AttendanceArea; +import org.dromara.property.mapper.AttendanceAreaMapper; +import org.dromara.property.service.IAttendanceAreaService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 区域区域管理Service业务层处理 + * + * @author LionLi + * @date 2025-08-13 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class AttendanceAreaServiceImpl implements IAttendanceAreaService { + + private final AttendanceAreaMapper baseMapper; + + /** + * 查询区域区域管理 + * + * @param id 主键 + * @return 区域区域管理 + */ + @Override + public AttendanceAreaVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询区域区域管理列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 区域区域管理分页列表 + */ + @Override + public TableDataInfo queryPageList(AttendanceAreaBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的区域区域管理列表 + * + * @param bo 查询条件 + * @return 区域区域管理列表 + */ + @Override + public List queryList(AttendanceAreaBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(AttendanceAreaBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(AttendanceArea::getId); + lqw.eq(bo.getDeviceManageId() != null, AttendanceArea::getDeviceManageId, bo.getDeviceManageId()); + lqw.like(StringUtils.isNotBlank(bo.getArea()), AttendanceArea::getArea, bo.getArea()); + lqw.eq(StringUtils.isNotBlank(bo.getReamark()), AttendanceArea::getReamark, bo.getReamark()); + return lqw; + } + + /** + * 新增区域区域管理 + * + * @param bo 区域区域管理 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(AttendanceAreaBo bo) { + AttendanceArea add = MapstructUtils.convert(bo, AttendanceArea.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改区域区域管理 + * + * @param bo 区域区域管理 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(AttendanceAreaBo bo) { + AttendanceArea update = MapstructUtils.convert(bo, AttendanceArea.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(AttendanceArea entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除区域区域管理信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/script/config/nacos/datasource.yml b/script/config/nacos/datasource.yml index 15210e86..5451080d 100644 --- a/script/config/nacos/datasource.yml +++ b/script/config/nacos/datasource.yml @@ -6,7 +6,7 @@ datasource: username: root password: 1234 gen: - url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true + url: jdbc:mysql://localhost:3306/dimp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true username: root password: 1234 job: