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

增加门禁设备管理

Browse Source
This commit is contained in:
lxj
2025-06-25 12:21:11 +08:00
parent d8d01b7d38
commit 71ba316e91
66 changed files with 1786 additions and 1122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,106 +0,0 @@
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.TbAccessControlVo;
import org.dromara.property.domain.bo.TbAccessControlBo;
import org.dromara.property.service.ITbAccessControlService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
* 门禁管理
* 前端访问路由地址为:/property/accessControl
*
* @author mocheng
* @date 2025-06-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/accessControl")
public class TbAccessControlController extends BaseController {
private final ITbAccessControlService tbAccessControlService;
/**
* 查询门禁管理列表
*/
@SaCheckPermission("property:accessControl:list")
@GetMapping("/list")
public TableDataInfo<TbAccessControlVo> list(TbAccessControlBo bo, PageQuery pageQuery) {
return tbAccessControlService.queryPageList(bo, pageQuery);
}
/**
* 导出门禁管理列表
*/
@SaCheckPermission("property:accessControl:export")
@Log(title = "门禁管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TbAccessControlBo bo, HttpServletResponse response) {
List<TbAccessControlVo> list = tbAccessControlService.queryList(bo);
ExcelUtil.exportExcel(list, "门禁管理", TbAccessControlVo.class, response);
}
/**
* 获取门禁管理详细信息
*
* @param id 主键
*/
@SaCheckPermission("property:accessControl:query")
@GetMapping("/{id}")
public R<TbAccessControlVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
return R.ok(tbAccessControlService.queryById(id));
}
/**
* 新增门禁管理
*/
@SaCheckPermission("property:accessControl:add")
@Log(title = "门禁管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody TbAccessControlBo bo) {
return toAjax(tbAccessControlService.insertByBo(bo));
}
/**
* 修改门禁管理
*/
@SaCheckPermission("property:accessControl:edit")
@Log(title = "门禁管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody TbAccessControlBo bo) {
return toAjax(tbAccessControlService.updateByBo(bo));
}
/**
* 删除门禁管理
*
* @param ids 主键串
*/
@SaCheckPermission("property:accessControl:remove")
@Log(title = "门禁管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable("ids") Long[] ids) {
return toAjax(tbAccessControlService.deleteWithValidByIds(List.of(ids), true));
}
}

101
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/TbAccessControl.java
View File

@@ -1,101 +0,0 @@
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;
/**
* 门禁管理对象 tb_access_control
*
* @author mocheng
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("tb_access_control")
public class TbAccessControl extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@TableId(value = "id")
private Long id;
/**
* 门禁设备编码
*/
private String accessCode;
/**
* 门禁名称
*/
private String accessName;
/**
* 园区编码
*/
private String communityCode;
/**
* 建筑编码
*/
private String buildingCode;
/**
* 门禁设备ip
*/
private String accessIp;
/**
*
*/
private Long accessPort;
/**
* 门禁设备类型
*/
private Long accessType;
/**
*
*/
private String factoryCode;
/**
* 控制卡类型：1-系统，2-E8
*/
private Long controlType;
/**
* 控制卡类型编码
*/
private String controlCode;
/**
* 外部编码
*/
private String outCode;
/**
* 组织编码
*/
private String orgCode;
/**
* 数据状态：1有效，0无效
*/
private Long dataState;
/**
* 搜索值
*/
private String searchValue;
}

109
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/bo/TbAccessControlBo.java
View File

@@ -1,109 +0,0 @@
package org.dromara.property.domain.bo;
import org.dromara.property.domain.TbAccessControl;
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.*;
/**
* 门禁管理业务对象 tb_access_control
*
* @author mocheng
* @date 2025-06-18
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = TbAccessControl.class, reverseConvertGenerate = false)
public class TbAccessControlBo extends BaseEntity {
/**
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long id;
/**
* 门禁设备编码
*/
@NotBlank(message = "门禁设备编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String accessCode;
/**
* 门禁名称
*/
@NotBlank(message = "门禁名称不能为空", groups = { AddGroup.class, EditGroup.class })
private String accessName;
/**
* 园区编码
*/
@NotBlank(message = "园区编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String communityCode;
/**
* 建筑编码
*/
@NotBlank(message = "建筑编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String buildingCode;
/**
* 门禁设备ip
*/
private String accessIp;
/**
*
*/
private Long accessPort;
/**
* 门禁设备类型
*/
@NotNull(message = "门禁设备类型不能为空", groups = { AddGroup.class, EditGroup.class })
private Long accessType;
/**
*
*/
@NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
private String factoryCode;
/**
* 控制卡类型：1-系统，2-E8
*/
@NotNull(message = "控制卡类型：1-系统，2-E8不能为空", groups = { AddGroup.class, EditGroup.class })
private Long controlType;
/**
* 控制卡类型编码
*/
private String controlCode;
/**
* 外部编码
*/
private String outCode;
/**
* 组织编码
*/
@NotBlank(message = "组织编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String orgCode;
/**
* 数据状态：1有效，0无效
*/
@NotNull(message = "数据状态：1有效，0无效不能为空", groups = { AddGroup.class, EditGroup.class })
private Long dataState;
/**
* 搜索值
*/
private String searchValue;
}

123
ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/TbAccessControlVo.java
View File

@@ -1,123 +0,0 @@
package org.dromara.property.domain.vo;
import org.dromara.property.domain.TbAccessControl;
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;
/**
* 门禁管理视图对象 tb_access_control
*
* @author mocheng
* @date 2025-06-18
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = TbAccessControl.class)
public class TbAccessControlVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Long id;
/**
* 门禁设备编码
*/
@ExcelProperty(value = "门禁设备编码")
private String accessCode;
/**
* 门禁名称
*/
@ExcelProperty(value = "门禁名称")
private String accessName;
/**
* 园区编码
*/
@ExcelProperty(value = "园区编码")
private String communityCode;
/**
* 建筑编码
*/
@ExcelProperty(value = "建筑编码")
private String buildingCode;
/**
* 门禁设备ip
*/
@ExcelProperty(value = "门禁设备ip")
private String accessIp;
/**
*
*/
@ExcelProperty(value = "")
private Long accessPort;
/**
* 门禁设备类型
*/
@ExcelProperty(value = "门禁设备类型")
private Long accessType;
/**
*
*/
@ExcelProperty(value = "")
private String factoryCode;
/**
* 控制卡类型：1-系统，2-E8
*/
@ExcelProperty(value = "控制卡类型：1-系统，2-E8", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "wy_kzklx")
private Long controlType;
/**
* 控制卡类型编码
*/
@ExcelProperty(value = "控制卡类型编码")
private String controlCode;
/**
* 外部编码
*/
@ExcelProperty(value = "外部编码")
private String outCode;
/**
* 组织编码
*/
@ExcelProperty(value = "组织编码")
private String orgCode;
/**
* 数据状态：1有效，0无效
*/
@ExcelProperty(value = "数据状态：1有效，0无效")
private Long dataState;
/**
* 搜索值
*/
@ExcelProperty(value = "搜索值")
private String searchValue;
}

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

@@ -1,69 +0,0 @@
package org.dromara.property.service;
import org.dromara.property.domain.TbAccessControl;
import org.dromara.property.domain.vo.TbAccessControlVo;
import org.dromara.property.domain.bo.TbAccessControlBo;
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 mocheng
* @date 2025-06-18
*/
public interface ITbAccessControlService {
/**
* 查询门禁管理
*
* @param id 主键
* @return 门禁管理
*/
TbAccessControlVo queryById(Long id);
/**
* 分页查询门禁管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 门禁管理分页列表
*/
TableDataInfo<TbAccessControlVo> queryPageList(TbAccessControlBo bo, PageQuery pageQuery);
/**
* 查询符合条件的门禁管理列表
*
* @param bo 查询条件
* @return 门禁管理列表
*/
List<TbAccessControlVo> queryList(TbAccessControlBo bo);
/**
* 新增门禁管理
*
* @param bo 门禁管理
* @return 是否新增成功
*/
Boolean insertByBo(TbAccessControlBo bo);
/**
* 修改门禁管理
*
* @param bo 门禁管理
* @return 是否修改成功
*/
Boolean updateByBo(TbAccessControlBo bo);
/**
* 校验并批量删除门禁管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

145
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbAccessControlServiceImpl.java
View File

@@ -1,145 +0,0 @@
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.TbAccessControlBo;
import org.dromara.property.domain.vo.TbAccessControlVo;
import org.dromara.property.domain.TbAccessControl;
import org.dromara.property.mapper.TbAccessControlMapper;
import org.dromara.property.service.ITbAccessControlService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 门禁管理Service业务层处理
*
* @author mocheng
* @date 2025-06-18
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class TbAccessControlServiceImpl implements ITbAccessControlService {
private final TbAccessControlMapper baseMapper;
/**
* 查询门禁管理
*
* @param id 主键
* @return 门禁管理
*/
@Override
public TbAccessControlVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询门禁管理列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 门禁管理分页列表
*/
@Override
public TableDataInfo<TbAccessControlVo> queryPageList(TbAccessControlBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<TbAccessControl> lqw = buildQueryWrapper(bo);
Page<TbAccessControlVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的门禁管理列表
*
* @param bo 查询条件
* @return 门禁管理列表
*/
@Override
public List<TbAccessControlVo> queryList(TbAccessControlBo bo) {
LambdaQueryWrapper<TbAccessControl> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<TbAccessControl> buildQueryWrapper(TbAccessControlBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<TbAccessControl> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(TbAccessControl::getId);
lqw.eq(StringUtils.isNotBlank(bo.getAccessCode()), TbAccessControl::getAccessCode, bo.getAccessCode());
lqw.like(StringUtils.isNotBlank(bo.getAccessName()), TbAccessControl::getAccessName, bo.getAccessName());
lqw.eq(StringUtils.isNotBlank(bo.getCommunityCode()), TbAccessControl::getCommunityCode, bo.getCommunityCode());
lqw.eq(StringUtils.isNotBlank(bo.getBuildingCode()), TbAccessControl::getBuildingCode, bo.getBuildingCode());
lqw.eq(StringUtils.isNotBlank(bo.getAccessIp()), TbAccessControl::getAccessIp, bo.getAccessIp());
lqw.eq(bo.getAccessPort() != null, TbAccessControl::getAccessPort, bo.getAccessPort());
lqw.eq(bo.getAccessType() != null, TbAccessControl::getAccessType, bo.getAccessType());
lqw.eq(StringUtils.isNotBlank(bo.getFactoryCode()), TbAccessControl::getFactoryCode, bo.getFactoryCode());
lqw.eq(bo.getControlType() != null, TbAccessControl::getControlType, bo.getControlType());
lqw.eq(StringUtils.isNotBlank(bo.getControlCode()), TbAccessControl::getControlCode, bo.getControlCode());
lqw.eq(StringUtils.isNotBlank(bo.getOutCode()), TbAccessControl::getOutCode, bo.getOutCode());
lqw.eq(StringUtils.isNotBlank(bo.getOrgCode()), TbAccessControl::getOrgCode, bo.getOrgCode());
lqw.eq(bo.getDataState() != null, TbAccessControl::getDataState, bo.getDataState());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), TbAccessControl::getSearchValue, bo.getSearchValue());
return lqw;
}
/**
* 新增门禁管理
*
* @param bo 门禁管理
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(TbAccessControlBo bo) {
TbAccessControl add = MapstructUtils.convert(bo, TbAccessControl.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改门禁管理
*
* @param bo 门禁管理
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(TbAccessControlBo bo) {
TbAccessControl update = MapstructUtils.convert(bo, TbAccessControl.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(TbAccessControl entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除门禁管理信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

7
ruoyi-modules/Property/src/main/resources/mapper/Property/TbAccessControlMapper.xml
View File

@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.property.mapper.TbAccessControlMapper">
</mapper>