From 815fe53f1ac0a637f52ae772324b15c2dcaa77ef Mon Sep 17 00:00:00 2001 From: lxj <15683799673@163.com> Date: Thu, 10 Jul 2025 18:36:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A2=AF=E6=8E=A7?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +- .../mybatis/core/page/TableDataInfo.java | 2 + .../dromara/sis/domain/SisAccessControl.java | 11 -- .../dromara/sis/domain/SisDeviceBindRef.java | 49 ++++++ .../sis/domain/bo/SisAccessControlBo.java | 5 - .../sis/domain/bo/SisDeviceBindRefBo.java | 50 ++++++ .../sis/domain/enums/ControlTypeEnum.java | 27 ++++ .../sis/domain/vo/SisAccessControlVo.java | 8 - .../sis/domain/vo/SisDeviceBindRefVo.java | 57 +++++++ .../sis/mapper/SisDeviceBindRefMapper.java | 15 ++ .../sdk/unview/service/VideoAlarmService.java | 77 ++++++---- .../sis/service/ISisAccessControlService.java | 17 +- .../sis/service/ISisDeviceBindRefService.java | 84 ++++++++++ .../impl/SisAccessControlServiceImpl.java | 30 ++-- .../impl/SisDeviceBindRefServiceImpl.java | 145 ++++++++++++++++++ .../impl/SisElevatorInfoServiceImpl.java | 9 +- .../mapper/sis/SisDeviceBindRefMapper.xml | 7 + 17 files changed, 508 insertions(+), 91 deletions(-) create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceBindRef.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceBindRefBo.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/ControlTypeEnum.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceBindRefVo.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceBindRefMapper.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceBindRefService.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceBindRefServiceImpl.java create mode 100644 ruoyi-modules/Sis/src/main/resources/mapper/sis/SisDeviceBindRefMapper.xml diff --git a/pom.xml b/pom.xml index 12792e2..121b2d4 100644 --- a/pom.xml +++ b/pom.xml @@ -91,10 +91,8 @@ dev - - - 47.109.37.87:8848 - 47.109.37.87:4560 + 192.168.110.207:8848 + 192.168.110.207:4560 DEFAULT_GROUP DEFAULT_GROUP nacos diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java index 8db4b3c..9df2bb8 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java @@ -51,6 +51,8 @@ public class TableDataInfo implements Serializable { public TableDataInfo(List list, long total) { this.rows = list; this.total = total; + this.msg = "success"; + this.code = HttpStatus.HTTP_OK; } /** diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java index 74491b7..f36747a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControl.java @@ -93,15 +93,4 @@ public class SisAccessControl extends TenantEntity { */ private String outCode; - /** - * 绑定设备id - */ - private Long bindDeviceId; - - /** - * 绑定设备ip - */ - private String bindDeviceIp; - - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceBindRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceBindRef.java new file mode 100644 index 0000000..1f7dcd5 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceBindRef.java @@ -0,0 +1,49 @@ +package org.dromara.sis.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.dromara.common.tenant.core.TenantEntity; + +import java.io.Serial; + +/** + * 摄像头绑定(门禁，电梯)关联关系对象 sis_device_bind_ref + * + * @author lxj + * @date 2025-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sis_device_bind_ref") +public class SisDeviceBindRef extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + + /** + * 设备id(摄像头id) + */ + private Long deviceId; + + private String deviceIp; + + /** + * control_type=1，是门禁id，control_type=2,3 是电梯id + */ + private Long bindId; + + /** + * 控制类型(1:门禁，2：电梯呼梯，3:电梯梯控 + */ + private Integer controlType; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java index f3c26e8..877395f 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlBo.java @@ -104,9 +104,4 @@ public class SisAccessControlBo extends BaseEntity { */ private Long bindDeviceId; - /** - * 绑定设备ip - */ - private String bindDeviceIp; - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceBindRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceBindRefBo.java new file mode 100644 index 0000000..8bb2081 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceBindRefBo.java @@ -0,0 +1,50 @@ +package org.dromara.sis.domain.bo; + +import org.dromara.sis.domain.SisDeviceBindRef; +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.*; + +/** + * 摄像头绑定(门禁，电梯)关联关系业务对象 sis_device_bind_ref + * + * @author lxj + * @date 2025-07-10 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SisDeviceBindRef.class, reverseConvertGenerate = false) +public class SisDeviceBindRefBo extends BaseEntity { + + /** + * 主键id + */ + @NotNull(message = "主键id不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 设备id(摄像头id) + */ + @NotNull(message = "设备id(摄像头id)不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long deviceId; + + private String deviceIp; + + /** + * control_type=1，是门禁id，control_type=2,3 是电梯id + */ + @NotNull(message = "control_type=1，是门禁id，control_type=2,3 是电梯id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long bindId; + + /** + * 控制类型(1:门禁，2：电梯呼梯，3:电梯梯控 + */ + @NotNull(message = "控制类型(1:门禁，2：电梯呼梯，3:电梯梯控不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer controlType; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/ControlTypeEnum.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/ControlTypeEnum.java new file mode 100644 index 0000000..96b5433 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/enums/ControlTypeEnum.java @@ -0,0 +1,27 @@ +package org.dromara.sis.domain.enums; + +import lombok.Getter; + +@Getter +public enum ControlTypeEnum { + /** + * 门禁 + */ + ACCESS_CONTROL(1), + /** + * 远程呼梯 + */ + REMOTE_CALL_ELEVATOR(2), + /** + * 梯控 + */ + ELEVATOR_CONTROL(3); + + private final Integer code; + + ControlTypeEnum(Integer code) { + this.code = code; + } + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java index 553a6c3..08ed4e1 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java @@ -104,12 +104,4 @@ public class SisAccessControlVo implements Serializable { */ @ExcelProperty(value = "外部编码") private String outCode; - - private Long bindDeviceId; - - /** - * 绑定设备ip - */ - private String bindDeviceIp; - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceBindRefVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceBindRefVo.java new file mode 100644 index 0000000..8661628 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceBindRefVo.java @@ -0,0 +1,57 @@ +package org.dromara.sis.domain.vo; + +import org.dromara.sis.domain.SisDeviceBindRef; +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; + + + +/** + * 摄像头绑定(门禁，电梯)关联关系视图对象 sis_device_bind_ref + * + * @author lxj + * @date 2025-07-10 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SisDeviceBindRef.class) +public class SisDeviceBindRefVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 设备id(摄像头id) + */ + @ExcelProperty(value = "设备id(摄像头id)") + private Long deviceId; + + private String deviceIp; + /** + * control_type=1，是门禁id，control_type=2,3 是电梯id + */ + @ExcelProperty(value = "control_type=1，是门禁id，control_type=2,3 是电梯id") + private Long bindId; + + /** + * 控制类型(1:门禁，2：电梯呼梯，3:电梯梯控 + */ + @ExcelProperty(value = "控制类型(1:门禁，2：电梯呼梯，3:电梯梯控") + private Integer controlType; + + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceBindRefMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceBindRefMapper.java new file mode 100644 index 0000000..09a8a2d --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisDeviceBindRefMapper.java @@ -0,0 +1,15 @@ +package org.dromara.sis.mapper; + +import org.dromara.sis.domain.SisDeviceBindRef; +import org.dromara.sis.domain.vo.SisDeviceBindRefVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 摄像头绑定(门禁，电梯)关联关系Mapper接口 + * + * @author lxj + * @date 2025-07-10 + */ +public interface SisDeviceBindRefMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/VideoAlarmService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/VideoAlarmService.java index efeb41a..a3b3f2d 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/VideoAlarmService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/unview/service/VideoAlarmService.java @@ -3,7 +3,8 @@ package org.dromara.sis.sdk.unview.service; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.dromara.sis.domain.vo.SisAccessControlVo; +import org.dromara.sis.domain.SisDeviceBindRef; +import org.dromara.sis.domain.enums.ControlTypeEnum; import org.dromara.sis.domain.vo.SisAuthRecordVo; import org.dromara.sis.sdk.e8.AccessControlService; import org.dromara.sis.sdk.e8.domain.accessControl.req.RemoteOpenDoorReq; @@ -11,10 +12,12 @@ import org.dromara.sis.sdk.unview.model.UvModel; import org.dromara.sis.sdk.unview.model.enums.AlarmTypeEnum; import org.dromara.sis.service.ISisAccessControlService; import org.dromara.sis.service.ISisAuthRecordService; +import org.dromara.sis.service.ISisDeviceBindRefService; import org.dromara.sis.service.ISisDeviceManageService; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * 宇视人体设备告警数据处理 @@ -30,6 +33,7 @@ public class VideoAlarmService { private final ISisAuthRecordService authRecordService; private final AccessControlService accessControlService; private final ISisAccessControlService sisAccessControlService; + private final ISisDeviceBindRefService deviceBindRefService; public void handleAlarmData(UvModel.AlarmReportInfo alarmReportData) { @@ -127,37 +131,52 @@ public class VideoAlarmService { return; } compareResults.forEach(result -> { - // 查询设备是偶绑定门径 -// SisDeviceManageVo sisDeviceManageVo = deviceManageService.queryVoByDeviceIp(deviceInfo.getDevice_code()); - SisAccessControlVo controlVo = sisAccessControlService.queryByBindDeviceIp(channelInfo.getIpc_addr()); - if (controlVo == null) { - log.info("设备[{}]未和门禁绑定，不处理此条数据。", channelInfo.getIpc_addr()); + // 查询设备绑定关联关系表 + SisDeviceBindRef ref = deviceBindRefService.queryByDeviceIp(channelInfo.getIpc_addr()); + if (ref == null) { return; } - // 人像库id -// Integer libId = result.getLib_id(); - // 宇视人员id - Integer personId = result.getPerson_id(); - // 门禁id - Long accessControlId = controlVo.getId(); - // 校验人脸是偶有同行此门禁的权限 - SisAuthRecordVo recordVo = authRecordService.checkAuth(personId, accessControlId); - // 如果有通行权限，则打开门禁 - if (recordVo == null) { - log.info("此人像[{}]没有门禁[{}]的通行权限。", personId, accessControlId); + // 门禁 + if (Objects.equals(ref.getControlType(), ControlTypeEnum.ACCESS_CONTROL.getCode())) { +// SisAccessControlVo controlVo = sisAccessControlService.queryById(ref.getBindId()); +// if (controlVo == null) { +// log.info("设备[{}]未和门禁绑定，不处理此条数据。", channelInfo.getIpc_addr()); +// return; +// } + // 人像库id +// Integer libId = result.getLib_id(); + // 宇视人员id + Integer personId = result.getPerson_id(); + // 门禁id + Long accessControlId = ref.getBindId(); + // 校验人脸是偶有同行此门禁的权限 + SisAuthRecordVo recordVo = authRecordService.checkAuth(personId, accessControlId); + // 如果有通行权限，则打开门禁 + if (recordVo == null) { + log.info("此人像[{}]没有门禁[{}]的通行权限。", personId, accessControlId); + } + // 打开门禁 + RemoteOpenDoorReq remoteOpenDoorReq = new RemoteOpenDoorReq(); + remoteOpenDoorReq.setType(0); + remoteOpenDoorReq.setReason("宇视人像识别,人像id=" + recordVo.getImgId()); + remoteOpenDoorReq.setOperatorId(0L); + RemoteOpenDoorReq.ControlData data = new RemoteOpenDoorReq.ControlData(); + data.setDoorId(recordVo.getDoorId()); + data.setDeviceId(recordVo.getDeviceId()); + remoteOpenDoorReq.setControlList(List.of(data)); + log.info("远程开门参数，params={}", JSONObject.toJSONString(remoteOpenDoorReq)); + Boolean b = accessControlService.remoteOpenDoor(remoteOpenDoorReq); + log.info("远程开门完成, result={}", b); + } + // 远程呼梯 + if (Objects.equals(ref.getControlType(), ControlTypeEnum.REMOTE_CALL_ELEVATOR.getCode())) { + // TODO 待实现 + } + + // 梯控 + if (Objects.equals(ref.getControlType(), ControlTypeEnum.ELEVATOR_CONTROL.getCode())) { + // TODO 待实现 } - // 打开门禁 - RemoteOpenDoorReq remoteOpenDoorReq = new RemoteOpenDoorReq(); - remoteOpenDoorReq.setType(0); - remoteOpenDoorReq.setReason("宇视人像识别,人像id=" + recordVo.getImgId()); - remoteOpenDoorReq.setOperatorId(0L); - RemoteOpenDoorReq.ControlData data = new RemoteOpenDoorReq.ControlData(); - data.setDoorId(recordVo.getDoorId()); - data.setDeviceId(recordVo.getDeviceId()); - remoteOpenDoorReq.setControlList(List.of(data)); - log.info("远程开门参数，params={}", JSONObject.toJSONString(remoteOpenDoorReq)); - Boolean b = accessControlService.remoteOpenDoor(remoteOpenDoorReq); - log.info("远程开门完成, result={}", b); }); } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAccessControlService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAccessControlService.java index 0a077f7..fa6b77c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAccessControlService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAccessControlService.java @@ -1,11 +1,10 @@ package org.dromara.sis.service; import org.dromara.common.core.domain.TreeNode; -import org.dromara.sis.domain.SisAccessControl; -import org.dromara.sis.domain.vo.SisAccessControlVo; -import org.dromara.sis.domain.bo.SisAccessControlBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.sis.domain.bo.SisAccessControlBo; +import org.dromara.sis.domain.vo.SisAccessControlVo; import java.util.Collection; import java.util.List; @@ -76,17 +75,9 @@ public interface ISisAccessControlService { */ List queryListByIds(Collection ids); - - - /** - * 通过绑定设备ip查询门禁 - * @param deviceCode 设备ip - * @return - */ - SisAccessControlVo queryByBindDeviceIp(String deviceCode); - /** * 查询门禁树 + * * @return */ List> queryAcTree(); diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceBindRefService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceBindRefService.java new file mode 100644 index 0000000..66161e4 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceBindRefService.java @@ -0,0 +1,84 @@ +package org.dromara.sis.service; + +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.sis.domain.SisDeviceBindRef; +import org.dromara.sis.domain.bo.SisDeviceBindRefBo; +import org.dromara.sis.domain.vo.SisDeviceBindRefVo; + +import java.util.Collection; +import java.util.List; + +/** + * 摄像头绑定(门禁，电梯)关联关系Service接口 + * + * @author lxj + * @date 2025-07-10 + */ +public interface ISisDeviceBindRefService { + + /** + * 查询摄像头绑定(门禁，电梯)关联关系 + * + * @param id 主键 + * @return 摄像头绑定(门禁 ， 电梯)关联关系 + */ + SisDeviceBindRefVo queryById(Long id); + + /** + * 分页查询摄像头绑定(门禁，电梯)关联关系列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 摄像头绑定(门禁 ， 电梯)关联关系分页列表 + */ + TableDataInfo queryPageList(SisDeviceBindRefBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的摄像头绑定(门禁，电梯)关联关系列表 + * + * @param bo 查询条件 + * @return 摄像头绑定(门禁 ， 电梯)关联关系列表 + */ + List queryList(SisDeviceBindRefBo bo); + + /** + * 新增摄像头绑定(门禁，电梯)关联关系 + * + * @param bo 摄像头绑定(门禁，电梯)关联关系 + * @return 是否新增成功 + */ + Boolean insertByBo(SisDeviceBindRefBo bo); + + /** + * 新增摄像头绑定(门禁，电梯)关联关系 + * + * @param ref 摄像头绑定(门禁，电梯)关联关系 + * @return 是否新增成功 + */ + Boolean insert(SisDeviceBindRef ref); + + /** + * 修改摄像头绑定(门禁，电梯)关联关系 + * + * @param bo 摄像头绑定(门禁，电梯)关联关系 + * @return 是否修改成功 + */ + Boolean updateByBo(SisDeviceBindRefBo bo); + + /** + * 校验并批量删除摄像头绑定(门禁，电梯)关联关系信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 通过ip查询设备关联关系 + * @param ipcAddr 设备ip + * @return 返回关联关系表 + */ + SisDeviceBindRef queryByDeviceIp(String ipcAddr); +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java index ed7057c..cb13e97 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java @@ -17,7 +17,9 @@ 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.SisDeviceBindRef; import org.dromara.sis.domain.bo.SisAccessControlBo; +import org.dromara.sis.domain.enums.ControlTypeEnum; import org.dromara.sis.domain.vo.SisAccessControlVo; import org.dromara.sis.domain.vo.SisDeviceManageVo; import org.dromara.sis.mapper.SisAccessControlMapper; @@ -25,6 +27,7 @@ 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.ISisDeviceBindRefService; import org.dromara.sis.service.ISisDeviceManageService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +50,7 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService { private final SisAccessControlMapper baseMapper; private final DoorDeviceService doorDeviceService; private final ISisDeviceManageService sisDeviceManageService; - + private final ISisDeviceBindRefService sisDeviceBindRefService; @DubboReference private RemoteFloorService remoteFloorService; @@ -131,10 +134,18 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService { add.setBuildingId(remoteFloorVo.getBuildingId()); add.setUnitId(remoteFloorVo.getUnitId()); add.setFloorId(remoteFloorVo.getId()); - add.setBindDeviceIp(sisDeviceManageVo.getDeviceIp()); Assert.notNull(add, "数据处理失败"); boolean flag = baseMapper.insert(add) > 0; if (flag) { + // 写入关联关系表中 + SisDeviceBindRef sisDeviceBindRef = new SisDeviceBindRef(); + sisDeviceBindRef.setDeviceId(sisDeviceManageVo.getId()); + sisDeviceBindRef.setDeviceIp(sisDeviceManageVo.getDeviceIp()); + sisDeviceBindRef.setBindId(add.getId()); + sisDeviceBindRef.setControlType(ControlTypeEnum.ACCESS_CONTROL.getCode()); + Boolean insert = sisDeviceBindRefService.insert(sisDeviceBindRef); + Assert.isTrue(insert, "写入设备关联表失败!"); + // 添加E8门禁设备 if (add.getControlType() == 2L) { log.info("开始同步写入E8门禁"); @@ -167,14 +178,6 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService { Assert.isTrue(update, "外部编码回写失败"); log.info("E8平台写入完成!"); } - - // 摄像头不绑定门禁，让门禁去绑定摄像头 - /*if (bo.getBindDeviceId() != null) { - SisDeviceManageBo device = new SisDeviceManageBo(); - device.setId(bo.getBindDeviceId()); - device.setAccessControlId(add.getId()); - sisDeviceManageService.updateByBo(device); - }*/ } return flag; } @@ -225,13 +228,6 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService { return baseMapper.selectVoByIds(ids); } - @Override - public SisAccessControlVo queryByBindDeviceIp(String deviceCode) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(SisAccessControl::getBindDeviceIp, deviceCode); - return baseMapper.selectVoOne(wrapper); - } - @Override public List> queryAcTree() { List> treeNodes = remoteFloorService.queryTreeList(); diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceBindRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceBindRefServiceImpl.java new file mode 100644 index 0000000..7560824 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceBindRefServiceImpl.java @@ -0,0 +1,145 @@ +package org.dromara.sis.service.impl; + +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.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.sis.domain.SisDeviceBindRef; +import org.dromara.sis.domain.bo.SisDeviceBindRefBo; +import org.dromara.sis.domain.vo.SisDeviceBindRefVo; +import org.dromara.sis.mapper.SisDeviceBindRefMapper; +import org.dromara.sis.service.ISisDeviceBindRefService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 摄像头绑定(门禁，电梯)关联关系Service业务层处理 + * + * @author lxj + * @date 2025-07-10 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class SisDeviceBindRefServiceImpl implements ISisDeviceBindRefService { + + private final SisDeviceBindRefMapper baseMapper; + + /** + * 查询摄像头绑定(门禁，电梯)关联关系 + * + * @param id 主键 + * @return 摄像头绑定(门禁 ， 电梯)关联关系 + */ + @Override + public SisDeviceBindRefVo queryById(Long id) { + return baseMapper.selectVoById(id); + } + + /** + * 分页查询摄像头绑定(门禁，电梯)关联关系列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 摄像头绑定(门禁 ， 电梯)关联关系分页列表 + */ + @Override + public TableDataInfo queryPageList(SisDeviceBindRefBo 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(SisDeviceBindRefBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SisDeviceBindRefBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(SisDeviceBindRef::getId); + lqw.eq(bo.getDeviceId() != null, SisDeviceBindRef::getDeviceId, bo.getDeviceId()); + lqw.eq(bo.getBindId() != null, SisDeviceBindRef::getBindId, bo.getBindId()); + lqw.eq(bo.getControlType() != null, SisDeviceBindRef::getControlType, bo.getControlType()); + return lqw; + } + + /** + * 新增摄像头绑定(门禁，电梯)关联关系 + * + * @param bo 摄像头绑定(门禁，电梯)关联关系 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(SisDeviceBindRefBo bo) { + SisDeviceBindRef add = MapstructUtils.convert(bo, SisDeviceBindRef.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + @Override + public Boolean insert(SisDeviceBindRef ref) { + return baseMapper.insert(ref) > 0; + } + + /** + * 修改摄像头绑定(门禁，电梯)关联关系 + * + * @param bo 摄像头绑定(门禁，电梯)关联关系 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(SisDeviceBindRefBo bo) { + SisDeviceBindRef update = MapstructUtils.convert(bo, SisDeviceBindRef.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SisDeviceBindRef entity) { + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除摄像头绑定(门禁，电梯)关联关系信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (isValid) { + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public SisDeviceBindRef queryByDeviceIp(String ipcAddr) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(SisDeviceBindRef::getDeviceIp, ipcAddr); + return baseMapper.selectOne(lqw); + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java index 432f35a..3317cce 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java @@ -128,13 +128,14 @@ public class SisElevatorInfoServiceImpl implements ISisElevatorInfoService { boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setElevatorId(add.getElevatorId()); - // sdk 链接设备 + // hik sdk 登录 // short port = bo.getControlPort().shortValue(); // Boolean isLogin = HikApiService.getInstance().login(bo.getControlIp(), port, bo.getControlAccount(), bo.getControlPwd()); -// if (!isLogin) { -// throw new RuntimeException("电梯添加失败, 发起梯控设备连接失败."); -// } +// Assert.isTrue(isLogin, "电梯添加失败, 发起梯控设备连接失败."); // todo 发起电梯楼层信息同步 + + + } return flag; } diff --git a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisDeviceBindRefMapper.xml b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisDeviceBindRefMapper.xml new file mode 100644 index 0000000..3691ade --- /dev/null +++ b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisDeviceBindRefMapper.xml @@ -0,0 +1,7 @@ + + + + + From d70d99fb9a36508437346a65568e7b0e47bdf637 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Thu, 10 Jul 2025 21:05:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor(sis):=20-=20=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=BA=93=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= =?UTF-8?q?=20-=20=E4=BA=BA=E5=83=8F=E4=BF=A1=E6=81=AF=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4=20-=20=E5=8D=8E=E4=B8=BA?= =?UTF-8?q?=E7=9B=92=E5=AD=90=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/constant/CodePrefixConstants.java | 4 +- .../org/dromara/sis/domain/SisPersonLib.java | 12 +- .../dromara/sis/domain/SisPersonLibImg.java | 4 + .../dromara/sis/domain/bo/SisPersonLibBo.java | 33 -- .../sis/domain/bo/SisPersonLibImgBo.java | 5 + .../dromara/sis/domain/vo/SisPersonLibVo.java | 21 +- .../dromara/sis/sdk/huawei/HuaWeiBoxApi.java | 22 ++ .../sis/sdk/huawei/domain/AddHWPersonReq.java | 51 +++ .../huawei/service/HuaWeiBoxApiService.java | 53 +++ .../sis/sdk/huawei/utils/HuaWeiHttp.java | 74 ++++ .../impl/SisAuthRecordServiceImpl.java | 333 +++++++++--------- .../impl/SisPersonLibImgServiceImpl.java | 75 ++-- .../service/impl/SisPersonLibServiceImpl.java | 84 +---- 13 files changed, 410 insertions(+), 361 deletions(-) create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/HuaWeiBoxApi.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/domain/AddHWPersonReq.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/service/HuaWeiBoxApiService.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/utils/HuaWeiHttp.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java index 7d1e158..8b42cfd 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CodePrefixConstants.java @@ -12,9 +12,9 @@ public interface CodePrefixConstants { String SIS_DEVICE_CODE_PREFIX = "101"; /** - * 人像编码前缀 + * 华为人像编码前缀 */ - String PERSON_LIB_IMAGE_CODE_PREFIX = "102"; + String PERSON_LIB_IMAGE_CODE_PREFIX = "HW"; String ELEVATOR_CONTROL_CODE_PREFIX = "E01"; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java index 566e8a8..c8ec2d6 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLib.java @@ -12,7 +12,7 @@ import java.io.Serial; * 人像库对象 tb_person_lib * * @author mocheng - * @date 2025-06-24 + * @since 2025-06-24 */ @Data @EqualsAndHashCode(callSuper = true) @@ -37,14 +37,4 @@ public class SisPersonLib extends TenantEntity { * 人员库描述 */ private String libDesc; - - /** - * 库类型，1：人员库，2：工服库 - */ - private Integer libType; - - /** - * 库的业务类型 1: 门禁库，2: 黑名单库 - */ - private Integer busiType; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java index 0dc26c9..64bc16d 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisPersonLibImg.java @@ -73,5 +73,9 @@ public class SisPersonLibImg extends TenantEntity { */ private String birthDate; + /** + * 远程库图像ID + */ + private Long remoteImgId; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java index 472e76a..c373261 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibBo.java @@ -8,12 +8,8 @@ import lombok.EqualsAndHashCode; 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.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; import org.dromara.sis.domain.SisPersonLib; -import java.util.List; - /** * 人像库业务对象 tb_person_lib * @@ -36,37 +32,8 @@ public class SisPersonLibBo extends BaseEntity { @NotBlank(message = "人员库名称不能为空", groups = {AddGroup.class, EditGroup.class}) private String libName; - /** - * 设备编码，需要同步创建到设备中 - */ - @NotNull(message = "人像设备不能为空", groups = {AddGroup.class, EditGroup.class}) - private List eqpIds; - /** * 人员库描述 */ private String libDesc; - - /** - * 库类型，1：人员库，2：工服库 - */ - private Integer libType; - - /** - * 库类型名称 - */ - @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "libType", other = "sis_lib_type") - private String libTypeName; - - /** - * 库的业务类型 1: 门禁库，2: 黑名单库 - */ - private Integer busiType = 1; - - /** - * 门禁设备id - */ - private Long eqbId; - - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java index 3c59511..c83c985 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisPersonLibImgBo.java @@ -79,4 +79,9 @@ public class SisPersonLibImgBo extends BaseEntity { */ private Boolean isSyncE8; + /** + * 远程库图像ID + */ + private Long remoteImgId; + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java index 569928c..fadcb66 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibVo.java @@ -8,14 +8,13 @@ import org.dromara.sis.domain.SisPersonLib; import java.io.Serial; import java.io.Serializable; -import java.util.List; /** * 人像库视图对象 tb_person_lib * * @author mocheng - * @date 2025-06-24 + * @since 2025-06-24 */ @Data @ExcelIgnoreUnannotated @@ -42,22 +41,4 @@ public class SisPersonLibVo implements Serializable { */ @ExcelProperty(value = "人员库描述") private String libDesc; - - /** - * 库类型，1：人员库，2：工服库 - */ - @ExcelProperty(value = "库类型，1：人员库，2：工服库") - private Integer libType; - - /** - * 库的业务类型 1: 门禁库，2: 黑名单库 - */ - @ExcelProperty(value = "库的业务类型 1: 门禁库，2: 黑名单库") - private Integer busiType; - - /** - * 库关联的设备id列表 - */ - List eqpIds; - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/HuaWeiBoxApi.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/HuaWeiBoxApi.java new file mode 100644 index 0000000..ebb3697 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/HuaWeiBoxApi.java @@ -0,0 +1,22 @@ +package org.dromara.sis.sdk.huawei; + +import org.dromara.sis.sdk.huawei.domain.AddHWPersonReq; + +import java.util.List; + +/** + * @apiNote HuaWeiBoxApi + * @author lsm + * @since 2025/7/10 +*/ +public interface HuaWeiBoxApi { + + /** + * 新增图片 + * + * @param req 入参 + * @return Long + */ + Long addPerson(List req); + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/domain/AddHWPersonReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/domain/AddHWPersonReq.java new file mode 100644 index 0000000..55e690d --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/domain/AddHWPersonReq.java @@ -0,0 +1,51 @@ +package org.dromara.sis.sdk.huawei.domain; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author lsm + * @apiNote AddHWPersonReq + * @since 2025/7/10 + */ +@Data +@NoArgsConstructor +public class AddHWPersonReq { + + /** + * img_id + */ + private String index; + + /** + * 名称 + */ + private String name; + + /** + * 性别 0：男 1：女 -1:未知 + */ + private String gender; + + /** + * 证件类型，枚举类型 0：身份证 1：护照 2：学生证 3：军官证 4：驾照 5：其他 + */ + private String credentialType; + + /** + * 证件号码 + */ + private String credentialNumber; + + /** + * 出生日期， 格式：yyyy-mm-dd，如2015-09-25 + */ + private String bornTime; + + /** + * base64 + */ + private List pictures; +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/service/HuaWeiBoxApiService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/service/HuaWeiBoxApiService.java new file mode 100644 index 0000000..6c33969 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/service/HuaWeiBoxApiService.java @@ -0,0 +1,53 @@ +package org.dromara.sis.sdk.huawei.service; + +import cn.hutool.json.JSONArray; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.dromara.sis.sdk.huawei.HuaWeiBoxApi; +import org.dromara.sis.sdk.huawei.domain.AddHWPersonReq; +import org.dromara.sis.sdk.huawei.utils.HuaWeiHttp; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author lsm + * @apiNote HuaWeiBoxApiService + * @since 2025/7/10 + */ +@Slf4j +@Service +public class HuaWeiBoxApiService implements HuaWeiBoxApi { + + @Resource + private HuaWeiHttp huaWeiHttp; + + /** + * 新增图片 + * + * @param req 入参 + * @return Long + */ + @Override + public Long addPerson(List req) { + String url = "/sdk_service/rest/facerepositories/201/peoples"; + + JSONObject json = new JSONObject(); + json.putOnce("peopleList", req); + String jsonReq = JSONUtil.toJsonStr(json); + + String jsonStrRes = huaWeiHttp.doPost(url, jsonReq); + JSONObject jsonRes = JSONUtil.parseObj(jsonStrRes); + + if (jsonRes.getInt("resultCode") != 0) { + log.error("新增图片失败，msg：{}", jsonRes.getStr("resultMsg")); + return null; + } + + JSONArray jsonArr = jsonRes.getJSONArray("ids"); + JSONObject obj = jsonArr.getJSONObject(0); + return Long.parseLong(obj.getStr("peopleId")); + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/utils/HuaWeiHttp.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/utils/HuaWeiHttp.java new file mode 100644 index 0000000..ae27269 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/utils/HuaWeiHttp.java @@ -0,0 +1,74 @@ +package org.dromara.sis.sdk.huawei.utils; + +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import cn.hutool.json.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.redis.utils.RedisUtils; +import org.springframework.stereotype.Component; + +/** + * @author lsm + * @apiNote HuaWeiHttp + * @since 2025/7/10 + */ +@Slf4j +@Component +public class HuaWeiHttp { + + private static final String BASE_URL = "https://192.168.110.195:18531"; + private static final String USERNAME = "huawei"; + private static final String PASSWORD = "qweasd123"; + + // 每次调用请求需要登录，获取JSESSIONID + public Boolean login() { + JSONObject json = new JSONObject(); + json.putOnce("userName", USERNAME); + json.putOnce("password", PASSWORD); + json.putOnce("timeout", 1800); + + String url = BASE_URL + "/loginInfo/login/v1.0"; + String jsonStr = json.toString(); + // 发送请求获取响应 + // 使用 try-with-resources 确保资源释放 + try (HttpResponse response = HttpRequest.post(url) + .header("Content-Type", "application/json") + .header("Cache-Control", "no-cache") + .body(jsonStr) + .execute()) { + if (response.getStatus() == 200 && response.getCookie("JSESSIONID") != null) { + RedisUtils.setCacheObject("JSESSIONID", response.getCookie("JSESSIONID").toString()); + RedisUtils.expire("JSESSIONID", 1800); + return true; + } else { + log.error("华为盒子登录失败，msg：{}", response.body()); + } + } + return false; + } + + public String doPost(String url, String json) { + if (!RedisUtils.isExistsObject("JSESSIONID")) { + if (!this.login()) { + RedisUtils.deleteObject("JSESSIONID"); + return null; + } + } + + String api = BASE_URL + url; + + try (HttpResponse response = HttpRequest.post(api) + .header("Content-Type", "application/json") + .header("Cache-Control", "no-cache") + .header("Cookie", RedisUtils.getCacheObject("JSESSIONID")) + .body(json) + .execute()) { + if (response.isOk()) { + return response.body(); + } else { + log.error("请求失败，msg：{}", response.body()); + } + } + return null; + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java index dcfe11d..4c0ff00 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java @@ -30,6 +30,7 @@ import org.dromara.sis.sdk.unview.model.UvModel; import org.dromara.sis.service.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -116,181 +117,163 @@ public class SisAuthRecordServiceImpl implements ISisAuthRecordService { @Override @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(SisAuthRecordBo bo) { - List refVos = sisLibDeviceRefService.queryByLibIds(Collections.singleton(bo.getLibId())); - Assert.notEmpty(refVos, "图像库与设备关联关系不存在"); - List eqpIds = refVos.stream().map(SisLibDeviceRefVo::getEqpId).toList(); - - - /* boolean flag = false; - log.info("开始写入授权记录，图片：{}、门禁：{}、设备：{}", bo.getImgIds(), bo.getAcIds(), eqpIds); - for (Long imgId : bo.getImgIds()) { - for (Long acId : bo.getAcIds()) { - for (Long eqpId : eqpIds) { - SisAuthRecord add = MapstructUtils.convert(bo, SisAuthRecord.class); - Assert.notNull(add, "数据处理失败"); - add.setAcId(acId); - add.setImgId(imgId); - add.setEqbId(eqpId); - flag = baseMapper.insert(add) > 0; - Assert.isTrue(flag, "授权记录写入失败"); - } - } - } - log.info("授权记录写入完成");*/ - - SisPersonLibVo libVo = sisPersonLibService.queryById(bo.getLibId()); - Assert.notNull(libVo, "图像库不存在，id=" + (bo.getLibId())); - - List imgList = sisPersonLibImgService.queryListByIds(bo.getImgIds()); - Assert.notEmpty(imgList, "图片不存在"); - - List acList = sisAccessControlService.queryListByIds(bo.getAcIds()); - Assert.notEmpty(acList, "门禁设备不存在!"); - - - try { - log.info("开始对宇视盒子下发照片，图片：{}、设备：{}", bo.getImgIds(), eqpIds); - for (SisPersonLibImgVo imgVo : imgList) { - for (Long eqpId : eqpIds) { - long eqp_lib_id; - Integer eqp_lib_img_id; - - byte[] imageByte = remoteFileService.downloadToByteArray(imgVo.getImgOssId()); - Assert.notNull(imageByte, "图片下载失败"); -// byte[] imageByte = Files.readAllBytes(Paths.get(imgVo.getImgUrl())); - - SisAccessControlDeviceVo vo = sisAccessControlDeviceService.queryById(eqpId); - Assert.notNull(vo, "门禁控制设备不存在，id=" + eqpId); - log.info(libVo.getLibType() == 1 ? "准备写入人像设备，code={}" : "准备写入工服设备，code={}", vo.getEqpNo()); - - UvModel.UvSystemInfo systemInfo = new UvModel.UvSystemInfo(); - systemInfo.setAccount(vo.getEqpAccount()); - systemInfo.setPassword(vo.getEqpPwd()); - systemInfo.setIp(vo.getEqpIp()); - systemInfo.setPort(vo.getEqpPort()); - - // 获取宇视线上库ID - SisLibDeviceRefBo refBo = new SisLibDeviceRefBo(); - refBo.setEqpId(eqpId); - refBo.setLibId(libVo.getId()); - List refVo = sisLibDeviceRefService.queryList(refBo); - Assert.notNull(refVo, "系统库与设备库关联关系不存在！libId:{},eqpId:{}", libVo.getId(), eqpId); - eqp_lib_id = refVo.get(0).getEqpLibId(); - - if (libVo.getLibType() == 1) { - // 宇视添加人像 - UvModel.AddPersonParams addPersonParams = new UvModel.AddPersonParams(); - addPersonParams.setPerson_name(imgVo.getImgName()); - addPersonParams.setImage_base64(base64Helper(imageByte)); - addPersonParams.setLib_id(Math.toIntExact(eqp_lib_id)); - addPersonParams.setSex(imgVo.getSex()); - addPersonParams.setEmail(imgVo.getEmail()); - addPersonParams.setTel(imgVo.getTel()); - addPersonParams.setCertificate_type(imgVo.getCertificateType()); - addPersonParams.setCertificate_no(imgVo.getCertificateNo()); - addPersonParams.setBirth_date(imgVo.getBirthDate()); - // 发起请求获取响应 - UvModel.AddPersonResult addResult = unViewAiBoxApi.addPerson(systemInfo, addPersonParams); - eqp_lib_img_id = addResult.getPerson_id(); - - } else { - UvModel.WorkClothesInfo addResult = unViewAiBoxApi.addWorkClothes(systemInfo, Math.toIntExact(eqp_lib_id), base64Helper(imageByte)); - eqp_lib_img_id = addResult.getWorkclothes_id(); - } - Assert.notNull(eqp_lib_img_id, "图片上传宇视盒子失败"); - log.info("图片上传宇视盒子完成，eqp_lib_img_id = {}", eqp_lib_img_id); - - SisLibDeviceImgRefBo ref = new SisLibDeviceImgRefBo(); - ref.setLibId(libVo.getId()); - ref.setImgId(imgVo.getId()); - ref.setEqpId(eqpId); - ref.setEqpLibId(eqp_lib_id); - ref.setEqpLibImgId(eqp_lib_img_id.longValue()); - Boolean insert = sisLibDeviceImgRefService.insertByBo(ref); - Assert.isTrue(insert, "写入图片关联关系表失败!"); - - } - } - log.info("图片开始下发完成!"); - - log.info("开始写入E8平台，图片：{}、门禁：{}", bo.getImgIds(), bo.getAcIds()); - for (SisPersonLibImgVo imgVo : imgList) { - byte[] imageByte = remoteFileService.downloadToByteArray(imgVo.getImgOssId()); - Assert.notNull(imageByte, "图片下载失败"); - - log.info("E8平台上传图片，{}", imgVo.getId()); - String url = e8VouchService.uploadFace(imageByte); - Assert.notNull(url, "E8平台上传图片失败"); - log.info("E8平台上传图片完成!"); - - log.info("E8平台发行凭证"); - IssueVoucherReq req = new IssueVoucherReq(); - // 34：普通用户卡 - req.setCardType(34); - // 70：人脸凭证 - req.setVoucherType(70); - // TODO 临时默认人员 - req.setPersonID(539696740646981L); - req.setTxtData(url); - Long vId = e8VouchService.issueVoucher(req); - Assert.notNull(vId, "E8平台发行凭证失败"); - log.info("E8平台发行凭证完成!"); - - log.info("E8平台授权凭证"); - // 查询E8授权门列表 - List authDoorList = e8DoorDeviceService.getPageAuthDoorDeviceList(); - Assert.notEmpty(authDoorList, "E8平台授权门列表为空"); - - // E8 授权列表 - List authList = new ArrayList<>(acList.size()); - // 授权记录 - List recordList = new ArrayList<>(acList.size()); - // E8授权门 - AuthDoorDeviceFindRes authDoor = null; - for (SisAccessControlVo sisAccessControlVo : acList) { - if (sisAccessControlVo.getControlType() != 1 && sisAccessControlVo.getAccessType() != 2) { - - // 通过门禁ID匹配授权门 - authDoor = authDoorList.stream().filter(item -> item.getDeviceId() == Long.parseLong(sisAccessControlVo.getOutCode())).findFirst().orElse(null); - - if (authDoor != null) { - CustomerAuthAddReq.AuthGroupData door = new CustomerAuthAddReq.AuthGroupData(); - door.setType(0); - door.setGatewayType(1); - // E8授权传入ID为门ID，非门禁ID - door.setId(authDoor.getId()); - authList.add(door); - - SisAuthRecord authRecord = new SisAuthRecord(); - authRecord.setDoorId(authDoor.getId()); - authRecord.setDeviceId(authDoor.getDeviceId()); - authRecord.setLibId(imgVo.getLibId()); - authRecord.setImgId(imgVo.getId()); - authRecord.setAcId(sisAccessControlVo.getId()); - recordList.add(authRecord); - } - } - } - - CustomerAuthAddReq authReq = new CustomerAuthAddReq(); - authReq.setAuthType(0); - authReq.setScheduleId(1L); - authReq.setPersonIds(Collections.singletonList(539696740646981L)); - authReq.setStartTime("2025-06-25 11: 23: 39"); - authReq.setEndTime("2025-07-25 11: 23: 39"); - authReq.setAuthData(authList); - Boolean auth = e8AccessControlService.addCustomerAuth(authReq); - Assert.isTrue(auth, "E8平台授权失败"); - log.info("E8平台授权完成!"); - boolean insert = baseMapper.insertBatch(recordList); - Assert.isTrue(insert, "写入E8关联关系表失败!"); - } - log.info("写入E8平台完成!"); - - } catch (Exception e) { - throw new RuntimeException(e.getMessage()); - } - +// List refVos = sisLibDeviceRefService.queryByLibIds(Collections.singleton(bo.getLibId())); +// Assert.notEmpty(refVos, "图像库与设备关联关系不存在"); +// List eqpIds = refVos.stream().map(SisLibDeviceRefVo::getEqpId).toList(); +// +// SisPersonLibVo libVo = sisPersonLibService.queryById(bo.getLibId()); +// Assert.notNull(libVo, "图像库不存在，id=" + (bo.getLibId())); +// +// List imgList = sisPersonLibImgService.queryListByIds(bo.getImgIds()); +// Assert.notEmpty(imgList, "图片不存在"); +// +// List acList = sisAccessControlService.queryListByIds(bo.getAcIds()); +// Assert.notEmpty(acList, "门禁设备不存在!"); +// +// +// try { +// log.info("开始对宇视盒子下发照片，图片：{}、设备：{}", bo.getImgIds(), eqpIds); +// for (SisPersonLibImgVo imgVo : imgList) { +// for (Long eqpId : eqpIds) { +// long eqp_lib_id; +// Integer eqp_lib_img_id; +// +// byte[] imageByte = remoteFileService.downloadToByteArray(imgVo.getImgOssId()); +// Assert.notNull(imageByte, "图片下载失败"); +// +// SisAccessControlDeviceVo vo = sisAccessControlDeviceService.queryById(eqpId); +// Assert.notNull(vo, "门禁控制设备不存在，id=" + eqpId); +// log.info(libVo .getLibType() == 1 ? "准备写入人像设备，code={}" : "准备写入工服设备，code={}", vo.getEqpNo()); +// +// UvModel.UvSystemInfo systemInfo = new UvModel.UvSystemInfo(); +// systemInfo.setAccount(vo.getEqpAccount()); +// systemInfo.setPassword(vo.getEqpPwd()); +// systemInfo.setIp(vo.getEqpIp()); +// systemInfo.setPort(vo.getEqpPort()); +// +// // 获取宇视线上库ID +// SisLibDeviceRefBo refBo = new SisLibDeviceRefBo(); +// refBo.setEqpId(eqpId); +// refBo.setLibId(libVo.getId()); +// List refVo = sisLibDeviceRefService.queryList(refBo); +// Assert.notNull(refVo, "系统库与设备库关联关系不存在！libId:{},eqpId:{}", libVo.getId(), eqpId); +// eqp_lib_id = refVo.get(0).getEqpLibId(); +// +// if (libVo.getLibType() == 1) { +// // 宇视添加人像 +// UvModel.AddPersonParams addPersonParams = new UvModel.AddPersonParams(); +// addPersonParams.setPerson_name(imgVo.getImgName()); +// addPersonParams.setImage_base64(base64Helper(imageByte)); +// addPersonParams.setLib_id(Math.toIntExact(eqp_lib_id)); +// addPersonParams.setSex(imgVo.getSex()); +// addPersonParams.setEmail(imgVo.getEmail()); +// addPersonParams.setTel(imgVo.getTel()); +// addPersonParams.setCertificate_type(imgVo.getCertificateType()); +// addPersonParams.setCertificate_no(imgVo.getCertificateNo()); +// addPersonParams.setBirth_date(imgVo.getBirthDate()); +// // 发起请求获取响应 +// UvModel.AddPersonResult addResult = unViewAiBoxApi.addPerson(systemInfo, addPersonParams); +// eqp_lib_img_id = addResult.getPerson_id(); +// +// } else { +// UvModel.WorkClothesInfo addResult = unViewAiBoxApi.addWorkClothes(systemInfo, Math.toIntExact(eqp_lib_id), base64Helper(imageByte)); +// eqp_lib_img_id = addResult.getWorkclothes_id(); +// } +// Assert.notNull(eqp_lib_img_id, "图片上传宇视盒子失败"); +// log.info("图片上传宇视盒子完成，eqp_lib_img_id = {}", eqp_lib_img_id); +// +// SisLibDeviceImgRefBo ref = new SisLibDeviceImgRefBo(); +// ref.setLibId(libVo.getId()); +// ref.setImgId(imgVo.getId()); +// ref.setEqpId(eqpId); +// ref.setEqpLibId(eqp_lib_id); +// ref.setEqpLibImgId(eqp_lib_img_id.longValue()); +// Boolean insert = sisLibDeviceImgRefService.insertByBo(ref); +// Assert.isTrue(insert, "写入图片关联关系表失败!"); +// +// } +// } +// log.info("图片开始下发完成!"); +// +// log.info("开始写入E8平台，图片：{}、门禁：{}", bo.getImgIds(), bo.getAcIds()); +// for (SisPersonLibImgVo imgVo : imgList) { +// byte[] imageByte = remoteFileService.downloadToByteArray(imgVo.getImgOssId()); +// Assert.notNull(imageByte, "图片下载失败"); +// +// log.info("E8平台上传图片，{}", imgVo.getId()); +// String url = e8VouchService.uploadFace(imageByte); +// Assert.notNull(url, "E8平台上传图片失败"); +// log.info("E8平台上传图片完成!"); +// +// log.info("E8平台发行凭证"); +// IssueVoucherReq req = new IssueVoucherReq(); +// // 34：普通用户卡 +// req.setCardType(34); +// // 70：人脸凭证 +// req.setVoucherType(70); +// // TODO 临时默认人员 +// req.setPersonID(539696740646981L); +// req.setTxtData(url); +// Long vId = e8VouchService.issueVoucher(req); +// Assert.notNull(vId, "E8平台发行凭证失败"); +// log.info("E8平台发行凭证完成!"); +// +// log.info("E8平台授权凭证"); +// // 查询E8授权门列表 +// List authDoorList = e8DoorDeviceService.getPageAuthDoorDeviceList(); +// Assert.notEmpty(authDoorList, "E8平台授权门列表为空"); +// +// // E8 授权列表 +// List authList = new ArrayList<>(acList.size()); +// // 授权记录 +// List recordList = new ArrayList<>(acList.size()); +// // E8授权门 +// AuthDoorDeviceFindRes authDoor = null; +// for (SisAccessControlVo sisAccessControlVo : acList) { +// if (sisAccessControlVo.getControlType() != 1 && sisAccessControlVo.getAccessType() != 2) { +// +// // 通过门禁ID匹配授权门 +// authDoor = authDoorList.stream().filter(item -> item.getDeviceId() == Long.parseLong(sisAccessControlVo.getOutCode())).findFirst().orElse(null); +// +// if (authDoor != null) { +// CustomerAuthAddReq.AuthGroupData door = new CustomerAuthAddReq.AuthGroupData(); +// door.setType(0); +// door.setGatewayType(1); +// // E8授权传入ID为门ID，非门禁ID +// door.setId(authDoor.getId()); +// authList.add(door); +// +// SisAuthRecord authRecord = new SisAuthRecord(); +// authRecord.setDoorId(authDoor.getId()); +// authRecord.setDeviceId(authDoor.getDeviceId()); +// authRecord.setLibId(imgVo.getLibId()); +// authRecord.setImgId(imgVo.getId()); +// authRecord.setAcId(sisAccessControlVo.getId()); +// recordList.add(authRecord); +// } +// } +// } +// +// CustomerAuthAddReq authReq = new CustomerAuthAddReq(); +// authReq.setAuthType(0); +// authReq.setScheduleId(1L); +// authReq.setPersonIds(Collections.singletonList(539696740646981L)); +// authReq.setStartTime("2025-06-25 11: 23: 39"); +// authReq.setEndTime("2025-07-25 11: 23: 39"); +// authReq.setAuthData(authList); +// Boolean auth = e8AccessControlService.addCustomerAuth(authReq); +// Assert.isTrue(auth, "E8平台授权失败"); +// log.info("E8平台授权完成!"); +// boolean insert = baseMapper.insertBatch(recordList); +// Assert.isTrue(insert, "写入E8关联关系表失败!"); +// } +// log.info("写入E8平台完成!"); +// +// } catch (Exception e) { +// throw new RuntimeException(e.getMessage()); +// } +// +// return true; return true; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java index 466b232..4b29383 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java @@ -1,22 +1,25 @@ package org.dromara.sis.service.impl; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.IdUtil; 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.apache.dubbo.config.annotation.DubboReference; +import org.dromara.common.core.constant.CodePrefixConstants; 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.resource.api.RemoteFileService; import org.dromara.sis.domain.SisPersonLibImg; -import org.dromara.sis.domain.bo.AccessControlLibDeviceBo; import org.dromara.sis.domain.bo.SisPersonLibImgBo; import org.dromara.sis.domain.vo.*; import org.dromara.sis.mapper.SisPersonLibImgMapper; -import org.dromara.sis.sdk.unview.UnViewAiBoxApi; -import org.dromara.sis.sdk.unview.model.UvModel; +import org.dromara.sis.sdk.huawei.HuaWeiBoxApi; +import org.dromara.sis.sdk.huawei.domain.AddHWPersonReq; import org.dromara.sis.service.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -35,10 +38,13 @@ import java.util.*; public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { private final SisPersonLibImgMapper baseMapper; - private final UnViewAiBoxApi unViewAiBoxApi; + private final HuaWeiBoxApi huaWeiBoxApi; private final ISisLibDeviceRefService libDeviceRefService; private final ISisLibDeviceImgRefService libDeviceImgRefService; + @DubboReference + private final RemoteFileService remoteFileService; + /** * 查询人像信息 * @@ -104,7 +110,32 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { public Boolean insertByBo(SisPersonLibImgBo bo) { SisPersonLibImg add = MapstructUtils.convert(bo, SisPersonLibImg.class); Assert.notNull(add, "数据处理失败"); - return baseMapper.insert(add) > 0; + boolean flag; + try { + AddHWPersonReq req = new AddHWPersonReq(); + req.setIndex(CodePrefixConstants.PERSON_LIB_IMAGE_CODE_PREFIX + IdUtil.getSnowflakeNextIdStr()); + req.setName(bo.getImgName()); + req.setGender(bo.getSex() == 1 ? "0" : bo.getSex() == 2 ? "1" : "-1"); + req.setBornTime(bo.getBirthDate()); + req.setCredentialType("0"); + req.setCredentialNumber(bo.getCertificateNo()); + + byte[] imageByte = remoteFileService.downloadToByteArray(bo.getImgOssId()); + ArrayList pictures = new ArrayList<>(); + pictures.add(Base64.getEncoder().encodeToString(imageByte)); + req.setPictures(pictures); + + Long pId = huaWeiBoxApi.addPerson(List.of(req)); + Assert.notNull(pId, "调用华为盒子新增图片失败"); + + add.setRemoteImgId(pId); + flag = baseMapper.insert(add) > 0; + Assert.isTrue(flag, "新增失败"); + } catch (Exception e) { + throw new RuntimeException(e.getMessage()); + } + + return flag; } /** @@ -137,40 +168,6 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { @Override @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - boolean del = baseMapper.deleteByIds(ids) > 0; - Assert.isTrue(del, "删除失败"); - - List list = libDeviceImgRefService.queryListByImgIds(ids); - Assert.notEmpty(list, "图片关联关系不存在"); - Collection refIds = list.stream().map(SisLibDeviceImgRefVo::getId).toList(); - Collection refLibIds = list.stream().map(SisLibDeviceImgRefVo::getLibId).toList(); - Integer[] refImgIds = list.stream().map(SisLibDeviceImgRefVo::getEqpLibImgId).map(Long::intValue).toArray(Integer[]::new); - - List ls = libDeviceRefService.queryDeviceListByLibIds(refLibIds); - Assert.notEmpty(ls, "库与设备关联关系不存在"); - - ls.forEach(item -> { - UvModel.UvSystemInfo systemInfo = new UvModel.UvSystemInfo(); - systemInfo.setAccount(item.getEqpAccount()); - systemInfo.setPassword(item.getEqpPwd()); - systemInfo.setIp(item.getEqpIp()); - systemInfo.setPort(item.getEqpPort()); - - Boolean b; - if (item.getEqpLibType() == 1) { - b = unViewAiBoxApi.batchDeletePerson(systemInfo, refImgIds); - log.info("删除宇视图片[{}]完成,result={}", refImgIds, b); - } else { - b = unViewAiBoxApi.deleteWorkClothes(systemInfo, item.getEqpLibId(), Arrays.stream(refImgIds).toList()); - log.info("删除宇视服装[{}]完成,result={}", refImgIds, b); - } - - Assert.isTrue(b, "删除图片失败"); - }); - - Boolean refFlag = libDeviceImgRefService.deleteWithValidByIds(refIds, true); - Assert.isTrue(refFlag, "删除图片关联关系失败"); - return true; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java index f6d1053..ed2e26c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibServiceImpl.java @@ -1,36 +1,24 @@ package org.dromara.sis.service.impl; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.lang.Assert; 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.common.core.constant.CodePrefixConstants; 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.sis.domain.SisLibDeviceRef; import org.dromara.sis.domain.SisPersonLib; -import org.dromara.sis.domain.bo.AccessControlLibDeviceBo; import org.dromara.sis.domain.bo.SisPersonLibBo; -import org.dromara.sis.domain.vo.SisAccessControlDeviceVo; -import org.dromara.sis.domain.vo.SisLibDeviceRefVo; import org.dromara.sis.domain.vo.SisPersonLibVo; import org.dromara.sis.mapper.SisPersonLibMapper; -import org.dromara.sis.sdk.unview.UnViewAiBoxApi; -import org.dromara.sis.sdk.unview.model.UvModel; -import org.dromara.sis.service.ISisAccessControlDeviceService; -import org.dromara.sis.service.ISisLibDeviceRefService; import org.dromara.sis.service.ISisPersonLibService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Map; @@ -46,9 +34,6 @@ import java.util.Map; public class SisPersonLibServiceImpl implements ISisPersonLibService { private final SisPersonLibMapper baseMapper; - private final UnViewAiBoxApi unViewAiBoxApi; - private final ISisLibDeviceRefService sisLibDeviceRefService; - private final ISisAccessControlDeviceService sisAccessControlDeviceService; /** * 查询人像库 @@ -58,13 +43,7 @@ public class SisPersonLibServiceImpl implements ISisPersonLibService { */ @Override public SisPersonLibVo queryById(Long id) { - SisPersonLibVo sisPersonLibVo = baseMapper.selectVoById(id); - List sisLibDeviceRefVos = sisLibDeviceRefService.queryByLibIds(Collections.singleton(id)); - if (CollUtil.isNotEmpty(sisLibDeviceRefVos)) { - List list = sisLibDeviceRefVos.stream().map(SisLibDeviceRefVo::getEqpId).toList(); - sisPersonLibVo.setEqpIds(list); - } - return sisPersonLibVo; + return baseMapper.selectVoById(id); } /** @@ -99,8 +78,6 @@ public class SisPersonLibServiceImpl implements ISisPersonLibService { lqw.orderByAsc(SisPersonLib::getId); lqw.like(StringUtils.isNotBlank(bo.getLibName()), SisPersonLib::getLibName, bo.getLibName()); lqw.eq(StringUtils.isNotBlank(bo.getLibDesc()), SisPersonLib::getLibDesc, bo.getLibDesc()); - lqw.eq(bo.getLibType() != null, SisPersonLib::getLibType, bo.getLibType()); - lqw.eq(bo.getBusiType() != null, SisPersonLib::getBusiType, bo.getBusiType()); lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), SisPersonLib::getSearchValue, bo.getSearchValue()); return lqw; } @@ -117,41 +94,7 @@ public class SisPersonLibServiceImpl implements ISisPersonLibService { SisPersonLib add = MapstructUtils.convert(bo, SisPersonLib.class); Assert.notNull(add, "数据处理失败"); boolean flag = baseMapper.insert(add) > 0; - log.info("库[{}]开始写入系统，result={}", add.getLibName(), flag); - if (flag) { - bo.setId(add.getId()); - for (Long eqpId : bo.getEqpIds()) { - // 查询设备信息 - SisAccessControlDeviceVo vo = sisAccessControlDeviceService.queryById(eqpId); - Assert.notNull(vo, "门禁控制设备不存在，id=" + eqpId); - log.info("准备写入门禁设备，code={}", vo.getEqpNo()); - UvModel.UvSystemInfo systemInfo = new UvModel.UvSystemInfo(); - systemInfo.setAccount(vo.getEqpAccount()); - systemInfo.setPassword(vo.getEqpPwd()); - systemInfo.setIp(vo.getEqpIp()); - systemInfo.setPort(vo.getEqpPort()); - // libType =1 人像库，否则工服库 - Integer outLibCode = null; - if (bo.getLibType() == 1) { - UvModel.AddLibResult addLibResult = unViewAiBoxApi.addPersonLib(systemInfo, bo.getLibName()); - outLibCode = addLibResult.getLib_id(); - } else { - UvModel.AddLibResult addLibResult = unViewAiBoxApi.addWorkClothesLib(systemInfo, bo.getLibName()); - outLibCode = addLibResult.getLib_id(); - } - log.info("宇视建库完成，libId = {}", outLibCode); - Assert.notNull(outLibCode, "写入宇视盒子失败"); - SisLibDeviceRef ref = new SisLibDeviceRef(); - ref.setLibId(add.getId()); - ref.setEqpId(vo.getId()); - ref.setEqpLibId(Long.valueOf(outLibCode)); - ref.setEqpLibState(1); - ref.setEqpLibType(bo.getLibType()); - Boolean insert = sisLibDeviceRefService.insert(ref); - Assert.isTrue(insert, "写入库关联关系表失败!"); - log.info("同步建库完成!"); - } - } + Assert.isTrue(flag, "新增失败"); return flag; } @@ -185,27 +128,6 @@ public class SisPersonLibServiceImpl implements ISisPersonLibService { @Transactional(rollbackFor = Exception.class) @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - // 查询关联的设备信息，先删除设备上的库 - List ls = sisLibDeviceRefService.queryDeviceListByLibIds(ids); - // 删除关联关系 - ls.forEach(item -> { - UvModel.UvSystemInfo systemInfo = new UvModel.UvSystemInfo(); - systemInfo.setAccount(item.getEqpAccount()); - systemInfo.setPassword(item.getEqpPwd()); - systemInfo.setIp(item.getEqpIp()); - systemInfo.setPort(item.getEqpPort()); - // 实际上这里需要根据厂商不同去不同的设备删除 - if (item.getEqpLibType() == 1) { - Boolean b = unViewAiBoxApi.deletePersonLib(systemInfo, item.getEqpLibId()); - log.info("删除宇试人像库[{}]完成,result={}", item.getEqpLibId(), b); - } else { - Boolean b = unViewAiBoxApi.deleteWorkClothesLib(systemInfo, item.getEqpLibId()); - log.info("删除宇试工服库[{}]完成,result={}", item.getEqpLibId(), b); - } - }); - // 查询当前库是否绑定 - sisLibDeviceRefService.deleteByLibIds(ids); - log.info("删除personLibRef关联关系完成!"); - return baseMapper.deleteByIds(ids) > 0; + return true; } } From 7db6d2adac6da05facbf08a0ab21ab376a83830d Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Thu, 10 Jul 2025 22:58:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?refactor(sis):=20=20-=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8D=8E=E4=B8=BA=E7=9B=92=E5=AD=90=E4=BA=BA?= =?UTF-8?q?=E5=83=8F=20=20-=20=E5=8D=8E=E4=B8=BA=E7=9B=92=E5=AD=90?= =?UTF-8?q?=E4=BA=BA=E8=84=B8=E6=AF=94=E5=AF=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sis/domain/vo/SisPersonLibImgVo.java | 5 ++ .../dromara/sis/sdk/huawei/HuaWeiBoxApi.java | 17 +++++ .../sdk/huawei/domain/FinaHWPersonReq.java | 70 +++++++++++++++++++ .../huawei/service/HuaWeiBoxApiService.java | 58 ++++++++++++++- .../sis/sdk/huawei/utils/HuaWeiHttp.java | 68 +++++++++++++++--- .../impl/SisPersonLibImgServiceImpl.java | 13 ++++ 6 files changed, 220 insertions(+), 11 deletions(-) create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/domain/FinaHWPersonReq.java diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java index 14c1c73..16d0b4a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java @@ -89,4 +89,9 @@ public class SisPersonLibImgVo implements Serializable { @ExcelProperty(value = "出生日期") private String birthDate; + /** + * 远程库图像ID + */ + @ExcelProperty(value = "远程库图像ID") + private Long remoteImgId; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/HuaWeiBoxApi.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/HuaWeiBoxApi.java index ebb3697..a1bec53 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/HuaWeiBoxApi.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/HuaWeiBoxApi.java @@ -1,7 +1,9 @@ package org.dromara.sis.sdk.huawei; import org.dromara.sis.sdk.huawei.domain.AddHWPersonReq; +import org.dromara.sis.sdk.huawei.domain.FinaHWPersonReq; +import java.util.Collection; import java.util.List; /** @@ -19,4 +21,19 @@ public interface HuaWeiBoxApi { */ Long addPerson(List req); + /** + * 删除图片 + * + * @param ids 入参 + * @return Boolean + */ + Boolean deletePerson(Collection ids); + + /** + * 根据抓拍图片比对，返回人员ID + * + * @param req 入参 + * @return Long + */ + Long findPerson(FinaHWPersonReq req); } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/domain/FinaHWPersonReq.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/domain/FinaHWPersonReq.java new file mode 100644 index 0000000..31520f9 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/domain/FinaHWPersonReq.java @@ -0,0 +1,70 @@ +package org.dromara.sis.sdk.huawei.domain; + +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author lsm + * @apiNote FinaHWPersonReq + * @since 2025/7/10 + */ +@NoArgsConstructor +@Data +public class FinaHWPersonReq { + /** + * 人员库ID + */ + private String groupids = "201"; + /** + * 相似度 + */ + private String similarityThreshold = "85"; + /** + * page + */ + private PageDTO page; + /** + * picture + */ + private PictureDTO picture; + + /** + * PageDTO + */ + @NoArgsConstructor + @Data + public static class PageDTO { + + /** + * no + */ + private String no = "1"; + + /** + * size + */ + private String size = "100"; + + /** + * sort + */ + private String sort = "desc"; + + /** + * orderName + */ + private String orderName = "similarity"; + } + + /** + * PictureDTO + */ + @NoArgsConstructor + @Data + public static class PictureDTO { + /** + * base64 + */ + private String base64; + } +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/service/HuaWeiBoxApiService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/service/HuaWeiBoxApiService.java index 6c33969..d123f08 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/service/HuaWeiBoxApiService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/service/HuaWeiBoxApiService.java @@ -7,10 +7,13 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.dromara.sis.sdk.huawei.HuaWeiBoxApi; import org.dromara.sis.sdk.huawei.domain.AddHWPersonReq; +import org.dromara.sis.sdk.huawei.domain.FinaHWPersonReq; import org.dromara.sis.sdk.huawei.utils.HuaWeiHttp; import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; +import java.util.stream.Collectors; /** * @author lsm @@ -42,7 +45,7 @@ public class HuaWeiBoxApiService implements HuaWeiBoxApi { JSONObject jsonRes = JSONUtil.parseObj(jsonStrRes); if (jsonRes.getInt("resultCode") != 0) { - log.error("新增图片失败，msg：{}", jsonRes.getStr("resultMsg")); + log.error("华为盒子新增图片失败，msg：{}", jsonRes.getStr("resultMsg")); return null; } @@ -50,4 +53,57 @@ public class HuaWeiBoxApiService implements HuaWeiBoxApi { JSONObject obj = jsonArr.getJSONObject(0); return Long.parseLong(obj.getStr("peopleId")); } + + /** + * 删除图片 + * + * @param ids 图片id + * @return Boolean + */ + @Override + public Boolean deletePerson(Collection ids) { + String url = "/sdk_service/rest/facerepositories/201/peoples"; + + String idStr = ids.stream().map(String::valueOf).collect(Collectors.joining(",")); + JSONObject json = new JSONObject(); + json.putOnce("ids", idStr); + + String jsonStrRes = huaWeiHttp.doGetOrDel(url, json.toString(), true); + JSONObject jsonRes = JSONUtil.parseObj(jsonStrRes); + + if (jsonRes.getInt("resultCode") != 0) { + log.error("华为盒子删除图片失败，msg：{}", jsonRes.getStr("resultMsg")); + return false; + } + + return true; + } + + /** + * 根据抓拍图片比对，返回人员ID + * + * @param req 入参 + * @return Long + */ + @Override + public Long findPerson(FinaHWPersonReq req){ + String url = "/sdk_service/rest/facerepositories/peoples"; + + String jsonReq = JSONUtil.toJsonStr(req); + String jsonStrRes = huaWeiHttp.doPost(url, jsonReq); + JSONObject jsonRes = JSONUtil.parseObj(jsonStrRes); + + if (jsonRes.getInt("resultCode") != 0) { + log.error("华为盒子人脸比对败，msg：{}", jsonRes.getStr("resultMsg")); + return null; + } + + JSONArray jsonArr = jsonRes.getJSONArray("algorithmCode"); + JSONObject obj = jsonArr.getJSONObject(0); + + JSONArray peopleList = obj.getJSONArray("peopleList"); + JSONObject people = peopleList.getJSONObject(0); + + return Long.parseLong(people.getStr("peopleId")); + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/utils/HuaWeiHttp.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/utils/HuaWeiHttp.java index ae27269..eaf48a3 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/utils/HuaWeiHttp.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/huawei/utils/HuaWeiHttp.java @@ -1,12 +1,17 @@ package org.dromara.sis.sdk.huawei.utils; +import cn.hutool.core.lang.TypeReference; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; +import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import lombok.extern.slf4j.Slf4j; import org.dromara.common.redis.utils.RedisUtils; import org.springframework.stereotype.Component; +import java.util.Map; + /** * @author lsm * @apiNote HuaWeiHttp @@ -32,10 +37,10 @@ public class HuaWeiHttp { // 发送请求获取响应 // 使用 try-with-resources 确保资源释放 try (HttpResponse response = HttpRequest.post(url) - .header("Content-Type", "application/json") - .header("Cache-Control", "no-cache") - .body(jsonStr) - .execute()) { + .header("Content-Type", "application/json") + .header("Cache-Control", "no-cache") + .body(jsonStr) + .execute()) { if (response.getStatus() == 200 && response.getCookie("JSESSIONID") != null) { RedisUtils.setCacheObject("JSESSIONID", response.getCookie("JSESSIONID").toString()); RedisUtils.expire("JSESSIONID", 1800); @@ -47,7 +52,14 @@ public class HuaWeiHttp { return false; } - public String doPost(String url, String json) { + /** + * 发起Post请求 + * + * @param jsonStr 请求入参 + * @param url 请求接口 + * @return 请求结果 + */ + public String doPost(String url, String jsonStr) { if (!RedisUtils.isExistsObject("JSESSIONID")) { if (!this.login()) { RedisUtils.deleteObject("JSESSIONID"); @@ -58,11 +70,11 @@ public class HuaWeiHttp { String api = BASE_URL + url; try (HttpResponse response = HttpRequest.post(api) - .header("Content-Type", "application/json") - .header("Cache-Control", "no-cache") - .header("Cookie", RedisUtils.getCacheObject("JSESSIONID")) - .body(json) - .execute()) { + .header("Content-Type", "application/json") + .header("Cache-Control", "no-cache") + .header("Cookie", RedisUtils.getCacheObject("JSESSIONID")) + .body(jsonStr) + .execute()) { if (response.isOk()) { return response.body(); } else { @@ -71,4 +83,40 @@ public class HuaWeiHttp { } return null; } + + /** + * 发起Get/Delete请求 + * + * @param url 请求接口 + * @param jsonStr 请求入参 + * @return 请求结果 + */ + public String doGetOrDel(String url, String jsonStr, Boolean isDelete) { + if (!RedisUtils.isExistsObject("JSESSIONID")) { + if (!this.login()) { + RedisUtils.deleteObject("JSESSIONID"); + return null; + } + } + + String api = BASE_URL + url; + + if (isDelete) { + // 直接转换为Map + Map map = JSONUtil.toBean(jsonStr, new TypeReference<>() { + }, false); + + String fullUrl = HttpUtil.urlWithForm(api, map, null, false); + + try (HttpResponse response = HttpRequest.delete(fullUrl) + .header("Content-Type", "application/json") + .header("Cache-Control", "no-cache") + .header("Cookie", RedisUtils.getCacheObject("JSESSIONID")) + .execute()) { + return response.body(); + } + } + + return null; + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java index 4b29383..0453293 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java @@ -112,6 +112,7 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { Assert.notNull(add, "数据处理失败"); boolean flag; try { + log.info("准备写入华为盒子，imgName={}", bo.getImgName()); AddHWPersonReq req = new AddHWPersonReq(); req.setIndex(CodePrefixConstants.PERSON_LIB_IMAGE_CODE_PREFIX + IdUtil.getSnowflakeNextIdStr()); req.setName(bo.getImgName()); @@ -127,6 +128,7 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { Long pId = huaWeiBoxApi.addPerson(List.of(req)); Assert.notNull(pId, "调用华为盒子新增图片失败"); + log.info("写入华为盒子完成，pId={}", pId); add.setRemoteImgId(pId); flag = baseMapper.insert(add) > 0; @@ -168,6 +170,17 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { @Override @Transactional(rollbackFor = Exception.class) public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + List list = this.queryListByIds(ids); + Collection remoteIds = list.stream().map(SisPersonLibImgVo::getRemoteImgId).toList(); + + if (!remoteIds.isEmpty()) { + Boolean flag = huaWeiBoxApi.deletePerson(remoteIds); + Assert.isTrue(flag, "调用华为盒子删除图片失败"); + } + + boolean flag = baseMapper.deleteByIds(ids) > 0; + Assert.isTrue(flag, "删除失败"); + return true; } From 6a7095ec58fc4769dac3d0fe8f103f18d53c2785 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Thu, 10 Jul 2025 22:59:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?refactor(sis):=20=20-=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8D=8E=E4=B8=BA=E7=9B=92=E5=AD=90=E4=BA=BA?= =?UTF-8?q?=E5=83=8F=20=20-=20=E5=8D=8E=E4=B8=BA=E7=9B=92=E5=AD=90?= =?UTF-8?q?=E4=BA=BA=E8=84=B8=E6=AF=94=E5=AF=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java | 3 +-- .../dromara/sis/service/impl/SisPersonLibImgServiceImpl.java | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java index 16d0b4a..7a36ff6 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java @@ -4,7 +4,6 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated; import cn.idev.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.common.translation.annotation.Translation; import org.dromara.sis.domain.SisPersonLibImg; import java.io.Serial; @@ -16,7 +15,7 @@ import java.io.Serializable; * 人像信息视图对象 tb_person_lib_img * * @author mocheng - * @date 2025-06-24 + * @since 2025-06-24 */ @Data @ExcelIgnoreUnannotated diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java index 0453293..70ed0ab 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisPersonLibImgServiceImpl.java @@ -39,8 +39,6 @@ public class SisPersonLibImgServiceImpl implements ISisPersonLibImgService { private final SisPersonLibImgMapper baseMapper; private final HuaWeiBoxApi huaWeiBoxApi; - private final ISisLibDeviceRefService libDeviceRefService; - private final ISisLibDeviceImgRefService libDeviceImgRefService; @DubboReference private final RemoteFileService remoteFileService; From be7002153c72cd23d0b32fd69d1091f3ab7726d5 Mon Sep 17 00:00:00 2001 From: 15683799673 Date: Fri, 11 Jul 2025 07:37:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8E=88=E6=9D=83=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SisAccessControlDeviceController.java | 112 ------------- .../controller/SisAuthRecordController.java | 19 +++ .../controller/SisDeviceManageController.java | 43 +++-- .../sis/domain/SisAccessControlDevice.java | 75 --------- .../org/dromara/sis/domain/SisAuthRecord.java | 5 - .../domain/bo/AccessControlLibDeviceBo.java | 3 +- .../org/dromara/sis/domain/bo/AuthLibBo.java | 22 +++ .../domain/bo/SisAccessControlDeviceBo.java | 75 --------- .../sis/domain/bo/SisElevatorInfoBo.java | 20 +++ .../domain/vo/SisAccessControlDeviceVo.java | 94 ----------- .../sis/domain/vo/SisAccessControlVo.java | 5 + .../sis/domain/vo/SisDeviceManageVo.java | 2 + .../sis/domain/vo/SisElevatorInfoVo.java | 20 ++- .../mapper/SisAccessControlDeviceMapper.java | 15 -- .../sis/mapper/SisAccessControlMapper.java | 3 +- .../ISisAccessControlDeviceService.java | 76 --------- .../sis/service/ISisAuthRecordService.java | 13 ++ .../sis/service/ISisDeviceBindRefService.java | 17 ++ .../sis/service/ISisDeviceManageService.java | 17 ++ .../SisAccessControlDeviceServiceImpl.java | 152 ------------------ .../impl/SisAccessControlServiceImpl.java | 18 ++- .../impl/SisAuthRecordServiceImpl.java | 56 +++++-- .../impl/SisDeviceBindRefServiceImpl.java | 21 +++ .../impl/SisDeviceManageServiceImpl.java | 43 ++++- .../impl/SisElevatorInfoServiceImpl.java | 89 +++++++++- .../impl/SisLibDeviceRefServiceImpl.java | 1 - .../sis/SisAccessControlDeviceMapper.xml | 7 - .../mapper/sis/SisAccessControlMapper.xml | 11 ++ 28 files changed, 368 insertions(+), 666 deletions(-) delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAccessControlDeviceController.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControlDevice.java create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/AuthLibBo.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlDeviceBo.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlDeviceVo.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlDeviceMapper.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAccessControlDeviceService.java delete mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlDeviceServiceImpl.java delete mode 100644 ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAccessControlDeviceMapper.xml diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAccessControlDeviceController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAccessControlDeviceController.java deleted file mode 100644 index 6c0bc6c..0000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAccessControlDeviceController.java +++ /dev/null @@ -1,112 +0,0 @@ -package org.dromara.sis.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.sis.domain.vo.SisAccessControlDeviceVo; -import org.dromara.sis.domain.bo.SisAccessControlDeviceBo; -import org.dromara.sis.service.ISisAccessControlDeviceService; -import org.dromara.common.mybatis.core.page.TableDataInfo; - -/** - * 门禁设备 - * 前端访问路由地址为:/sis/accessControlDevice - * - * @author mocheng - * @date 2025-06-25 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/accessControlDevice") -public class SisAccessControlDeviceController extends BaseController { - - private final ISisAccessControlDeviceService sisAccessControlDeviceService; - - /** - * 查询门禁设备列表 - */ - @SaCheckPermission("sis:accessControlDevice:list") - @GetMapping("/list") - public TableDataInfo list(SisAccessControlDeviceBo bo, PageQuery pageQuery) { - return sisAccessControlDeviceService.queryPageList(bo, pageQuery); - } - - @GetMapping("/list/{factoryNo}") - public R> queryListByFactoryNo(@PathVariable("factoryNo") String factoryNo) { - return R.ok(sisAccessControlDeviceService.queryListByFactoryNo(factoryNo)); - } - - - /** - * 导出门禁设备列表 - */ - @SaCheckPermission("sis:accessControlDevice:export") - @Log(title = "门禁设备", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(SisAccessControlDeviceBo bo, HttpServletResponse response) { - List list = sisAccessControlDeviceService.queryList(bo); - ExcelUtil.exportExcel(list, "门禁设备", SisAccessControlDeviceVo.class, response); - } - - /** - * 获取门禁设备详细信息 - * - * @param id 主键 - */ - @SaCheckPermission("sis:accessControlDevice:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { - return R.ok(sisAccessControlDeviceService.queryById(id)); - } - - /** - * 新增门禁设备 - */ - @SaCheckPermission("sis:accessControlDevice:add") - @Log(title = "门禁设备", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SisAccessControlDeviceBo bo) { - return toAjax(sisAccessControlDeviceService.insertByBo(bo)); - } - - /** - * 修改门禁设备 - */ - @SaCheckPermission("sis:accessControlDevice:edit") - @Log(title = "门禁设备", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SisAccessControlDeviceBo bo) { - return toAjax(sisAccessControlDeviceService.updateByBo(bo)); - } - - /** - * 删除门禁设备 - * - * @param ids 主键串 - */ - @SaCheckPermission("sis:accessControlDevice:remove") - @Log(title = "门禁设备", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable("ids") Long[] ids) { - return toAjax(sisAccessControlDeviceService.deleteWithValidByIds(List.of(ids), true)); - } -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAuthRecordController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAuthRecordController.java index d7fca73..11884c9 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAuthRecordController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAuthRecordController.java @@ -15,6 +15,8 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; +import org.dromara.sis.domain.SisAuthRecord; +import org.dromara.sis.domain.bo.AuthLibBo; import org.dromara.sis.domain.bo.SingleAuthRecordBo; import org.dromara.sis.domain.bo.SisAuthRecordBo; import org.dromara.sis.domain.vo.SisAuthRecordVo; @@ -117,4 +119,21 @@ public class SisAuthRecordController extends BaseController { @PathVariable("ids") Long[] ids) { return toAjax(sisAuthRecordService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 删除授权记录 + * + * @param bo 授权信息 + */ + @SaCheckPermission("sis:authRecord:authLib") + @Log(title = "人员库授权", businessType = BusinessType.INSERT) + @PostMapping("/authLib") + public R authLib(@Validated @RequestBody AuthLibBo bo) { + return toAjax(sisAuthRecordService.authLib(bo)); + } + + @GetMapping("/authDevice/{libId}") + public R> queryAuthDevice(@PathVariable("libId") String libId) { + return R.ok(sisAuthRecordService.queryAuthDevice(libId)); + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisDeviceManageController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisDeviceManageController.java index 2320f96..5f99679 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisDeviceManageController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisDeviceManageController.java @@ -1,33 +1,35 @@ package org.dromara.sis.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 jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; +import org.dromara.common.core.domain.TreeNode; 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.sis.domain.vo.SisDeviceManageVo; -import org.dromara.sis.domain.bo.SisDeviceManageBo; -import org.dromara.sis.service.ISisDeviceManageService; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.dromara.sis.domain.bo.SisDeviceManageBo; +import org.dromara.sis.domain.vo.SisDeviceManageVo; +import org.dromara.sis.service.ISisDeviceManageService; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 设备管理 * 前端访问路由地址为:/system/deviceManage * * @author mocheng - * @since 2025-06-26 + * @since 2025-06-26 */ @Validated @RequiredArgsConstructor @@ -65,7 +67,7 @@ public class SisDeviceManageController extends BaseController { @SaCheckPermission("sis:deviceManage:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable("id") Long id) { + @PathVariable("id") Long id) { return R.ok(sisDeviceManageService.queryById(id)); } @@ -103,4 +105,11 @@ public class SisDeviceManageController extends BaseController { @PathVariable("ids") Long[] ids) { return toAjax(sisDeviceManageService.deleteWithValidByIds(List.of(ids), true)); } + + @GetMapping("/tree") + public R>> tree() { + return R.ok(sisDeviceManageService.tree()); + } + + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControlDevice.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControlDevice.java deleted file mode 100644 index 44b5a1a..0000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAccessControlDevice.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.dromara.sis.domain; - -import org.dromara.common.tenant.core.TenantEntity; -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serial; - -/** - * 门禁设备对象 sis_access_control_device - * - * @author mocheng - * @date 2025-06-25 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sis_access_control_device") -public class SisAccessControlDevice extends TenantEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @TableId(value = "id") - private Long id; - - /** - * 设备编码 - */ - private String eqpNo; - - /** - * 设备名称 - */ - private String eqpName; - - /** - * 厂商编码 - */ - private String factoryNo; - - /** - * 设备类型 - */ - private Long eqpType; - - /** - * 接入类型(1: 平台接入，2:设备接入) - */ - private Long accessType; - - /** - * 设备ip - */ - private String eqpIp; - - /** - * 设备端口 - */ - private Integer eqpPort; - - /** - * 设备账号 - */ - private String eqpAccount; - - /** - * 设备密码 - */ - private String eqpPwd; - -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthRecord.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthRecord.java index 0479411..729b027 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthRecord.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisAuthRecord.java @@ -47,11 +47,6 @@ public class SisAuthRecord extends TenantEntity { */ private Long eqbId; - /** - * E8权限ID - */ - private Long remoteAuthId; - /* 门id */ diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/AccessControlLibDeviceBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/AccessControlLibDeviceBo.java index a39a720..62f8ead 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/AccessControlLibDeviceBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/AccessControlLibDeviceBo.java @@ -8,9 +8,8 @@ import lombok.EqualsAndHashCode; * * @author lxj */ -@EqualsAndHashCode(callSuper = true) @Data -public class AccessControlLibDeviceBo extends SisAccessControlDeviceBo { +public class AccessControlLibDeviceBo { private Integer eqpLibId; diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/AuthLibBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/AuthLibBo.java new file mode 100644 index 0000000..a8373f3 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/AuthLibBo.java @@ -0,0 +1,22 @@ +package org.dromara.sis.domain.bo; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.util.List; + +/** + * 人像库授权 + * + * @author lxj + */ +@Data +public class AuthLibBo { + + @NotNull(message = "人像库id不能为空") + private Long libId; + + @NotNull(message = "设备列表不能为空") + private List deviceIds; + +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlDeviceBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlDeviceBo.java deleted file mode 100644 index a2b729d..0000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAccessControlDeviceBo.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.dromara.sis.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; -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.SisAccessControlDevice; - -/** - * 门禁设备业务对象 sis_access_control_device - * - * @author mocheng - * @date 2025-06-25 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SisAccessControlDevice.class, reverseConvertGenerate = false) -public class SisAccessControlDeviceBo extends BaseEntity { - - /** - * 主键id - */ - @NotNull(message = "主键id不能为空", groups = {EditGroup.class}) - private Long id; - - /** - * 设备名称 - */ - @NotBlank(message = "设备名称不能为空", groups = {AddGroup.class, EditGroup.class}) - private String eqpName; - - /** - * 厂商编码 - */ - private String factoryNo; - - /** - * 设备类型 - */ - private Integer eqpType; - - /** - * 接入类型(1: 平台接入，2:设备接入) - */ - private Integer accessType; - - /** - * 设备ip - */ - @NotBlank(message = "设备ip不能为空", groups = {AddGroup.class, EditGroup.class}) - private String eqpIp; - - /** - * 设备端口 - */ - @NotNull(message = "设备端口不能为空", groups = {AddGroup.class, EditGroup.class}) - private Integer eqpPort; - - /** - * 设备账号 - */ - @NotBlank(message = "设备账号不能为空", groups = {AddGroup.class, EditGroup.class}) - private String eqpAccount; - - /** - * 设备密码 - */ - @NotBlank(message = "设备密码不能为空", groups = {AddGroup.class, EditGroup.class}) - private String eqpPwd; - -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorInfoBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorInfoBo.java index accc46a..3f132a8 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorInfoBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorInfoBo.java @@ -11,6 +11,7 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.sis.domain.SisElevatorInfo; import java.util.Date; +import java.util.List; /** * 电梯基本信息业务对象 sis_elevator_info @@ -141,4 +142,23 @@ public class SisElevatorInfoBo extends BaseEntity { */ @NotNull(message = "不能为空", groups = {AddGroup.class, EditGroup.class}) private Long unitId; + + /** + * 绑定的远程呼梯设备 + */ + private List remoteCallElevatorDeviceId; + + /** + * 绑定梯控时设备 + */ + private DeviceInfo elevatorControlDeviceId; + + + @Data + public static class DeviceInfo { + private Long deviceId; + private String deviceIp; + } + + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlDeviceVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlDeviceVo.java deleted file mode 100644 index 6913aac..0000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlDeviceVo.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.dromara.sis.domain.vo; - -import cn.idev.excel.annotation.ExcelIgnoreUnannotated; -import cn.idev.excel.annotation.ExcelProperty; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import org.dromara.common.translation.annotation.Translation; -import org.dromara.common.translation.constant.TransConstant; -import org.dromara.sis.domain.SisAccessControlDevice; - -import java.io.Serial; -import java.io.Serializable; - - - -/** - * 门禁设备视图对象 sis_access_control_device - * - * @author mocheng - * @date 2025-06-25 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SisAccessControlDevice.class) -public class SisAccessControlDeviceVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @ExcelProperty(value = "主键id") - private Long id; - - /** - * 设备编码 - */ - @ExcelProperty(value = "设备编码") - private String eqpNo; - - /** - * 设备名称 - */ - @ExcelProperty(value = "设备名称") - private String eqpName; - - /** - * 厂商编码 - */ - @ExcelProperty(value = "厂商编码") - private String factoryNo; - - @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "factoryNo", other = "sis_access_control_device_type") - private String factoryName; - - /** - * 设备类型 - */ - @ExcelProperty(value = "设备类型") - private Long eqpType; - - /** - * 接入类型(1: 平台接入，2:设备接入) - */ - @ExcelProperty(value = "接入类型(1: 平台接入，2:设备接入)") - private Long accessType; - - /** - * 设备ip - */ - @ExcelProperty(value = "设备ip") - private String eqpIp; - - /** - * 设备端口 - */ - @ExcelProperty(value = "设备端口") - private Integer eqpPort; - - /** - * 设备账号 - */ - @ExcelProperty(value = "设备账号") - private String eqpAccount; - - /** - * 设备密码 - */ - @ExcelProperty(value = "设备密码") - private String eqpPwd; - - -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java index 08ed4e1..864abca 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAccessControlVo.java @@ -104,4 +104,9 @@ public class SisAccessControlVo implements Serializable { */ @ExcelProperty(value = "外部编码") private String outCode; + + private String bindDeviceId; + + private String bindDeviceIp; + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java index fd1c616..bc29925 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java @@ -98,4 +98,6 @@ public class SisDeviceManageVo implements Serializable { */ private String channelNo; + private String bindDeviceId; + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorInfoVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorInfoVo.java index 308aebf..7a47951 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorInfoVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorInfoVo.java @@ -1,19 +1,15 @@ package org.dromara.sis.domain.vo; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.dromara.sis.domain.SisElevatorInfo; 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 org.dromara.sis.domain.SisElevatorInfo; import java.io.Serial; import java.io.Serializable; import java.util.Date; - +import java.util.List; /** @@ -159,4 +155,16 @@ public class SisElevatorInfoVo implements Serializable { * 单元编码 */ private Long unitId; + + /** + * 呼梯摄像头 + */ + private List remoteCallElevatorDeviceId; + + /** + * 梯控摄像头 + */ + private Long elevatorControlDeviceId; + + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlDeviceMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlDeviceMapper.java deleted file mode 100644 index 3007963..0000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlDeviceMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.sis.mapper; - -import org.dromara.sis.domain.SisAccessControlDevice; -import org.dromara.sis.domain.vo.SisAccessControlDeviceVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 门禁设备Mapper接口 - * - * @author mocheng - * @date 2025-06-25 - */ -public interface SisAccessControlDeviceMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java index ac3ea8a..6a593fd 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java @@ -1,8 +1,8 @@ package org.dromara.sis.mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.sis.domain.SisAccessControl; import org.dromara.sis.domain.vo.SisAccessControlVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** * 门禁设备Mapper接口 @@ -12,4 +12,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface SisAccessControlMapper extends BaseMapperPlus { + SisAccessControlVo queryById(Long id); } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAccessControlDeviceService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAccessControlDeviceService.java deleted file mode 100644 index 8e3bf7b..0000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAccessControlDeviceService.java +++ /dev/null @@ -1,76 +0,0 @@ -package org.dromara.sis.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.sis.domain.bo.SisAccessControlDeviceBo; -import org.dromara.sis.domain.vo.SisAccessControlDeviceVo; - -import java.util.Collection; -import java.util.List; - -/** - * 门禁设备Service接口 - * - * @author mocheng - * @date 2025-06-25 - */ -public interface ISisAccessControlDeviceService { - - /** - * 查询门禁设备 - * - * @param id 主键 - * @return 门禁设备 - */ - SisAccessControlDeviceVo queryById(Long id); - - /** - * 分页查询门禁设备列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 门禁设备分页列表 - */ - TableDataInfo queryPageList(SisAccessControlDeviceBo bo, PageQuery pageQuery); - - /** - * 查询符合条件的门禁设备列表 - * - * @param bo 查询条件 - * @return 门禁设备列表 - */ - List queryList(SisAccessControlDeviceBo bo); - - /** - * 新增门禁设备 - * - * @param bo 门禁设备 - * @return 是否新增成功 - */ - Boolean insertByBo(SisAccessControlDeviceBo bo); - - /** - * 修改门禁设备 - * - * @param bo 门禁设备 - * @return 是否修改成功 - */ - Boolean updateByBo(SisAccessControlDeviceBo bo); - - /** - * 校验并批量删除门禁设备信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - - /** - * 根据factoryNo 查询设备列表 - * - * @param factoryNo 厂商编号 - * @return 返回设备列表 - */ - List queryListByFactoryNo(String factoryNo); -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthRecordService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthRecordService.java index ed1cb45..c38079d 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthRecordService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAuthRecordService.java @@ -2,6 +2,8 @@ package org.dromara.sis.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.sis.domain.SisAuthRecord; +import org.dromara.sis.domain.bo.AuthLibBo; import org.dromara.sis.domain.bo.SingleAuthRecordBo; import org.dromara.sis.domain.bo.SisAuthRecordBo; import org.dromara.sis.domain.vo.SisAuthRecordVo; @@ -83,4 +85,15 @@ public interface ISisAuthRecordService { * @return 是否授权成功 */ Boolean singleAuth(SingleAuthRecordBo bo); + + Boolean deleteByLibId(Long libId); + + Boolean authLib(AuthLibBo bo); + + /** + * 插叙库id授权的设备 + * @param libId 人像库id + * @return + */ + List queryAuthDevice(String libId); } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceBindRefService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceBindRefService.java index 66161e4..d47a2f8 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceBindRefService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceBindRefService.java @@ -77,8 +77,25 @@ public interface ISisDeviceBindRefService { /** * 通过ip查询设备关联关系 + * * @param ipcAddr 设备ip * @return 返回关联关系表 */ SisDeviceBindRef queryByDeviceIp(String ipcAddr); + + /** + * 批量写入设备绑定关系 + * + * @param ls 写入数据 + */ + Boolean batchInsert(List ls); + + Boolean deleteByBindId(Long elevatorId); + + /** + * 通过电梯id 查询绑定的设备关系 + * @param elevatorId 电梯id + * @return 返回绑定设备列表 + */ + List queryByBindId(Long elevatorId); } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceManageService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceManageService.java index 3d8859d..218b1b0 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceManageService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisDeviceManageService.java @@ -1,7 +1,9 @@ package org.dromara.sis.service; +import org.dromara.common.core.domain.TreeNode; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.sis.domain.SisDeviceManage; import org.dromara.sis.domain.bo.SisDeviceManageBo; import org.dromara.sis.domain.vo.SisDeviceManageVo; @@ -73,4 +75,19 @@ public interface ISisDeviceManageService { * @return 设备信息 */ SisDeviceManageVo queryVoByDeviceIp(Integer deviceCode); + + /** + * 查询设备数 + * + * @return + */ + List> tree(); + + + /** + * 通过设备id列表查询设备信息 + * @param deviceIds 设备id列表 + * @return 返回设备报表 + */ + List queryByIds(List deviceIds); } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlDeviceServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlDeviceServiceImpl.java deleted file mode 100644 index 11400bd..0000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlDeviceServiceImpl.java +++ /dev/null @@ -1,152 +0,0 @@ -package org.dromara.sis.service.impl; - -import cn.hutool.core.util.IdUtil; -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.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CodePrefixConstants; -import org.dromara.common.core.service.DictService; -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.sis.domain.SisAccessControlDevice; -import org.dromara.sis.domain.bo.SisAccessControlDeviceBo; -import org.dromara.sis.domain.vo.SisAccessControlDeviceVo; -import org.dromara.sis.mapper.SisAccessControlDeviceMapper; -import org.dromara.sis.service.ISisAccessControlDeviceService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * 门禁设备Service业务层处理 - * - * @author mocheng - * @date 2025-06-25 - */ -@Slf4j -@Service -public class SisAccessControlDeviceServiceImpl implements ISisAccessControlDeviceService { - @Resource - private SisAccessControlDeviceMapper baseMapper; - @Resource - private DictService dictService; - - /** - * 查询门禁设备 - * - * @param id 主键 - * @return 门禁设备 - */ - @Override - public SisAccessControlDeviceVo queryById(Long id) { - return baseMapper.selectVoById(id); - } - - /** - * 分页查询门禁设备列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 门禁设备分页列表 - */ - @Override - public TableDataInfo queryPageList(SisAccessControlDeviceBo 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(SisAccessControlDeviceBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SisAccessControlDeviceBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.orderByAsc(SisAccessControlDevice::getId); - lqw.like(StringUtils.isNotBlank(bo.getEqpName()), SisAccessControlDevice::getEqpName, bo.getEqpName()); - lqw.eq(StringUtils.isNotBlank(bo.getFactoryNo()), SisAccessControlDevice::getFactoryNo, bo.getFactoryNo()); - lqw.eq(bo.getEqpType() != null, SisAccessControlDevice::getEqpType, bo.getEqpType()); - lqw.eq(bo.getAccessType() != null, SisAccessControlDevice::getAccessType, bo.getAccessType()); - lqw.eq(StringUtils.isNotBlank(bo.getEqpIp()), SisAccessControlDevice::getEqpIp, bo.getEqpIp()); - lqw.eq(bo.getEqpPort() != null, SisAccessControlDevice::getEqpPort, bo.getEqpPort()); - lqw.eq(StringUtils.isNotBlank(bo.getEqpAccount()), SisAccessControlDevice::getEqpAccount, bo.getEqpAccount()); - lqw.eq(StringUtils.isNotBlank(bo.getEqpPwd()), SisAccessControlDevice::getEqpPwd, bo.getEqpPwd()); - lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), SisAccessControlDevice::getSearchValue, bo.getSearchValue()); - return lqw; - } - - /** - * 新增门禁设备 - * - * @param bo 门禁设备 - * @return 是否新增成功 - */ - @Override - public Boolean insertByBo(SisAccessControlDeviceBo bo) { - SisAccessControlDevice add = MapstructUtils.convert(bo, SisAccessControlDevice.class); - // 生成设备比吗 - add.setEqpNo(CodePrefixConstants.SIS_DEVICE_CODE_PREFIX + IdUtil.getSnowflakeNextIdStr()); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setId(add.getId()); - } - return flag; - } - - /** - * 修改门禁设备 - * - * @param bo 门禁设备 - * @return 是否修改成功 - */ - @Override - public Boolean updateByBo(SisAccessControlDeviceBo bo) { - SisAccessControlDevice update = MapstructUtils.convert(bo, SisAccessControlDevice.class); - validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(SisAccessControlDevice entity) { - //TODO 做一些数据校验,如唯一约束 - } - - /** - * 校验并批量删除门禁设备信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if (isValid) { - //TODO 做一些业务上的校验,判断是否需要校验 - } - return baseMapper.deleteByIds(ids) > 0; - } - - @Override - public List queryListByFactoryNo(String factoryNo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(SisAccessControlDevice::getFactoryNo, factoryNo); - return baseMapper.selectVoList(lqw); - } -} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java index cb13e97..fa606f2 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java @@ -63,7 +63,7 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService { */ @Override public SisAccessControlVo queryById(Long id) { - return baseMapper.selectVoById(id); + return baseMapper.queryById(id); } /** @@ -189,9 +189,23 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService { * @return 是否修改成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean updateByBo(SisAccessControlBo bo) { SisAccessControl update = MapstructUtils.convert(bo, SisAccessControl.class); - validEntityBeforeSave(update); + sisDeviceBindRefService.deleteByBindId(bo.getId()); + if (bo.getBindDeviceId() != null) { + // 检验设备是否存在 + SisDeviceManageVo sisDeviceManageVo = sisDeviceManageService.queryById(bo.getBindDeviceId()); + // 写入关联关系表中 + SisDeviceBindRef sisDeviceBindRef = new SisDeviceBindRef(); + sisDeviceBindRef.setDeviceId(sisDeviceManageVo.getId()); + sisDeviceBindRef.setDeviceIp(sisDeviceManageVo.getDeviceIp()); + sisDeviceBindRef.setBindId(bo.getId()); + sisDeviceBindRef.setControlType(ControlTypeEnum.ACCESS_CONTROL.getCode()); + Boolean insert = sisDeviceBindRefService.insert(sisDeviceBindRef); + Assert.isTrue(insert, "写入设备关联表失败!"); + } + return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java index 4c0ff00..9b262c1 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java @@ -1,7 +1,7 @@ package org.dromara.sis.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.img.ImgUtil; -import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,20 +13,16 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.resource.api.RemoteFileService; import org.dromara.sis.domain.SisAuthRecord; +import org.dromara.sis.domain.SisDeviceManage; +import org.dromara.sis.domain.bo.AuthLibBo; import org.dromara.sis.domain.bo.SingleAuthRecordBo; import org.dromara.sis.domain.bo.SisAuthRecordBo; -import org.dromara.sis.domain.bo.SisLibDeviceImgRefBo; -import org.dromara.sis.domain.bo.SisLibDeviceRefBo; -import org.dromara.sis.domain.vo.*; +import org.dromara.sis.domain.vo.SisAuthRecordVo; import org.dromara.sis.mapper.SisAuthRecordMapper; import org.dromara.sis.sdk.e8.AccessControlService; import org.dromara.sis.sdk.e8.DoorDeviceService; import org.dromara.sis.sdk.e8.VoucherControlService; -import org.dromara.sis.sdk.e8.domain.accessControl.req.CustomerAuthAddReq; -import org.dromara.sis.sdk.e8.domain.door.res.AuthDoorDeviceFindRes; -import org.dromara.sis.sdk.e8.domain.voucher.req.IssueVoucherReq; import org.dromara.sis.sdk.unview.UnViewAiBoxApi; -import org.dromara.sis.sdk.unview.model.UvModel; import org.dromara.sis.service.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,7 +30,10 @@ import org.springframework.transaction.annotation.Transactional; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.util.*; +import java.util.Base64; +import java.util.Collection; +import java.util.List; +import java.util.Map; /** * 授权记录Service业务层处理 @@ -58,7 +57,7 @@ public class SisAuthRecordServiceImpl implements ISisAuthRecordService { private final ISisLibDeviceRefService sisLibDeviceRefService; private final ISisAccessControlService sisAccessControlService; private final ISisLibDeviceImgRefService sisLibDeviceImgRefService; - private final ISisAccessControlDeviceService sisAccessControlDeviceService; + private final ISisDeviceManageService deviceManageService; @DubboReference private final RemoteFileService remoteFileService; @@ -336,4 +335,41 @@ public class SisAuthRecordServiceImpl implements ISisAuthRecordService { public SisAuthRecordVo checkAuth(Integer personId, Long accessControlId) { return baseMapper.checkAuth(personId, accessControlId); } + + @Override + public Boolean deleteByLibId(Long libId) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(SisAuthRecord::getLibId, libId); + return baseMapper.delete(lqw) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean authLib(AuthLibBo bo) { + if (CollUtil.isEmpty(bo.getDeviceIds())) { + return false; + } + // 每次授权先删除上一次授权信息 + deleteByLibId(bo.getLibId()); + // 过滤点不是设备的节点数据 + List ls = deviceManageService.queryByIds(bo.getDeviceIds()); + if (CollUtil.isEmpty(ls)) { + return false; + } + // 批量写入授权数据 + List list = ls.stream().map(item -> { + SisAuthRecord authRecord = new SisAuthRecord(); + authRecord.setDeviceId(item.getId()); + authRecord.setLibId(bo.getLibId()); + return authRecord; + }).toList(); + return baseMapper.insertBatch(list); + } + + @Override + public List queryAuthDevice(String libId) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(SisAuthRecord::getLibId, libId); + return baseMapper.selectList(lqw); + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceBindRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceBindRefServiceImpl.java index 7560824..6657674 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceBindRefServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceBindRefServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.sis.service.impl; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -142,4 +143,24 @@ public class SisDeviceBindRefServiceImpl implements ISisDeviceBindRefService { lqw.eq(SisDeviceBindRef::getDeviceIp, ipcAddr); return baseMapper.selectOne(lqw); } + + @Override + public Boolean batchInsert(List ls) { + return baseMapper.insertBatch(ls); + } + + @Override + public Boolean deleteByBindId(Long elevatorId) { + Assert.notNull(elevatorId, "elevatorId 不能为null"); + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(SisDeviceBindRef::getBindId, elevatorId); + return baseMapper.delete(lqw) > 0; + } + + @Override + public List queryByBindId(Long elevatorId) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(SisDeviceBindRef::getBindId, elevatorId); + return baseMapper.selectList(lqw); + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java index 1f5fff0..6433ba8 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java @@ -1,24 +1,25 @@ package org.dromara.sis.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 com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; +import org.dromara.common.core.domain.TreeNode; +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.sis.domain.SisDeviceManage; import org.dromara.sis.domain.bo.SisDeviceManageBo; import org.dromara.sis.domain.vo.SisDeviceManageVo; -import org.dromara.sis.domain.SisDeviceManage; import org.dromara.sis.mapper.SisDeviceManageMapper; import org.dromara.sis.service.ISisDeviceManageService; +import org.springframework.stereotype.Service; +import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Collection; /** * 设备管理Service业务层处理 @@ -142,4 +143,30 @@ public class SisDeviceManageServiceImpl implements ISisDeviceManageService { lqw.eq(SisDeviceManage::getDeviceIp, deviceCode); return baseMapper.selectVoById(lqw); } + + @Override + public List> tree() { + // 暂时将所有数据放入写死的根节点中 + TreeNode root = new TreeNode<>(); + root.setLevel(1); + root.setCode(0L); + root.setParentCode(-1L); + root.setLabel("商务中心"); + List vo = baseMapper.selectVoList(); + List> childrenList = vo.stream().map(item -> { + TreeNode node = new TreeNode<>(); + node.setLevel(2); + node.setCode(item.getId()); + node.setParentCode(root.getCode()); + node.setLabel(item.getDeviceName()); + return node; + }).toList(); + root.setChildren(childrenList); + return List.of(root); + } + + @Override + public List queryByIds(List deviceIds) { + return baseMapper.selectByIds(deviceIds); + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java index 3317cce..139b88e 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.sis.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -14,17 +15,18 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.property.api.RemoteUnitService; import org.dromara.property.api.domain.vo.RemoteUnitVo; +import org.dromara.sis.domain.SisDeviceBindRef; import org.dromara.sis.domain.SisElevatorInfo; import org.dromara.sis.domain.bo.SisElevatorInfoBo; +import org.dromara.sis.domain.enums.ControlTypeEnum; import org.dromara.sis.domain.vo.SisElevatorInfoVo; import org.dromara.sis.mapper.SisElevatorInfoMapper; +import org.dromara.sis.service.ISisDeviceBindRefService; import org.dromara.sis.service.ISisElevatorInfoService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; import static org.dromara.common.core.constant.CodePrefixConstants.ELEVATOR_CONTROL_CODE_PREFIX; @@ -40,6 +42,7 @@ import static org.dromara.common.core.constant.CodePrefixConstants.ELEVATOR_CONT public class SisElevatorInfoServiceImpl implements ISisElevatorInfoService { private final SisElevatorInfoMapper baseMapper; + private final ISisDeviceBindRefService deviceBindRefService; @DubboReference private RemoteUnitService remoteUnitService; @@ -52,7 +55,25 @@ public class SisElevatorInfoServiceImpl implements ISisElevatorInfoService { */ @Override public SisElevatorInfoVo queryById(Long elevatorId) { - return baseMapper.selectVoById(elevatorId); + SisElevatorInfoVo sisElevatorInfoVo = baseMapper.selectVoById(elevatorId); + if (sisElevatorInfoVo == null) { + return sisElevatorInfoVo; + } + List ref = deviceBindRefService.queryByBindId(elevatorId); + if (CollUtil.isNotEmpty(ref)) { + List remoteCallElevatorDeviceId = new ArrayList<>(ref.size()); + Long elevatorControlDeviceId = null; + for (SisDeviceBindRef item : ref) { + if (Objects.equals(item.getControlType(), ControlTypeEnum.REMOTE_CALL_ELEVATOR.getCode())) { + remoteCallElevatorDeviceId.add(item.getDeviceId()); + } else { + elevatorControlDeviceId = item.getDeviceId(); + } + sisElevatorInfoVo.setRemoteCallElevatorDeviceId(remoteCallElevatorDeviceId); + sisElevatorInfoVo.setElevatorControlDeviceId(elevatorControlDeviceId); + } + } + return sisElevatorInfoVo; } /** @@ -128,14 +149,37 @@ public class SisElevatorInfoServiceImpl implements ISisElevatorInfoService { boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setElevatorId(add.getElevatorId()); + List ls = new ArrayList<>(); + // 梯控 + if (bo.getElevatorControlDeviceId() != null) { + SisDeviceBindRef ref = new SisDeviceBindRef(); + ref.setDeviceId(bo.getElevatorControlDeviceId().getDeviceId()); + ref.setDeviceIp(bo.getElevatorControlDeviceId().getDeviceIp()); + ref.setBindId(bo.getElevatorId()); + ref.setControlType(ControlTypeEnum.ELEVATOR_CONTROL.getCode()); + ls.add(ref); + } + // 远程呼叫 + if (bo.getRemoteCallElevatorDeviceId() != null && !bo.getRemoteCallElevatorDeviceId().isEmpty()) { + for (SisElevatorInfoBo.DeviceInfo deviceInfo : bo.getRemoteCallElevatorDeviceId()) { + SisDeviceBindRef ref = new SisDeviceBindRef(); + ref.setDeviceId(deviceInfo.getDeviceId()); + ref.setDeviceIp(deviceInfo.getDeviceIp()); + ref.setBindId(bo.getElevatorId()); + ref.setControlType(ControlTypeEnum.REMOTE_CALL_ELEVATOR.getCode()); + ls.add(ref); + } + } + // 写入绑定设备表 + if (!ls.isEmpty()) { + Boolean b = deviceBindRefService.batchInsert(ls); + Assert.isTrue(b, "设备绑定关联关系写入失败！"); + } // hik sdk 登录 // short port = bo.getControlPort().shortValue(); // Boolean isLogin = HikApiService.getInstance().login(bo.getControlIp(), port, bo.getControlAccount(), bo.getControlPwd()); // Assert.isTrue(isLogin, "电梯添加失败, 发起梯控设备连接失败."); // todo 发起电梯楼层信息同步 - - - } return flag; } @@ -147,9 +191,38 @@ public class SisElevatorInfoServiceImpl implements ISisElevatorInfoService { * @return 是否修改成功 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean updateByBo(SisElevatorInfoBo bo) { SisElevatorInfo update = MapstructUtils.convert(bo, SisElevatorInfo.class); - validEntityBeforeSave(update); + // 删除设备绑定关系 + deviceBindRefService.deleteByBindId(bo.getElevatorId()); + // 重新写入关联关系 + List ls = new ArrayList<>(); + // 梯控 + if (bo.getElevatorControlDeviceId() != null) { + SisDeviceBindRef ref = new SisDeviceBindRef(); + ref.setDeviceId(bo.getElevatorControlDeviceId().getDeviceId()); + ref.setDeviceIp(bo.getElevatorControlDeviceId().getDeviceIp()); + ref.setBindId(bo.getElevatorId()); + ref.setControlType(ControlTypeEnum.ELEVATOR_CONTROL.getCode()); + ls.add(ref); + } + // 远程呼叫 + if (bo.getRemoteCallElevatorDeviceId() != null && !bo.getRemoteCallElevatorDeviceId().isEmpty()) { + for (SisElevatorInfoBo.DeviceInfo deviceInfo : bo.getRemoteCallElevatorDeviceId()) { + SisDeviceBindRef ref = new SisDeviceBindRef(); + ref.setDeviceId(deviceInfo.getDeviceId()); + ref.setDeviceIp(deviceInfo.getDeviceIp()); + ref.setBindId(bo.getElevatorId()); + ref.setControlType(ControlTypeEnum.REMOTE_CALL_ELEVATOR.getCode()); + ls.add(ref); + } + } + // 写入绑定设备表 + if (!ls.isEmpty()) { + Boolean b = deviceBindRefService.batchInsert(ls); + Assert.isTrue(b, "设备绑定关联关系写入失败！"); + } return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java index 6f69e22..acbbf81 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisLibDeviceRefServiceImpl.java @@ -12,7 +12,6 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.sis.domain.SisLibDeviceRef; import org.dromara.sis.domain.bo.AccessControlLibDeviceBo; import org.dromara.sis.domain.bo.SisLibDeviceRefBo; -import org.dromara.sis.domain.vo.SisAccessControlDeviceVo; import org.dromara.sis.domain.vo.SisLibDeviceRefVo; import org.dromara.sis.mapper.SisLibDeviceRefMapper; import org.dromara.sis.service.ISisLibDeviceRefService; diff --git a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAccessControlDeviceMapper.xml b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAccessControlDeviceMapper.xml deleted file mode 100644 index 81a4d8a..0000000 --- a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAccessControlDeviceMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAccessControlMapper.xml b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAccessControlMapper.xml index 006583e..bc5f1a8 100644 --- a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAccessControlMapper.xml +++ b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAccessControlMapper.xml @@ -4,4 +4,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +