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

增加门禁设备
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source
This commit is contained in:
15683799673 2025-06-29 02:59:43 +08:00
parent 6b1e9253af
commit 8b065703cd
16 changed files with 315 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ruoyi-api/property-api/pom.xml Normal file
View File

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-api</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>property-api</artifactId>
<description>
物业api模块
</description>
<dependencies>
<!-- RuoYi Common Core-->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-core</artifactId>
</dependency>
</dependencies>
</project>

57
ruoyi-api/property-api/src/main/java/org/dromara/property/api/domain/vo/RemoteFloorVo.java Normal file
View File

@ -0,0 +1,57 @@
package org.dromara.property.api.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
@Data
public class RemoteFloorVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
private Long id;
/**
* 社区id
*/
private Long communityId;
/**
* 建筑名称
*/
private Long buildingId;
/**
* 单元编码
*/
private Long unitId;
/**
* 楼层数名称
*/
private String floorName;
/**
* 楼层号
*/
private Long floorNumber;
/**
* 楼层类型
*/
private Integer floorType;
/**
* 房间数量
*/
private Integer roomCount;
/**
* 层高
*/
private Integer floorHeight;
}

7
ruoyi-api/ruoyi-api-bom/pom.xml
View File

@ -41,6 +41,13 @@
<version>${revision}</version>
</dependency>
<!-- 物业模块接口 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>property-api</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>

5
ruoyi-modules/Property/pom.xml
View File

@ -110,6 +110,11 @@
<artifactId>ruoyi-api-workflow</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>property-api</artifactId>
</dependency>
</dependencies>
<build>

29
ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteFloorServiceImpl.java Normal file
View File

@ -0,0 +1,29 @@
package org.dromara.property.dubbo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.property.api.RemoteFloorService;
import org.dromara.property.api.domain.vo.RemoteFloorVo;
import org.dromara.property.domain.vo.TbFloorVo;
import org.dromara.property.service.ITbFloorService;
/**
* 楼层服务远程调用实现
*
* @author lxj
*/
@Slf4j
@RequiredArgsConstructor
@DubboService
public class RemoteFloorServiceImpl implements RemoteFloorService {
private final ITbFloorService floorService;
@Override
public RemoteFloorVo queryByFloorId(Long floorId) {
TbFloorVo tbFloorVo = floorService.queryById(floorId);
return MapstructUtils.convert(tbFloorVo, RemoteFloorVo.class);
}
}

4
ruoyi-modules/Sis/pom.xml
View File

@ -106,6 +106,10 @@
<groupId>org.dromara</groupId>
<artifactId>ruoyi-api-workflow</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>property-api</artifactId>
</dependency>
</dependencies>

12
ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisDeviceManageController.java
View File

@ -40,7 +40,7 @@ public class SisDeviceManageController extends BaseController {
/**
* 查询设备管理列表
*/
@SaCheckPermission("system:deviceManage:list")
@SaCheckPermission("sis:deviceManage:list")
@GetMapping("/list")
public TableDataInfo<SisDeviceManageVo> list(SisDeviceManageBo bo, PageQuery pageQuery) {
return sisDeviceManageService.queryPageList(bo, pageQuery);
@ -49,7 +49,7 @@ public class SisDeviceManageController extends BaseController {
/**
* 导出设备管理列表
*/
@SaCheckPermission("system:deviceManage:export")
@SaCheckPermission("sis:deviceManage:export")
@Log(title = "设备管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SisDeviceManageBo bo, HttpServletResponse response) {
@ -62,7 +62,7 @@ public class SisDeviceManageController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("system:deviceManage:query")
@SaCheckPermission("sis:deviceManage:query")
@GetMapping("/{id}")
public R<SisDeviceManageVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable("id") Long id) {
@ -72,7 +72,7 @@ public class SisDeviceManageController extends BaseController {
/**
* 新增设备管理
*/
@SaCheckPermission("system:deviceManage:add")
@SaCheckPermission("sis:deviceManage:add")
@Log(title = "设备管理", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@ -83,7 +83,7 @@ public class SisDeviceManageController extends BaseController {
/**
* 修改设备管理
*/
@SaCheckPermission("system:deviceManage:edit")
@SaCheckPermission("sis:deviceManage:edit")
@Log(title = "设备管理", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@ -96,7 +96,7 @@ public class SisDeviceManageController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("system:deviceManage:remove")
@SaCheckPermission("sis:deviceManage:remove")
@Log(title = "设备管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

19
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java
View File

@ -41,12 +41,22 @@ public class SisAccessControl extends TenantEntity {
/**
* 园区编码
*/
private String communityCode;
private Long communityId;
/**
* 建筑编码
*/
private String buildingCode;
private Long buildingId;
/**
* 园区编码
*/
private Long unitId;
/**
* 建筑编码
*/
private Long floorId;
/**
* 门禁设备ip
@ -83,10 +93,5 @@ public class SisAccessControl extends TenantEntity {
*/
private String outCode;
/**
* 组织编码
*/
private String orgCode;
}

30
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java
View File

@ -28,11 +28,6 @@ public class SisDeviceManage extends BaseEntity {
@TableId(value = "id")
private Long id;
/**
* 设备编码
*/
private String deviceNo;
/**
* 设备名称
*/
@ -78,5 +73,30 @@ public class SisDeviceManage extends BaseEntity {
*/
private Long accessControlId;
/**
* 设备账号
*/
private String deviceAccount;
/**
* 设备密码
*/
private String devicePwd;
/**
* 录像机账号
*/
private String vcrAccount;
/**
* 录像机密码
*/
private String vcrPwd;
/**
* 设备在录像机的通道编码
*/
private String channelNo;
}

33
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java
View File

@ -1,13 +1,14 @@
package org.dromara.sis.domain.bo;
import org.dromara.sis.domain.SisAccessControl;
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 jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.sis.domain.SisAccessControl;
/**
* 门禁设备业务对象 sis_access_control
@ -41,14 +42,22 @@ public class SisAccessControlBo extends BaseEntity {
/**
* 园区编码
*/
@NotBlank(message = "园区编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String communityCode;
private Long communityId;
/**
* 建筑编码
*/
@NotBlank(message = "建筑编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String buildingCode;
private Long buildingId;
/**
* 园区编码
*/
private Long unitId;
/**
* 建筑编码
*/
private Long floorId;
/**
* 门禁设备ip
@ -90,12 +99,6 @@ public class SisAccessControlBo extends BaseEntity {
*/
private String outCode;
/**
* 组织编码
*/
@NotBlank(message = "组织编码不能为空", groups = { AddGroup.class, EditGroup.class })
private String orgCode;
/**
* 绑定设备Id
*/

46
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java
View File

@ -1,13 +1,14 @@
package org.dromara.sis.domain.bo;
import org.dromara.sis.domain.SisDeviceManage;
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 jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.sis.domain.SisDeviceManage;
/**
* 设备管理业务对象 sis_device_manage
@ -26,12 +27,6 @@ public class SisDeviceManageBo extends BaseEntity {
@NotNull(message = "主键id不能为空", groups = {EditGroup.class})
private Long id;
/**
* 设备编码
*/
@NotBlank(message = "设备编码不能为空", groups = {AddGroup.class, EditGroup.class})
private String deviceNo;
/**
* 设备名称
*/
@ -58,7 +53,7 @@ public class SisDeviceManageBo extends BaseEntity {
/**
* 父级设备id
*/
@NotNull(message = "父级设备id不能为空", groups = {AddGroup.class, EditGroup.class})
// @NotNull(message = "父级设备id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long parentId;
/**
@ -76,5 +71,32 @@ public class SisDeviceManageBo extends BaseEntity {
*/
private Long accessControlId;
/**
* 设备账号
*/
@NotBlank(message = "设备账号不能为空", groups = {AddGroup.class, EditGroup.class})
private String deviceAccount;
/**
* 设备密码
*/
@NotBlank(message = "设备密码不能为空", groups = {AddGroup.class, EditGroup.class})
private String devicePwd;
/**
* 录像机账号
*/
private String vcrAccount;
/**
* 录像机密码
*/
private String vcrPwd;
/**
* 设备在录像机的通道编码
*/
private String channelNo;
}

21
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java
View File

@ -46,14 +46,22 @@ public class SisAccessControlVo implements Serializable {
/**
* 园区编码
*/
@ExcelProperty(value = "园区编码")
private String communityCode;
private Long communityId;
/**
* 建筑编码
*/
@ExcelProperty(value = "建筑编码")
private String buildingCode;
private Long buildingId;
/**
* 园区编码
*/
private Long unitId;
/**
* 建筑编码
*/
private Long floorId;
/**
* 门禁设备ip
@ -97,10 +105,5 @@ public class SisAccessControlVo implements Serializable {
@ExcelProperty(value = "外部编码")
private String outCode;
/**
* 组织编码
*/
@ExcelProperty(value = "外部编码")
private String orgCode;
}

30
ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java
View File

@ -31,12 +31,6 @@ public class SisDeviceManageVo implements Serializable {
@ExcelProperty(value = "主键id")
private Long id;
/**
* 设备编码
*/
@ExcelProperty(value = "设备编码")
private String deviceNo;
/**
* 设备名称
*/
@ -85,5 +79,29 @@ public class SisDeviceManageVo implements Serializable {
@ExcelProperty(value = "门禁id")
private Long accessControlId;
/**
* 设备账号
*/
private String deviceAccount;
/**
* 设备密码
*/
private String devicePwd;
/**
* 录像机账号
*/
private String vcrAccount;
/**
* 录像机密码
*/
private String vcrPwd;
/**
* 设备在录像机的通道编码
*/
private String channelNo;
}

6
ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/VideoAlarmService.java
View File

@ -90,7 +90,11 @@ public class VideoAlarmService {
* @param alarmReportData 告警数据
*/
private void handleFacialCapture(UvModel.AlarmReportInfo alarmReportData) {
//TODO
// 查询设备是偶绑定门径
// 校验人脸是偶有同行此门禁的权限
// 如果有通行权限，则打开门禁
}
/**

48
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java
View File

@ -1,33 +1,35 @@
package org.dromara.sis.service.impl;
import cn.hutool.core.lang.Assert;
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 cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.sis.domain.SisDeviceManage;
import org.apache.dubbo.config.annotation.DubboReference;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.property.api.RemoteFloorService;
import org.dromara.property.api.domain.vo.RemoteFloorVo;
import org.dromara.sis.domain.SisAccessControl;
import org.dromara.sis.domain.bo.SisAccessControlBo;
import org.dromara.sis.domain.bo.SisDeviceManageBo;
import org.dromara.sis.mapper.SisDeviceManageMapper;
import org.dromara.sis.domain.vo.SisAccessControlVo;
import org.dromara.sis.mapper.SisAccessControlMapper;
import org.dromara.sis.sdk.e8.DoorDeviceService;
import org.dromara.sis.sdk.e8.domain.door.req.DoorDeviceAddReq;
import org.dromara.sis.sdk.e8.domain.door.res.DoorDeviceAddRes;
import org.dromara.sis.service.ISisAccessControlService;
import org.dromara.sis.service.ISisDeviceManageService;
import org.springframework.stereotype.Service;
import org.dromara.sis.domain.bo.SisAccessControlBo;
import org.dromara.sis.domain.vo.SisAccessControlVo;
import org.dromara.sis.domain.SisAccessControl;
import org.dromara.sis.mapper.SisAccessControlMapper;
import org.dromara.sis.service.ISisAccessControlService;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 门禁设备Service业务层处理
@ -44,6 +46,10 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService {
private final DoorDeviceService doorDeviceService;
private final ISisDeviceManageService sisDeviceManageService;
@DubboReference
private RemoteFloorService remoteFloorService;
/**
* 查询门禁设备
*
@ -87,8 +93,6 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService {
lqw.orderByAsc(SisAccessControl::getId);
lqw.eq(StringUtils.isNotBlank(bo.getAccessCode()), SisAccessControl::getAccessCode, bo.getAccessCode());
lqw.like(StringUtils.isNotBlank(bo.getAccessName()), SisAccessControl::getAccessName, bo.getAccessName());
lqw.eq(StringUtils.isNotBlank(bo.getCommunityCode()), SisAccessControl::getCommunityCode, bo.getCommunityCode());
lqw.eq(StringUtils.isNotBlank(bo.getBuildingCode()), SisAccessControl::getBuildingCode, bo.getBuildingCode());
lqw.eq(StringUtils.isNotBlank(bo.getAccessIp()), SisAccessControl::getAccessIp, bo.getAccessIp());
lqw.eq(bo.getAccessPort() != null, SisAccessControl::getAccessPort, bo.getAccessPort());
lqw.eq(bo.getAccessType() != null, SisAccessControl::getAccessType, bo.getAccessType());
@ -96,7 +100,12 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService {
lqw.eq(bo.getControlType() != null, SisAccessControl::getControlType, bo.getControlType());
lqw.eq(StringUtils.isNotBlank(bo.getControlCode()), SisAccessControl::getControlCode, bo.getControlCode());
lqw.eq(StringUtils.isNotBlank(bo.getOutCode()), SisAccessControl::getOutCode, bo.getOutCode());
lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), SisAccessControl::getSearchValue, bo.getSearchValue());
if (StrUtil.isNotEmpty(bo.getSearchValue())) {
lqw.or().eq(SisAccessControl::getCommunityId, bo.getSearchValue());
lqw.or().eq(SisAccessControl::getBuildingId, bo.getSearchValue());
lqw.or().eq(SisAccessControl::getUnitId, bo.getSearchValue());
lqw.or().eq(SisAccessControl::getFloorId, bo.getSearchValue());
}
return lqw;
}
@ -109,7 +118,14 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService {
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(SisAccessControlBo bo) {
// 校验楼层是否存在
RemoteFloorVo remoteFloorVo = remoteFloorService.queryByFloorId(bo.getFloorId());
Assert.notNull(remoteFloorVo, "当前楼层信息不存在。");
SisAccessControl add = MapstructUtils.convert(bo, SisAccessControl.class);
add.setCommunityId(remoteFloorVo.getCommunityId());
add.setBuildingId(remoteFloorVo.getBuildingId());
add.setUnitId(remoteFloorVo.getUnitId());
add.setFloorId(remoteFloorVo.getId());
Assert.notNull(add, "数据处理失败");
boolean flag = baseMapper.insert(add) > 0;
if (flag) {

1
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java
View File

@ -74,7 +74,6 @@ public class SisDeviceManageServiceImpl implements ISisDeviceManageService {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SisDeviceManage> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(SisDeviceManage::getId);
lqw.eq(StringUtils.isNotBlank(bo.getDeviceNo()), SisDeviceManage::getDeviceNo, bo.getDeviceNo());
lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), SisDeviceManage::getDeviceName, bo.getDeviceName());
lqw.eq(StringUtils.isNotBlank(bo.getDeviceIp()), SisDeviceManage::getDeviceIp, bo.getDeviceIp());
lqw.eq(bo.getDevicePort() != null, SisDeviceManage::getDevicePort, bo.getDevicePort());