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

Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

Browse Source
This commit is contained in:
dy 2025-07-01 15:13:48 +08:00
commit 5ed4796d3c
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-api/pom.xml
View File

@ -13,6 +13,7 @@
<module>ruoyi-api-system</module> <module>ruoyi-api-system</module>
<module>ruoyi-api-resource</module> <module>ruoyi-api-resource</module>
<module>ruoyi-api-workflow</module> <module>ruoyi-api-workflow</module>
<module>property-api</module>
</modules> </modules>
<artifactId>ruoyi-api</artifactId> <artifactId>ruoyi-api</artifactId>

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

@ -39,4 +39,10 @@ public class SisAuthRecordBo extends BaseEntity {
*/ */
@NotNull(message = "门禁id列表能为空", groups = {AddGroup.class, EditGroup.class}) @NotNull(message = "门禁id列表能为空", groups = {AddGroup.class, EditGroup.class})
private List<Long> acIds; private List<Long> acIds;
/**
* 是否将图片下发到宇视盒子
*/
private Boolean issue = false;
} }

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

@ -4,6 +4,7 @@ import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.common.translation.annotation.Translation;
import org.dromara.sis.domain.SisPersonLibImg; import org.dromara.sis.domain.SisPersonLibImg;
import java.io.Serial; import java.io.Serial;
@ -53,7 +54,7 @@ public class SisPersonLibImgVo implements Serializable {
* 性别 1：男 * 性别 1：男
2：女 99：未说明 2：女 99：未说明
*/ */
@ExcelProperty(value = "性别 1") @ExcelProperty(value = "性别")
private Integer sex; private Integer sex;
/** /**

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

@ -239,7 +239,7 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService {
if (sisAccessControlVos != null && !sisAccessControlVos.isEmpty()) { if (sisAccessControlVos != null && !sisAccessControlVos.isEmpty()) {
List<TreeNode<Long>> l1 = sisAccessControlVos.stream().map(item -> { List<TreeNode<Long>> l1 = sisAccessControlVos.stream().map(item -> {
TreeNode<Long> node = new TreeNode<>(); TreeNode<Long> node = new TreeNode<>();
node.setLevel(4); node.setLevel(5);
node.setCode(item.getId()); node.setCode(item.getId());
node.setParentCode(item.getFloorId()); node.setParentCode(item.getFloorId());
node.setLabel(item.getAccessName()); node.setLabel(item.getAccessName());