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 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());