From b70c3f2ee1848612a040cdf8b710a27771257d04 Mon Sep 17 00:00:00 2001 From: 15683799673 Date: Tue, 1 Jul 2025 08:45:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=A8=E7=A6=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/sis/domain/bo/SisAuthRecordBo.java | 6 ++++++ .../java/org/dromara/sis/domain/vo/SisPersonLibImgVo.java | 3 ++- .../sis/service/impl/SisAccessControlServiceImpl.java | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthRecordBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthRecordBo.java index 053bdc0..cb683c0 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthRecordBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisAuthRecordBo.java @@ -39,4 +39,10 @@ public class SisAuthRecordBo extends BaseEntity { */ @NotNull(message = "门禁id列表能为空", groups = {AddGroup.class, EditGroup.class}) private List acIds; + + /** + * 是否将图片下发到宇视盒子 + */ + private Boolean issue = false; + } 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 3e11012..8a3a39d 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,6 +4,7 @@ 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; @@ -53,7 +54,7 @@ public class SisPersonLibImgVo implements Serializable { * 性别 1:男 2:女 99:未说明 */ - @ExcelProperty(value = "性别 1") + @ExcelProperty(value = "性别") private Integer sex; /** 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 304bbff..423e7a4 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 @@ -239,7 +239,7 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService { if (sisAccessControlVos != null && !sisAccessControlVos.isEmpty()) { List> l1 = sisAccessControlVos.stream().map(item -> { TreeNode node = new TreeNode<>(); - node.setLevel(4); + node.setLevel(5); node.setCode(item.getId()); node.setParentCode(item.getFloorId()); node.setLabel(item.getAccessName()); From 26be25d9cb4c6a4016f55a7ef36bfe0d001a70bc Mon Sep 17 00:00:00 2001 From: lxj <15683799673@163.com> Date: Tue, 1 Jul 2025 10:47:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0property-api=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-api/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index 8b5f0b9..e276c9a 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -13,6 +13,7 @@ ruoyi-api-system ruoyi-api-resource ruoyi-api-workflow + property-api ruoyi-api