by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

排班区域管理

Browse Source
This commit is contained in:
dy 2025-08-14 09:16:19 +08:00
parent 005dbc1110
commit cef84284bb
8 changed files with 472 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
ruoyi-modules/Property/src/main/java/org/dromara/property/controller/AttendanceAreaController.java Normal file
View File

@ -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<AttendanceAreaVo> 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<AttendanceAreaVo> list = attendanceAreaService.queryList(bo);
ExcelUtil.exportExcel(list, "区域区域管理", AttendanceAreaVo.class, response);
}
/**
* 获取区域区域管理详细信息
*
* @param id 主键
*/
@SaCheckPermission("property:attendanceArea:query")
@GetMapping("/{id}")
public R<AttendanceAreaVo> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(attendanceAreaService.deleteWithValidByIds(List.of(ids), true));
}
}

46
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/AttendanceArea.java Normal file
View File

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

45
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/AttendanceAreaBo.java Normal file
View File

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

56
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/AttendanceAreaVo.java Normal file
View File

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

15
ruoyi-modules/Property/src/main/java/org/dromara/property/mapper/AttendanceAreaMapper.java Normal file
View File

@ -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<AttendanceArea, AttendanceAreaVo> {
}

69
ruoyi-modules/Property/src/main/java/org/dromara/property/service/IAttendanceAreaService.java Normal file
View File

@ -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<AttendanceAreaVo> queryPageList(AttendanceAreaBo bo, PageQuery pageQuery);
/**
* 查询符合条件的区域区域管理列表
*
* @param bo 查询条件
* @return 区域区域管理列表
*/
List<AttendanceAreaVo> 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<Long> ids, Boolean isValid);
}

134
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceAreaServiceImpl.java Normal file
View File

@ -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<AttendanceAreaVo> queryPageList(AttendanceAreaBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<AttendanceArea> lqw = buildQueryWrapper(bo);
Page<AttendanceAreaVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的区域区域管理列表
*
* @param bo 查询条件
* @return 区域区域管理列表
*/
@Override
public List<AttendanceAreaVo> queryList(AttendanceAreaBo bo) {
LambdaQueryWrapper<AttendanceArea> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<AttendanceArea> buildQueryWrapper(AttendanceAreaBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<AttendanceArea> 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<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

2
script/config/nacos/datasource.yml
View File

@ -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: